diff options
255 files changed, 1829 insertions, 3285 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index d19ecd450f0a..f384fa9e6a0b 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -5863,20 +5863,20 @@ public final class ActivityThread extends ClientTransactionHandler final boolean movedToDifferentDisplay = isDifferentDisplay(activity.getDisplayId(), displayId); - final Configuration currentConfig = activity.mCurrentConfig; - final int diff = currentConfig.diffPublicOnly(newConfig); - final boolean hasPublicConfigChange = diff != 0; + final Configuration currentResConfig = activity.getResources().getConfiguration(); + final int diff = currentResConfig.diffPublicOnly(newConfig); + final boolean hasPublicResConfigChange = diff != 0; final ActivityClientRecord r = getActivityClient(activityToken); // TODO(b/173090263): Use diff instead after the improvement of AssetManager and // ResourcesImpl constructions. - final boolean shouldUpdateResources = hasPublicConfigChange - || shouldUpdateResources(activityToken, currentConfig, newConfig, amOverrideConfig, - movedToDifferentDisplay, hasPublicConfigChange); - final boolean shouldReportChange = shouldReportChange(diff, currentConfig, newConfig, + final boolean shouldUpdateResources = hasPublicResConfigChange + || shouldUpdateResources(activityToken, currentResConfig, newConfig, + amOverrideConfig, movedToDifferentDisplay, hasPublicResConfigChange); + final boolean shouldReportChange = shouldReportChange(activity.mCurrentConfig, newConfig, r != null ? r.mSizeConfigurations : null, activity.mActivityInfo.getRealConfigChanged()); // Nothing significant, don't proceed with updating and reporting. - if (!shouldUpdateResources) { + if (!shouldUpdateResources && !shouldReportChange) { return null; } @@ -5896,9 +5896,6 @@ public final class ActivityThread extends ClientTransactionHandler amOverrideConfig, contextThemeWrapperOverrideConfig); mResourcesManager.updateResourcesForActivity(activityToken, finalOverrideConfig, displayId); - activity.mConfigChangeFlags = 0; - activity.mCurrentConfig = new Configuration(newConfig); - // Apply the ContextThemeWrapper override if necessary. // NOTE: Make sure the configurations are not modified, as they are treated as immutable // in many places. @@ -5909,8 +5906,10 @@ public final class ActivityThread extends ClientTransactionHandler activity.dispatchMovedToDisplay(displayId, configToReport); } + activity.mConfigChangeFlags = 0; if (shouldReportChange) { activity.mCalled = false; + activity.mCurrentConfig = new Configuration(newConfig); activity.onConfigurationChanged(configToReport); if (!activity.mCalled) { throw new SuperNotCalledException("Activity " + activity.getLocalClassName() + @@ -5925,8 +5924,6 @@ public final class ActivityThread extends ClientTransactionHandler * Returns {@code true} if {@link Activity#onConfigurationChanged(Configuration)} should be * dispatched. * - * @param publicDiff Usually computed by {@link Configuration#diffPublicOnly(Configuration)}. - * This parameter is to prevent we compute it again. * @param currentConfig The current configuration cached in {@link Activity#mCurrentConfig}. * It is {@code null} before the first config update from the server side. * @param newConfig The updated {@link Configuration} @@ -5935,9 +5932,10 @@ public final class ActivityThread extends ClientTransactionHandler * @return {@code true} if the config change should be reported to the Activity */ @VisibleForTesting - public static boolean shouldReportChange(int publicDiff, @Nullable Configuration currentConfig, + public static boolean shouldReportChange(@Nullable Configuration currentConfig, @NonNull Configuration newConfig, @Nullable SizeConfigurationBuckets sizeBuckets, int handledConfigChanges) { + final int publicDiff = currentConfig.diffPublicOnly(newConfig); // Don't report the change if there's no public diff between current and new config. if (publicDiff == 0) { return false; diff --git a/core/java/android/view/WindowLayout.java b/core/java/android/view/WindowLayout.java index 9b6b2b906e8e..0941ee8a714f 100644 --- a/core/java/android/view/WindowLayout.java +++ b/core/java/android/view/WindowLayout.java @@ -16,8 +16,6 @@ package android.view; -import static android.view.Gravity.DISPLAY_CLIP_HORIZONTAL; -import static android.view.Gravity.DISPLAY_CLIP_VERTICAL; import static android.view.InsetsState.ITYPE_IME; import static android.view.InsetsState.ITYPE_NAVIGATION_BAR; import static android.view.InsetsState.ITYPE_STATUS_BAR; @@ -275,17 +273,9 @@ public class WindowLayout { Gravity.applyDisplay(attrs.gravity, outDisplayFrame, outFrame); } - if (extendedByCutout && !displayCutoutSafe.contains(outFrame)) { - mTempRect.set(outFrame); - - // Move the frame into displayCutoutSafe. - final int clipFlags = DISPLAY_CLIP_VERTICAL | DISPLAY_CLIP_HORIZONTAL; - Gravity.applyDisplay(attrs.gravity & ~clipFlags, displayCutoutSafe, + if (extendedByCutout) { + extendFrameByCutout(attrs.gravity, displayCutoutSafe, outDisplayFrame, outFrame, mTempRect); - - if (mTempRect.intersect(outDisplayFrame)) { - outFrame.union(mTempRect); - } } if (DEBUG) Log.d(TAG, "computeFrames " + attrs.getTitle() @@ -301,6 +291,21 @@ public class WindowLayout { + " requestedVisibilities=" + requestedVisibilities); } + public static void extendFrameByCutout(int gravity, Rect displayCutoutSafe, + Rect displayFrame, Rect inOutFrame, Rect tempRect) { + if (displayCutoutSafe.contains(inOutFrame)) { + return; + } + tempRect.set(inOutFrame); + + // Move the frame into displayCutoutSafe. + Gravity.applyDisplay(0 /* gravity */, displayCutoutSafe, tempRect); + + if (tempRect.intersect(displayFrame)) { + inOutFrame.union(tempRect); + } + } + public static void computeSurfaceSize(WindowManager.LayoutParams attrs, Rect maxBounds, int requestedWidth, int requestedHeight, Rect winFrame, boolean dragResizing, Point outSurfaceSize) { diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java index 2ed0f981692e..737d5e348249 100644 --- a/core/java/com/android/internal/app/ResolverListAdapter.java +++ b/core/java/com/android/internal/app/ResolverListAdapter.java @@ -265,6 +265,7 @@ public class ResolverListAdapter extends BaseAdapter { return mResolverListController.getResolversForIntent( /* shouldGetResolvedFilter= */ true, mResolverListCommunicator.shouldGetActivityMetadata(), + mResolverListCommunicator.shouldGetOnlyDefaultActivities(), mIntents); } } @@ -727,6 +728,7 @@ public class ResolverListAdapter extends BaseAdapter { protected List<ResolvedComponentInfo> getResolversForUser(UserHandle userHandle) { return mResolverListController.getResolversForIntentAsUser(true, mResolverListCommunicator.shouldGetActivityMetadata(), + mResolverListCommunicator.shouldGetOnlyDefaultActivities(), mIntents, userHandle); } @@ -820,6 +822,12 @@ public class ResolverListAdapter extends BaseAdapter { boolean shouldGetActivityMetadata(); + /** + * @return true to filter only apps that can handle + * {@link android.content.Intent#CATEGORY_DEFAULT} intents + */ + default boolean shouldGetOnlyDefaultActivities() { return true; }; + Intent getTargetIntent(); void onHandlePackagesChanged(ResolverListAdapter listAdapter); diff --git a/core/java/com/android/internal/app/ResolverListController.java b/core/java/com/android/internal/app/ResolverListController.java index 27573631b2ce..100fcd817812 100644 --- a/core/java/com/android/internal/app/ResolverListController.java +++ b/core/java/com/android/internal/app/ResolverListController.java @@ -110,17 +110,19 @@ public class ResolverListController { public List<ResolverActivity.ResolvedComponentInfo> getResolversForIntent( boolean shouldGetResolvedFilter, boolean shouldGetActivityMetadata, + boolean shouldGetOnlyDefaultActivities, List<Intent> intents) { return getResolversForIntentAsUser(shouldGetResolvedFilter, shouldGetActivityMetadata, - intents, mUserHandle); + shouldGetOnlyDefaultActivities, intents, mUserHandle); } public List<ResolverActivity.ResolvedComponentInfo> getResolversForIntentAsUser( boolean shouldGetResolvedFilter, boolean shouldGetActivityMetadata, + boolean shouldGetOnlyDefaultActivities, List<Intent> intents, UserHandle userHandle) { - int baseFlags = PackageManager.MATCH_DEFAULT_ONLY + int baseFlags = (shouldGetOnlyDefaultActivities ? PackageManager.MATCH_DEFAULT_ONLY : 0) | PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE | (shouldGetResolvedFilter ? PackageManager.GET_RESOLVED_FILTER : 0) diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl index e93a7854f1cd..65bec0e405ea 100644 --- a/core/java/com/android/internal/statusbar/IStatusBar.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl @@ -33,6 +33,7 @@ import android.view.InsetsVisibilities; import com.android.internal.statusbar.IAddTileResultCallback; import com.android.internal.statusbar.IUndoMediaTransferCallback; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.view.AppearanceRegion; @@ -202,10 +203,12 @@ oneway interface IStatusBar * @param behavior the behavior of the focused window. * @param requestedVisibilities the collection of the requested visibilities of system insets. * @param packageName the package name of the focused app. + * @param letterboxDetails a set of letterbox details of apps visible on the screen. */ void onSystemBarAttributesChanged(int displayId, int appearance, in AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, - int behavior, in InsetsVisibilities requestedVisibilities, String packageName); + int behavior, in InsetsVisibilities requestedVisibilities, String packageName, + in LetterboxDetails[] letterboxDetails); /** * Notifies System UI to show transient bars. The transient bars are system bars, e.g., status diff --git a/core/java/com/android/internal/statusbar/LetterboxDetails.aidl b/core/java/com/android/internal/statusbar/LetterboxDetails.aidl new file mode 100644 index 000000000000..7875796cd3ba --- /dev/null +++ b/core/java/com/android/internal/statusbar/LetterboxDetails.aidl @@ -0,0 +1,19 @@ +/* + * 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.internal.statusbar; + +parcelable LetterboxDetails; diff --git a/core/java/com/android/internal/statusbar/LetterboxDetails.java b/core/java/com/android/internal/statusbar/LetterboxDetails.java new file mode 100644 index 000000000000..5d14ee347482 --- /dev/null +++ b/core/java/com/android/internal/statusbar/LetterboxDetails.java @@ -0,0 +1,243 @@ +/* + * 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.internal.statusbar; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.graphics.Rect; +import android.os.Parcel; +import android.os.Parcelable; +import android.view.InsetsFlags; +import android.view.ViewDebug; +import android.view.WindowInsetsController.Appearance; + +import com.android.internal.util.DataClass; + +/** + * Details about the letterbox state of an app. + */ +@DataClass( + genParcelable = true, + genAidl = true, + genToString = true, + genGetters = false, + genEqualsHashCode = true +) +public class LetterboxDetails implements Parcelable { + + @NonNull + private final Rect mLetterboxInnerBounds; + @NonNull + private final Rect mLetterboxFullBounds; + private final int mAppAppearance; + + /** + * Returns the bounds of the inner letterbox (app content). + * + * <p>When an app is letterboxed, it is not using the full bounds of its window. Here we return + * the bounds that are being used for the app content. + * + * <pre> + * +-------+---------+-------+ + * | | | | + * | | | | + * | Outer | Inner | Outer | + * | | | | + * | | | | + * +-------+-------- +-------+ + * <pre> + */ + @NonNull + public Rect getLetterboxInnerBounds() { + return mLetterboxInnerBounds; + } + + /** + * Returns the full bounds of the letterbox. + * + * <p>These are the entire bounds of the window where the app is placed. We cannot assume that + * the full bounds are the bounds of the screen, as the app can be in split-screen, or can have + * some margin due to display cutouts. + * + * <pre> + * ---- Full bounds width ---- + * +-------+---------+-------+ | + * | | | | | + * | | | | | + * | Outer | Inner | Outer | + Full bounds height + * | | | | | + * | | | | | + * +-------+-------- +-------+ | + * </pre> + */ + @NonNull + public Rect getLetterboxFullBounds() { + return mLetterboxFullBounds; + } + + /** + * Returns the {@link Appearance} of the inner letterbox (app content). + */ + @Appearance + public int getAppAppearance() { + return mAppAppearance; + } + + /** Returns a string representation of the {@link #getAppAppearance()} property. */ + public String appAppearanceToString() { + return ViewDebug.flagsToString(InsetsFlags.class, "appearance", mAppAppearance); + } + + + + // Code below generated by codegen v1.0.23. + // + // DO NOT MODIFY! + // CHECKSTYLE:OFF Generated code + // + // To regenerate run: + // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/com/android/internal/statusbar/LetterboxDetails.java + // + // To exclude the generated code from IntelliJ auto-formatting enable (one-time): + // Settings > Editor > Code Style > Formatter Control + //@formatter:off + + + @DataClass.Generated.Member + public LetterboxDetails( + @NonNull Rect letterboxInnerBounds, + @NonNull Rect letterboxFullBounds, + int appAppearance) { + this.mLetterboxInnerBounds = letterboxInnerBounds; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, mLetterboxInnerBounds); + this.mLetterboxFullBounds = letterboxFullBounds; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, mLetterboxFullBounds); + this.mAppAppearance = appAppearance; + + // onConstructed(); // You can define this method to get a callback + } + + @Override + @DataClass.Generated.Member + public String toString() { + // You can override field toString logic by defining methods like: + // String fieldNameToString() { ... } + + return "LetterboxDetails { " + + "letterboxInnerBounds = " + mLetterboxInnerBounds + ", " + + "letterboxFullBounds = " + mLetterboxFullBounds + ", " + + "appAppearance = " + appAppearanceToString() + + " }"; + } + + @Override + @DataClass.Generated.Member + public boolean equals(@Nullable Object o) { + // You can override field equality logic by defining either of the methods like: + // boolean fieldNameEquals(LetterboxDetails other) { ... } + // boolean fieldNameEquals(FieldType otherValue) { ... } + + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + @SuppressWarnings("unchecked") + LetterboxDetails that = (LetterboxDetails) o; + //noinspection PointlessBooleanExpression + return true + && java.util.Objects.equals(mLetterboxInnerBounds, that.mLetterboxInnerBounds) + && java.util.Objects.equals(mLetterboxFullBounds, that.mLetterboxFullBounds) + && mAppAppearance == that.mAppAppearance; + } + + @Override + @DataClass.Generated.Member + public int hashCode() { + // You can override field hashCode logic by defining methods like: + // int fieldNameHashCode() { ... } + + int _hash = 1; + _hash = 31 * _hash + java.util.Objects.hashCode(mLetterboxInnerBounds); + _hash = 31 * _hash + java.util.Objects.hashCode(mLetterboxFullBounds); + _hash = 31 * _hash + mAppAppearance; + return _hash; + } + + @Override + @DataClass.Generated.Member + public void writeToParcel(@NonNull Parcel dest, int flags) { + // You can override field parcelling by defining methods like: + // void parcelFieldName(Parcel dest, int flags) { ... } + + dest.writeTypedObject(mLetterboxInnerBounds, flags); + dest.writeTypedObject(mLetterboxFullBounds, flags); + dest.writeInt(mAppAppearance); + } + + @Override + @DataClass.Generated.Member + public int describeContents() { return 0; } + + /** @hide */ + @SuppressWarnings({"unchecked", "RedundantCast"}) + @DataClass.Generated.Member + protected LetterboxDetails(@NonNull Parcel in) { + // You can override field unparcelling by defining methods like: + // static FieldType unparcelFieldName(Parcel in) { ... } + + Rect letterboxInnerBounds = (Rect) in.readTypedObject(Rect.CREATOR); + Rect letterboxFullBounds = (Rect) in.readTypedObject(Rect.CREATOR); + int appAppearance = in.readInt(); + + this.mLetterboxInnerBounds = letterboxInnerBounds; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, mLetterboxInnerBounds); + this.mLetterboxFullBounds = letterboxFullBounds; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, mLetterboxFullBounds); + this.mAppAppearance = appAppearance; + + // onConstructed(); // You can define this method to get a callback + } + + @DataClass.Generated.Member + public static final @NonNull Parcelable.Creator<LetterboxDetails> CREATOR + = new Parcelable.Creator<LetterboxDetails>() { + @Override + public LetterboxDetails[] newArray(int size) { + return new LetterboxDetails[size]; + } + + @Override + public LetterboxDetails createFromParcel(@NonNull Parcel in) { + return new LetterboxDetails(in); + } + }; + + @DataClass.Generated( + time = 1656941109526L, + codegenVersion = "1.0.23", + sourceFile = "frameworks/base/core/java/com/android/internal/statusbar/LetterboxDetails.java", + inputSignatures = "private final @android.annotation.NonNull android.graphics.Rect mLetterboxInnerBounds\nprivate final @android.annotation.NonNull android.graphics.Rect mLetterboxFullBounds\nprivate final int mAppAppearance\npublic @android.annotation.NonNull android.graphics.Rect getLetterboxInnerBounds()\npublic @android.annotation.NonNull android.graphics.Rect getLetterboxFullBounds()\npublic @android.view.WindowInsetsController.Appearance int getAppAppearance()\npublic java.lang.String appAppearanceToString()\nclass LetterboxDetails extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genAidl=true, genToString=true, genGetters=false, genEqualsHashCode=true)") + @Deprecated + private void __metadata() {} + + + //@formatter:on + // End of generated code + +} diff --git a/core/java/com/android/internal/statusbar/RegisterStatusBarResult.java b/core/java/com/android/internal/statusbar/RegisterStatusBarResult.java index 4dcc82e2e572..8b898f01554f 100644 --- a/core/java/com/android/internal/statusbar/RegisterStatusBarResult.java +++ b/core/java/com/android/internal/statusbar/RegisterStatusBarResult.java @@ -43,12 +43,14 @@ public final class RegisterStatusBarResult implements Parcelable { public final InsetsVisibilities mRequestedVisibilities; public final String mPackageName; public final int[] mTransientBarTypes; + public final LetterboxDetails[] mLetterboxDetails; public RegisterStatusBarResult(ArrayMap<String, StatusBarIcon> icons, int disabledFlags1, int appearance, AppearanceRegion[] appearanceRegions, int imeWindowVis, int imeBackDisposition, boolean showImeSwitcher, int disabledFlags2, IBinder imeToken, boolean navbarColorManagedByIme, int behavior, InsetsVisibilities requestedVisibilities, - String packageName, @NonNull int[] transientBarTypes) { + String packageName, @NonNull int[] transientBarTypes, + LetterboxDetails[] letterboxDetails) { mIcons = new ArrayMap<>(icons); mDisabledFlags1 = disabledFlags1; mAppearance = appearance; @@ -63,6 +65,7 @@ public final class RegisterStatusBarResult implements Parcelable { mRequestedVisibilities = requestedVisibilities; mPackageName = packageName; mTransientBarTypes = transientBarTypes; + mLetterboxDetails = letterboxDetails; } @Override @@ -86,6 +89,7 @@ public final class RegisterStatusBarResult implements Parcelable { dest.writeTypedObject(mRequestedVisibilities, 0); dest.writeString(mPackageName); dest.writeIntArray(mTransientBarTypes); + dest.writeParcelableArray(mLetterboxDetails, flags); } /** @@ -112,10 +116,13 @@ public final class RegisterStatusBarResult implements Parcelable { source.readTypedObject(InsetsVisibilities.CREATOR); final String packageName = source.readString(); final int[] transientBarTypes = source.createIntArray(); + final LetterboxDetails[] letterboxDetails = + source.readParcelableArray(null, LetterboxDetails.class); return new RegisterStatusBarResult(icons, disabledFlags1, appearance, appearanceRegions, imeWindowVis, imeBackDisposition, showImeSwitcher, disabledFlags2, imeToken, navbarColorManagedByIme, behavior, - requestedVisibilities, packageName, transientBarTypes); + requestedVisibilities, packageName, transientBarTypes, + letterboxDetails); } @Override diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 7b97084883d4..6ebc5297ebc1 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -628,7 +628,7 @@ <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"برای حذف مدل چهرهتان ضربه بزنید، سپس چهرهتان را دوباره اضافه کنید"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"راهاندازی «قفلگشایی با چهره»"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"برای باز کردن قفل تلفن خود به آن نگاه کنید"</string> - <string name="face_sensor_privacy_enabled" msgid="7407126963510598508">"برای استفاده از «قفلگشایی با چهره»، "<b>"دسترسی به دوربین"</b>" را در «تنظیمات > حریمخصوصی» روشن کنید"</string> + <string name="face_sensor_privacy_enabled" msgid="7407126963510598508">"برای استفاده از «قفلگشایی با چهره»، "<b>"دسترسی به دوربین"</b>" را در «تنظیمات > حریم خصوصی» روشن کنید"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"راهاندازی روشهای بیشتر برای باز کردن قفل"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"برای افزودن اثر انگشت، ضربه بزنید"</string> <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"قفلگشایی با اثر انگشت"</string> @@ -1051,7 +1051,7 @@ <string name="permlab_writeGeolocationPermissions" msgid="8605631647492879449">"تغییر مجوزهای مکان جغرافیایی مرورگر"</string> <string name="permdesc_writeGeolocationPermissions" msgid="5817346421222227772">"به برنامه اجازه میدهد تا مجوزهای جغرافیایی مرورگر را تغییر دهد. برنامههای مخرب میتوانند از آن استفاده کنند تا اطلاعات موقعیت مکانی را به سایتهای وب کتابخانه بفرستند."</string> <string name="save_password_message" msgid="2146409467245462965">"میخواهید مرورگر این گذرواژه را به خاطر داشته باشد؟"</string> - <string name="save_password_notnow" msgid="2878327088951240061">"اکنون نه"</string> + <string name="save_password_notnow" msgid="2878327088951240061">"حالا نه"</string> <string name="save_password_remember" msgid="6490888932657708341">"به خاطر سپردن"</string> <string name="save_password_never" msgid="6776808375903410659">"هیچوقت"</string> <string name="open_permission_deny" msgid="5136793905306987251">"شما اجازه بازکردن این صفحه را ندارید."</string> @@ -2271,7 +2271,7 @@ <string name="sensor_privacy_start_use_camera_notification_content_title" msgid="7287720213963466672">"لغو انسداد دوربین دستگاه"</string> <string name="sensor_privacy_start_use_notification_content_text" msgid="7595608891015777346">"برای <b><xliff:g id="APP">%s</xliff:g></b> و همه برنامهها و سرویسها"</string> <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7089318886628390827">"لغو انسداد"</string> - <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"حریمخصوصی حسگر"</string> + <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"حریم خصوصی حسگر"</string> <string name="splash_screen_view_icon_description" msgid="180638751260598187">"نماد برنامه"</string> <string name="splash_screen_view_branding_description" msgid="7911129347402728216">"تصویر نمانامسازی برنامه"</string> <string name="view_and_control_notification_title" msgid="4300765399209912240">"بررسی تنظیمات دسترسی"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 769f0c009d76..c0fae1bc7160 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -269,7 +269,7 @@ <string name="global_action_lockdown" msgid="2475471405907902963">"Құлыптау"</string> <string name="status_bar_notification_info_overflow" msgid="3330152558746563475">"999+"</string> <string name="notification_hidden_text" msgid="2835519769868187223">"Жаңа хабарландыру"</string> - <string name="notification_channel_virtual_keyboard" msgid="6465975799223304567">"Виртуалды пернетақта"</string> + <string name="notification_channel_virtual_keyboard" msgid="6465975799223304567">"Виртуалдық пернетақта"</string> <string name="notification_channel_physical_keyboard" msgid="5417306456125988096">"Физикалық пернетақта"</string> <string name="notification_channel_security" msgid="8516754650348238057">"Қауіпсіздік"</string> <string name="notification_channel_car_mode" msgid="2123919247040988436">"Көлік режимі"</string> @@ -1384,7 +1384,7 @@ <string name="decline_remote_bugreport_action" msgid="4040894777519784346">"ҚАБЫЛДАМАУ"</string> <string name="select_input_method" msgid="3971267998568587025">"Енгізу әдісін таңдау"</string> <string name="show_ime" msgid="6406112007347443383">"Физикалық пернетақта қосулы кезде оны экранға шығару"</string> - <string name="hardware" msgid="1800597768237606953">"Виртуалды пернетақтаны көрсету"</string> + <string name="hardware" msgid="1800597768237606953">"Виртуалдық пернетақтаны көрсету"</string> <string name="select_keyboard_layout_notification_title" msgid="4427643867639774118">"Физикалық пернетақтаны конфигурациялау"</string> <string name="select_keyboard_layout_notification_message" msgid="8835158247369158154">"Тіл мен пернетақта схемасын таңдау үшін түртіңіз"</string> <string name="fast_scroll_alphabet" msgid="8854435958703888376">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> @@ -1483,7 +1483,7 @@ <string name="wallpaper_binding_label" msgid="1197440498000786738">"Артқы фоны"</string> <string name="chooser_wallpaper" msgid="3082405680079923708">"Артқы фонын өзгерту"</string> <string name="notification_listener_binding_label" msgid="2702165274471499713">"Хабар бақылағыш"</string> - <string name="vr_listener_binding_label" msgid="8013112996671206429">"Виртуалды шынайылық тыңдаушысы"</string> + <string name="vr_listener_binding_label" msgid="8013112996671206429">"Виртуалдық шынайылық тыңдаушысы"</string> <string name="condition_provider_service_binding_label" msgid="8490641013951857673">"Шарт провайдері"</string> <string name="notification_ranker_binding_label" msgid="432708245635563763">"Хабарландыруларды жіктеу қызметі"</string> <string name="vpn_title" msgid="5906991595291514182">"VPN белсенді"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 879cfe75e6df..fd9bfc61dc11 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -1018,7 +1018,7 @@ <string name="js_dialog_before_unload_negative_button" msgid="3873765747622415310">"ഈ പേജിൽ തുടരുക"</string> <string name="js_dialog_before_unload" msgid="7213364985774778744">"<xliff:g id="MESSAGE">%s</xliff:g>\n\nഈ പേജിൽ നിന്നും നാവിഗേറ്റുചെയ്തു പോകണമെന്ന് തീർച്ചയാണോ?"</string> <string name="save_password_label" msgid="9161712335355510035">"സ്ഥിരീകരിക്കുക"</string> - <string name="double_tap_toast" msgid="7065519579174882778">"നുറുങ്ങ്: സൂം ഇൻ ചെയ്യാനും സൂം ഔട്ട് ചെയ്യാനും ഇരട്ട-ടാപ്പുചെയ്യുക."</string> + <string name="double_tap_toast" msgid="7065519579174882778">"നുറുങ്ങ്: സൂം ഇൻ ചെയ്യാനും സൂം ഔട്ട് ചെയ്യാനും ഡബിൾ ടാപ്പ് ചെയ്യുക."</string> <string name="autofill_this_form" msgid="3187132440451621492">"ഓട്ടോഫിൽ"</string> <string name="setup_autofill" msgid="5431369130866618567">"ഓട്ടോഫിൽ സജ്ജീകരിക്കുക"</string> <string name="autofill_window_title" msgid="4379134104008111961">"<xliff:g id="SERVICENAME">%1$s</xliff:g> ഉപയോഗിച്ച് സ്വമേധയാ പൂരിപ്പിക്കുക"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 9f1453503e28..7293701c9bb2 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -289,9 +289,9 @@ <string name="notification_channel_foreground_service" msgid="7102189948158885178">"Апп батарей ашиглаж байна"</string> <string name="notification_channel_accessibility_magnification" msgid="1707913872219798098">"Томруулах"</string> <string name="notification_channel_accessibility_security_policy" msgid="1727787021725251912">"Хандалтын ашиглалт"</string> - <string name="foreground_service_app_in_background" msgid="1439289699671273555">"<xliff:g id="APP_NAME">%1$s</xliff:g> батерей ашиглаж байна"</string> - <string name="foreground_service_apps_in_background" msgid="7340037176412387863">"<xliff:g id="NUMBER">%1$d</xliff:g> апп батерей ашиглаж байна"</string> - <string name="foreground_service_tap_for_details" msgid="9078123626015586751">"Батерей, дата ашиглалтын талаар дэлгэрэнгүйг харахын тулд товшино уу"</string> + <string name="foreground_service_app_in_background" msgid="1439289699671273555">"<xliff:g id="APP_NAME">%1$s</xliff:g> батарей ашиглаж байна"</string> + <string name="foreground_service_apps_in_background" msgid="7340037176412387863">"<xliff:g id="NUMBER">%1$d</xliff:g> апп батарей ашиглаж байна"</string> + <string name="foreground_service_tap_for_details" msgid="9078123626015586751">"Батарей, дата ашиглалтын талаар дэлгэрэнгүйг харахын тулд товшино уу"</string> <string name="foreground_service_multiple_separator" msgid="5002287361849863168">"<xliff:g id="LEFT_SIDE">%1$s</xliff:g>, <xliff:g id="RIGHT_SIDE">%2$s</xliff:g>"</string> <string name="safeMode" msgid="8974401416068943888">"Аюулгүй горим"</string> <string name="android_system_label" msgid="5974767339591067210">"Андройд систем"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 83c30bb611d7..95cff2cb8939 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -93,7 +93,7 @@ <string name="notification_channel_mobile_data_status" msgid="1941911162076442474">"Status for mobildata"</string> <string name="notification_channel_sms" msgid="1243384981025535724">"SMS-meldinger"</string> <string name="notification_channel_voice_mail" msgid="8457433203106654172">"Talepostmeldinger"</string> - <string name="notification_channel_wfc" msgid="9048240466765169038">"Wi-Fi-anrop"</string> + <string name="notification_channel_wfc" msgid="9048240466765169038">"Wifi-anrop"</string> <string name="notification_channel_sim" msgid="5098802350325677490">"SIM-status"</string> <string name="notification_channel_sim_high_prio" msgid="642361929452850928">"SIM-status er satt til høy prioritet"</string> <string name="peerTtyModeFull" msgid="337553730440832160">"Motpart ba om TTY-modus FULL"</string> @@ -122,25 +122,25 @@ <string name="roamingText11" msgid="5245687407203281407">"Roaming-banner på"</string> <string name="roamingText12" msgid="673537506362152640">"Roaming-banner av"</string> <string name="roamingTextSearching" msgid="5323235489657753486">"Leter etter tjeneste"</string> - <string name="wfcRegErrorTitle" msgid="3193072971584858020">"Kunne ikke konfigurere Wi-Fi-anrop"</string> + <string name="wfcRegErrorTitle" msgid="3193072971584858020">"Kunne ikke konfigurere wifi-anrop"</string> <string-array name="wfcOperatorErrorAlertMessages"> - <item msgid="468830943567116703">"For å ringe og sende meldinger over Wi-Fi, må du først be operatøren om å konfigurere denne tjenesten. Deretter slår du på Wi-Fi-anrop igjen fra Innstillinger. (Feilkode: <xliff:g id="CODE">%1$s</xliff:g>)"</item> + <item msgid="468830943567116703">"For å ringe og sende meldinger over Wi-Fi, må du først be operatøren om å konfigurere denne tjenesten. Deretter slår du på wifi-anrop igjen fra Innstillinger. (Feilkode: <xliff:g id="CODE">%1$s</xliff:g>)"</item> </string-array> <string-array name="wfcOperatorErrorNotificationMessages"> - <item msgid="4795145070505729156">"Problem med å registrere Wi-Fi-anrop med operatøren din: <xliff:g id="CODE">%1$s</xliff:g>"</item> + <item msgid="4795145070505729156">"Problem med å registrere wifi-anrop med operatøren din: <xliff:g id="CODE">%1$s</xliff:g>"</item> </string-array> <!-- no translation found for wfcSpnFormat_spn (2982505428519096311) --> <skip /> - <string name="wfcSpnFormat_spn_wifi_calling" msgid="3165949348000906194">"<xliff:g id="SPN">%s</xliff:g> Wi-Fi-anrop"</string> - <string name="wfcSpnFormat_spn_wifi_calling_vo_hyphen" msgid="3836827895369365298">"<xliff:g id="SPN">%s</xliff:g>-Wi-Fi-anrop"</string> + <string name="wfcSpnFormat_spn_wifi_calling" msgid="3165949348000906194">"<xliff:g id="SPN">%s</xliff:g> Wifi-anrop"</string> + <string name="wfcSpnFormat_spn_wifi_calling_vo_hyphen" msgid="3836827895369365298">"<xliff:g id="SPN">%s</xliff:g>-Wifi-anrop"</string> <string name="wfcSpnFormat_wlan_call" msgid="4895315549916165700">"WLAN-anrop"</string> <string name="wfcSpnFormat_spn_wlan_call" msgid="255919245825481510">"<xliff:g id="SPN">%s</xliff:g> WLAN-anrop"</string> <string name="wfcSpnFormat_spn_wifi" msgid="7232899594327126970">"<xliff:g id="SPN">%s</xliff:g> Wi-Fi"</string> - <string name="wfcSpnFormat_wifi_calling_bar_spn" msgid="8383917598312067365">"Wi-Fi-anrop | <xliff:g id="SPN">%s</xliff:g>"</string> + <string name="wfcSpnFormat_wifi_calling_bar_spn" msgid="8383917598312067365">"Wifi-anrop | <xliff:g id="SPN">%s</xliff:g>"</string> <string name="wfcSpnFormat_spn_vowifi" msgid="6865214948822061486">"<xliff:g id="SPN">%s</xliff:g> VoWifi"</string> - <string name="wfcSpnFormat_wifi_calling" msgid="6178935388378661755">"Wi-Fi-anrop"</string> + <string name="wfcSpnFormat_wifi_calling" msgid="6178935388378661755">"Wifi-anrop"</string> <string name="wfcSpnFormat_wifi" msgid="1376356951297043426">"Wi-Fi"</string> - <string name="wfcSpnFormat_wifi_calling_wo_hyphen" msgid="7178561009225028264">"Wi-Fi-anrop"</string> + <string name="wfcSpnFormat_wifi_calling_wo_hyphen" msgid="7178561009225028264">"Wifi-anrop"</string> <string name="wfcSpnFormat_vowifi" msgid="8371335230890725606">"VoWifi"</string> <string name="wifi_calling_off_summary" msgid="5626710010766902560">"Av"</string> <string name="wfc_mode_wifi_preferred_summary" msgid="1035175836270943089">"Ring via Wi-Fi"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index c68f91fe1202..64789fb32dcb 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -1141,7 +1141,7 @@ <string name="copyUrl" msgid="6229645005987260230">"URLని కాపీ చేయి"</string> <string name="selectTextMode" msgid="3225108910999318778">"వచనాన్ని ఎంచుకోండి"</string> <string name="undo" msgid="3175318090002654673">"చర్య రద్దు చేయి"</string> - <string name="redo" msgid="7231448494008532233">"చర్యను పునరావృతం చేయి"</string> + <string name="redo" msgid="7231448494008532233">"చర్యను రిపీట్ చేయి"</string> <string name="autofill" msgid="511224882647795296">"ఆటోఫిల్"</string> <string name="textSelectionCABTitle" msgid="5151441579532476940">"వచన ఎంపిక"</string> <string name="addToDictionary" msgid="8041821113480950096">"నిఘంటువుకు జోడించు"</string> @@ -1647,7 +1647,7 @@ <string name="kg_password_wrong_pin_code" msgid="9013856346870572451">"చెల్లని పిన్ కోడ్."</string> <string name="kg_invalid_sim_pin_hint" msgid="4821601451222564077">"4 నుండి 8 సంఖ్యలు ఉండే పిన్ను టైప్ చేయండి."</string> <string name="kg_invalid_sim_puk_hint" msgid="2539364558870734339">"PUK కోడ్ 8 సంఖ్యలు ఉండాలి."</string> - <string name="kg_invalid_puk" msgid="4809502818518963344">"సరైన PUK కోడ్ను మళ్లీ నమోదు చేయండి. పునరావృత ప్రయత్నాల వలన సిమ్ శాశ్వతంగా నిలిపివేయబడుతుంది."</string> + <string name="kg_invalid_puk" msgid="4809502818518963344">"సరైన PUK కోడ్ను మళ్లీ నమోదు చేయండి. రిపీట్ ప్రయత్నాల వలన సిమ్ శాశ్వతంగా నిలిపివేయబడుతుంది."</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="4705368340409816254">"పిన్ కోడ్లు సరిపోలలేదు"</string> <string name="kg_login_too_many_attempts" msgid="699292728290654121">"చాలా ఎక్కువ ఆకృతి ప్రయత్నాలు చేశారు"</string> <string name="kg_login_instructions" msgid="3619844310339066827">"అన్లాక్ చేయడానికి, మీ Google ఖాతాతో సైన్ ఇన్ చేయండి."</string> diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java index 82148422aabf..e8c7ce0b312b 100644 --- a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java @@ -266,6 +266,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); final IChooserWrapper activity = (IChooserWrapper) mActivityRule.launchActivity( @@ -289,6 +290,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, "chooser test")); @@ -309,6 +311,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -329,6 +332,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -352,6 +356,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -378,6 +383,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -403,6 +409,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -424,6 +431,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -478,6 +486,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -518,6 +527,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -552,6 +562,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(null); Intent sendIntent = createSendTextIntent(); @@ -587,6 +598,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -649,6 +661,7 @@ public class ChooserActivityTest { when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); when(ChooserActivityOverrideData.getInstance().resolverListController.getLastChosen()) .thenReturn(resolvedComponentInfos.get(0).getResolveInfoAt(0)); @@ -688,6 +701,7 @@ public class ChooserActivityTest { when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); final IChooserWrapper activity = (IChooserWrapper) @@ -720,6 +734,7 @@ public class ChooserActivityTest { when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); final ChooserActivity activity = @@ -747,6 +762,7 @@ public class ChooserActivityTest { when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); MetricsLogger mockLogger = ChooserActivityOverrideData.getInstance().metricsLogger; @@ -776,6 +792,7 @@ public class ChooserActivityTest { when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); final IChooserWrapper activity = (IChooserWrapper) @@ -846,6 +863,7 @@ public class ChooserActivityTest { when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); final IChooserWrapper activity = (IChooserWrapper) @@ -922,6 +940,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -958,6 +977,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -997,6 +1017,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -1091,6 +1112,7 @@ public class ChooserActivityTest { when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -1124,6 +1146,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -1157,6 +1180,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -1189,6 +1213,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); @@ -1218,6 +1243,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -1250,6 +1276,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -1284,6 +1311,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); when( @@ -1323,6 +1351,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -1365,6 +1394,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -1409,6 +1439,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -1485,6 +1516,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -1566,6 +1598,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); // Create direct share target @@ -1638,6 +1671,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); // Create direct share target @@ -1745,6 +1779,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -2060,6 +2095,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -2142,6 +2178,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -2229,6 +2266,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -2298,6 +2336,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); @@ -2446,6 +2485,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); Intent sendIntent = createSendTextIntent(); @@ -2475,6 +2515,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); Intent sendIntent = createSendTextIntent(); @@ -2528,6 +2569,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); Intent chooserIntent = createChooserIntent(createSendTextIntent(), @@ -2664,6 +2706,7 @@ public class ChooserActivityTest { when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); // Create caller target which is duplicate with one of app targets @@ -3057,6 +3100,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); when( @@ -3066,6 +3110,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(new ArrayList<>(workResolvedComponentInfos)); when( @@ -3075,6 +3120,7 @@ public class ChooserActivityTest { .getResolversForIntentAsUser( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class), eq(UserHandle.SYSTEM))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); @@ -3131,6 +3177,7 @@ public class ChooserActivityTest { .getResolversForIntent( Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(resolvedComponentInfos); } diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java index 43fba529182e..92c05b0fe9fc 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java @@ -96,6 +96,7 @@ public class ResolverActivityTest { when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); final ResolverWrapperActivity activity = mActivityRule.launchActivity(sendIntent); @@ -127,6 +128,7 @@ public class ResolverActivityTest { when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); waitForIdle(); @@ -171,6 +173,7 @@ public class ResolverActivityTest { when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); waitForIdle(); @@ -203,6 +206,7 @@ public class ResolverActivityTest { when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); when(sOverrides.resolverListController.getLastChosen()) .thenReturn(resolvedComponentInfos.get(0).getResolveInfoAt(0)); @@ -273,6 +277,7 @@ public class ResolverActivityTest { when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); final ResolverWrapperActivity activity = mActivityRule.launchActivity(sendIntent); @@ -317,6 +322,7 @@ public class ResolverActivityTest { when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); when(sOverrides.resolverListController.getLastChosen()) .thenReturn(resolvedComponentInfos.get(1).getResolveInfoAt(0)); @@ -807,6 +813,7 @@ public class ResolverActivityTest { createResolvedComponentsForTestWithOtherProfile(2, /* userId */ 10); when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); Intent sendIntent = createSendImageIntent(); @@ -831,6 +838,7 @@ public class ResolverActivityTest { createResolvedComponentsForTest(1); when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); Intent sendIntent = createSendImageIntent(); @@ -888,6 +896,7 @@ public class ResolverActivityTest { when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); when(sOverrides.resolverListController.getLastChosen()) .thenReturn(resolvedComponentInfos.get(1).getResolveInfoAt(0)); @@ -965,13 +974,16 @@ public class ResolverActivityTest { List<ResolvedComponentInfo> workResolvedComponentInfos) { when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); when(sOverrides.workResolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class))).thenReturn(workResolvedComponentInfos); when(sOverrides.workResolverListController.getResolversForIntentAsUser(Mockito.anyBoolean(), Mockito.anyBoolean(), + Mockito.anyBoolean(), Mockito.isA(List.class), eq(UserHandle.SYSTEM))) .thenReturn(new ArrayList<>(personalResolvedComponentInfos)); diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java index e16d44854516..42593f60094b 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java @@ -20,11 +20,14 @@ import static junit.framework.Assert.assertEquals; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.mockito.ArgumentMatchers.intThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.usage.IUsageStatsManager; @@ -48,6 +51,7 @@ import com.android.internal.app.ResolverActivity.ResolvedComponentInfo; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; @@ -78,6 +82,8 @@ public class ResolverListControllerTest { Configuration config = new Configuration(); config.locale = Locale.getDefault(); List<ResolveInfo> services = new ArrayList<>(); + mUsm = new UsageStatsManager(mMockContext, mMockService); + when(mMockContext.getSystemService(Context.USAGE_STATS_SERVICE)).thenReturn(mUsm); when(mMockPackageManager.queryIntentServices(any(), anyInt())).thenReturn(services); when(mMockResources.getConfiguration()).thenReturn(config); when(mMockContext.getResources()).thenReturn(mMockResources); @@ -112,8 +118,6 @@ public class ResolverListControllerTest { doAnswer(answer).when(mMockService).reportChooserSelection( anyString(), anyInt(), anyString(), any(), anyString()); when(mMockContext.getOpPackageName()).thenReturn(refererPackage); - mUsm = new UsageStatsManager(mMockContext, mMockService); - when(mMockContext.getSystemService(Context.USAGE_STATS_SERVICE)).thenReturn(mUsm); mController = new ResolverListController(mMockContext, mMockPackageManager, sendIntent, refererPackage, UserHandle.USER_CURRENT, /* userHandle */ UserHandle.SYSTEM); mController.sort(new ArrayList<ResolvedComponentInfo>()); @@ -129,8 +133,6 @@ public class ResolverListControllerTest { Intent sendIntent = createSendImageIntent(annotation); String refererPackage = "test_referer_package"; List<ResolvedComponentInfo> resolvedComponents = createResolvedComponentsForTest(10); - mUsm = new UsageStatsManager(mMockContext, mMockService); - when(mMockContext.getSystemService(Context.USAGE_STATS_SERVICE)).thenReturn(mUsm); mController = new ResolverListController(mMockContext, mMockPackageManager, sendIntent, refererPackage, UserHandle.USER_CURRENT, /* userHandle */ UserHandle.SYSTEM); List<ResolvedComponentInfo> topKList = new ArrayList<>(resolvedComponents); @@ -151,6 +153,102 @@ public class ResolverListControllerTest { sortList, topKList); } + @Test + public void getResolversForIntent_usesResultsFromPackageManager() { + mockStats(); + List<ResolveInfo> infos = new ArrayList<>(); + infos.add(ResolverDataProvider.createResolveInfo(0, UserHandle.USER_CURRENT)); + when(mMockPackageManager.queryIntentActivitiesAsUser(any(), anyInt(), + any(UserHandle.class))).thenReturn(infos); + mController = new ResolverListController(mMockContext, mMockPackageManager, + createSendImageIntent("test"), null, UserHandle.USER_CURRENT, + /* userHandle= */ UserHandle.SYSTEM); + List<Intent> intents = new ArrayList<>(); + intents.add(createActionMainIntent()); + + List<ResolvedComponentInfo> resolvers = mController + .getResolversForIntent( + /* shouldGetResolvedFilter= */ true, + /* shouldGetActivityMetadata= */ true, + /* shouldGetOnlyDefaultActivities= */ true, + intents); + + assertThat(resolvers, hasSize(1)); + assertThat(resolvers.get(0).getResolveInfoAt(0), is(infos.get(0))); + } + + @Test + public void getResolversForIntent_shouldGetOnlyDefaultActivitiesTrue_addsFlag() { + mockStats(); + List<ResolveInfo> infos = new ArrayList<>(); + infos.add(ResolverDataProvider.createResolveInfo(0, UserHandle.USER_CURRENT)); + when(mMockPackageManager.queryIntentActivitiesAsUser(any(), anyInt(), + any(UserHandle.class))).thenReturn(infos); + mController = new ResolverListController(mMockContext, mMockPackageManager, + createSendImageIntent("test"), null, UserHandle.USER_CURRENT, + /* userHandle= */ UserHandle.SYSTEM); + List<Intent> intents = new ArrayList<>(); + intents.add(createActionMainIntent()); + + mController + .getResolversForIntent( + /* shouldGetResolvedFilter= */ true, + /* shouldGetActivityMetadata= */ true, + /* shouldGetOnlyDefaultActivities= */ true, + intents); + + verify(mMockPackageManager).queryIntentActivitiesAsUser(any(), + containsFlag(PackageManager.MATCH_DEFAULT_ONLY), any()); + } + + @Test + public void getResolversForIntent_shouldGetOnlyDefaultActivitiesFalse_doesNotAddFlag() { + mockStats(); + List<ResolveInfo> infos = new ArrayList<>(); + infos.add(ResolverDataProvider.createResolveInfo(0, UserHandle.USER_CURRENT)); + when(mMockPackageManager.queryIntentActivitiesAsUser(any(), anyInt(), + any(UserHandle.class))).thenReturn(infos); + mController = new ResolverListController(mMockContext, mMockPackageManager, + createSendImageIntent("test"), null, UserHandle.USER_CURRENT, + /* userHandle= */ UserHandle.SYSTEM); + List<Intent> intents = new ArrayList<>(); + intents.add(createActionMainIntent()); + + mController + .getResolversForIntent( + /* shouldGetResolvedFilter= */ true, + /* shouldGetActivityMetadata= */ true, + /* shouldGetOnlyDefaultActivities= */ false, + intents); + + verify(mMockPackageManager).queryIntentActivitiesAsUser(any(), + doesNotContainFlag(PackageManager.MATCH_DEFAULT_ONLY), any()); + } + + private int containsFlag(int flag) { + return intThat(new FlagMatcher(flag, /* contains= */ true)); + } + + private int doesNotContainFlag(int flag) { + return intThat(new FlagMatcher(flag, /* contains= */ false)); + } + + public static class FlagMatcher implements ArgumentMatcher<Integer> { + + private final int mFlag; + private final boolean mContains; + + public FlagMatcher(int flag, boolean contains) { + mFlag = flag; + mContains = contains; + } + + @Override + public boolean matches(Integer integer) { + return ((integer & mFlag) != 0) == mContains; + } + } + private UsageStats initStats(String packageName, String action, String annotation, int count) { ArrayMap<String, ArrayMap<String, Integer>> chooserCounts = new ArrayMap<>(); @@ -174,6 +272,24 @@ public class ResolverListControllerTest { return sendIntent; } + private Intent createActionMainIntent() { + Intent sendIntent = new Intent(); + sendIntent.setAction(Intent.ACTION_MAIN); + sendIntent.addCategory(Intent.CATEGORY_LAUNCHER); + return sendIntent; + } + + private void mockStats() { + final List<UsageStats> slices = new ArrayList<>(); + ParceledListSlice<UsageStats> stats = new ParceledListSlice<>(slices); + try { + when(mMockService.queryUsageStats(anyInt(), anyLong(), anyLong(), anyString(), + anyInt())).thenReturn(stats); + } catch (RemoteException e) { + e.printStackTrace(); + } + } + private Integer getCount( UsageStatsManager usm, String packageName, String action, String annotation) { if (usm == null) { diff --git a/core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java b/core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java index 0f05be06bff6..c53fb23ba948 100644 --- a/core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java +++ b/core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java @@ -20,6 +20,7 @@ import static android.view.WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_B import static com.google.common.truth.Truth.assertThat; +import android.graphics.Rect; import android.os.Binder; import android.os.Parcel; import android.os.UserHandle; @@ -48,7 +49,11 @@ public class RegisterStatusBarResultTest { final ArrayMap<String, StatusBarIcon> iconMap = new ArrayMap<>(); iconMap.put(dumyIconKey, new StatusBarIcon("com.android.internal.statusbar.test", UserHandle.of(100), 123, 1, 2, "dummyIconDescription")); - + final LetterboxDetails letterboxDetails = new LetterboxDetails( + /* letterboxInnerBounds= */ new Rect(1, 2, 3, 4), + /* letterboxFullBounds= */ new Rect(5, 6, 7, 8), + /* appAppearance= */ 321 + ); final RegisterStatusBarResult original = new RegisterStatusBarResult(iconMap, 0x2 /* disabledFlags1 */, 0x4 /* appearance */, @@ -62,7 +67,8 @@ public class RegisterStatusBarResultTest { BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE, new InsetsVisibilities() /* requestedVisibilities */, "test" /* packageName */, - new int[0] /* transientBarTypes */); + new int[0] /* transientBarTypes */, + new LetterboxDetails[] {letterboxDetails}); final RegisterStatusBarResult copy = clone(original); @@ -84,6 +90,7 @@ public class RegisterStatusBarResultTest { assertThat(copy.mRequestedVisibilities).isEqualTo(original.mRequestedVisibilities); assertThat(copy.mPackageName).isEqualTo(original.mPackageName); assertThat(copy.mTransientBarTypes).isEqualTo(original.mTransientBarTypes); + assertThat(copy.mLetterboxDetails).isEqualTo(original.mLetterboxDetails); } private RegisterStatusBarResult clone(RegisterStatusBarResult original) { diff --git a/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java b/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java index 8d3751e6ad6c..47f70ddf2d42 100644 --- a/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java +++ b/core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java @@ -207,8 +207,8 @@ public class ActivityThreadClientTest { final Configuration currentConfig = new Configuration(); assertFalse("Must not report change if no public diff", - shouldReportChange(0 /* publicDiff */, currentConfig, newConfig, - null /* sizeBuckets */, 0 /* handledConfigChanges */)); + shouldReportChange(currentConfig, newConfig, null /* sizeBuckets */, + 0 /* handledConfigChanges */)); final int[] verticalThresholds = {100, 400}; final SizeConfigurationBuckets buckets = new SizeConfigurationBuckets( @@ -221,25 +221,25 @@ public class ActivityThreadClientTest { newConfig.screenHeightDp = 300; assertFalse("Must not report changes if the diff is small and not handled", - shouldReportChange(CONFIG_SCREEN_SIZE /* publicDiff */, currentConfig, - newConfig, buckets, CONFIG_FONT_SCALE /* handledConfigChanges */)); + shouldReportChange(currentConfig, newConfig, buckets, + CONFIG_FONT_SCALE /* handledConfigChanges */)); assertTrue("Must report changes if the small diff is handled", - shouldReportChange(CONFIG_SCREEN_SIZE /* publicDiff */, currentConfig, newConfig, - buckets, CONFIG_SCREEN_SIZE /* handledConfigChanges */)); + shouldReportChange(currentConfig, newConfig, buckets, + CONFIG_SCREEN_SIZE /* handledConfigChanges */)); currentConfig.fontScale = 0.8f; newConfig.fontScale = 1.2f; assertTrue("Must report handled changes regardless of small unhandled change", - shouldReportChange(CONFIG_SCREEN_SIZE | CONFIG_FONT_SCALE /* publicDiff */, - currentConfig, newConfig, buckets, CONFIG_FONT_SCALE /* handledConfigChanges */)); + shouldReportChange(currentConfig, newConfig, buckets, + CONFIG_FONT_SCALE /* handledConfigChanges */)); newConfig.screenHeightDp = 500; assertFalse("Must not report changes if there's unhandled big changes", - shouldReportChange(CONFIG_SCREEN_SIZE | CONFIG_FONT_SCALE /* publicDiff */, - currentConfig, newConfig, buckets, CONFIG_FONT_SCALE /* handledConfigChanges */)); + shouldReportChange(currentConfig, newConfig, buckets, + CONFIG_FONT_SCALE /* handledConfigChanges */)); } private void recreateAndVerifyNoRelaunch(ActivityThread activityThread, TestActivity activity) { diff --git a/libs/WindowManager/Shell/res/values-af/strings.xml b/libs/WindowManager/Shell/res/values-af/strings.xml index eb8b5ba06f4c..6959a591338c 100644 --- a/libs/WindowManager/Shell/res/values-af/strings.xml +++ b/libs/WindowManager/Shell/res/values-af/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Borrel"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Bestuur"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Borrel is toegemaak."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Tik om hierdie program te herbegin vir ’n beter aansig."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Kamerakwessies?\nTik om aan te pas"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nie opgelos nie?\nTik om terug te stel"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Geen kamerakwessies nie? Tik om toe te maak."</string> diff --git a/libs/WindowManager/Shell/res/values-am/strings.xml b/libs/WindowManager/Shell/res/values-am/strings.xml index 5da81906fccb..fe22b2ce3278 100644 --- a/libs/WindowManager/Shell/res/values-am/strings.xml +++ b/libs/WindowManager/Shell/res/values-am/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"አረፋ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ያቀናብሩ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"አረፋ ተሰናብቷል።"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"ለተሻለ ዕይታ ይህን መተግበሪያ ዳግም ለማስነሳት መታ ያድርጉ።"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"የካሜራ ችግሮች አሉ?\nዳግም ለማበጀት መታ ያድርጉ"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"አልተስተካከለም?\nለማህደር መታ ያድርጉ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ምንም የካሜራ ችግሮች የሉም? ለማሰናበት መታ ያድርጉ።"</string> diff --git a/libs/WindowManager/Shell/res/values-ar/strings.xml b/libs/WindowManager/Shell/res/values-ar/strings.xml index d350f2af6ab8..2be6f39f9475 100644 --- a/libs/WindowManager/Shell/res/values-ar/strings.xml +++ b/libs/WindowManager/Shell/res/values-ar/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"فقاعة"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"إدارة"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"تم إغلاق الفقاعة."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"انقر لإعادة تشغيل هذا التطبيق للحصول على عرض أفضل."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"هل هناك مشاكل في الكاميرا؟\nانقر لإعادة الضبط."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ألم يتم حل المشكلة؟\nانقر للعودة"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"أليس هناك مشاكل في الكاميرا؟ انقر للإغلاق."</string> diff --git a/libs/WindowManager/Shell/res/values-as/strings.xml b/libs/WindowManager/Shell/res/values-as/strings.xml index a15d800c6da1..098ee84de018 100644 --- a/libs/WindowManager/Shell/res/values-as/strings.xml +++ b/libs/WindowManager/Shell/res/values-as/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"বাবল"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"পৰিচালনা কৰক"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"বাবল অগ্ৰাহ্য কৰা হৈছে"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"উন্নত ভিউৰ বাবে এপ্টো ৰিষ্টাৰ্ট কৰিবলৈ টিপক।"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"কেমেৰাৰ কোনো সমস্যা হৈছে নেকি?\nপুনৰ খাপ খোৱাবলৈ টিপক"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"এইটো সমাধান কৰা নাই নেকি?\nপূৰ্বাৱস্থালৈ নিবলৈ টিপক"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"কেমেৰাৰ কোনো সমস্যা নাই নেকি? অগ্ৰাহ্য কৰিবলৈ টিপক।"</string> diff --git a/libs/WindowManager/Shell/res/values-az/strings.xml b/libs/WindowManager/Shell/res/values-az/strings.xml index 2d64c308247a..2f49ae6fdafc 100644 --- a/libs/WindowManager/Shell/res/values-az/strings.xml +++ b/libs/WindowManager/Shell/res/values-az/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Qabarcıq"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"İdarə edin"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Qabarcıqdan imtina edilib."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Toxunaraq bu tətbiqi yenidən başladın ki, daha görüntü əldə edəsiniz."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Kamera problemi var?\nBərpa etmək üçün toxunun"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Düzəltməmisiniz?\nGeri qaytarmaq üçün toxunun"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Kamera problemi yoxdur? Qapatmaq üçün toxunun."</string> diff --git a/libs/WindowManager/Shell/res/values-be/strings.xml b/libs/WindowManager/Shell/res/values-be/strings.xml index 7b27e3056958..702f0abc07ae 100644 --- a/libs/WindowManager/Shell/res/values-be/strings.xml +++ b/libs/WindowManager/Shell/res/values-be/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Усплывальнае апавяшчэнне"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Кіраваць"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Усплывальнае апавяшчэнне адхілена."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Націсніце, каб перазапусціць гэту праграму для лепшага прагляду."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Праблемы з камерай?\nНацісніце, каб пераабсталяваць"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Не ўдалося выправіць?\nНацісніце, каб аднавіць"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Ніякіх праблем з камерай? Націсніце, каб адхіліць."</string> diff --git a/libs/WindowManager/Shell/res/values-bg/strings.xml b/libs/WindowManager/Shell/res/values-bg/strings.xml index c32b4cbd0cea..0de16d37cd69 100644 --- a/libs/WindowManager/Shell/res/values-bg/strings.xml +++ b/libs/WindowManager/Shell/res/values-bg/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Балонче"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Управление"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Балончето е отхвърлено."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Докоснете, за да рестартирате това приложение с цел по-добър изглед."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Имате проблеми с камерата?\nДокоснете за ремонтиране"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Проблемът не се отстрани?\nДокоснете за връщане в предишното състояние"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Нямате проблеми с камерата? Докоснете, за да отхвърлите."</string> diff --git a/libs/WindowManager/Shell/res/values-bs/strings.xml b/libs/WindowManager/Shell/res/values-bs/strings.xml index 03bd7e27db4e..31e906de7f51 100644 --- a/libs/WindowManager/Shell/res/values-bs/strings.xml +++ b/libs/WindowManager/Shell/res/values-bs/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Oblačić"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Upravljaj"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Oblačić je odbačen."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Dodirnite da ponovo pokrenete ovu aplikaciju radi boljeg prikaza."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problemi s kamerom?\nDodirnite da ponovo namjestite"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nije popravljeno?\nDodirnite da vratite"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nema problema s kamerom? Dodirnite da odbacite."</string> diff --git a/libs/WindowManager/Shell/res/values-ca/strings.xml b/libs/WindowManager/Shell/res/values-ca/strings.xml index 35eb3bffbeba..ca0a4211c435 100644 --- a/libs/WindowManager/Shell/res/values-ca/strings.xml +++ b/libs/WindowManager/Shell/res/values-ca/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bombolla"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gestiona"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"La bombolla s\'ha ignorat."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Toca per reiniciar aquesta aplicació i obtenir una millor visualització."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Tens problemes amb la càmera?\nToca per resoldre\'ls"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"El problema no s\'ha resolt?\nToca per desfer els canvis"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"No tens cap problema amb la càmera? Toca per ignorar."</string> diff --git a/libs/WindowManager/Shell/res/values-cs/strings.xml b/libs/WindowManager/Shell/res/values-cs/strings.xml index 6e28c5405f5b..e8772fe269b6 100644 --- a/libs/WindowManager/Shell/res/values-cs/strings.xml +++ b/libs/WindowManager/Shell/res/values-cs/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bublina"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Spravovat"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bublina byla zavřena."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Klepnutím tuto aplikaci kvůli lepšímu zobrazení restartujete."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problémy s fotoaparátem?\nKlepnutím vyřešíte"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nepomohlo to?\nKlepnutím se vrátíte"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Žádné problémy s fotoaparátem? Klepnutím zavřete."</string> diff --git a/libs/WindowManager/Shell/res/values-da/strings.xml b/libs/WindowManager/Shell/res/values-da/strings.xml index e954c4d47d10..2b55d4d688ac 100644 --- a/libs/WindowManager/Shell/res/values-da/strings.xml +++ b/libs/WindowManager/Shell/res/values-da/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Boble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Administrer"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Boblen blev lukket."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Tryk for at genstarte denne app, så visningen forbedres."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Har du problemer med dit kamera?\nTryk for at gendanne det oprindelige format"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Løste det ikke problemet?\nTryk for at fortryde"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Har du ingen problemer med dit kamera? Tryk for at afvise."</string> diff --git a/libs/WindowManager/Shell/res/values-de/strings.xml b/libs/WindowManager/Shell/res/values-de/strings.xml index e717f6a0f37e..03eee024f3be 100644 --- a/libs/WindowManager/Shell/res/values-de/strings.xml +++ b/libs/WindowManager/Shell/res/values-de/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Verwalten"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bubble verworfen."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Tippe, um diese App neu zu starten und die Ansicht zu verbessern."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Probleme mit der Kamera?\nZum Anpassen tippen."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Das Problem ist nicht behoben?\nZum Rückgängigmachen tippen."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Keine Probleme mit der Kamera? Zum Schließen tippen."</string> diff --git a/libs/WindowManager/Shell/res/values-el/strings.xml b/libs/WindowManager/Shell/res/values-el/strings.xml index 1643ac59d1a9..49bfdf18b1e6 100644 --- a/libs/WindowManager/Shell/res/values-el/strings.xml +++ b/libs/WindowManager/Shell/res/values-el/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Συννεφάκι"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Διαχείριση"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Το συννεφάκι παραβλέφθηκε."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Πατήστε για να επανεκκινήσετε αυτή την εφαρμογή για καλύτερη προβολή."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Προβλήματα με την κάμερα;\nΠατήστε για επιδιόρθωση."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Δεν διορθώθηκε;\nΠατήστε για επαναφορά."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Δεν αντιμετωπίζετε προβλήματα με την κάμερα; Πατήστε για παράβλεψη."</string> diff --git a/libs/WindowManager/Shell/res/values-es/strings.xml b/libs/WindowManager/Shell/res/values-es/strings.xml index 3cf6816a5949..79c1f90a4b8d 100644 --- a/libs/WindowManager/Shell/res/values-es/strings.xml +++ b/libs/WindowManager/Shell/res/values-es/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Burbuja"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gestionar"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Burbuja cerrada."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Toca para reiniciar esta aplicación y obtener una mejor vista."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"¿Problemas con la cámara?\nToca para reajustar"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"¿No se ha solucionado?\nToca para revertir"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"¿No hay problemas con la cámara? Toca para cerrar."</string> diff --git a/libs/WindowManager/Shell/res/values-et/strings.xml b/libs/WindowManager/Shell/res/values-et/strings.xml index 22ef08ca26ae..a7fead6af9aa 100644 --- a/libs/WindowManager/Shell/res/values-et/strings.xml +++ b/libs/WindowManager/Shell/res/values-et/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Mull"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Halda"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Mullist loobuti."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Puudutage, et see rakendus parema vaate jaoks taaskäivitada."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Kas teil on kaameraprobleeme?\nPuudutage ümberpaigutamiseks."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Kas probleemi ei lahendatud?\nPuudutage ennistamiseks."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Kas kaameraprobleeme pole? Puudutage loobumiseks."</string> diff --git a/libs/WindowManager/Shell/res/values-eu/strings.xml b/libs/WindowManager/Shell/res/values-eu/strings.xml index 4f529c55765f..e7530c9690a7 100644 --- a/libs/WindowManager/Shell/res/values-eu/strings.xml +++ b/libs/WindowManager/Shell/res/values-eu/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Burbuila"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Kudeatu"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Baztertu da globoa."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Hobeto ikusteko, sakatu hau aplikazioa berrabiarazteko."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Arazoak dauzkazu kamerarekin?\nBerriro doitzeko, sakatu hau."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Ez al da konpondu?\nLeheneratzeko, sakatu hau."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Ez daukazu arazorik kamerarekin? Baztertzeko, sakatu hau."</string> diff --git a/libs/WindowManager/Shell/res/values-fa/strings.xml b/libs/WindowManager/Shell/res/values-fa/strings.xml index dce1d1d33df7..66a657e36c13 100644 --- a/libs/WindowManager/Shell/res/values-fa/strings.xml +++ b/libs/WindowManager/Shell/res/values-fa/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"حباب"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"مدیریت"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"حبابک رد شد."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"برای داشتن نمایی بهتر، ضربه بزنید تا این برنامه بازراهاندازی شود."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"دوربین مشکل دارد؟\nبرای تنظیم مجدد اندازه ضربه بزنید"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"مشکل برطرف نشد؟\nبرای برگرداندن ضربه بزنید"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"دوربین مشکلی ندارد؟ برای بستن ضربه بزنید."</string> diff --git a/libs/WindowManager/Shell/res/values-fi/strings.xml b/libs/WindowManager/Shell/res/values-fi/strings.xml index 8223fb872bca..eaf369ad0486 100644 --- a/libs/WindowManager/Shell/res/values-fi/strings.xml +++ b/libs/WindowManager/Shell/res/values-fi/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Kupla"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Ylläpidä"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Kupla ohitettu."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Napauta, niin sovellus käynnistyy uudelleen paremmin näytölle sopivana."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Onko kameran kanssa ongelmia?\nKorjaa napauttamalla"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Eikö ongelma ratkennut?\nKumoa napauttamalla"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Ei ongelmia kameran kanssa? Hylkää napauttamalla."</string> diff --git a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml index 655f8341f708..8f614c56db14 100644 --- a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bulle"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gérer"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bulle ignorée."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Touchez pour redémarrer cette application afin d\'obtenir un meilleur affichage."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problèmes d\'appareil photo?\nTouchez pour réajuster"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Problème non résolu?\nTouchez pour rétablir"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Aucun problème d\'appareil photo? Touchez pour ignorer."</string> diff --git a/libs/WindowManager/Shell/res/values-fr/strings.xml b/libs/WindowManager/Shell/res/values-fr/strings.xml index d8f561bde38d..ec3e1b33a4fa 100644 --- a/libs/WindowManager/Shell/res/values-fr/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bulle"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gérer"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bulle fermée."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Appuyez pour redémarrer cette appli et avoir une meilleure vue."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problèmes d\'appareil photo ?\nAppuyez pour réajuster"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Problème non résolu ?\nAppuyez pour rétablir"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Aucun problème d\'appareil photo ? Appuyez pour ignorer."</string> diff --git a/libs/WindowManager/Shell/res/values-gl/strings.xml b/libs/WindowManager/Shell/res/values-gl/strings.xml index 47e8f04c1b2a..651353d89319 100644 --- a/libs/WindowManager/Shell/res/values-gl/strings.xml +++ b/libs/WindowManager/Shell/res/values-gl/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Burbulla"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Xestionar"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Ignorouse a burbulla."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Toca o botón para reiniciar esta aplicación e gozar dunha mellor visualización."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Tes problemas coa cámara?\nToca para reaxustala"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Non se solucionaron os problemas?\nToca para reverter o seu tratamento"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Non hai problemas coa cámara? Tocar para ignorar."</string> diff --git a/libs/WindowManager/Shell/res/values-hr/strings.xml b/libs/WindowManager/Shell/res/values-hr/strings.xml index 9e81df061e79..cb4f424cf317 100644 --- a/libs/WindowManager/Shell/res/values-hr/strings.xml +++ b/libs/WindowManager/Shell/res/values-hr/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Oblačić"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Upravljanje"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Oblačić odbačen."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Dodirnite da biste ponovo pokrenuli tu aplikaciju kako biste bolje vidjeli."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problemi s fotoaparatom?\nDodirnite za popravak"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Problem nije riješen?\nDodirnite za vraćanje"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nemate problema s fotoaparatom? Dodirnite za odbacivanje."</string> diff --git a/libs/WindowManager/Shell/res/values-hu/strings.xml b/libs/WindowManager/Shell/res/values-hu/strings.xml index 9ade248b5ebd..635f4dad8f89 100644 --- a/libs/WindowManager/Shell/res/values-hu/strings.xml +++ b/libs/WindowManager/Shell/res/values-hu/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Buborék"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Kezelés"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Buborék elvetve."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"A jobb nézet érdekében koppintson az alkalmazás újraindításához."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Kamerával kapcsolatos problémába ütközött?\nKoppintson a megoldáshoz."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nem sikerült a hiba kijavítása?\nKoppintson a visszaállításhoz."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nincsenek problémái kamerával? Koppintson az elvetéshez."</string> diff --git a/libs/WindowManager/Shell/res/values-hy/strings.xml b/libs/WindowManager/Shell/res/values-hy/strings.xml index 2c12bfc06128..da382c113797 100644 --- a/libs/WindowManager/Shell/res/values-hy/strings.xml +++ b/libs/WindowManager/Shell/res/values-hy/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Պղպջակ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Կառավարել"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Ամպիկը փակվեց։"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Հպեք՝ հավելվածը վերագործարկելու և ավելի հարմար տեսք ընտրելու համար։"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Տեսախցիկի հետ կապված խնդիրնե՞ր կան։\nՀպեք՝ վերակարգավորելու համար։"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Չհաջողվե՞ց շտկել։\nՀպեք՝ փոփոխությունները չեղարկելու համար։"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Տեսախցիկի հետ կապված խնդիրներ չկա՞ն։ Փակելու համար հպեք։"</string> diff --git a/libs/WindowManager/Shell/res/values-in/strings.xml b/libs/WindowManager/Shell/res/values-in/strings.xml index 03f45da7aea3..cd795390128b 100644 --- a/libs/WindowManager/Shell/res/values-in/strings.xml +++ b/libs/WindowManager/Shell/res/values-in/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Balon"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Kelola"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balon ditutup."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Ketuk untuk memulai ulang aplikasi ini agar mendapatkan tampilan yang lebih baik."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Masalah kamera?\nKetuk untuk memperbaiki"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Tidak dapat diperbaiki?\nKetuk untuk mengembalikan"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Tidak ada masalah kamera? Ketuk untuk menutup."</string> diff --git a/libs/WindowManager/Shell/res/values-is/strings.xml b/libs/WindowManager/Shell/res/values-is/strings.xml index 2a4e42c41297..37141b74005c 100644 --- a/libs/WindowManager/Shell/res/values-is/strings.xml +++ b/libs/WindowManager/Shell/res/values-is/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Blaðra"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Stjórna"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Blöðru lokað."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Ýta til að endurræsa forritið og fá betri sýn."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Myndavélavesen?\nÝttu til að breyta stærð"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Ennþá vesen?\nÝttu til að afturkalla"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Ekkert myndavélavesen? Ýttu til að hunsa."</string> diff --git a/libs/WindowManager/Shell/res/values-kk/strings.xml b/libs/WindowManager/Shell/res/values-kk/strings.xml index 9494bc9e196f..c42efdc4cf25 100644 --- a/libs/WindowManager/Shell/res/values-kk/strings.xml +++ b/libs/WindowManager/Shell/res/values-kk/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Көпіршік"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Басқару"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Қалқыма хабар жабылды."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Ыңғайлы көріністі реттеу үшін қолданбаны түртіп, өшіріп қосыңыз."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Камерада қателер шықты ма?\nЖөндеу үшін түртіңіз."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Жөнделмеді ме?\nҚайтару үшін түртіңіз."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Камерада қателер шықпады ма? Жабу үшін түртіңіз."</string> diff --git a/libs/WindowManager/Shell/res/values-km/strings.xml b/libs/WindowManager/Shell/res/values-km/strings.xml index f40ba05bbcfb..302b25e5bad2 100644 --- a/libs/WindowManager/Shell/res/values-km/strings.xml +++ b/libs/WindowManager/Shell/res/values-km/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ពពុះ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"គ្រប់គ្រង"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"បានច្រានចោលសារលេចឡើង។"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"ចុចដើម្បីចាប់ផ្ដើមកម្មវិធីនេះឡើងវិញសម្រាប់ទិដ្ឋភាពកាន់តែប្រសើរ។"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"មានបញ្ហាពាក់ព័ន្ធនឹងកាមេរ៉ាឬ?\nចុចដើម្បីដោះស្រាយ"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"មិនបានដោះស្រាយបញ្ហានេះទេឬ?\nចុចដើម្បីត្រឡប់"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"មិនមានបញ្ហាពាក់ព័ន្ធនឹងកាមេរ៉ាទេឬ? ចុចដើម្បីច្រានចោល។"</string> diff --git a/libs/WindowManager/Shell/res/values-kn/strings.xml b/libs/WindowManager/Shell/res/values-kn/strings.xml index d2bce350c09a..2b3aa0791336 100644 --- a/libs/WindowManager/Shell/res/values-kn/strings.xml +++ b/libs/WindowManager/Shell/res/values-kn/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ಬಬಲ್"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ನಿರ್ವಹಿಸಿ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ಬಬಲ್ ವಜಾಗೊಳಿಸಲಾಗಿದೆ."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"ಉತ್ತಮ ವೀಕ್ಷಣೆಗಾಗಿ ಈ ಆ್ಯಪ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"ಕ್ಯಾಮರಾ ಸಮಸ್ಯೆಗಳಿವೆಯೇ?\nಮರುಹೊಂದಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ಅದನ್ನು ಸರಿಪಡಿಸಲಿಲ್ಲವೇ?\nಹಿಂತಿರುಗಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ಕ್ಯಾಮರಾ ಸಮಸ್ಯೆಗಳಿಲ್ಲವೇ? ವಜಾಗೊಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> diff --git a/libs/WindowManager/Shell/res/values-ko/strings.xml b/libs/WindowManager/Shell/res/values-ko/strings.xml index af7db9a10002..5505955db71a 100644 --- a/libs/WindowManager/Shell/res/values-ko/strings.xml +++ b/libs/WindowManager/Shell/res/values-ko/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"버블"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"관리"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"대화창을 닫았습니다."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"보기를 개선하려면 탭하여 앱을 다시 시작합니다."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"카메라 문제가 있나요?\n해결하려면 탭하세요."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"해결되지 않았나요?\n되돌리려면 탭하세요."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"카메라에 문제가 없나요? 닫으려면 탭하세요."</string> diff --git a/libs/WindowManager/Shell/res/values-ky/strings.xml b/libs/WindowManager/Shell/res/values-ky/strings.xml index 61fb5972cc72..d45a9848abc4 100644 --- a/libs/WindowManager/Shell/res/values-ky/strings.xml +++ b/libs/WindowManager/Shell/res/values-ky/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Көбүк"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Башкаруу"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Калкып чыкма билдирме жабылды."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Жакшыраак көрүү үчүн бул колдонмону өчүрүп күйгүзүңүз. Ал үчүн таптап коюңуз."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Камерада маселелер келип чыктыбы?\nОңдоо үчүн таптаңыз"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Оңдолгон жокпу?\nАртка кайтаруу үчүн таптаңыз"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Камерада маселе жокпу? Этибарга албоо үчүн таптаңыз."</string> diff --git a/libs/WindowManager/Shell/res/values-lo/strings.xml b/libs/WindowManager/Shell/res/values-lo/strings.xml index 7e8dd867e92c..0eeee906070b 100644 --- a/libs/WindowManager/Shell/res/values-lo/strings.xml +++ b/libs/WindowManager/Shell/res/values-lo/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ຟອງ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ຈັດການ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ປິດ Bubble ໄສ້ແລ້ວ."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"ແຕະເພື່ອຣີສະຕາດແອັບນີ້ເພື່ອມຸມມອງທີ່ດີຂຶ້ນ."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"ມີບັນຫາກ້ອງຖ່າຍຮູບບໍ?\nແຕະເພື່ອປັບໃໝ່"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ບໍ່ໄດ້ແກ້ໄຂມັນບໍ?\nແຕະເພື່ອແປງກັບຄືນ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ບໍ່ມີບັນຫາກ້ອງຖ່າຍຮູບບໍ? ແຕະເພື່ອປິດໄວ້."</string> diff --git a/libs/WindowManager/Shell/res/values-lt/strings.xml b/libs/WindowManager/Shell/res/values-lt/strings.xml index 87abc833a92b..fc118e217481 100644 --- a/libs/WindowManager/Shell/res/values-lt/strings.xml +++ b/libs/WindowManager/Shell/res/values-lt/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Debesėlis"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Tvarkyti"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Debesėlio atsisakyta."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Palieskite, kad iš naujo paleistumėte šią programą ir matytumėte aiškiau."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Iškilo problemų dėl kameros?\nPalieskite, kad pritaikytumėte iš naujo"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nepavyko pataisyti?\nPalieskite, kad grąžintumėte"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nėra jokių problemų dėl kameros? Palieskite, kad atsisakytumėte."</string> diff --git a/libs/WindowManager/Shell/res/values-lv/strings.xml b/libs/WindowManager/Shell/res/values-lv/strings.xml index 9414569d0e56..cd2af07beb7e 100644 --- a/libs/WindowManager/Shell/res/values-lv/strings.xml +++ b/libs/WindowManager/Shell/res/values-lv/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Burbulis"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Pārvaldīt"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Burbulis ir noraidīts."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Pieskarieties, lai restartētu šo lietotni un uzlabotu attēlojumu."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Vai ir problēmas ar kameru?\nPieskarieties, lai tās novērstu."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Vai problēma netika novērsta?\nPieskarieties, lai atjaunotu."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Vai nav problēmu ar kameru? Pieskarieties, lai nerādītu."</string> diff --git a/libs/WindowManager/Shell/res/values-mr/strings.xml b/libs/WindowManager/Shell/res/values-mr/strings.xml index 988e327f2a2e..b9a165eb6b11 100644 --- a/libs/WindowManager/Shell/res/values-mr/strings.xml +++ b/libs/WindowManager/Shell/res/values-mr/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"बबल"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"व्यवस्थापित करा"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"बबल डिसमिस केला."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"अधिक चांगल्या व्ह्यूसाठी हे अॅप रीस्टार्ट करण्याकरिता टॅप करा."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"कॅमेराशी संबंधित काही समस्या आहेत का?\nपुन्हा फिट करण्यासाठी टॅप करा"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"निराकरण झाले नाही?\nरिव्हर्ट करण्यासाठी कृपया टॅप करा"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"कॅमेराशी संबंधित कोणत्याही समस्या नाहीत का? डिसमिस करण्यासाठी टॅप करा."</string> diff --git a/libs/WindowManager/Shell/res/values-ms/strings.xml b/libs/WindowManager/Shell/res/values-ms/strings.xml index 30bcf6274045..3d81c9a551fa 100644 --- a/libs/WindowManager/Shell/res/values-ms/strings.xml +++ b/libs/WindowManager/Shell/res/values-ms/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Gelembung"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Urus"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Gelembung diketepikan."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Ketik untuk memulakan semula apl ini untuk mendapatkan paparan yang lebih baik."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Isu kamera?\nKetik untuk memuatkan semula"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Isu tidak dibetulkan?\nKetik untuk kembali"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Tiada isu kamera? Ketik untuk mengetepikan."</string> diff --git a/libs/WindowManager/Shell/res/values-my/strings.xml b/libs/WindowManager/Shell/res/values-my/strings.xml index 4d95c24ab959..50adfe98d8f9 100644 --- a/libs/WindowManager/Shell/res/values-my/strings.xml +++ b/libs/WindowManager/Shell/res/values-my/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ပူဖောင်းဖောက်သံ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"စီမံရန်"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ပူဖောင်းကွက် ဖယ်လိုက်သည်။"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"ပိုကောင်းသောမြင်ကွင်းအတွက် ဤအက်ပ်ပြန်စရန် တို့နိုင်သည်။"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"ကင်မရာပြဿနာလား။\nပြင်ဆင်ရန် တို့ပါ"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ကောင်းမသွားဘူးလား။\nပြန်ပြောင်းရန် တို့ပါ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ကင်မရာပြဿနာ မရှိဘူးလား။ ပယ်ရန် တို့ပါ။"</string> diff --git a/libs/WindowManager/Shell/res/values-nb/strings.xml b/libs/WindowManager/Shell/res/values-nb/strings.xml index 30e34b592283..74e066ec11fd 100644 --- a/libs/WindowManager/Shell/res/values-nb/strings.xml +++ b/libs/WindowManager/Shell/res/values-nb/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Boble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Administrer"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Boblen er avvist."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Trykk for å starte denne appen på nytt for bedre visning."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Har du kameraproblemer?\nTrykk for å tilpasse"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Ble ikke problemet løst?\nTrykk for å gå tilbake"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Har du ingen kameraproblemer? Trykk for å lukke."</string> diff --git a/libs/WindowManager/Shell/res/values-ne/strings.xml b/libs/WindowManager/Shell/res/values-ne/strings.xml index 60d071708c41..b257f9e6d0d3 100644 --- a/libs/WindowManager/Shell/res/values-ne/strings.xml +++ b/libs/WindowManager/Shell/res/values-ne/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"बबल"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"व्यवस्थापन गर्नुहोस्"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"बबल हटाइयो।"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"यो एप अझ राम्रो हेर्न मिल्ने बनाउनका लागि यसलाई रिस्टार्ट गर्न ट्याप गर्नुहोस्।"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"क्यामेरासम्बन्धी समस्या देखियो?\nसमस्या हल गर्न ट्याप गर्नुहोस्"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"समस्या हल भएन?\nपहिलेको जस्तै बनाउन ट्याप गर्नुहोस्"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"क्यामेरासम्बन्धी कुनै पनि समस्या छैन? खारेज गर्न ट्याप गर्नुहोस्।"</string> diff --git a/libs/WindowManager/Shell/res/values-nl/strings.xml b/libs/WindowManager/Shell/res/values-nl/strings.xml index 481405e2c93d..6ea24a8b3808 100644 --- a/libs/WindowManager/Shell/res/values-nl/strings.xml +++ b/libs/WindowManager/Shell/res/values-nl/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubbel"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Beheren"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bubbel gesloten."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Tik om deze app opnieuw op te starten voor een betere weergave."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Cameraproblemen?\nTik om opnieuw passend te maken."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Is dit geen oplossing?\nTik om terug te zetten."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Geen cameraproblemen? Tik om te sluiten."</string> diff --git a/libs/WindowManager/Shell/res/values-or/strings.xml b/libs/WindowManager/Shell/res/values-or/strings.xml index 905b4d71d251..f8c924828d50 100644 --- a/libs/WindowManager/Shell/res/values-or/strings.xml +++ b/libs/WindowManager/Shell/res/values-or/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ବବଲ୍"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ପରିଚାଳନା କରନ୍ତୁ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ବବଲ୍ ଖାରଜ କରାଯାଇଛି।"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"ଏକ ଆହୁରି ଭଲ ଭ୍ୟୁ ପାଇଁ ଏହି ଆପ ରିଷ୍ଟାର୍ଟ କରିବାକୁ ଟାପ କରନ୍ତୁ।"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"କ୍ୟାମେରାରେ ସମସ୍ୟା ଅଛି?\nପୁଣି ଫିଟ କରିବାକୁ ଟାପ କରନ୍ତୁ"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ଏହାର ସମାଧାନ ହୋଇନାହିଁ?\nଫେରିଯିବା ପାଇଁ ଟାପ କରନ୍ତୁ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"କ୍ୟାମେରାରେ କିଛି ସମସ୍ୟା ନାହିଁ? ଖାରଜ କରିବାକୁ ଟାପ କରନ୍ତୁ।"</string> diff --git a/libs/WindowManager/Shell/res/values-pa/strings.xml b/libs/WindowManager/Shell/res/values-pa/strings.xml index 03687b5fc29d..b80da0ba4e57 100644 --- a/libs/WindowManager/Shell/res/values-pa/strings.xml +++ b/libs/WindowManager/Shell/res/values-pa/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ਬੁਲਬੁਲਾ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ਪ੍ਰਬੰਧਨ ਕਰੋ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ਬਬਲ ਨੂੰ ਖਾਰਜ ਕੀਤਾ ਗਿਆ।"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"ਬਿਹਤਰ ਦ੍ਰਿਸ਼ ਲਈ ਇਸ ਐਪ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"ਕੀ ਕੈਮਰੇ ਸੰਬੰਧੀ ਸਮੱਸਿਆਵਾਂ ਹਨ?\nਮੁੜ-ਫਿੱਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ਕੀ ਇਹ ਠੀਕ ਨਹੀਂ ਹੋਈ?\nਵਾਪਸ ਉਹੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ਕੀ ਕੈਮਰੇ ਸੰਬੰਧੀ ਕੋਈ ਸਮੱਸਿਆ ਨਹੀਂ ਹੈ? ਖਾਰਜ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> diff --git a/libs/WindowManager/Shell/res/values-pl/strings.xml b/libs/WindowManager/Shell/res/values-pl/strings.xml index 5484fbd8ac18..bdd44dd8a743 100644 --- a/libs/WindowManager/Shell/res/values-pl/strings.xml +++ b/libs/WindowManager/Shell/res/values-pl/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Dymek"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Zarządzaj"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Zamknięto dymek"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Kliknij, aby zrestartować aplikację i zyskać lepszą widoczność."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problemy z aparatem?\nKliknij, aby dopasować"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Naprawa się nie udała?\nKliknij, aby cofnąć"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Brak problemów z aparatem? Kliknij, aby zamknąć"</string> diff --git a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml index 2de30e4cf2ba..b9e41eae5de9 100644 --- a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bolha"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gerenciar"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balão dispensado."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Toque para reiniciar o app e atualizar a visualização."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problemas com a câmera?\nToque para ajustar o enquadramento"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"O problema não foi corrigido?\nToque para reverter"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Não tem problemas com a câmera? Toque para dispensar."</string> diff --git a/libs/WindowManager/Shell/res/values-pt/strings.xml b/libs/WindowManager/Shell/res/values-pt/strings.xml index 2de30e4cf2ba..b9e41eae5de9 100644 --- a/libs/WindowManager/Shell/res/values-pt/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bolha"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gerenciar"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balão dispensado."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Toque para reiniciar o app e atualizar a visualização."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problemas com a câmera?\nToque para ajustar o enquadramento"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"O problema não foi corrigido?\nToque para reverter"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Não tem problemas com a câmera? Toque para dispensar."</string> diff --git a/libs/WindowManager/Shell/res/values-ru/strings.xml b/libs/WindowManager/Shell/res/values-ru/strings.xml index 7fa0ec280e3c..ffe031d86725 100644 --- a/libs/WindowManager/Shell/res/values-ru/strings.xml +++ b/libs/WindowManager/Shell/res/values-ru/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Всплывающая подсказка"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Настроить"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Всплывающий чат закрыт."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Нажмите, чтобы перезапустить приложение и настроить удобный для просмотра вид"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Проблемы с камерой?\nНажмите, чтобы исправить."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Не помогло?\nНажмите, чтобы отменить изменения."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Нет проблем с камерой? Нажмите, чтобы закрыть."</string> diff --git a/libs/WindowManager/Shell/res/values-sk/strings.xml b/libs/WindowManager/Shell/res/values-sk/strings.xml index 322a14f2f3ec..b5bedf79f3ba 100644 --- a/libs/WindowManager/Shell/res/values-sk/strings.xml +++ b/libs/WindowManager/Shell/res/values-sk/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bublina"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Spravovať"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bublina bola zavretá."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Ak chcete zlepšiť zobrazenie, klepnutím túto aplikáciu reštartujte."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problémy s kamerou?\nKlepnutím znova upravte."</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nevyriešilo sa to?\nKlepnutím sa vráťte."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nemáte problémy s kamerou? Klepnutím zatvoríte."</string> diff --git a/libs/WindowManager/Shell/res/values-sl/strings.xml b/libs/WindowManager/Shell/res/values-sl/strings.xml index 4917a63cd7de..ac926b9ee8db 100644 --- a/libs/WindowManager/Shell/res/values-sl/strings.xml +++ b/libs/WindowManager/Shell/res/values-sl/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Mehurček"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Upravljanje"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Oblaček je bil opuščen."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Če želite boljši prikaz, se dotaknite za vnovični zagon te aplikacije."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Težave s fotoaparatom?\nDotaknite se za vnovično prilagoditev"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"To ni odpravilo težave?\nDotaknite se za povrnitev"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nimate težav s fotoaparatom? Dotaknite se za opustitev."</string> diff --git a/libs/WindowManager/Shell/res/values-sq/strings.xml b/libs/WindowManager/Shell/res/values-sq/strings.xml index be554274e1cc..07c52fe4251a 100644 --- a/libs/WindowManager/Shell/res/values-sq/strings.xml +++ b/libs/WindowManager/Shell/res/values-sq/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Flluskë"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Menaxho"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Flluska u hoq."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Trokit për të rifilluar këtë aplikacion për një pamje më të mirë."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Ka probleme me kamerën?\nTrokit për ta ripërshtatur"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nuk u rregullua?\nTrokit për ta rikthyer"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nuk ka probleme me kamerën? Trokit për ta shpërfillur."</string> diff --git a/libs/WindowManager/Shell/res/values-sv/strings.xml b/libs/WindowManager/Shell/res/values-sv/strings.xml index 16fb515f94d1..cfdb1ddcf377 100644 --- a/libs/WindowManager/Shell/res/values-sv/strings.xml +++ b/libs/WindowManager/Shell/res/values-sv/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubbla"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Hantera"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bubblan ignorerades."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Tryck för att starta om appen och få en bättre vy."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Problem med kameran?\nTryck för att anpassa på nytt"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Löstes inte problemet?\nTryck för att återställa"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Inga problem med kameran? Tryck för att ignorera."</string> diff --git a/libs/WindowManager/Shell/res/values-sw/strings.xml b/libs/WindowManager/Shell/res/values-sw/strings.xml index 37e4c304fd8f..383e9bb6bbfa 100644 --- a/libs/WindowManager/Shell/res/values-sw/strings.xml +++ b/libs/WindowManager/Shell/res/values-sw/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Kiputo"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Dhibiti"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Umeondoa kiputo."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Gusa ili uzime kisha uwashe programu hii, ili upate mwonekano bora."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Je, kuna hitilafu za kamera?\nGusa ili urekebishe"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Umeshindwa kurekebisha?\nGusa ili urejeshe nakala ya awali"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Je, hakuna hitilafu za kamera? Gusa ili uondoe."</string> diff --git a/libs/WindowManager/Shell/res/values-ta/strings.xml b/libs/WindowManager/Shell/res/values-ta/strings.xml index 1ab101bcab7e..cc512f3c48aa 100644 --- a/libs/WindowManager/Shell/res/values-ta/strings.xml +++ b/libs/WindowManager/Shell/res/values-ta/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"பபிள்"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"நிர்வகி"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"குமிழ் நிராகரிக்கப்பட்டது."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"இங்கு தட்டுவதன் மூலம் இந்த ஆப்ஸை மீண்டும் தொடங்கி, ஆப்ஸ் காட்டப்படும் விதத்தை இன்னும் சிறப்பாக்கலாம்."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"கேமரா தொடர்பான சிக்கல்களா?\nமீண்டும் பொருத்த தட்டவும்"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"சிக்கல்கள் சரிசெய்யப்படவில்லையா?\nமாற்றியமைக்க தட்டவும்"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"கேமரா தொடர்பான சிக்கல்கள் எதுவும் இல்லையா? நிராகரிக்க தட்டவும்."</string> diff --git a/libs/WindowManager/Shell/res/values-th/strings.xml b/libs/WindowManager/Shell/res/values-th/strings.xml index 644a1fad8313..136a81c06c4f 100644 --- a/libs/WindowManager/Shell/res/values-th/strings.xml +++ b/libs/WindowManager/Shell/res/values-th/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"บับเบิล"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"จัดการ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ปิดบับเบิลแล้ว"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"แตะเพื่อรีสตาร์ทแอปนี้และรับมุมมองที่ดียิ่งขึ้น"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"หากพบปัญหากับกล้อง\nแตะเพื่อแก้ไข"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"หากไม่ได้แก้ไข\nแตะเพื่อเปลี่ยนกลับ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"หากไม่พบปัญหากับกล้อง แตะเพื่อปิด"</string> diff --git a/libs/WindowManager/Shell/res/values-tr/strings.xml b/libs/WindowManager/Shell/res/values-tr/strings.xml index 2b6c14ab41c4..f3ab37065270 100644 --- a/libs/WindowManager/Shell/res/values-tr/strings.xml +++ b/libs/WindowManager/Shell/res/values-tr/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Baloncuk"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Yönet"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balon kapatıldı."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Bu uygulamayı yeniden başlatarak daha iyi bir görünüm elde etmek için dokunun."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Kameranızda sorun mu var?\nDüzeltmek için dokunun"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Bu işlem sorunu düzeltmedi mi?\nİşlemi geri almak için dokunun"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Kameranızda sorun yok mu? Kapatmak için dokunun."</string> diff --git a/libs/WindowManager/Shell/res/values-uk/strings.xml b/libs/WindowManager/Shell/res/values-uk/strings.xml index 333adad93373..d7d82cb56ac5 100644 --- a/libs/WindowManager/Shell/res/values-uk/strings.xml +++ b/libs/WindowManager/Shell/res/values-uk/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Спливаюче сповіщення"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Налаштувати"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Спливаюче сповіщення закрито."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Натисніть, щоб перезапустити цей додаток для зручнішого перегляду."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Проблеми з камерою?\nНатисніть, щоб пристосувати"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Проблему не вирішено?\nНатисніть, щоб скасувати зміни"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Немає проблем із камерою? Торкніться, щоб закрити."</string> diff --git a/libs/WindowManager/Shell/res/values-ur/strings.xml b/libs/WindowManager/Shell/res/values-ur/strings.xml index 86a7d7926867..4a8476aebe18 100644 --- a/libs/WindowManager/Shell/res/values-ur/strings.xml +++ b/libs/WindowManager/Shell/res/values-ur/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"بلبلہ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"نظم کریں"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"بلبلہ برخاست کر دیا گیا۔"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"بہتر منظر کے لیے اس ایپ کو ری اسٹارٹ کرنے کی خاطر تھپتھپائیں۔"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"کیمرے کے مسائل؟\nدوبارہ فٹ کرنے کیلئے تھپتھپائیں"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"یہ حل نہیں ہوا؟\nلوٹانے کیلئے تھپتھپائیں"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"کوئی کیمرے کا مسئلہ نہیں ہے؟ برخاست کرنے کیلئے تھپتھپائیں۔"</string> diff --git a/libs/WindowManager/Shell/res/values-uz/strings.xml b/libs/WindowManager/Shell/res/values-uz/strings.xml index f3a85ac768e3..8a4eac3bb657 100644 --- a/libs/WindowManager/Shell/res/values-uz/strings.xml +++ b/libs/WindowManager/Shell/res/values-uz/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Pufaklar"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Boshqarish"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bulutcha yopildi."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Yaxshiroq koʻrish maqsadida bu ilovani qayta ishga tushirish uchun bosing."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Kamera nosozmi?\nQayta moslash uchun bosing"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Tuzatilmadimi?\nQaytarish uchun bosing"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Kamera muammosizmi? Yopish uchun bosing."</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml index d3aecadf7b18..ab44fb1d2488 100644 --- a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"气泡"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"管理"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"已关闭对话泡。"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"点按即可重启此应用，获得更好的视图体验。"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"相机有问题？\n点按即可整修"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"没有解决此问题？\n点按即可恢复"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"相机没有问题？点按即可忽略。"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml index ed7b54e53eb2..b4bc3909c08f 100644 --- a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"氣泡"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"管理"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"對話氣泡已關閉。"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"請輕觸並重新啟動此應用程式，取得更良好的觀看體驗。"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"相機有問題？\n輕按即可修正"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"未能修正問題？\n輕按即可還原"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"相機冇問題？㩒一下就可以即可閂咗佢。"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml index 30ad16c51013..45de4156084b 100644 --- a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"泡泡"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"管理"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"已關閉泡泡。"</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"請輕觸並重新啟動此應用程式，取得更良好的觀看體驗。"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"相機有問題嗎？\n輕觸即可修正"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"未修正問題嗎？\n輕觸即可還原"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"相機沒問題嗎？輕觸即可關閉。"</string> diff --git a/libs/WindowManager/Shell/res/values-zu/strings.xml b/libs/WindowManager/Shell/res/values-zu/strings.xml index 4994c6a559f0..7c31a166e825 100644 --- a/libs/WindowManager/Shell/res/values-zu/strings.xml +++ b/libs/WindowManager/Shell/res/values-zu/strings.xml @@ -72,8 +72,7 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Ibhamuza"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Phatha"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Ibhamuza licashisiwe."</string> - <!-- no translation found for restart_button_description (6712141648865547958) --> - <skip /> + <string name="restart_button_description" msgid="6712141648865547958">"Thepha ukuze uqale kabusha le app ukuze ibonakale kangcono."</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Izinkinga zekhamera?\nThepha ukuze uyilinganise kabusha"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Akuyilungisanga?\nThepha ukuze ubuyele"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Azikho izinkinga zekhamera? Thepha ukuze ucashise."</string> diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml index 946bbb512f1c..e6337663ad35 100644 --- a/packages/SettingsLib/res/values-fa/strings.xml +++ b/packages/SettingsLib/res/values-fa/strings.xml @@ -576,7 +576,7 @@ <string name="user_setup_dialog_message" msgid="269931619868102841">"مطمئن شوید شخص در دسترس است تا دستگاه را بگیرد و فضایش را تنظیم کند"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"اکنون نمایه را تنظیم میکنید؟"</string> <string name="user_setup_button_setup_now" msgid="1708269547187760639">"اکنون تنظیم شود"</string> - <string name="user_setup_button_setup_later" msgid="8712980133555493516">"اکنون نه"</string> + <string name="user_setup_button_setup_later" msgid="8712980133555493516">"حالا نه"</string> <string name="user_add_user_type_title" msgid="551279664052914497">"افزودن"</string> <string name="user_new_user_name" msgid="60979820612818840">"کاربر جدید"</string> <string name="user_new_profile_name" msgid="2405500423304678841">"نمایه جدید"</string> diff --git a/packages/SettingsLib/res/values-mn/strings.xml b/packages/SettingsLib/res/values-mn/strings.xml index 475178ef726b..4b2c602f4162 100644 --- a/packages/SettingsLib/res/values-mn/strings.xml +++ b/packages/SettingsLib/res/values-mn/strings.xml @@ -100,13 +100,13 @@ <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Холбогдсон (медиа байхгүй)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Холбогдсон (мессежийн хандалт байхгүй)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_headset_no_a2dp" msgid="2893204819854215433">"Холбогдсон (утас эсвэл медиа байхгүй)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_connected_battery_level" msgid="5410325759372259950">"Холбогдсон, батерей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> - <string name="bluetooth_connected_no_headset_battery_level" msgid="2661863370509206428">"Холбогдсон (утас байхгүй), батерей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> - <string name="bluetooth_connected_no_a2dp_battery_level" msgid="6499078454894324287">"Холбогдсон (медиа байхгүй), батерей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> - <string name="bluetooth_connected_no_headset_no_a2dp_battery_level" msgid="8477440576953067242">"Холбогдсон (утас эсвэл медиа байхгүй), батерей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> - <string name="bluetooth_active_battery_level" msgid="3450745316700494425">"Идэвхтэй, батерей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> + <string name="bluetooth_connected_battery_level" msgid="5410325759372259950">"Холбогдсон, батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> + <string name="bluetooth_connected_no_headset_battery_level" msgid="2661863370509206428">"Холбогдсон (утас байхгүй), батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> + <string name="bluetooth_connected_no_a2dp_battery_level" msgid="6499078454894324287">"Холбогдсон (медиа байхгүй), батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> + <string name="bluetooth_connected_no_headset_no_a2dp_battery_level" msgid="8477440576953067242">"Холбогдсон (утас эсвэл медиа байхгүй), батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string> + <string name="bluetooth_active_battery_level" msgid="3450745316700494425">"Идэвхтэй, батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> <string name="bluetooth_active_battery_level_untethered" msgid="2706188607604205362">"Идэвхтэй, Зүүн: Батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE_0">%1$s</xliff:g>, Баруун: Батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE_1">%2$s</xliff:g>"</string> - <string name="bluetooth_battery_level" msgid="2893696778200201555">"Батерей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> + <string name="bluetooth_battery_level" msgid="2893696778200201555">"Батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> <string name="bluetooth_battery_level_untethered" msgid="4002282355111504349">"Зүүн: Батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE_0">%1$s</xliff:g>, Баруун: Батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE_1">%2$s</xliff:g>"</string> <string name="bluetooth_active_no_battery_level" msgid="4155462233006205630">"Идэвхтэй"</string> <string name="bluetooth_hearing_aid_left_active" msgid="7084887715570971441">"Идэвхтэй, зөвхөн зүүн тал"</string> diff --git a/packages/SettingsLib/res/values-my/strings.xml b/packages/SettingsLib/res/values-my/strings.xml index c3dac352ad25..1b43ad472d8b 100644 --- a/packages/SettingsLib/res/values-my/strings.xml +++ b/packages/SettingsLib/res/values-my/strings.xml @@ -183,8 +183,8 @@ <string name="running_process_item_user_label" msgid="3988506293099805796">"အသုံးပြုသူ- <xliff:g id="USER_NAME">%1$s</xliff:g>"</string> <string name="launch_defaults_some" msgid="3631650616557252926">"မူရင်းအချို့ သတ်မှတ်ပြီး"</string> <string name="launch_defaults_none" msgid="8049374306261262709">"မူရင်း သတ်မှတ်မထားပါ။"</string> - <string name="tts_settings" msgid="8130616705989351312">"စာသားမှစကားပြောပြောင်း ဆက်တင်များ"</string> - <string name="tts_settings_title" msgid="7602210956640483039">"စာသားမှ စကားပြောသို့ အထွက်"</string> + <string name="tts_settings" msgid="8130616705989351312">"စာ-မှ-စကားပြောင်းခြင်း ဆက်တင်များ"</string> + <string name="tts_settings_title" msgid="7602210956640483039">"စာ-မှ-စကားသို့ အထွက်"</string> <string name="tts_default_rate_title" msgid="3964187817364304022">"စကားပြောနှုန်း"</string> <string name="tts_default_rate_summary" msgid="3781937042151716987">"စာတမ်းအားပြောဆိုသော အမြန်နှုန်း"</string> <string name="tts_default_pitch_title" msgid="6988592215554485479">"အသံအနိမ့်အမြင့်"</string> @@ -198,7 +198,7 @@ <string name="tts_install_data_title" msgid="1829942496472751703">"အသံဒေတာများကို ထည့်သွင်းခြင်း"</string> <string name="tts_install_data_summary" msgid="3608874324992243851">"စကားသံပေါင်းစပ်မှုအတွက်လိုအပ်သောအသံဒေတာအား ထည့်သွင်းမည်"</string> <string name="tts_engine_security_warning" msgid="3372432853837988146">"ဤစကားသံပေါင်းစပ်စနစ်အားအသုံးပြုရာရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကတ်နံပါတ်စသည်တို့အပါအဝင် သင်ပြောဆိုသောစာသားများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ ဤစနစ်သည် <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> မှ လာပါသည်။ ဤစကားသံပေါင်းစပ်စနစ်ကို အသုံးပြုမလား။"</string> - <string name="tts_engine_network_required" msgid="8722087649733906851">"ဤဘာသာစကားသည် စာသားမှ အသံထွက်ရန် အလုပ်လုပ်သော ကွန်ရက်ချိတ်ဆက်မှု လိုအပ်သည်။"</string> + <string name="tts_engine_network_required" msgid="8722087649733906851">"ဤဘာသာစကားသည် စာ-မှ-စကား ပြောင်းရန် အလုပ်လုပ်သော ကွန်ရက်ချိတ်ဆက်မှု လိုအပ်သည်။"</string> <string name="tts_default_sample_string" msgid="6388016028292967973">"ဤသည်မှာ အသံတုလုပ်ခြင်း ၏ နမူနာတစ်ခုဖြစ်သည်။"</string> <string name="tts_status_title" msgid="8190784181389278640">"လက်ရှိဘာသာစကားအခြေအနေ"</string> <string name="tts_status_ok" msgid="8583076006537547379">"<xliff:g id="LOCALE">%1$s</xliff:g> သည်အပြည့်အ၀ အထောက်အကူပြုသည်။"</string> diff --git a/packages/SettingsProvider/res/values-nb/strings.xml b/packages/SettingsProvider/res/values-nb/strings.xml index 3bdaf83a4230..8da90c0f32cb 100644 --- a/packages/SettingsProvider/res/values-nb/strings.xml +++ b/packages/SettingsProvider/res/values-nb/strings.xml @@ -20,6 +20,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4567566098528588863">"Lagring av innstillinger"</string> - <string name="wifi_softap_config_change" msgid="5688373762357941645">"Innstillingene for Wi-Fi-sone er endret"</string> + <string name="wifi_softap_config_change" msgid="5688373762357941645">"Innstillingene for wifi-sone er endret"</string> <string name="wifi_softap_config_change_summary" msgid="8946397286141531087">"Trykk for å se detaljer"</string> </resources> diff --git a/packages/SimAppDialog/res/values-fa/strings.xml b/packages/SimAppDialog/res/values-fa/strings.xml index 7eb87dddf41d..74e81a42e675 100644 --- a/packages/SimAppDialog/res/values-fa/strings.xml +++ b/packages/SimAppDialog/res/values-fa/strings.xml @@ -21,6 +21,6 @@ <string name="install_carrier_app_title" msgid="334729104862562585">"سرویس دستگاه همراه را فعال کنید"</string> <string name="install_carrier_app_description" msgid="4014303558674923797">"برای اینکه سیمکارت جدیدتان بهدرستی کار کند، باید برنامه <xliff:g id="ID_1">%1$s</xliff:g> را نصب کنید"</string> <string name="install_carrier_app_description_default" msgid="7356830245205847840">"برای اینکه سیمکارت جدیدتان بهدرستی کار کند، باید برنامه شرکت مخابراتی را نصب کنید"</string> - <string name="install_carrier_app_defer_action" msgid="2558576736886876209">"الآن نه"</string> + <string name="install_carrier_app_defer_action" msgid="2558576736886876209">"حالا نه"</string> <string name="install_carrier_app_download_action" msgid="7859229305958538064">"بارگیری برنامه"</string> </resources> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 1c13b1660e31..6edf13addbca 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -618,6 +618,17 @@ android:excludeFromRecents="true" android:visibleToInstantApps="true"/> + <activity + android:name=".media.MediaProjectionAppSelectorActivity" + android:theme="@style/Theme.SystemUI.MediaProjectionAppSelector" + android:finishOnCloseSystemDialogs="true" + android:excludeFromRecents="true" + android:documentLaunchMode="never" + android:relinquishTaskIdentity="true" + android:configChanges= + "screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden" + android:visibleToInstantApps="true"/> + <!-- started from TvNotificationPanel --> <activity android:name=".statusbar.tv.notifications.TvNotificationPanelActivity" 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 cb16d7c3471f..dbdbdf6ee2ba 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt @@ -150,15 +150,16 @@ constructor( fun showFromDialog( dialog: Dialog, animateFrom: Dialog, + cuj: DialogCuj? = null, animateBackgroundBoundsChange: Boolean = false ) { val view = openedDialogs.firstOrNull { it.dialog == animateFrom }?.dialogContentWithBackground ?: throw IllegalStateException( "The animateFrom dialog was not animated using " + - "DialogLaunchAnimator.showFrom(View|Dialog)" - ) - showFromView(dialog, view, animateBackgroundBoundsChange = animateBackgroundBoundsChange) + "DialogLaunchAnimator.showFrom(View|Dialog)") + showFromView( + dialog, view, animateBackgroundBoundsChange = animateBackgroundBoundsChange, cuj = cuj) } /** diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 8f8993f3c8d9..12dfa1042dd7 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -59,26 +59,6 @@ </LinearLayout> - <com.android.systemui.statusbar.KeyguardAffordanceView - android:id="@+id/camera_button" - android:layout_height="@dimen/keyguard_affordance_height" - android:layout_width="@dimen/keyguard_affordance_width" - android:layout_gravity="bottom|end" - android:src="@drawable/ic_camera_alt_24dp" - android:scaleType="center" - android:contentDescription="@string/accessibility_camera_button" - android:tint="?attr/wallpaperTextColor" /> - - <com.android.systemui.statusbar.KeyguardAffordanceView - android:id="@+id/left_button" - android:layout_height="@dimen/keyguard_affordance_height" - android:layout_width="@dimen/keyguard_affordance_width" - android:layout_gravity="bottom|start" - android:src="@*android:drawable/ic_phone" - android:scaleType="center" - android:contentDescription="@string/accessibility_phone_button" - android:tint="?attr/wallpaperTextColor" /> - <ImageView android:id="@+id/wallet_button" android:layout_height="@dimen/keyguard_affordance_fixed_height" diff --git a/packages/SystemUI/res/layout/media_ttt_chip_receiver.xml b/packages/SystemUI/res/layout/media_ttt_chip_receiver.xml index 2b3d11b0e191..e079fd3c5e8f 100644 --- a/packages/SystemUI/res/layout/media_ttt_chip_receiver.xml +++ b/packages/SystemUI/res/layout/media_ttt_chip_receiver.xml @@ -21,6 +21,12 @@ android:layout_height="wrap_content" > + <com.android.systemui.media.taptotransfer.receiver.ReceiverChipRippleView + android:id="@+id/ripple" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> + <com.android.internal.widget.CachingIconView android:id="@+id/app_icon" android:layout_width="@dimen/media_ttt_icon_size_receiver" diff --git a/packages/SystemUI/res/layout/wireless_charging_layout.xml b/packages/SystemUI/res/layout/wireless_charging_layout.xml index 1312b413f106..887e3e715369 100644 --- a/packages/SystemUI/res/layout/wireless_charging_layout.xml +++ b/packages/SystemUI/res/layout/wireless_charging_layout.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <com.android.systemui.statusbar.charging.ChargingRippleView + <com.android.systemui.ripple.RippleView android:id="@+id/wireless_charging_ripple" android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index d0f5a9399b0e..f772e75bf653 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Toestel is gesluit"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skandeer tans gesig"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Stuur"</string> - <string name="phone_label" msgid="5715229948920451352">"maak foon oop"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"maak stembystand oop"</string> - <string name="camera_label" msgid="8253821920931143699">"maak kamera oop"</string> <string name="cancel" msgid="1089011503403416730">"Kanselleer"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bevestig"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Probeer weer"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Saai <xliff:g id="SWITCHAPP">%1$s</xliff:g> uit"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Verander uitvoer"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Onbekend"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EE. d MMM."</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 8b60356610ac..b3f5d39a3101 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"መሣሪያ ተቆልፏል"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"የቅኝት ፊት"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ላክ"</string> - <string name="phone_label" msgid="5715229948920451352">"ስልክ ክፈት"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"የድምጽ ረዳትን ክፈት"</string> - <string name="camera_label" msgid="8253821920931143699">"ካሜራ ክፈት"</string> <string name="cancel" msgid="1089011503403416730">"ይቅር"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"አረጋግጥ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"እንደገና ይሞክሩ"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> ያሰራጩ"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"ውፅዓትን ይቀይሩ"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"ያልታወቀ"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE፣ MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index ae3fcb972f78..5bc1f89a9a86 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"الجهاز مُقفل."</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"مسح الوجه"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"إرسال"</string> - <string name="phone_label" msgid="5715229948920451352">"فتح الهاتف"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"فتح المساعد الصوتي"</string> - <string name="camera_label" msgid="8253821920931143699">"فتح الكاميرا"</string> <string name="cancel" msgid="1089011503403416730">"إلغاء"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"تأكيد"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"إعادة المحاولة"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"بث تطبيق <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"تغيير جهاز الإخراج"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"غير معروف"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE، d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index a3a2a546b198..f411b7d9e533 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"ডিভাইচটো লক হৈ আছে"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"চেহেৰা স্কেন কৰি থকা হৈছে"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"পঠিয়াওক"</string> - <string name="phone_label" msgid="5715229948920451352">"ফ\'ন খোলক"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"কণ্ঠধ্বনিৰে সহায় খোলক"</string> - <string name="camera_label" msgid="8253821920931143699">"কেমেৰা খোলক"</string> <string name="cancel" msgid="1089011503403416730">"বাতিল কৰক"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"নিশ্চিত কৰক"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"আকৌ চেষ্টা কৰক"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> সম্প্ৰচাৰ কৰক"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"আউটপুট সলনি কৰক"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"অজ্ঞাত"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 2c0ec4934945..fe542c1a79b4 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Cihaz kilidlənib"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Üzün skan edilməsi"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Göndərin"</string> - <string name="phone_label" msgid="5715229948920451352">"telefonu açın"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"səs yardımçısını açın"</string> - <string name="camera_label" msgid="8253821920931143699">"kemaranı açın"</string> <string name="cancel" msgid="1089011503403416730">"Ləğv edin"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Təsdiq"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Yenidən cəhd edin"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> tətbiqini yayımlayın"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Nəticəni dəyişdirin"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Naməlum"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"HHH, AAA g"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"s:dd"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"ss:dd"</string> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index cc04b5b7f967..873663bc0e59 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Uređaj je zaključan"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skeniranje lica"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Pošalji"</string> - <string name="phone_label" msgid="5715229948920451352">"otvori telefon"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"otvori glasovnu pomoć"</string> - <string name="camera_label" msgid="8253821920931143699">"otvori kameru"</string> <string name="cancel" msgid="1089011503403416730">"Otkaži"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdi"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Probaj ponovo"</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 192a6caf8ac2..7e595c951054 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Прылада заблакіравана"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Сканіраванне твару"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Адправіць"</string> - <string name="phone_label" msgid="5715229948920451352">"адкрыць тэлефон"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"адкрыць галасавую дапамогу"</string> - <string name="camera_label" msgid="8253821920931143699">"адкрыць камеру"</string> <string name="cancel" msgid="1089011503403416730">"Скасаваць"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Пацвердзіць"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Паўтарыць спробу"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Трансляцыя праграмы \"<xliff:g id="SWITCHAPP">%1$s</xliff:g>\""</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Змяненне вываду"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Невядома"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 4a1fe2ea77be..d32b85a8623c 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Устройството е заключено"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Извършва се сканиране на лице"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Изпращане"</string> - <string name="phone_label" msgid="5715229948920451352">"отваряне на телефона"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"отваряне на гласовата помощ"</string> - <string name="camera_label" msgid="8253821920931143699">"отваряне на камерата"</string> <string name="cancel" msgid="1089011503403416730">"Отказ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Потвърждаване"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Нов опит"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Предаване на <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Промяна на изхода"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Неизвестно"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 2aa46a141173..7b5a7d88d42f 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"ডিভাইস লক করা আছে"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"ফেস স্ক্যান করা হচ্ছে"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"পাঠান"</string> - <string name="phone_label" msgid="5715229948920451352">"ফোন খুলুন"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ভয়েস সহায়তা খুলুন"</string> - <string name="camera_label" msgid="8253821920931143699">"ক্যামেরা খুলুন"</string> <string name="cancel" msgid="1089011503403416730">"বাতিল করুন"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"কনফার্ম করুন"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"আবার চেষ্টা করুন"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 77640bf208b6..c1d20e3a66b2 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Uređaj je zaključan"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skeniranje lica"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Pošalji"</string> - <string name="phone_label" msgid="5715229948920451352">"otvori telefon"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"otvori glasovnu pomoć"</string> - <string name="camera_label" msgid="8253821920931143699">"otvori kameru"</string> <string name="cancel" msgid="1089011503403416730">"Otkaži"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdite"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Pokušaj ponovo"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Emitiraj aplikaciju <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Promijeni izlaz"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Nepoznato"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"DDD, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 65598f40fe70..137b04733c07 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispositiu bloquejat"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"S\'està escanejant la cara"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Envia"</string> - <string name="phone_label" msgid="5715229948920451352">"obre el telèfon"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"obre l\'assistència per veu"</string> - <string name="camera_label" msgid="8253821920931143699">"obre la càmera"</string> <string name="cancel" msgid="1089011503403416730">"Cancel·la"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirma"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Torna-ho a provar"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Emet <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Canvia la sortida"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Desconeguda"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"hh:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index d00dbc6abd71..e0fa698f85aa 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Zařízení uzamčeno"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skenování obličeje"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Odeslat"</string> - <string name="phone_label" msgid="5715229948920451352">"otevřít telefon"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"otevřít hlasovou asistenci"</string> - <string name="camera_label" msgid="8253821920931143699">"spustit fotoaparát"</string> <string name="cancel" msgid="1089011503403416730">"Zrušit"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdit"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Zkusit znovu"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Vysílat v aplikaci <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Změna výstupu"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Neznámé"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE d. MMMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"H:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index c6490de6562a..c52fc71c79d4 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Enheden er låst"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanner ansigt"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> - <string name="phone_label" msgid="5715229948920451352">"åbn telefon"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"åbn taleassistent"</string> - <string name="camera_label" msgid="8253821920931143699">"åbn kamera"</string> <string name="cancel" msgid="1089011503403416730">"Annuller"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bekræft"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Prøv igen"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Udsend <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Skift output"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Ukendt"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE d. MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"tt.mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk.mm"</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 40fe122b3475..815b231307f0 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Gerät gesperrt"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Gesicht wird gescannt"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Senden"</string> - <string name="phone_label" msgid="5715229948920451352">"Telefon öffnen"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"Sprachassistent öffnen"</string> - <string name="camera_label" msgid="8253821920931143699">"Kamera öffnen"</string> <string name="cancel" msgid="1089011503403416730">"Abbrechen"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bestätigen"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Noch einmal versuchen"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> streamen"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Ausgabe ändern"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Unbekannt"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d. MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 10b7ec5bcb81..225f7ec20d47 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Η συσκευή κλειδώθηκε"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Σάρωση προσώπου"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Αποστολή"</string> - <string name="phone_label" msgid="5715229948920451352">"άνοιγμα τηλεφώνου"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"άνοιγμα φωνητικής υποβοήθησης"</string> - <string name="camera_label" msgid="8253821920931143699">"άνοιγμα φωτογραφικής μηχανής"</string> <string name="cancel" msgid="1089011503403416730">"Ακύρωση"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Επιβεβαίωση"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Δοκιμάστε ξανά"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Μετάδοση με την εφαρμογή <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Αλλαγή εξόδου"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Άγνωστο"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"ΗΗΗ, ΜΜΜ η"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"ώ:λλ"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:λλ"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 79040122ae79..ccb0a284b2b2 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Device locked"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> - <string name="phone_label" msgid="5715229948920451352">"open phone"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"open voice assist"</string> - <string name="camera_label" msgid="8253821920931143699">"open camera"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 1ae0d8a3dbfd..4b14e1f68ca6 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Device locked"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> - <string name="phone_label" msgid="5715229948920451352">"open phone"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"open voice assist"</string> - <string name="camera_label" msgid="8253821920931143699">"open camera"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 79040122ae79..ccb0a284b2b2 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Device locked"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> - <string name="phone_label" msgid="5715229948920451352">"open phone"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"open voice assist"</string> - <string name="camera_label" msgid="8253821920931143699">"open camera"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 79040122ae79..ccb0a284b2b2 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Device locked"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> - <string name="phone_label" msgid="5715229948920451352">"open phone"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"open voice assist"</string> - <string name="camera_label" msgid="8253821920931143699">"open camera"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 704c9356fa2c..4418230539bd 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Device locked"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanning face"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> - <string name="phone_label" msgid="5715229948920451352">"open phone"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"open voice assist"</string> - <string name="camera_label" msgid="8253821920931143699">"open camera"</string> <string name="cancel" msgid="1089011503403416730">"Cancel"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirm"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Try again"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 8764a6025df7..8140bda8fd4d 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispositivo bloqueado"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Escaneando rostro"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> - <string name="phone_label" msgid="5715229948920451352">"abrir teléfono"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"abrir el asistente de voz"</string> - <string name="camera_label" msgid="8253821920931143699">"abrir cámara"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Volver a intentarlo"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 1dfacc2110f4..955bb116865e 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispositivo bloqueado"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Escaneando cara"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> - <string name="phone_label" msgid="5715229948920451352">"abrir teléfono"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"abrir el asistente de voz"</string> - <string name="camera_label" msgid="8253821920931143699">"abrir cámara"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Reintentar"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Emitir <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Cambiar salida"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Desconocido"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 4fb4504a0ec7..61ca78df4945 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Seade on lukustatud"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Näo skannimine"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Saada"</string> - <string name="phone_label" msgid="5715229948920451352">"ava telefon"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ava häälabi"</string> - <string name="camera_label" msgid="8253821920931143699">"ava kaamera"</string> <string name="cancel" msgid="1089011503403416730">"Tühista"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Kinnita"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Proovi uuesti"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Rakenduse <xliff:g id="SWITCHAPP">%1$s</xliff:g> ülekandmine"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Väljundi muutmine"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Tundmatu"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d. MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 8c251337bcde..3b051e52d105 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Gailua blokeatuta dago"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Aurpegia eskaneatzen"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Bidali"</string> - <string name="phone_label" msgid="5715229948920451352">"ireki telefonoan"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ireki ahots-laguntza"</string> - <string name="camera_label" msgid="8253821920931143699">"ireki kamera"</string> <string name="cancel" msgid="1089011503403416730">"Utzi"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Berretsi"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Saiatu berriro"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Igorri <xliff:g id="SWITCHAPP">%1$s</xliff:g> aplikazioaren audioa"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Aldatu audio-irteera"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Ezezaguna"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 2646a693c72b..03191a866262 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"دستگاه قفل است"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"درحال اسکن کردن چهره"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ارسال"</string> - <string name="phone_label" msgid="5715229948920451352">"باز کردن تلفن"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"«دستیار صوتی» را باز کنید"</string> - <string name="camera_label" msgid="8253821920931143699">"باز کردن دوربین"</string> <string name="cancel" msgid="1089011503403416730">"لغو"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"تأیید"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"امتحان مجدد"</string> @@ -293,9 +290,9 @@ <string name="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"میکروفن مسدود شده است"</string> <string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"دوربین مسدود شده است"</string> <string name="sensor_privacy_start_use_mic_camera_blocked_dialog_title" msgid="195236134743281973">"میکروفون و دوربین مسدود شدهاند"</string> - <string name="sensor_privacy_start_use_mic_blocked_dialog_content" msgid="2138318880682877747">"برای لغو انسداد، کلید حریمخصوصی روی دستگاه را به موقعیت میکروفون روشن ببرید تا دسترسی به میکروفون مجاز شود. برای پیدا کردن کلید حریمخصوصی روی دستگاه، به دفترچه راهنمای دستگاه مراجعه کنید."</string> - <string name="sensor_privacy_start_use_camera_blocked_dialog_content" msgid="7216015168047965948">"برای لغو انسداد، کلید حریمخصوصی روی دستگاه را به موقعیت دوربین روشن ببرید تا دسترسی به دوربین مجاز شود. برای پیدا کردن کلید حریمخصوصی روی دستگاه، به دفترچه راهنمای دستگاه مراجعه کنید."</string> - <string name="sensor_privacy_start_use_mic_camera_blocked_dialog_content" msgid="3960837827570483762">"برای لغو انسداد آن، کلید حریمخصوصی روی دستگاه را به موقعیت لغو انسداد ببرید تا دسترسی مجاز شود. برای پیدا کردن کلید حریمخصوصی روی دستگاه، به دفترچه راهنمای دستگاه مراجعه کنید."</string> + <string name="sensor_privacy_start_use_mic_blocked_dialog_content" msgid="2138318880682877747">"برای لغو انسداد، کلید حریم خصوصی روی دستگاه را به موقعیت میکروفون روشن ببرید تا دسترسی به میکروفون مجاز شود. برای پیدا کردن کلید حریم خصوصی روی دستگاه، به دفترچه راهنمای دستگاه مراجعه کنید."</string> + <string name="sensor_privacy_start_use_camera_blocked_dialog_content" msgid="7216015168047965948">"برای لغو انسداد، کلید حریم خصوصی روی دستگاه را به موقعیت دوربین روشن ببرید تا دسترسی به دوربین مجاز شود. برای پیدا کردن کلید حریم خصوصی روی دستگاه، به دفترچه راهنمای دستگاه مراجعه کنید."</string> + <string name="sensor_privacy_start_use_mic_camera_blocked_dialog_content" msgid="3960837827570483762">"برای لغو انسداد آن، کلید حریم خصوصی روی دستگاه را به موقعیت لغو انسداد ببرید تا دسترسی مجاز شود. برای پیدا کردن کلید حریم خصوصی روی دستگاه، به دفترچه راهنمای دستگاه مراجعه کنید."</string> <string name="sensor_privacy_mic_unblocked_toast_content" msgid="306555320557065068">"میکروفون دردسترس است"</string> <string name="sensor_privacy_camera_unblocked_toast_content" msgid="7843105715964332311">"دوربین دردسترس است"</string> <string name="sensor_privacy_mic_camera_unblocked_toast_content" msgid="7339355093282661115">"میکروفون و دوربین دردسترساند"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"همهفرستی <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"تغییر خروجی"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"نامشخص"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index cf7471cc42fc..ba9f9afc6e9c 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Laite lukittu"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Kasvojen skannaus"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Lähetä"</string> - <string name="phone_label" msgid="5715229948920451352">"avaa puhelin"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"Avaa ääniapuri"</string> - <string name="camera_label" msgid="8253821920931143699">"avaa kamera"</string> <string name="cancel" msgid="1089011503403416730">"Peru"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Vahvista"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Yritä uudelleen"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Lähetä <xliff:g id="SWITCHAPP">%1$s</xliff:g>-sovellusta"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Muuta ulostuloa"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Tuntematon"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"VKP, KKK p"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index dc64130d6c15..eb2081071de9 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Appareil verrouillé"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Numérisation du visage"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Envoyer"</string> - <string name="phone_label" msgid="5715229948920451352">"Ouvrir le téléphone"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ouvrir l\'assistance vocale"</string> - <string name="camera_label" msgid="8253821920931143699">"Ouvrir l\'appareil photo"</string> <string name="cancel" msgid="1089011503403416730">"Annuler"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmer"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Réessayer"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Diffuser <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Changer la sortie"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Inconnue"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 0a90719ebf94..1c6943f9a207 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Appareil verrouillé"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Analyse du visage en cours"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Envoyer"</string> - <string name="phone_label" msgid="5715229948920451352">"ouvrir le téléphone"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ouvrir l\'assistance vocale"</string> - <string name="camera_label" msgid="8253821920931143699">"ouvrir l\'appareil photo"</string> <string name="cancel" msgid="1089011503403416730">"Annuler"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmer"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Réessayer"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Diffuser <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Modifier le résultat"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Inconnue"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM j"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"hh:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 9cbf0d812467..9258be9a5d8c 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispositivo bloqueado"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Analizando cara"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> - <string name="phone_label" msgid="5715229948920451352">"abrir teléfono"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"abrir asistente de voz"</string> - <string name="camera_label" msgid="8253821920931143699">"abrir cámara"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tentar de novo"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Emitir contido a través de <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Cambiar de saída"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Descoñecida"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index f76b23ad01af..f3cc2dd7eaff 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"ડિવાઇસ લૉક કરેલું છે"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"ચહેરો સ્કૅન કરવો"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"મોકલો"</string> - <string name="phone_label" msgid="5715229948920451352">"ફોન ખોલો"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"વૉઇસ સહાય ખોલો"</string> - <string name="camera_label" msgid="8253821920931143699">"કૅમેરા ખોલો"</string> <string name="cancel" msgid="1089011503403416730">"રદ કરો"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"કન્ફર્મ કરો"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ફરી પ્રયાસ કરો"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 103af8c68bd4..15612080da5c 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"डिवाइस लॉक है"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"डिवाइस अनलॉक करने के लिए चेहरा स्कैन किया जाता है"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"भेजें"</string> - <string name="phone_label" msgid="5715229948920451352">"फ़ोन खोलें"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"आवाज़ से डिवाइस को इस्तेमाल करें"</string> - <string name="camera_label" msgid="8253821920931143699">"कैमरा खोलें"</string> <string name="cancel" msgid="1089011503403416730">"रद्द करें"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"पुष्टि करें"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"फिर से कोशिश करें"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index dc02be05f592..01ad02b69356 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Uređaj je zaključan"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skeniranje lica"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Pošalji"</string> - <string name="phone_label" msgid="5715229948920451352">"otvaranje telefona"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"otvaranje glasovne pomoći"</string> - <string name="camera_label" msgid="8253821920931143699">"otvaranje fotoaparata"</string> <string name="cancel" msgid="1089011503403416730">"Odustani"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdi"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Pokušaj ponovo"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Emitiranje aplikacije <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Promjena izlaza"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Nepoznato"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE., d. MMM."</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 7da89a4fc249..8d33bc8f4c56 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Az eszköz zárolva van"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Arc keresése"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Küldés"</string> - <string name="phone_label" msgid="5715229948920451352">"telefon megnyitása"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"hangsegéd megnyitása"</string> - <string name="camera_label" msgid="8253821920931143699">"kamera megnyitása"</string> <string name="cancel" msgid="1089011503403416730">"Mégse"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Megerősítés"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Újrapróbálkozás"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> közvetítése"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Kimenet módosítása"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Ismeretlen"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, HHH n"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"ó:pp"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"óó:pp"</string> </resources> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index ba1bebebbb1c..c69ee42cd85f 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Սարքը կողպված է"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Դեմքի սկանավորում"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Ուղարկել"</string> - <string name="phone_label" msgid="5715229948920451352">"բացել հեռախոսը"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"բացեք ձայնային հուշումը"</string> - <string name="camera_label" msgid="8253821920931143699">"բացել ֆոտոխցիկը"</string> <string name="cancel" msgid="1089011503403416730">"Չեղարկել"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Հաստատել"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Նորից փորձել"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Հեռարձակել <xliff:g id="SWITCHAPP">%1$s</xliff:g> հավելվածը"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Փոխել աուդիո ելքը"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Անհայտ"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 4202390d57c3..19b9d40e84fe 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Perangkat terkunci"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Memindai wajah"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Kirim"</string> - <string name="phone_label" msgid="5715229948920451352">"buka ponsel"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"buka bantuan suara"</string> - <string name="camera_label" msgid="8253821920931143699">"buka kamera"</string> <string name="cancel" msgid="1089011503403416730">"Batal"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Konfirmasi"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Coba lagi"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Siarkan <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Ubah output"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Tidak diketahui"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 7da66d2fb6f6..93ed60375bbd 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Tækið er læst"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Andlit skannað"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Senda"</string> - <string name="phone_label" msgid="5715229948920451352">"opna síma"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"opna raddaðstoð"</string> - <string name="camera_label" msgid="8253821920931143699">"opna myndavél"</string> <string name="cancel" msgid="1089011503403416730">"Hætta við"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Staðfesta"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Reyna aftur"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Senda út <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Skipta um úttak"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Óþekkt"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"k:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 3ee860548f9e..02917338874e 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispositivo bloccato"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scansione del viso"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Invia"</string> - <string name="phone_label" msgid="5715229948920451352">"apri telefono"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"apri Voice Assist"</string> - <string name="camera_label" msgid="8253821920931143699">"apri fotocamera"</string> <string name="cancel" msgid="1089011503403416730">"Annulla"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Conferma"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Riprova"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 8adf07f24046..6a0199c66e3c 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"המכשיר נעול"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"סורק פנים"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"שליחה"</string> - <string name="phone_label" msgid="5715229948920451352">"פתיחת הטלפון"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"פתיחת האסיסטנט"</string> - <string name="camera_label" msgid="8253821920931143699">"פתיחת המצלמה"</string> <string name="cancel" msgid="1089011503403416730">"ביטול"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"אישור"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ניסיון נוסף"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 274fa67bd94a..3a34f3c2206e 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"デバイスはロックされています"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"顔のスキャン"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"送信"</string> - <string name="phone_label" msgid="5715229948920451352">"電話を起動"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"音声アシストを開く"</string> - <string name="camera_label" msgid="8253821920931143699">"カメラを起動"</string> <string name="cancel" msgid="1089011503403416730">"キャンセル"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"確認"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"再試行"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index fd76cc6af73a..57b56f7b57e7 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"მოწყობილობა ჩაკეტილია"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"მიმდინარეობს სახის სკანირება"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"გაგზავნა"</string> - <string name="phone_label" msgid="5715229948920451352">"ტელეფონის გახსნა"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ხმოვანი დახმარების გახსნა"</string> - <string name="camera_label" msgid="8253821920931143699">"კამერის გახსნა"</string> <string name="cancel" msgid="1089011503403416730">"გაუქმება"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"დადასტურება"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ხელახლა ცდა"</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index cbb0ed2350bd..e14c8274d125 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Құрылғы құлыпталды."</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Бетті сканерлеу"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Жіберу"</string> - <string name="phone_label" msgid="5715229948920451352">"телефонды ашу"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ашық дауыс көмекшісі"</string> - <string name="camera_label" msgid="8253821920931143699">"камераны ашу"</string> <string name="cancel" msgid="1089011503403416730">"Бас тарту"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Растау"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Қайталап көріңіз"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> қолданбасын тарату"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Аудио шығысын өзгерту"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Белгісіз"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"d MMM EEEE"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 5f8aa7d30551..14fa8de52289 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"បានចាក់សោឧបករណ៍"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"ការស្កេនមុខ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ផ្ញើ"</string> - <string name="phone_label" msgid="5715229948920451352">"បើកទូរស័ព្ទ"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"បើកជំនួយសំឡេង"</string> - <string name="camera_label" msgid="8253821920931143699">"បើកម៉ាស៊ីនថត"</string> <string name="cancel" msgid="1089011503403416730">"បោះបង់"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"បញ្ជាក់"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ព្យាយាមម្ដងទៀត"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"ការផ្សាយ <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"ប្ដូរឧបករណ៍បញ្ចេញសំឡេង"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"មិនស្គាល់"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 8d571c8f315f..f980937cca84 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"ಸಾಧನ ಲಾಕ್ ಆಗಿದೆ"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"ಮುಖವನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ಕಳುಹಿಸಿ"</string> - <string name="phone_label" msgid="5715229948920451352">"ಫೋನ್ ತೆರೆಯಿರಿ"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ಧ್ವನಿ ಸಹಾಯಕವನ್ನು ತೆರೆ"</string> - <string name="camera_label" msgid="8253821920931143699">"ಕ್ಯಾಮರಾ ತೆರೆಯಿರಿ"</string> <string name="cancel" msgid="1089011503403416730">"ರದ್ದುಮಾಡಿ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ದೃಢೀಕರಿಸಿ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> ಅನ್ನು ಪ್ರಸಾರ ಮಾಡಿ"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"ಔಟ್ಪುಟ್ ಅನ್ನು ಬದಲಾಯಿಸಿ"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"ಅಪರಿಚಿತ"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 8961e723ecd2..cd88795f771b 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"기기 잠김"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"얼굴 스캔 중"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"보내기"</string> - <string name="phone_label" msgid="5715229948920451352">"휴대전화 열기"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"음성 지원 열기"</string> - <string name="camera_label" msgid="8253821920931143699">"카메라 열기"</string> <string name="cancel" msgid="1089011503403416730">"취소"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"확인"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"다시 시도하세요."</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> 방송"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"출력 변경"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"알 수 없음"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"MMM d일 EEE"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 51706c436b23..391311159d34 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -50,7 +50,7 @@ <string name="usb_debugging_title" msgid="8274884945238642726">"USB аркылуу жөндөөгө уруксат берилсинби?"</string> <string name="usb_debugging_message" msgid="5794616114463921773">"Компүтердин RSA ачкычынын контролдук суммасы:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="4003121804294739548">"Бул компүтерден дайыма уруксат берилсин"</string> - <string name="usb_debugging_allow" msgid="1722643858015321328">"Уруксат берүү"</string> + <string name="usb_debugging_allow" msgid="1722643858015321328">"Ооба"</string> <string name="usb_debugging_secondary_user_title" msgid="7843050591380107998">"USB мүчүлүштүктөрүн оңдоого уруксат жок"</string> <string name="usb_debugging_secondary_user_message" msgid="3740347841470403244">"Учурда бул аккаунтта USB аркылуу мүчүлүштүктөрдү аныктоо функциясын иштетүүгө болбойт. Негизги колдонуучунун аккаунтуна кириңиз."</string> <string name="hdmi_cec_set_menu_language_title" msgid="1259765420091503742">"Тутум тилин <xliff:g id="LANGUAGE">%1$s</xliff:g> тилине өзгөртөсүзбү?"</string> @@ -60,7 +60,7 @@ <string name="wifi_debugging_title" msgid="7300007687492186076">"Ушул тармакта мүчүлүштүктөрдү Wi-Fi аркылуу аныктоого уруксат бересизби?"</string> <string name="wifi_debugging_message" msgid="5461204211731802995">"Тармактын аталышы (SSID)\n<xliff:g id="SSID_0">%1$s</xliff:g>\n\nWi‑Fi дареги (BSSID)\n<xliff:g id="BSSID_1">%2$s</xliff:g>"</string> <string name="wifi_debugging_always" msgid="2968383799517975155">"Бул тармакта ар дайым уруксат берилсин"</string> - <string name="wifi_debugging_allow" msgid="4573224609684957886">"Уруксат берүү"</string> + <string name="wifi_debugging_allow" msgid="4573224609684957886">"Ооба"</string> <string name="wifi_debugging_secondary_user_title" msgid="2493201475880517725">"Мүчүлүштүктөрдү Wi-Fi аркылуу оңдоого уруксат берилген жок"</string> <string name="wifi_debugging_secondary_user_message" msgid="4492383073970079751">"Учурда бул түзмөккө кирген колдонуучу мүчүлүштүктөрдү Wi-Fi аркылуу оңдоо функциясын күйгүзө албайт. Бул функцияны колдонуу үчүн негизги колдонуучунун аккаунтуна которулуңуз."</string> <string name="usb_contaminant_title" msgid="894052515034594113">"USB порту өчүрүлдү"</string> @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Түзмөк кулпуланды"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Жүз скандалууда"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Жөнөтүү"</string> - <string name="phone_label" msgid="5715229948920451352">"телефонду ачуу"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"үн жардамчысысын ачуу"</string> - <string name="camera_label" msgid="8253821920931143699">"камераны ачуу"</string> <string name="cancel" msgid="1089011503403416730">"Жок"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Ырастоо"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Кайталоо"</string> @@ -470,7 +467,7 @@ <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Жаңырууда"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Колдонуу үчүн кулпусун ачыңыз"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Кыйытмаларды алууда ката кетти. Бир аздан кийин кайталап көрүңүз."</string> - <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Кулпуланган экран жөндөөлөрү"</string> + <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Экранды кулпулоо параметрлери"</string> <string name="qr_code_scanner_title" msgid="5290201053875420785">"QR кодун скандоо"</string> <string name="status_bar_work" msgid="5238641949837091056">"Жумуш профили"</string> <string name="status_bar_airplane" msgid="4848702508684541009">"Учак режими"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> колдонмосунда кабарлоо"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Аудионун чыгуусун өзгөртүү"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Белгисиз"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index e8a3f89e4bc9..469f77bf60d0 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"ອຸປະກອນຖືກລັອກໄວ້"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"ການສະແກນໜ້າ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ສົ່ງ"</string> - <string name="phone_label" msgid="5715229948920451352">"ເປີດແປ້ນໂທລະສັບ"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ຊ່ວເຫຼືອເປີດສຽງ"</string> - <string name="camera_label" msgid="8253821920931143699">"ເປີດກ້ອງ"</string> <string name="cancel" msgid="1089011503403416730">"ຍົກເລີກ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ຢືນຢັນ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ລອງໃໝ່"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"ອອກອາກາດ <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"ປ່ຽນເອົ້າພຸດ"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"ບໍ່ຮູ້ຈັກ"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"ຊມ:ນທ"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"ຊມ:ນທ"</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 6a291eb1455c..66c9c3466f6a 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Įrenginys užrakintas"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Nuskaitomas veidas"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Siųsti"</string> - <string name="phone_label" msgid="5715229948920451352">"atidaryti telefoną"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"atidaryti „Voice Assist“"</string> - <string name="camera_label" msgid="8253821920931143699">"atidaryti fotoaparatą"</string> <string name="cancel" msgid="1089011503403416730">"Atšaukti"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Patvirtinkite"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Bandyti dar kartą"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Transliuoti „<xliff:g id="SWITCHAPP">%1$s</xliff:g>“"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Keisti išvestį"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Nežinoma"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index bcf5b3e58486..a32c5e41be30 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Ierīce ir bloķēta"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Sejas skenēšana"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Sūtīt"</string> - <string name="phone_label" msgid="5715229948920451352">"atvērt tālruni"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"atvērt balss palīgu"</string> - <string name="camera_label" msgid="8253821920931143699">"atvērt kameru"</string> <string name="cancel" msgid="1089011503403416730">"Atcelt"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Apstiprināt"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Mēģināt vēlreiz"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Lietotnes <xliff:g id="SWITCHAPP">%1$s</xliff:g> apraide"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Izvades maiņa"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Nezināms"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d. MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"hh:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index a2bc7036ddb4..d7951b190241 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Уредот е заклучен"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Скенирање лице"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Испрати"</string> - <string name="phone_label" msgid="5715229948920451352">"отвори телефон"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"отвори гласовна помош"</string> - <string name="camera_label" msgid="8253821920931143699">"отвори камера"</string> <string name="cancel" msgid="1089011503403416730">"Откажи"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Потврди"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Обиди се повторно"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index fc6c76a2fa37..5b0164d8e3be 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"ഉപകരണം ലോക്ക് ചെയ്തു"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"മുഖം സ്കാൻ ചെയ്യുന്നു"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"അയയ്ക്കുക"</string> - <string name="phone_label" msgid="5715229948920451352">"ഫോൺ തുറക്കുക"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"വോയ്സ് അസിസ്റ്റ് തുറക്കുക"</string> - <string name="camera_label" msgid="8253821920931143699">"ക്യാമറ തുറക്കുക"</string> <string name="cancel" msgid="1089011503403416730">"റദ്ദാക്കുക"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"സ്ഥിരീകരിക്കുക"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"വീണ്ടും ശ്രമിക്കുക"</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 0ba4c44b4623..2648c5c2477d 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Төхөөрөмжийг түгжсэн"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Скан хийх нүүр царай"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Илгээх"</string> - <string name="phone_label" msgid="5715229948920451352">"утас нээх"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"дуут туслахыг нээнэ"</string> - <string name="camera_label" msgid="8253821920931143699">"камер нээх"</string> <string name="cancel" msgid="1089011503403416730">"Цуцлах"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Баталгаажуулах"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Дахин оролдох"</string> @@ -173,7 +170,7 @@ <string name="cell_data_off" msgid="4886198950247099526">"Идэвхгүй"</string> <string name="accessibility_airplane_mode" msgid="1899529214045998505">"Нислэгийн горим"</string> <string name="accessibility_vpn_on" msgid="8037549696057288731">"VPN асаалттай байна."</string> - <string name="accessibility_battery_level" msgid="5143715405241138822">"Батерей <xliff:g id="NUMBER">%d</xliff:g> хувьтай."</string> + <string name="accessibility_battery_level" msgid="5143715405241138822">"Батарей <xliff:g id="NUMBER">%d</xliff:g> хувьтай."</string> <string name="accessibility_battery_level_with_estimate" msgid="4843119982547599452">"Батарей <xliff:g id="PERCENTAGE">%1$s</xliff:g> хувьтай байна. Таны хэрэглээнд тулгуурлан ойролцоогоор <xliff:g id="TIME">%2$s</xliff:g> үлдсэн"</string> <string name="accessibility_battery_level_charging" msgid="8892191177774027364">"Батарейг цэнэглэж байна, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g>%%."</string> <string name="accessibility_overflow_action" msgid="8555835828182509104">"Бүх мэдэгдлийг харах"</string> @@ -214,7 +211,7 @@ <string name="quick_settings_dnd_label" msgid="7728690179108024338">"Бүү саад бол"</string> <string name="quick_settings_bluetooth_label" msgid="7018763367142041481">"Bluetooth"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="5760239584390514322">"Хослуулсан төхөөрөмж байхгүй"</string> - <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> батерей"</string> + <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="4182034939479344093">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> батарей"</string> <string name="quick_settings_bluetooth_secondary_label_audio" msgid="780333390310051161">"Аудио"</string> <string name="quick_settings_bluetooth_secondary_label_headset" msgid="2332093067553000852">"Чихэвч"</string> <string name="quick_settings_bluetooth_secondary_label_input" msgid="3887552721233148132">"Оролт"</string> @@ -248,7 +245,7 @@ <string name="quick_settings_done" msgid="2163641301648855793">"Дууссан"</string> <string name="quick_settings_close_user_panel" msgid="5599724542275896849">"Хаах"</string> <string name="quick_settings_connected" msgid="3873605509184830379">"Холбогдсон"</string> - <string name="quick_settings_connected_battery_level" msgid="1322075669498906959">"Холбогдсон, батерей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> + <string name="quick_settings_connected_battery_level" msgid="1322075669498906959">"Холбогдсон, батарей <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> <string name="quick_settings_connecting" msgid="2381969772953268809">"Холбогдож байна..."</string> <string name="quick_settings_hotspot_label" msgid="1199196300038363424">"Сүлжээний цэг"</string> <string name="quick_settings_hotspot_secondary_label_transient" msgid="7585604088079160564">"Асааж байна…"</string> @@ -706,7 +703,7 @@ <string name="qs_dnd_prompt_app" msgid="4027984447935396820">"Апп (<xliff:g id="ID_1">%s</xliff:g>) Бүү саад бол горимыг асаасан."</string> <string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Автомат дүрэм эсвэл апп Бүү саад бол горимыг асаасан."</string> <string name="running_foreground_services_title" msgid="5137313173431186685">"Цаана ажиллаж буй апп"</string> - <string name="running_foreground_services_msg" msgid="3009459259222695385">"Батерей, дата ашиглалтын талаар дэлгэрэнгүйг харахын тулд товшино уу"</string> + <string name="running_foreground_services_msg" msgid="3009459259222695385">"Батарей, дата ашиглалтын талаар дэлгэрэнгүйг харахын тулд товшино уу"</string> <string name="mobile_data_disable_title" msgid="5366476131671617790">"Мобайл датаг унтраах уу?"</string> <string name="mobile_data_disable_message" msgid="8604966027899770415">"Та <xliff:g id="CARRIER">%s</xliff:g>-р дата эсвэл интернэтэд хандах боломжгүй болно. Интернэтэд зөвхөн Wi-Fi-р холбогдох боломжтой болно."</string> <string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"таны оператор компани"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 6b25680684b4..7129762b6e58 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"डिव्हाइस लॉक केले"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"चेहरा स्कॅन करत आहे"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"पाठवा"</string> - <string name="phone_label" msgid="5715229948920451352">"फोन उघडा"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"व्हॉइस सहाय्य उघडा"</string> - <string name="camera_label" msgid="8253821920931143699">"कॅमेरा उघडा"</string> <string name="cancel" msgid="1089011503403416730">"रद्द करा"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"कंफर्म करा"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"पुन्हा प्रयत्न करा"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> चे प्रसारण करा"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"आउटपूट बदला"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"अज्ञात"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index b373076782b7..e37d88cd4f8a 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Peranti dikunci"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Mengimbas wajah"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Hantar"</string> - <string name="phone_label" msgid="5715229948920451352">"buka telefon"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"buka bantuan suara"</string> - <string name="camera_label" msgid="8253821920931143699">"buka kamera"</string> <string name="cancel" msgid="1089011503403416730">"Batal"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Sahkan"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Cuba lagi"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Siarkan <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Tukar output"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Tidak diketahui"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 5ead7b0f8ec8..301d42e2e3c3 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"စက်ပစ္စည်းကို လော့ခ်ချထားသည်"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"မျက်နှာ စကင်ဖတ်နေသည်"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ပို့ရန်"</string> - <string name="phone_label" msgid="5715229948920451352">"ဖုန်းကို ဖွင့်ရန်"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"အသံ အကူအညီအား ဖွင့်ရန်"</string> - <string name="camera_label" msgid="8253821920931143699">"ကင်မရာ ဖွင့်ရန်"</string> <string name="cancel" msgid="1089011503403416730">"မလုပ်တော့"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"အတည်ပြုပါ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ထပ်စမ်းကြည့်ရန်"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> ထုတ်လွှင့်ခြင်း"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"အထွက်ကို ပြောင်းခြင်း"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"မသိ"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE၊ MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index b97e7420a1f2..64bc528fc71f 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Enheten er låst"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skanning av ansikt"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Send"</string> - <string name="phone_label" msgid="5715229948920451352">"åpne telefonen"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"åpne talehjelp"</string> - <string name="camera_label" msgid="8253821920931143699">"åpne kamera"</string> <string name="cancel" msgid="1089011503403416730">"Avbryt"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bekreft"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Prøv på nytt"</string> @@ -250,7 +247,7 @@ <string name="quick_settings_connected" msgid="3873605509184830379">"Tilkoblet"</string> <string name="quick_settings_connected_battery_level" msgid="1322075669498906959">"Tilkoblet, batterinivå <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string> <string name="quick_settings_connecting" msgid="2381969772953268809">"Kobler til …"</string> - <string name="quick_settings_hotspot_label" msgid="1199196300038363424">"Wi-Fi-sone"</string> + <string name="quick_settings_hotspot_label" msgid="1199196300038363424">"Wifi-sone"</string> <string name="quick_settings_hotspot_secondary_label_transient" msgid="7585604088079160564">"Slår på …"</string> <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="1280433136266439372">"Datasparing er på"</string> <string name="quick_settings_hotspot_secondary_label_num_devices" msgid="7536823087501239457">"{count,plural, =1{# enhet}other{# enheter}}"</string> @@ -477,7 +474,7 @@ <string name="zen_alarm_warning" msgid="7844303238486849503">"Du hører ikke neste innstilte alarm <xliff:g id="WHEN">%1$s</xliff:g>"</string> <string name="alarm_template" msgid="2234991538018805736">"kl. <xliff:g id="WHEN">%1$s</xliff:g>"</string> <string name="alarm_template_far" msgid="3561752195856839456">"<xliff:g id="WHEN">%1$s</xliff:g>"</string> - <string name="accessibility_status_bar_hotspot" msgid="2888479317489131669">"Wi-Fi-sone"</string> + <string name="accessibility_status_bar_hotspot" msgid="2888479317489131669">"Wifi-sone"</string> <string name="accessibility_managed_profile" msgid="4703836746209377356">"Work-profil"</string> <string name="tuner_warning_title" msgid="7721976098452135267">"Gøy for noen – ikke for alle"</string> <string name="tuner_warning" msgid="1861736288458481650">"Med System UI Tuner har du flere måter å justere og tilpasse Android-brukergrensesnittet på. Disse eksperimentelle funksjonene kan endres, avbrytes eller fjernes i fremtidige utgivelser. Fortsett med forbehold."</string> @@ -912,7 +909,7 @@ <string name="wifi_wont_autoconnect_for_now" msgid="5782282612749867762">"Wi-Fi kobles ikke til automatisk inntil videre"</string> <string name="see_all_networks" msgid="3773666844913168122">"Se alle"</string> <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"For å bytte nettverk, koble fra Ethernet"</string> - <string name="wifi_scan_notify_message" msgid="3753839537448621794">"For å forbedre brukeropplevelsen på enheten kan apper og tjenester søke etter Wi-Fi-nettverk når som helst – også når Wi-Fi er slått av. Du kan endre dette i innstillingene for Wi-Fi-skanning. "<annotation id="link">"Endre"</annotation></string> + <string name="wifi_scan_notify_message" msgid="3753839537448621794">"For å forbedre brukeropplevelsen på enheten kan apper og tjenester søke etter Wi-Fi-nettverk når som helst – også når Wi-Fi er slått av. Du kan endre dette i innstillingene for wifi-skanning. "<annotation id="link">"Endre"</annotation></string> <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Slå av flymodus"</string> <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"<xliff:g id="APPNAME">%1$s</xliff:g> vil legge til denne brikken i Hurtiginnstillinger"</string> <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Legg til brikke"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Kringkast <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Endre utgang"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Ukjent"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE d. MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"t:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"tt:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index e927c798071c..4db5278a170d 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"यन्त्र लक गरिएको छ"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"अनुहार स्क्यान गर्दै"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"पठाउनुहोस्"</string> - <string name="phone_label" msgid="5715229948920451352">"फोन खोल्नुहोस्"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"आवाज सहायता खोल्नुहोस्"</string> - <string name="camera_label" msgid="8253821920931143699">"क्यामेरा खोल्नुहोस्"</string> <string name="cancel" msgid="1089011503403416730">"रद्द गर्नुहोस्"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"पुष्टि गर्नुहोस्"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"फेरि प्रयास गर्नुहोस्"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> ब्रोडकास्ट गर्नुहोस्"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"आउटपुट परिवर्तन गर्नुहोस्"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"अज्ञात"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 15b915602996..07c53c513c73 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Apparaat vergrendeld"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Gezicht scannen"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Verzenden"</string> - <string name="phone_label" msgid="5715229948920451352">"telefoon openen"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"spraakassistent openen"</string> - <string name="camera_label" msgid="8253821920931143699">"camera openen"</string> <string name="cancel" msgid="1089011503403416730">"Annuleren"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bevestigen"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Opnieuw proberen"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> uitzenden"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Uitvoer wijzigen"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Onbekend"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE d mmm"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"u:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index ff2de5c5dbb6..7eda9bc84dd3 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"ଡିଭାଇସ୍ ଲକ୍ ହୋଇଯାଇଛି"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"ଫେସ୍ ସ୍କାନିଙ୍ଗ କରାଯାଉଛି"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ପଠାନ୍ତୁ"</string> - <string name="phone_label" msgid="5715229948920451352">"ଫୋନ୍ ଖୋଲନ୍ତୁ"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ଭଏସ୍ ସହାୟକ ଖୋଲନ୍ତୁ"</string> - <string name="camera_label" msgid="8253821920931143699">"କ୍ୟାମେରା ଖୋଲନ୍ତୁ"</string> <string name="cancel" msgid="1089011503403416730">"ବାତିଲ୍ କରନ୍ତୁ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ନିଶ୍ଚିତ କରନ୍ତୁ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> ବ୍ରଡକାଷ୍ଟ କରନ୍ତୁ"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"ଆଉଟପୁଟ ବଦଳାନ୍ତୁ"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"ଅଜଣା"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 7a327072449c..425e66472b47 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"ਡੀਵਾਈਸ ਲਾਕ ਹੈ"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"ਚਿਹਰਾ ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ਭੇਜੋ"</string> - <string name="phone_label" msgid="5715229948920451352">"ਫ਼ੋਨ ਖੋਲ੍ਹੋ"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ਅਵਾਜ਼ੀ ਸਹਾਇਕ ਖੋਲ੍ਹੋ"</string> - <string name="camera_label" msgid="8253821920931143699">"ਕੈਮਰਾ ਖੋਲ੍ਹੋ"</string> <string name="cancel" msgid="1089011503403416730">"ਰੱਦ ਕਰੋ"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ਤਸਦੀਕ ਕਰੋ"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> ਦਾ ਪ੍ਰਸਾਰਨ ਕਰੋ"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"ਆਊਟਪੁੱਟ ਬਦਲੋ"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"ਅਗਿਆਤ"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index d608bf1916db..ccf51800d2ed 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Urządzenie zablokowane"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skanowanie twarzy"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Wyślij"</string> - <string name="phone_label" msgid="5715229948920451352">"otwórz telefon"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"otwórz pomoc głosową"</string> - <string name="camera_label" msgid="8253821920931143699">"otwórz aparat"</string> <string name="cancel" msgid="1089011503403416730">"Anuluj"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potwierdź"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Spróbuj jeszcze raz"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Transmisja aplikacji <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Zmień dane wyjściowe"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Brak informacji"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index cdbbcf51a1ab..1fa4954ccb58 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispositivo bloqueado"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Verificando rosto"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> - <string name="phone_label" msgid="5715229948920451352">"abrir telefone"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"abrir assistência de voz"</string> - <string name="camera_label" msgid="8253821920931143699">"abrir câmera"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tentar novamente"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Transmitir <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Mudar saída"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Desconhecido"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d de MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 74cb36b8ad48..7f24b90448f0 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispositivo bloqueado"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"A analisar o rosto…"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> - <string name="phone_label" msgid="5715229948920451352">"abrir telemóvel"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"abrir assistente de voz"</string> - <string name="camera_label" msgid="8253821920931143699">"abrir câmara"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tentar novamente"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index cdbbcf51a1ab..1fa4954ccb58 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispositivo bloqueado"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Verificando rosto"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Enviar"</string> - <string name="phone_label" msgid="5715229948920451352">"abrir telefone"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"abrir assistência de voz"</string> - <string name="camera_label" msgid="8253821920931143699">"abrir câmera"</string> <string name="cancel" msgid="1089011503403416730">"Cancelar"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmar"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tentar novamente"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Transmitir <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Mudar saída"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Desconhecido"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d de MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 86acf08d634d..80cdb953b527 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispozitiv blocat"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Scanarea chipului"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Trimiteți"</string> - <string name="phone_label" msgid="5715229948920451352">"deschideți telefonul"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"deschideți asistentul vocal"</string> - <string name="camera_label" msgid="8253821920931143699">"deschideți camera foto"</string> <string name="cancel" msgid="1089011503403416730">"Anulați"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Confirmați"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Încercați din nou"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index c11bc539b069..dd5e0e5a9561 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Устройство заблокировано"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Сканирование лица"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Отправить"</string> - <string name="phone_label" msgid="5715229948920451352">"Открыть телефон."</string> - <string name="voice_assist_label" msgid="3725967093735929020">"включить аудиоподсказки"</string> - <string name="camera_label" msgid="8253821920931143699">"Открыть камеру."</string> <string name="cancel" msgid="1089011503403416730">"Отмена"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Подтвердить"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Повторить попытку"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Транслировать \"<xliff:g id="SWITCHAPP">%1$s</xliff:g>\""</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Транслировать на другое устройство"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Неизвестно"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"d MMM EEEE"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index b4ef21deb6c0..b2c393f6c16d 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"උපාංගය අගුලු දමා ඇත"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"මුහුණ ස්කෑන් කිරීම"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"යවන්න"</string> - <string name="phone_label" msgid="5715229948920451352">"දුරකථනය විවෘත කරන්න"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"විවෘත හඬ සහාය"</string> - <string name="camera_label" msgid="8253821920931143699">"කැමරාව විවෘත කරන්න"</string> <string name="cancel" msgid="1089011503403416730">"අවලංගු කරන්න"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"තහවුරු කරන්න"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"නැවත උත්සාහ කරන්න"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index b1134c488645..542f197cf429 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Zariadenie je uzamknuté"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Skenovanie tváre"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Odoslať"</string> - <string name="phone_label" msgid="5715229948920451352">"otvoriť telefón"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"otvoriť hlasového asistenta"</string> - <string name="camera_label" msgid="8253821920931143699">"spustiť fotoaparát"</string> <string name="cancel" msgid="1089011503403416730">"Zrušiť"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potvrdiť"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Skúsiť znova"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Vysielanie aplikácie <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Zmena výstupu"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Neznáme"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d. MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index a57192e8601e..9dfc7cc3c618 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Naprava je zaklenjena."</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Optično branje obraza"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Pošlji"</string> - <string name="phone_label" msgid="5715229948920451352">"odpri telefon"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"odpri glasovnega pomočnika"</string> - <string name="camera_label" msgid="8253821920931143699">"odpri fotoaparat"</string> <string name="cancel" msgid="1089011503403416730">"Prekliči"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Potrdite"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Poskusi znova"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Oddajaj aplikacijo <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Sprememba izhoda"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Neznano"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d. MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index db5b2f7b0c84..8417ee640566 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Pajisja është e kyçur"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Po skanon fytyrën"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Dërgo"</string> - <string name="phone_label" msgid="5715229948920451352">"hap telefonin"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"hap ndihmën zanore"</string> - <string name="camera_label" msgid="8253821920931143699">"hap kamerën"</string> <string name="cancel" msgid="1089011503403416730">"Anulo"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Konfirmo"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Provo përsëri"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Transmeto <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Ndrysho daljen"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"I panjohur"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 19b2b16f4cef..3bb3bfb1124c 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Уређај је закључан"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Скенирање лица"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Пошаљи"</string> - <string name="phone_label" msgid="5715229948920451352">"отвори телефон"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"отвори гласовну помоћ"</string> - <string name="camera_label" msgid="8253821920931143699">"отвори камеру"</string> <string name="cancel" msgid="1089011503403416730">"Откажи"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Потврди"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Пробај поново"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 293c869a96aa..b7f9b05ad4b6 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Enheten är låst"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Registrerar ansikte"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Skicka"</string> - <string name="phone_label" msgid="5715229948920451352">"öppna mobilen"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"öppna röstassistenten"</string> - <string name="camera_label" msgid="8253821920931143699">"öppna kameran"</string> <string name="cancel" msgid="1089011503403416730">"Avbryt"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bekräfta"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Försök igen"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Sänd från <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Byt ljudutgång"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Okänt"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h.mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk.mm"</string> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index ab73a1e7e822..1f5b7eac04c1 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Kifaa kimefungwa"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Inachanganua uso"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Tuma"</string> - <string name="phone_label" msgid="5715229948920451352">"fungua simu"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"fungua mapendekezo ya sauti"</string> - <string name="camera_label" msgid="8253821920931143699">"fungua kamera"</string> <string name="cancel" msgid="1089011503403416730">"Ghairi"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Thibitisha"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Jaribu tena"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Tangaza kwenye <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Badilisha maudhui"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Haijulikani"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"saa:dk"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:dk"</string> </resources> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 4052bcea7568..8fea33e79de8 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"சாதனம் பூட்டப்பட்டுள்ளது"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"முகத்தை ஸ்கேன் செய்கிறது"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"அனுப்பு"</string> - <string name="phone_label" msgid="5715229948920451352">"ஃபோனைத் திற"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"குரல் உதவியைத் திற"</string> - <string name="camera_label" msgid="8253821920931143699">"கேமராவைத் திற"</string> <string name="cancel" msgid="1089011503403416730">"ரத்துசெய்"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"உறுதிப்படுத்துக"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"மீண்டும் முயல்க"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> ஆப்ஸை ஒலிபரப்பு"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"அவுட்புட்டை மாற்று"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"தெரியவில்லை"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 4367ed264da9..759ebb471bb5 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"పరికరం లాక్ చేయబడింది"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"ముఖాన్ని స్కాన్ చేస్తోంది"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"పంపు"</string> - <string name="phone_label" msgid="5715229948920451352">"ఫోన్ను తెరువు"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"వాయిస్ అసిస్టెంట్ను తెరువు"</string> - <string name="camera_label" msgid="8253821920931143699">"కెమెరాను తెరవండి"</string> <string name="cancel" msgid="1089011503403416730">"రద్దు చేయండి"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"నిర్ధారించు"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"మళ్లీ ప్రయత్నించు"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 3b9237c5dbf1..99c2e32a6947 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"อุปกรณ์ถูกล็อก"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"กำลังสแกนใบหน้า"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"ส่ง"</string> - <string name="phone_label" msgid="5715229948920451352">"เปิดโทรศัพท์"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"เปิดตัวช่วยเสียง"</string> - <string name="camera_label" msgid="8253821920931143699">"เปิดกล้อง"</string> <string name="cancel" msgid="1089011503403416730">"ยกเลิก"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"ยืนยัน"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"ลองอีกครั้ง"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"ออกอากาศ <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"เปลี่ยนเอาต์พุต"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"ไม่ทราบ"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"HH:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 052f1f716033..2943313eb071 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Naka-lock ang device"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Sina-scan ang mukha"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Ipadala"</string> - <string name="phone_label" msgid="5715229948920451352">"buksan ang telepono"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"buksan ang voice assist"</string> - <string name="camera_label" msgid="8253821920931143699">"buksan ang camera"</string> <string name="cancel" msgid="1089011503403416730">"Kanselahin"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Kumpirmahin"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Subukang muli"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 8167366aac1c..00569a0b5f5c 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Cihaz kilitlendi"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Yüz taranıyor"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Gönder"</string> - <string name="phone_label" msgid="5715229948920451352">"telefonu aç"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"sesli yardımı aç"</string> - <string name="camera_label" msgid="8253821920931143699">"kamerayı aç"</string> <string name="cancel" msgid="1089011503403416730">"İptal"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Onayla"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Tekrar dene"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> uygulamasında anons yapın"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Çıkışı değiştirme"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Bilinmiyor"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"d MMM, EEE"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:dd"</string> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index a173be3c5ce7..85573a925293 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Пристрій заблоковано"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Сканування обличчя"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Надіслати"</string> - <string name="phone_label" msgid="5715229948920451352">"відкрити телефон"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"запустити голосові підказки"</string> - <string name="camera_label" msgid="8253821920931143699">"відкрити камеру"</string> <string name="cancel" msgid="1089011503403416730">"Скасувати"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Підтвердити"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Повторити спробу"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Змінити додаток для трансляції на <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Змінити аудіовихід"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Невідомо"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, d MMM"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index d403f8dd8a73..d9d1cbd12fb3 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"آلہ مقفل کر دیا گیا"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"اسکیننگ چہرہ"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"بھیجیں"</string> - <string name="phone_label" msgid="5715229948920451352">"فون کھولیں"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"صوتی معاون کھولیں"</string> - <string name="camera_label" msgid="8253821920931143699">"کیمرا کھولیں"</string> <string name="cancel" msgid="1089011503403416730">"منسوخ کريں"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"تصدیق کریں"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"دوبارہ کوشش کریں"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> پر براڈکاسٹ کریں"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"آؤٹ پٹ تبدیل کریں"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"نامعلوم"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index d354cd896bdc..65a3e5113902 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Qurilma qulflandi"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Yuzni skanerlash"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Yuborish"</string> - <string name="phone_label" msgid="5715229948920451352">"telefonni ochish"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"ovozli yordamni yoqish"</string> - <string name="camera_label" msgid="8253821920931143699">"kamerani ochish"</string> <string name="cancel" msgid="1089011503403416730">"Bekor qilish"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"OK"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Qayta urinish"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> ilovasiga translatsiya"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Ovoz chiqishini oʻzgartirish"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Noaniq"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"s:dd"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index d1cc8eb730aa..7340db2fe58d 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Đã khóa thiết bị"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Quét tìm khuôn mặt"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Gửi"</string> - <string name="phone_label" msgid="5715229948920451352">"mở điện thoại"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"mở trợ lý thoại"</string> - <string name="camera_label" msgid="8253821920931143699">"mở máy ảnh"</string> <string name="cancel" msgid="1089011503403416730">"Hủy"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Xác nhận"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Thử lại"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 41d6a7e2aed6..96d895832bfe 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"设备已锁定"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"正在扫描面孔"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"发送"</string> - <string name="phone_label" msgid="5715229948920451352">"打开电话"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"打开语音助理"</string> - <string name="camera_label" msgid="8253821920931143699">"打开相机"</string> <string name="cancel" msgid="1089011503403416730">"取消"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"确认"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"重试"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"广播“<xliff:g id="SWITCHAPP">%1$s</xliff:g>”的内容"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"更改输出来源"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"未知"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 77cf07300899..89c7c29e4494 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"裝置已上鎖"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"掃瞄緊面孔"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"傳送"</string> - <string name="phone_label" msgid="5715229948920451352">"開啟電話"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"開啟語音助手"</string> - <string name="camera_label" msgid="8253821920931143699">"開啟相機"</string> <string name="cancel" msgid="1089011503403416730">"取消"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"確認"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"請再試一次"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"廣播「<xliff:g id="SWITCHAPP">%1$s</xliff:g>」的內容"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"變更輸出來源"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"不明"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"MMM d EEE"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 783e19ac1d24..9e22840d6478 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"裝置已鎖定"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"掃描臉孔"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"傳送"</string> - <string name="phone_label" msgid="5715229948920451352">"開啟電話"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"開啟語音小幫手"</string> - <string name="camera_label" msgid="8253821920931143699">"開啟攝影機"</string> <string name="cancel" msgid="1089011503403416730">"取消"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"確認"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"再試一次"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"播送「<xliff:g id="SWITCHAPP">%1$s</xliff:g>」的內容"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"變更輸出來源"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"不明"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"MMM d EEE"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 50c02c5d797b..a6e302664728 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -124,9 +124,6 @@ <string name="accessibility_lock_icon" msgid="661492842417875775">"Idivayisi ikhiyiwe"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"Ukuskena ubuso"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"Thumela"</string> - <string name="phone_label" msgid="5715229948920451352">"vula ifoni"</string> - <string name="voice_assist_label" msgid="3725967093735929020">"vula isilekeleli sezwi"</string> - <string name="camera_label" msgid="8253821920931143699">"vula ikhamera"</string> <string name="cancel" msgid="1089011503403416730">"Khansela"</string> <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Qinisekisa"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Zama futhi"</string> @@ -953,10 +950,7 @@ <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="6098768269397105733">"Sakaza i-<xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="7885102097302562674">"Shintsha okuphumayo"</string> <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"Akwaziwa"</string> - <!-- no translation found for dream_date_complication_date_format (8191225366513860104) --> - <skip /> - <!-- no translation found for dream_time_complication_12_hr_time_format (4691197486690291529) --> - <skip /> - <!-- no translation found for dream_time_complication_24_hr_time_format (6248280719733640813) --> - <skip /> + <string name="dream_date_complication_date_format" msgid="8191225366513860104">"EEE, MMM d"</string> + <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> + <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index eff4e00fd07b..771973c36053 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -37,12 +37,6 @@ <item>400</item> </integer-array> - <!-- Show mic or phone affordance on Keyguard --> - <bool name="config_keyguardShowLeftAffordance">false</bool> - - <!-- Show camera affordance on Keyguard --> - <bool name="config_keyguardShowCameraAffordance">false</bool> - <!-- decay duration (from size_max -> size), in ms --> <integer name="navigation_bar_deadzone_hold">333</integer> <integer name="navigation_bar_deadzone_decay">333</integer> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 36a2d6469ec8..bb5c5928181a 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -676,9 +676,6 @@ <!-- The minimum background radius when swiping to a side for the camera / phone affordances. --> <dimen name="keyguard_affordance_min_background_radius">30dp</dimen> - <!-- The size of the touch targets on the keyguard for the affordances. --> - <dimen name="keyguard_affordance_touch_target_size">120dp</dimen> - <!-- The grow amount for the camera and phone circles when hinting --> <dimen name="hint_grow_amount_sideways">60dp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 343ec4f67964..ef672f3a6213 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -313,13 +313,6 @@ <string name="accessibility_scanning_face">Scanning face</string> <!-- Click action label for accessibility for the smart reply buttons (not shown on-screen).". [CHAR LIMIT=NONE] --> <string name="accessibility_send_smart_reply">Send</string> - <!-- Content description of the manage notification button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] --> - <string name="phone_label">open phone</string> - <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] --> - <string name="voice_assist_label">open voice assist</string> - <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] --> - <string name="camera_label">open camera</string> <!-- Button name for "Cancel". [CHAR LIMIT=NONE] --> <string name="cancel">Cancel</string> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index f954bc9bf17c..112d903c609c 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -265,6 +265,10 @@ <style name="Animation.ShutdownUi" parent="@android:style/Animation.Toast"> </style> + <style name="Theme.SystemUI.MediaProjectionAppSelector" + parent="@*android:style/Theme.DeviceDefault.Chooser"> + </style> + <!-- Standard animations for hiding and showing the status bar. --> <style name="Theme.SystemUI" parent="@*android:style/Theme.DeviceDefault.SystemUI"> diff --git a/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ScreenshotTestRule.kt b/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ScreenshotTestRule.kt index 363ce10fa36c..564901c2a773 100644 --- a/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ScreenshotTestRule.kt +++ b/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ScreenshotTestRule.kt @@ -20,6 +20,7 @@ import android.app.UiModeManager import android.content.Context import android.graphics.Bitmap import android.graphics.Canvas +import android.os.Build import android.os.UserHandle import android.view.Display import android.view.View @@ -32,6 +33,7 @@ import platform.test.screenshot.GoldenImagePathManager import platform.test.screenshot.PathConfig import platform.test.screenshot.PathElementNoContext import platform.test.screenshot.ScreenshotTestRule +import platform.test.screenshot.matchers.MSSIMMatcher import platform.test.screenshot.matchers.PixelPerfectMatcher /** @@ -55,7 +57,11 @@ class ScreenshotTestRule(private val testSpec: ScreenshotTestSpec) : TestRule { currentDisplay?.name ?: error("currentDisplay is null") }, ) - private val defaultMatcher = PixelPerfectMatcher() + private val matcher = if (shouldUsePerfectMatching()) { + PixelPerfectMatcher() + } else { + MSSIMMatcher() + } private val screenshotRule = ScreenshotTestRule( @@ -67,6 +73,17 @@ class ScreenshotTestRule(private val testSpec: ScreenshotTestSpec) : TestRule { ) ) + private fun shouldUsePerfectMatching(): Boolean { + // Different CPU architectures can sometimes end up rendering differently, so we can't do + // pixel-perfect matching on different architectures using the same golden. Given that our + // presubmits are run on cf_x86_64_phone, our goldens should be perfectly matched on the + // x86_64 architecture and use the Structural Similarity Index on others. + // TODO(b/237511747): Run our screenshot presubmit tests on arm64 instead so that we can + // do pixel perfect matching both at presubmit time and at development time with actual + // devices. + return Build.CPU_ABI == "x86_64" + } + override fun apply(base: Statement, description: Description): Statement { // The statement which call beforeTest() before running the test and afterTest() afterwards. val statement = @@ -147,7 +164,7 @@ class ScreenshotTestRule(private val testSpec: ScreenshotTestSpec) : TestRule { // device to assertBitmapAgainstGolden instead? currentDisplay = testSpec.display currentGoldenIdentifier = goldenIdentifier - screenshotRule.assertBitmapAgainstGolden(bitmap, identifierWithSpec, defaultMatcher) + screenshotRule.assertBitmapAgainstGolden(bitmap, identifierWithSpec, matcher) currentDisplay = null currentGoldenIdentifier = goldenIdentifier } diff --git a/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewScreenshotTestRule.kt b/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewScreenshotTestRule.kt index 35812e39677d..6a80c486d515 100644 --- a/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewScreenshotTestRule.kt +++ b/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewScreenshotTestRule.kt @@ -60,11 +60,17 @@ class ViewScreenshotTestRule(testSpec: ScreenshotTestSpec) : TestRule { ) { var dialog: Dialog? = null activityRule.scenario.onActivity { activity -> - // Make sure that the dialog draws full screen and fits the whole display instead of the - // system bars. dialog = dialogProvider(activity).apply { + // Make sure that the dialog draws full screen and fits the whole display + // instead of the system bars. window.setDecorFitsSystemWindows(false) + + // Disable enter/exit animations. + create() + window.setWindowAnimations(0) + + // Show the dialog. show() } } @@ -74,7 +80,11 @@ class ViewScreenshotTestRule(testSpec: ScreenshotTestSpec) : TestRule { activityRule.scenario.onActivity { // Check that the content is what we expected. val dialog = dialog ?: error("dialog is null") - screenshotRule.screenshotTest(goldenIdentifier, dialog.window.decorView) + try { + screenshotRule.screenshotTest(goldenIdentifier, dialog.window.decorView) + } finally { + dialog.dismiss() + } } } } diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java index c1b2aba22b57..43e737823692 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java @@ -23,7 +23,6 @@ import static com.android.keyguard.LockIconView.ICON_LOCK; import static com.android.keyguard.LockIconView.ICON_UNLOCK; import static com.android.systemui.classifier.Classifier.LOCK_ICON; import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; -import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInProgressOffset; import android.content.res.Configuration; import android.content.res.Resources; @@ -403,7 +402,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme float offsetY = MathUtils.lerp(0f, getBurnInOffset(mMaxBurnInOffsetY * 2, false /* xAxis */) - mMaxBurnInOffsetY, mInterpolatedDarkAmount); - float progress = MathUtils.lerp(0f, getBurnInProgressOffset(), mInterpolatedDarkAmount); mView.setTranslationX(offsetX); mView.setTranslationY(offsetY); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt index 378ae14f0327..fef7383634f0 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt @@ -29,8 +29,7 @@ import android.view.View import android.view.animation.PathInterpolator import com.android.internal.graphics.ColorUtils import com.android.systemui.animation.Interpolators -import com.android.systemui.statusbar.charging.DwellRippleShader -import com.android.systemui.statusbar.charging.RippleShader +import com.android.systemui.ripple.RippleShader private const val RIPPLE_SPARKLE_STRENGTH: Float = 0.4f @@ -298,7 +297,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at addListener(object : AnimatorListenerAdapter() { override fun onAnimationStart(animation: Animator?) { unlockedRippleInProgress = true - rippleShader.shouldFadeOutRipple = true + rippleShader.rippleFill = false drawRipple = true visibility = VISIBLE } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/charging/DwellRippleShader.kt b/packages/SystemUI/src/com/android/systemui/biometrics/DwellRippleShader.kt index 236129f8eb50..979fe33fb25b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/charging/DwellRippleShader.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/DwellRippleShader.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.charging +package com.android.systemui.biometrics import android.graphics.PointF import android.graphics.RuntimeShader diff --git a/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt new file mode 100644 index 000000000000..4986fe85af19 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt @@ -0,0 +1,156 @@ +/* + * 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.camera + +import android.app.ActivityManager +import android.app.ActivityManager.RunningTaskInfo +import android.app.ActivityOptions +import android.app.ActivityTaskManager +import android.content.ContentResolver +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.content.pm.ResolveInfo +import android.os.AsyncTask +import android.os.RemoteException +import android.os.UserHandle +import android.util.Log +import android.view.WindowManager +import com.android.keyguard.KeyguardUpdateMonitor +import com.android.systemui.ActivityIntentHelper +import com.android.systemui.camera.CameraIntents.Companion.isSecureCameraIntent +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.statusbar.StatusBarState +import com.android.systemui.statusbar.phone.CentralSurfaces +import com.android.systemui.statusbar.phone.PanelViewController +import com.android.systemui.statusbar.policy.KeyguardStateController +import javax.inject.Inject + +/** + * Helps with handling camera-related gestures (for example, double-tap the power button to launch + * the camera). + */ +class CameraGestureHelper @Inject constructor( + private val context: Context, + private val centralSurfaces: CentralSurfaces, + private val keyguardStateController: KeyguardStateController, + private val packageManager: PackageManager, + private val activityManager: ActivityManager, + private val activityStarter: ActivityStarter, + private val activityIntentHelper: ActivityIntentHelper, + private val cameraIntents: CameraIntentsWrapper, + private val contentResolver: ContentResolver, +) { + /** + * Whether the camera application can be launched for the camera launch gesture. + */ + fun canCameraGestureBeLaunched(statusBarState: Int): Boolean { + if (!centralSurfaces.isCameraAllowedByAdmin) { + return false + } + + val resolveInfo: ResolveInfo = packageManager.resolveActivityAsUser( + getStartCameraIntent(), + PackageManager.MATCH_DEFAULT_ONLY, + KeyguardUpdateMonitor.getCurrentUser() + ) + val resolvedPackage = resolveInfo.activityInfo?.packageName + return (resolvedPackage != null && + (statusBarState != StatusBarState.SHADE || + !isForegroundApp(resolvedPackage))) + } + + /** + * Launches the camera. + * + * @param source The source of the camera launch, to be passed to the camera app via [Intent] + */ + fun launchCamera(source: Int) { + val intent: Intent = getStartCameraIntent() + intent.putExtra(EXTRA_CAMERA_LAUNCH_SOURCE, source) + val wouldLaunchResolverActivity = activityIntentHelper.wouldLaunchResolverActivity( + intent, KeyguardUpdateMonitor.getCurrentUser() + ) + if (isSecureCameraIntent(intent) && !wouldLaunchResolverActivity) { + AsyncTask.execute { + // Normally an activity will set its requested rotation animation on its window. + // However when launching an activity causes the orientation to change this is too + // late. In these cases, the default animation is used. This doesn't look good for + // the camera (as it rotates the camera contents out of sync with physical reality). + // Therefore, we ask the WindowManager to force the cross-fade animation if an + // orientation change happens to occur during the launch. + val activityOptions = ActivityOptions.makeBasic() + activityOptions.setDisallowEnterPictureInPictureWhileLaunching(true) + activityOptions.rotationAnimationHint = + WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS + try { + ActivityTaskManager.getService().startActivityAsUser( + null, + context.basePackageName, + context.attributionTag, + intent, + intent.resolveTypeIfNeeded(contentResolver), + null, + null, + 0, + Intent.FLAG_ACTIVITY_NEW_TASK, + null, + activityOptions.toBundle(), + UserHandle.CURRENT.identifier, + ) + } catch (e: RemoteException) { + Log.w( + PanelViewController.TAG, + "Unable to start camera activity", + e + ) + } + } + } else { + // We need to delay starting the activity because ResolverActivity finishes itself if + // launched from behind the lock-screen. + activityStarter.startActivity(intent, false /* dismissShade */) + } + } + + /** + * Returns an [Intent] that can be used to start the camera app such that it occludes the + * lock-screen, if needed. + */ + private fun getStartCameraIntent(): Intent { + val isLockScreenDismissible = keyguardStateController.canDismissLockScreen() + val isSecure = keyguardStateController.isMethodSecure + return if (isSecure && !isLockScreenDismissible) { + cameraIntents.getSecureCameraIntent() + } else { + cameraIntents.getInsecureCameraIntent() + } + } + + /** + * Returns `true` if the application with the given package name is running in the foreground; + * `false` otherwise + */ + private fun isForegroundApp(packageName: String): Boolean { + val tasks: List<RunningTaskInfo> = activityManager.getRunningTasks(1) + return tasks.isNotEmpty() && packageName == tasks[0].topActivity.packageName + } + + companion object { + private const val EXTRA_CAMERA_LAUNCH_SOURCE = "com.android.systemui.camera_launch_source" + } +} diff --git a/packages/SystemUI/src/com/android/systemui/camera/CameraIntentsWrapper.kt b/packages/SystemUI/src/com/android/systemui/camera/CameraIntentsWrapper.kt new file mode 100644 index 000000000000..cf02f8fb4a3c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/camera/CameraIntentsWrapper.kt @@ -0,0 +1,43 @@ +/* + * 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.camera + +import android.content.Context +import android.content.Intent +import javax.inject.Inject + +/** Injectable wrapper around [CameraIntents]. */ +class CameraIntentsWrapper @Inject constructor( + private val context: Context, +) { + + /** + * Returns an [Intent] that can be used to start the camera, suitable for when the device is + * already unlocked + */ + fun getSecureCameraIntent(): Intent { + return CameraIntents.getSecureCameraIntent(context) + } + + /** + * Returns an [Intent] that can be used to start the camera, suitable for when the device is not + * already unlocked + */ + fun getInsecureCameraIntent(): Intent { + return CameraIntents.getInsecureCameraIntent(context) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/charging/WiredChargingRippleController.kt b/packages/SystemUI/src/com/android/systemui/charging/WiredChargingRippleController.kt index 558bcac681d9..8292e52b1ffd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/charging/WiredChargingRippleController.kt +++ b/packages/SystemUI/src/com/android/systemui/charging/WiredChargingRippleController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.charging +package com.android.systemui.charging import android.content.Context import android.content.res.Configuration @@ -32,6 +32,7 @@ import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags +import com.android.systemui.ripple.RippleView import com.android.systemui.statusbar.commandline.Command import com.android.systemui.statusbar.commandline.CommandRegistry import com.android.systemui.statusbar.policy.BatteryController @@ -84,7 +85,7 @@ class WiredChargingRippleController @Inject constructor( private var debounceLevel = 0 @VisibleForTesting - var rippleView: ChargingRippleView = ChargingRippleView(context, attrs = null) + var rippleView: RippleView = RippleView(context, attrs = null) init { pluggedIn = batteryController.isPluggedIn diff --git a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java index 0d3e2ae9a776..f6368ee19e8f 100644 --- a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java +++ b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java @@ -34,7 +34,7 @@ import android.widget.TextView; import com.android.settingslib.Utils; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; -import com.android.systemui.statusbar.charging.ChargingRippleView; +import com.android.systemui.ripple.RippleView; import java.text.NumberFormat; @@ -46,7 +46,7 @@ public class WirelessChargingLayout extends FrameLayout { private static final long RIPPLE_ANIMATION_DURATION = 1500; private static final int SCRIM_COLOR = 0x4C000000; private static final int SCRIM_FADE_DURATION = 300; - private ChargingRippleView mRippleView; + private RippleView mRippleView; public WirelessChargingLayout(Context context) { super(context); diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index ba1e057716f8..137e28888728 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -43,6 +43,7 @@ import com.android.systemui.flags.FlagsModule; import com.android.systemui.fragments.FragmentService; import com.android.systemui.log.dagger.LogModule; import com.android.systemui.lowlightclock.LowLightClockController; +import com.android.systemui.media.dagger.MediaProjectionModule; import com.android.systemui.model.SysUiState; import com.android.systemui.navigationbar.NavigationBarComponent; import com.android.systemui.plugins.BcSmartspaceDataPlugin; @@ -119,6 +120,7 @@ import dagger.Provides; FalsingModule.class, FlagsModule.class, LogModule.class, + MediaProjectionModule.class, PeopleHubModule.class, PluginModule.class, PrivacyModule.class, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 95b3b3f6452f..3eb3c80f4081 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -453,6 +453,8 @@ public class KeyguardService extends Service { @Override // Binder interface public void setOccluded(boolean isOccluded, boolean animate) { + Log.d(TAG, "setOccluded(" + isOccluded + ")"); + Trace.beginSection("KeyguardService.mBinder#setOccluded"); checkPermission(); mKeyguardViewMediator.setOccluded(isOccluded, animate); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 340cde11c6e7..3c88e4023960 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -837,9 +837,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, private final ActivityLaunchAnimator.Controller mOccludeAnimationController = new ActivityLaunchAnimator.Controller() { @Override - public void onLaunchAnimationStart(boolean isExpandingFullyAbove) { - setOccluded(true /* occluded */, false /* animate */); - } + public void onLaunchAnimationStart(boolean isExpandingFullyAbove) {} @Override public void onLaunchAnimationCancelled() { @@ -925,6 +923,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps, IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException { + Log.d(TAG, "UnoccludeAnimator#onAnimationStart. Set occluded = false."); setOccluded(false /* isOccluded */, true /* animate */); if (apps == null || apps.length == 0 || apps[0] == null) { @@ -1676,6 +1675,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, * Notify us when the keyguard is occluded by another window */ public void setOccluded(boolean isOccluded, boolean animate) { + Log.d(TAG, "setOccluded(" + isOccluded + ")"); + Trace.beginSection("KeyguardViewMediator#setOccluded"); if (DEBUG) Log.d(TAG, "setOccluded " + isOccluded); mInteractionJankMonitor.cancel(CUJ_LOCKSCREEN_TRANSITION_FROM_AOD); @@ -1706,6 +1707,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, */ private void handleSetOccluded(boolean isOccluded, boolean animate) { Trace.beginSection("KeyguardViewMediator#handleSetOccluded"); + Log.d(TAG, "handleSetOccluded(" + isOccluded + ")"); synchronized (KeyguardViewMediator.this) { if (mHiding && isOccluded) { // We're in the process of going away but WindowManager wants to show a @@ -2705,7 +2707,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, /** Hides the surface behind the keyguard by re-showing the keyguard/activity lock screen. */ public void hideSurfaceBehindKeyguard() { mSurfaceBehindRemoteAnimationRequested = false; - + mKeyguardStateController.notifyKeyguardGoingAway(false); if (mShowing) { setShowingLocked(true, true); } @@ -3213,16 +3215,18 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, // internal state to reflect that immediately, vs. waiting for the launch animator to // begin. Otherwise, calls to setShowingLocked, etc. will not know that we're about to // be occluded and might re-show the keyguard. + Log.d(TAG, "OccludeAnimator#onAnimationStart. Set occluded = true."); setOccluded(true /* isOccluded */, false /* animate */); } @Override public void onAnimationCancelled(boolean isKeyguardOccluded) throws RemoteException { super.onAnimationCancelled(isKeyguardOccluded); - setOccluded(isKeyguardOccluded /* occluded */, false /* animate */); Log.d(TAG, "Occlude animation cancelled by WM. " - + "Setting occluded state to: " + mOccluded); + + "Setting occluded state to: " + isKeyguardOccluded); + setOccluded(isKeyguardOccluded /* occluded */, false /* animate */); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt new file mode 100644 index 000000000000..6802da347c93 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt @@ -0,0 +1,119 @@ +/* + * 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.media + +import android.app.ActivityOptions +import android.content.Intent +import android.media.projection.IMediaProjection +import android.media.projection.MediaProjectionManager.EXTRA_MEDIA_PROJECTION +import android.os.Binder +import android.os.Bundle +import android.os.IBinder +import android.view.View +import com.android.internal.app.ChooserActivity +import com.android.internal.app.chooser.NotSelectableTargetInfo +import com.android.internal.app.chooser.TargetInfo +import com.android.systemui.util.AsyncActivityLauncher +import com.android.systemui.R; +import javax.inject.Inject + +class MediaProjectionAppSelectorActivity @Inject constructor( + private val activityLauncher: AsyncActivityLauncher +) : ChooserActivity() { + + public override fun onCreate(bundle: Bundle?) { + val queryIntent = Intent(Intent.ACTION_MAIN) + .addCategory(Intent.CATEGORY_LAUNCHER) + intent.putExtra(Intent.EXTRA_INTENT, queryIntent) + + // TODO(b/235465652) Use resource lexeme + intent.putExtra(Intent.EXTRA_TITLE, "Record or cast an app") + + super.onCreate(bundle) + + // TODO(b/235465652) we should update VisD of the title and add an icon + findViewById<View>(R.id.title)?.visibility = View.VISIBLE + } + + override fun appliedThemeResId(): Int = + R.style.Theme_SystemUI_MediaProjectionAppSelector + + override fun startSelected(which: Int, always: Boolean, filtered: Boolean) { + val currentListAdapter = mChooserMultiProfilePagerAdapter.activeListAdapter + val targetInfo = currentListAdapter.targetInfoForPosition(which, filtered) ?: return + if (targetInfo is NotSelectableTargetInfo) return + + val intent = createIntent(targetInfo) + + val launchToken: IBinder = Binder("media_projection_launch_token") + val activityOptions = ActivityOptions.makeBasic() + activityOptions.launchCookie = launchToken + + val userHandle = mMultiProfilePagerAdapter.activeListAdapter.userHandle + + // Launch activity asynchronously and wait for the result, launching of an activity + // is typically very fast, so we don't show any loaders. + // We wait for the activity to be launched to make sure that the window of the activity + // is created and ready to be captured. + val activityStarted = activityLauncher + .startActivityAsUser(intent, userHandle, activityOptions.toBundle()) { + onTargetActivityLaunched(launchToken) + } + + // Rely on the ActivityManager to pop up a dialog regarding app suspension + // and return false if suspended + if (!targetInfo.isSuspended && activityStarted) { + // TODO(b/222078415) track activity launch + } + } + + private fun createIntent(target: TargetInfo): Intent { + val intent = Intent(target.resolvedIntent) + + // Launch the app in a new task, so it won't be in the host's app task + intent.flags = intent.flags or Intent.FLAG_ACTIVITY_NEW_TASK + + // Remove activity forward result flag as this activity will + // return the media projection session + intent.flags = intent.flags and Intent.FLAG_ACTIVITY_FORWARD_RESULT.inv() + + return intent + } + + override fun onDestroy() { + activityLauncher.destroy() + super.onDestroy() + } + + override fun onActivityStarted(cti: TargetInfo) { + // do nothing + } + + private fun onTargetActivityLaunched(launchToken: IBinder) { + val mediaProjectionBinder = intent.getIBinderExtra(EXTRA_MEDIA_PROJECTION) + val projection = IMediaProjection.Stub.asInterface(mediaProjectionBinder) + + projection.launchCookie = launchToken + + val intent = Intent() + intent.putExtra(EXTRA_MEDIA_PROJECTION, projection.asBinder()) + setResult(RESULT_OK, intent) + setForceSendResultForMediaProjection() + finish() + } + + override fun shouldGetOnlyDefaultActivities() = false +} diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java index 38604091c409..397bffcaa64c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java @@ -40,7 +40,10 @@ import android.text.style.StyleSpan; import android.util.Log; import android.view.Window; +import com.android.systemui.Dependency; import com.android.systemui.R; +import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.flags.Flags; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.util.Utils; @@ -53,6 +56,7 @@ public class MediaProjectionPermissionActivity extends Activity private String mPackageName; private int mUid; private IMediaProjectionManager mService; + private FeatureFlags mFeatureFlags; private AlertDialog mDialog; @@ -60,6 +64,7 @@ public class MediaProjectionPermissionActivity extends Activity public void onCreate(Bundle icicle) { super.onCreate(icicle); + mFeatureFlags = Dependency.get(FeatureFlags.class); mPackageName = getCallingPackage(); IBinder b = ServiceManager.getService(MEDIA_PROJECTION_SERVICE); mService = IMediaProjectionManager.Stub.asInterface(b); @@ -141,14 +146,22 @@ public class MediaProjectionPermissionActivity extends Activity dialogTitle = getString(R.string.media_projection_dialog_title, appName); } - mDialog = new AlertDialog.Builder(this, R.style.Theme_SystemUI_Dialog) + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this, + R.style.Theme_SystemUI_Dialog) .setTitle(dialogTitle) .setIcon(R.drawable.ic_media_projection_permission) .setMessage(dialogText) .setPositiveButton(R.string.media_projection_action_text, this) .setNeutralButton(android.R.string.cancel, this) - .setOnCancelListener(this) - .create(); + .setOnCancelListener(this); + + if (isPartialScreenSharingEnabled()) { + // This is a temporary entry point before we have a new permission dialog + // TODO(b/233183090): this activity should be redesigned to have a dropdown selector + dialogBuilder.setNegativeButton("App", this); + } + + mDialog = dialogBuilder.create(); SystemUIDialog.registerDismissListener(mDialog); SystemUIDialog.applyFlags(mDialog); @@ -177,6 +190,15 @@ public class MediaProjectionPermissionActivity extends Activity if (which == AlertDialog.BUTTON_POSITIVE) { setResult(RESULT_OK, getMediaProjectionIntent(mUid, mPackageName)); } + + if (isPartialScreenSharingEnabled() && which == AlertDialog.BUTTON_NEGATIVE) { + IMediaProjection projection = createProjection(mUid, mPackageName); + final Intent intent = new Intent(this, MediaProjectionAppSelectorActivity.class); + intent.putExtra(MediaProjectionManager.EXTRA_MEDIA_PROJECTION, + projection.asBinder()); + intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); + startActivity(intent); + } } catch (RemoteException e) { Log.e(TAG, "Error granting projection permission", e); setResult(RESULT_CANCELED); @@ -188,10 +210,14 @@ public class MediaProjectionPermissionActivity extends Activity } } + private IMediaProjection createProjection(int uid, String packageName) throws RemoteException { + return mService.createProjection(uid, packageName, + MediaProjectionManager.TYPE_SCREEN_CAPTURE, false /* permanentGrant */); + } + private Intent getMediaProjectionIntent(int uid, String packageName) throws RemoteException { - IMediaProjection projection = mService.createProjection(uid, packageName, - MediaProjectionManager.TYPE_SCREEN_CAPTURE, false /* permanentGrant */); + IMediaProjection projection = createProjection(uid, packageName); Intent intent = new Intent(); intent.putExtra(MediaProjectionManager.EXTRA_MEDIA_PROJECTION, projection.asBinder()); return intent; @@ -201,4 +227,8 @@ public class MediaProjectionPermissionActivity extends Activity public void onCancel(DialogInterface dialog) { finish(); } + + private boolean isPartialScreenSharingEnabled() { + return mFeatureFlags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING); + } } diff --git a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaProjectionModule.kt b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaProjectionModule.kt new file mode 100644 index 000000000000..e33a1b909d48 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaProjectionModule.kt @@ -0,0 +1,35 @@ +/* + * 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.media.dagger + +import android.app.Activity +import com.android.systemui.media.MediaProjectionAppSelectorActivity +import dagger.Binds +import dagger.Module +import dagger.multibindings.ClassKey +import dagger.multibindings.IntoMap + +@Module +abstract class MediaProjectionModule { + + @Binds + @IntoMap + @ClassKey(MediaProjectionAppSelectorActivity::class) + abstract fun provideMediaProjectionAppSelectorActivity( + activity: MediaProjectionAppSelectorActivity): Activity + +} diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt index 0f1cdcc3fa5b..c9fce794f57f 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt @@ -54,7 +54,7 @@ import com.android.systemui.util.view.ViewUtil abstract class MediaTttChipControllerCommon<T : ChipInfoCommon>( internal val context: Context, internal val logger: MediaTttLogger, - private val windowManager: WindowManager, + internal val windowManager: WindowManager, private val viewUtil: ViewUtil, @Main private val mainExecutor: DelayableExecutor, private val accessibilityManager: AccessibilityManager, diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt index f9818f0ad8be..99a5b8b2d450 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt @@ -16,8 +16,10 @@ package com.android.systemui.media.taptotransfer.receiver +import android.annotation.SuppressLint import android.app.StatusBarManager import android.content.Context +import android.graphics.PointF import android.graphics.drawable.Drawable import android.graphics.drawable.Icon import android.media.MediaRoute2Info @@ -29,6 +31,8 @@ import android.view.View import android.view.ViewGroup import android.view.WindowManager import android.view.accessibility.AccessibilityManager +import androidx.core.graphics.ColorUtils +import com.android.settingslib.Utils import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main @@ -72,9 +76,15 @@ class MediaTttChipControllerReceiver @Inject constructor( powerManager, R.layout.media_ttt_chip_receiver ) { + @SuppressLint("WrongConstant") // We're allowed to use LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS override val windowLayoutParams = commonWindowLayoutParams.apply { - height = getWindowHeight() gravity = Gravity.BOTTOM.or(Gravity.CENTER_HORIZONTAL) + // Params below are needed for the ripple to work correctly + width = WindowManager.LayoutParams.MATCH_PARENT + height = WindowManager.LayoutParams.MATCH_PARENT + layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS + fitInsetsTypes = 0 // Ignore insets from all system bars + flags = WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE } private val commandQueueCallbacks = object : CommandQueue.Callbacks { @@ -149,7 +159,7 @@ class MediaTttChipControllerReceiver @Inject constructor( .alpha(1f) .setDuration(5.frames) .start() - + startRipple(chipView.requireViewById(R.id.ripple)) } override fun getIconSize(isAppIcon: Boolean): Int? = @@ -161,16 +171,44 @@ class MediaTttChipControllerReceiver @Inject constructor( } ) - private fun getWindowHeight(): Int { - return context.resources.getDimensionPixelSize(R.dimen.media_ttt_icon_size_receiver) + - // Make the window large enough to accommodate the animation amount - getTranslationAmount() - } - /** Returns the amount that the chip will be translated by in its intro animation. */ private fun getTranslationAmount(): Int { return context.resources.getDimensionPixelSize(R.dimen.media_ttt_receiver_vert_translation) } + + private fun startRipple(rippleView: ReceiverChipRippleView) { + if (rippleView.rippleInProgress) { + // Skip if ripple is still playing + return + } + rippleView.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener { + override fun onViewDetachedFromWindow(view: View?) {} + + override fun onViewAttachedToWindow(view: View?) { + if (view == null) { + return + } + val attachedRippleView = view as ReceiverChipRippleView + layoutRipple(attachedRippleView) + attachedRippleView.startRipple() + attachedRippleView.removeOnAttachStateChangeListener(this) + } + }) + } + + private fun layoutRipple(rippleView: ReceiverChipRippleView) { + val windowBounds = windowManager.currentWindowMetrics.bounds + val height = windowBounds.height() + val width = windowBounds.width() + + rippleView.radius = height / 5f + // Center the ripple on the bottom of the screen in the middle. + rippleView.origin = PointF(/* x= */ width / 2f, /* y= */ height.toFloat()) + + val color = Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColorAccent) + val colorWithAlpha = ColorUtils.setAlphaComponent(color, 70) + rippleView.setColor(colorWithAlpha) + } } data class ChipReceiverInfo( 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 new file mode 100644 index 000000000000..fed546bf52c2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt @@ -0,0 +1,33 @@ +/* + * 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.media.taptotransfer.receiver + +import android.content.Context +import android.util.AttributeSet +import com.android.systemui.ripple.RippleView + +/** + * An expanding ripple effect for the media tap-to-transfer receiver chip. + */ +class ReceiverChipRippleView( + context: Context?, attrs: AttributeSet? +) : RippleView(context, attrs) { + init { + setRippleFill(true) + duration = 3000L + } +} diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java index 730f88ab9f8f..5f52485a5481 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java @@ -105,6 +105,7 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.util.LatencyTracker; import com.android.internal.view.AppearanceRegion; import com.android.systemui.Gefingerpoken; @@ -1069,7 +1070,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements @Override public void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, - @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName) { + @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName, + LetterboxDetails[] letterboxDetails) { if (displayId != mDisplayId) { return; } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java index 1abf9903c08d..9e0c49641e72 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java @@ -57,6 +57,7 @@ import android.view.WindowInsetsController.Behavior; import androidx.annotation.NonNull; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.view.AppearanceRegion; import com.android.systemui.Dumpable; import com.android.systemui.dagger.SysUISingleton; @@ -357,7 +358,8 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void onSystemBarAttributesChanged(int displayId, int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, int behavior, - InsetsVisibilities requestedVisibilities, String packageName) { + InsetsVisibilities requestedVisibilities, String packageName, + LetterboxDetails[] letterboxDetails) { mOverviewProxyService.onSystemBarAttributesChanged(displayId, behavior); boolean nbModeChanged = false; if (mAppearance != appearance) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt index 260a3714a368..bdcc6b0b2a57 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt @@ -128,15 +128,16 @@ class UserSwitchDialogController @VisibleForTesting constructor( private val animateFrom: Dialog, private val dialogLaunchAnimator: DialogLaunchAnimator ) : DialogInterface by animateFrom, DialogShower { - override fun showDialog(dialog: Dialog) { + override fun showDialog(dialog: Dialog, cuj: DialogCuj) { dialogLaunchAnimator.showFromDialog( dialog, - animateFrom = animateFrom + animateFrom = animateFrom, + cuj ) } } interface DialogShower : DialogInterface { - fun showDialog(dialog: Dialog) + fun showDialog(dialog: Dialog, cuj: DialogCuj) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/charging/RippleShader.kt b/packages/SystemUI/src/com/android/systemui/ripple/RippleShader.kt index bdad36c58480..93a2efc4e96d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/charging/RippleShader.kt +++ b/packages/SystemUI/src/com/android/systemui/ripple/RippleShader.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.statusbar.charging +package com.android.systemui.ripple import android.graphics.PointF import android.graphics.RuntimeShader @@ -148,7 +148,7 @@ class RippleShader internal constructor() : RuntimeShader(SHADER) { val fadeOutNoise = subProgress(0.4f, 1f, value) var fadeOutRipple = 0f var fadeCircle = 0f - if (shouldFadeOutRipple) { + if (!rippleFill) { fadeCircle = subProgress(0f, 0.2f, value) fadeOutRipple = subProgress(0.3f, 1f, value) } @@ -202,5 +202,9 @@ class RippleShader internal constructor() : RuntimeShader(SHADER) { setFloatUniform("in_pixelDensity", value) } - var shouldFadeOutRipple: Boolean = true + /** + * True if the ripple should stayed filled in as it expands to give a filled-in circle effect. + * False for a ring effect. + */ + var rippleFill: Boolean = false } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/charging/ChargingRippleView.kt b/packages/SystemUI/src/com/android/systemui/ripple/RippleView.kt index 10e90fee1469..fc52464ecf85 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/charging/ChargingRippleView.kt +++ b/packages/SystemUI/src/com/android/systemui/ripple/RippleView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.charging +package com.android.systemui.ripple import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -30,9 +30,10 @@ import android.view.View private const val RIPPLE_SPARKLE_STRENGTH: Float = 0.3f /** - * Expanding ripple effect that shows when charging begins. + * A generic expanding ripple effect. To trigger the ripple expansion, set [radius] and [origin], + * then call [startRipple]. */ -class ChargingRippleView(context: Context?, attrs: AttributeSet?) : View(context, attrs) { +open class RippleView(context: Context?, attrs: AttributeSet?) : View(context, attrs) { private val rippleShader = RippleShader() private val defaultColor: Int = 0xffffffff.toInt() private val ripplePaint = Paint() @@ -74,9 +75,9 @@ class ChargingRippleView(context: Context?, attrs: AttributeSet?) : View(context } val animator = ValueAnimator.ofFloat(0f, 1f) animator.duration = duration - animator.addUpdateListener { animator -> - val now = animator.currentPlayTime - val progress = animator.animatedValue as Float + animator.addUpdateListener { updateListener -> + val now = updateListener.currentPlayTime + val progress = updateListener.animatedValue as Float rippleShader.progress = progress rippleShader.distortionStrength = 1 - progress rippleShader.time = now.toFloat() @@ -92,10 +93,20 @@ class ChargingRippleView(context: Context?, attrs: AttributeSet?) : View(context rippleInProgress = true } + /** Set the color to be used for the ripple. */ fun setColor(color: Int) { rippleShader.color = color } + /** + * Set whether the ripple should remain filled as the ripple expands. + * + * See [RippleShader.rippleFill]. + */ + fun setRippleFill(rippleFill: Boolean) { + rippleShader.rippleFill = rippleFill + } + override fun onDraw(canvas: Canvas?) { if (canvas == null || !canvas.isHardwareAccelerated) { // Drawing with the ripple shader requires hardware acceleration, so skip @@ -107,6 +118,6 @@ class ChargingRippleView(context: Context?, attrs: AttributeSet?) : View(context // animation implementation in the ripple shader. val maskRadius = (1 - (1 - rippleShader.progress) * (1 - rippleShader.progress) * (1 - rippleShader.progress)) * radius * 2 - canvas?.drawCircle(origin.x, origin.y, maskRadius, ripplePaint) + canvas.drawCircle(origin.x, origin.y, maskRadius, ripplePaint) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index cc3121ddc0e9..e99244048fd6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -66,6 +66,7 @@ import com.android.internal.os.SomeArgs; import com.android.internal.statusbar.IAddTileResultCallback; import com.android.internal.statusbar.IStatusBar; import com.android.internal.statusbar.IUndoMediaTransferCallback; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.util.GcUtils; import com.android.internal.view.AppearanceRegion; @@ -361,7 +362,7 @@ public class CommandQueue extends IStatusBar.Stub implements default void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, @Behavior int behavior, InsetsVisibilities requestedVisibilities, - String packageName) { } + String packageName, LetterboxDetails[] letterboxDetails) { } /** * @see IStatusBar#showTransient(int, int[], boolean). @@ -1090,7 +1091,8 @@ public class CommandQueue extends IStatusBar.Stub implements @Override public void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, - @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName) { + @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName, + LetterboxDetails[] letterboxDetails) { synchronized (mLock) { SomeArgs args = SomeArgs.obtain(); args.argi1 = displayId; @@ -1100,6 +1102,7 @@ public class CommandQueue extends IStatusBar.Stub implements args.argi4 = behavior; args.arg2 = requestedVisibilities; args.arg3 = packageName; + args.arg4 = letterboxDetails; mHandler.obtainMessage(MSG_SYSTEM_BAR_CHANGED, args).sendToTarget(); } } @@ -1561,7 +1564,8 @@ public class CommandQueue extends IStatusBar.Stub implements for (int i = 0; i < mCallbacks.size(); i++) { mCallbacks.get(i).onSystemBarAttributesChanged(args.argi1, args.argi2, (AppearanceRegion[]) args.arg1, args.argi3 == 1, args.argi4, - (InsetsVisibilities) args.arg2, (String) args.arg3); + (InsetsVisibilities) args.arg2, (String) args.arg3, + (LetterboxDetails[]) args.arg4); } args.recycle(); break; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java index 5cdd01f0ee0b..78b3b0a65351 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java @@ -286,10 +286,6 @@ public class NotificationRemoteInputManager implements Dumpable { ServiceManager.getService(Context.STATUS_BAR_SERVICE)); mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); mRebuilder = rebuilder; - if (!mNotifPipelineFlags.isNewPipelineEnabled()) { - mRemoteInputListener = createLegacyRemoteInputLifetimeExtender(mainHandler, - notificationEntryManager, smartReplyController); - } mKeyguardManager = context.getSystemService(KeyguardManager.class); mStatusBarStateController = statusBarStateController; mRemoteInputUriController = remoteInputUriController; @@ -313,34 +309,19 @@ public class NotificationRemoteInputManager implements Dumpable { int reason) { // We're removing the notification, the smart controller can forget about it. mSmartReplyController.stopSending(entry); - - if (removedByUser && entry != null) { - onPerformRemoveNotification(entry, entry.getKey()); - } } }); } /** Add a listener for various remote input events. Works with NEW pipeline only. */ public void setRemoteInputListener(@NonNull RemoteInputListener remoteInputListener) { - if (mNotifPipelineFlags.isNewPipelineEnabled()) { - if (mRemoteInputListener != null) { - throw new IllegalStateException("mRemoteInputListener is already set"); - } - mRemoteInputListener = remoteInputListener; - if (mRemoteInputController != null) { - mRemoteInputListener.setRemoteInputController(mRemoteInputController); - } + if (mRemoteInputListener != null) { + throw new IllegalStateException("mRemoteInputListener is already set"); + } + mRemoteInputListener = remoteInputListener; + if (mRemoteInputController != null) { + mRemoteInputListener.setRemoteInputController(mRemoteInputController); } - } - - @NonNull - @VisibleForTesting - protected LegacyRemoteInputLifetimeExtender createLegacyRemoteInputLifetimeExtender( - Handler mainHandler, - NotificationEntryManager notificationEntryManager, - SmartReplyController smartReplyController) { - return new LegacyRemoteInputLifetimeExtender(); } /** Initializes this component with the provided dependencies. */ @@ -381,12 +362,6 @@ public class NotificationRemoteInputManager implements Dumpable { } } }); - if (!mNotifPipelineFlags.isNewPipelineEnabled()) { - mSmartReplyController.setCallback((entry, reply) -> { - StatusBarNotification newSbn = mRebuilder.rebuildForSendingSmartReply(entry, reply); - mEntryManager.updateNotification(newSbn, null /* ranking */); - }); - } } public void addControllerCallback(RemoteInputController.Callback callback) { @@ -588,19 +563,6 @@ public class NotificationRemoteInputManager implements Dumpable { return v.findViewWithTag(RemoteInputView.VIEW_TAG); } - public ArrayList<NotificationLifetimeExtender> getLifetimeExtenders() { - // OLD pipeline code ONLY; can assume implementation - return ((LegacyRemoteInputLifetimeExtender) mRemoteInputListener).mLifetimeExtenders; - } - - @VisibleForTesting - void onPerformRemoveNotification(NotificationEntry entry, final String key) { - // OLD pipeline code ONLY; can assume implementation - ((LegacyRemoteInputLifetimeExtender) mRemoteInputListener) - .mKeysKeptForRemoteInputHistory.remove(key); - cleanUpRemoteInputForUserRemoval(entry); - } - /** * Disable remote input on the entry and remove the remote input view. * This should be called when a user dismisses a notification that won't be lifetime extended. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt index 5aeab84b677c..d24896148095 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt @@ -31,7 +31,6 @@ import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.inflation.BindEventManager -import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow @@ -129,11 +128,9 @@ class AnimatedImageNotificationManager @Inject constructor( */ @SysUISingleton class ConversationNotificationManager @Inject constructor( - private val bindEventManager: BindEventManager, - private val notificationGroupManager: NotificationGroupManagerLegacy, + bindEventManager: BindEventManager, private val context: Context, private val notifCollection: CommonNotifCollection, - private val featureFlags: NotifPipelineFlags, @Main private val mainHandler: Handler ) { // Need this state to be thread safe, since it's accessed from the ui thread @@ -172,12 +169,10 @@ class ConversationNotificationManager @Inject constructor( layout.setIsImportantConversation(important, false) } } - if (changed && !featureFlags.isNewPipelineEnabled()) { - notificationGroupManager.updateIsolation(entry) - } } } } + fun onEntryViewBound(entry: NotificationEntry) { if (!entry.ranking.isConversation) { return diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java index d99b5f9df12a..2c85fddc2905 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java @@ -578,12 +578,10 @@ public class NotifCollection implements Dumpable { // TODO: (b/145659174) update the sbn's overrideGroupKey in // NotificationEntry.setRanking instead of here once we fully migrate to the // NewNotifPipeline - if (mNotifPipelineFlags.isNewPipelineEnabled()) { - final String newOverrideGroupKey = ranking.getOverrideGroupKey(); - if (!Objects.equals(entry.getSbn().getOverrideGroupKey(), - newOverrideGroupKey)) { - entry.getSbn().setOverrideGroupKey(newOverrideGroupKey); - } + final String newOverrideGroupKey = ranking.getOverrideGroupKey(); + if (!Objects.equals(entry.getSbn().getOverrideGroupKey(), + newOverrideGroupKey)) { + entry.getSbn().setOverrideGroupKey(newOverrideGroupKey); } } else { if (currentEntriesWithoutRankings == null) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipeline.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipeline.kt index e3ee8139d71c..a57440c95271 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipeline.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipeline.kt @@ -76,7 +76,6 @@ import javax.inject.Inject */ @SysUISingleton class NotifPipeline @Inject constructor( - notifPipelineFlags: NotifPipelineFlags, private val mNotifCollection: NotifCollection, private val mShadeListBuilder: ShadeListBuilder, private val mRenderStageManager: RenderStageManager @@ -107,8 +106,6 @@ class NotifPipeline @Inject constructor( return mNotifCollection.getEntry(key) } - val isNewPipelineEnabled: Boolean = notifPipelineFlags.isNewPipelineEnabled() - /** * Registers a lifetime extender. Lifetime extenders can cause notifications that have been * dismissed or retracted by system server to be temporarily retained in the collection. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java index b923fdfe6be8..7293953eb8d3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java @@ -127,14 +127,6 @@ public class BubbleCoordinator implements Coordinator { DismissedByUserStats dismissedByUserStats, int reason ) { - if (!mNotifPipeline.isNewPipelineEnabled()) { - // The `entry` will be from whichever pipeline is active, so if the old pipeline is - // running, make sure that we use the new pipeline's entry (if it still exists). - NotificationEntry newPipelineEntry = mNotifPipeline.getEntry(entry.getKey()); - if (newPipelineEntry != null) { - entry = newPipelineEntry; - } - } if (isInterceptingDismissal(entry)) { mInterceptedDismissalEntries.remove(entry.getKey()); mOnEndDismissInterception.onEndDismissInterception(mDismissInterceptor, entry, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt index 359e2028d9f3..891e25ef6c25 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt @@ -72,9 +72,7 @@ class NotifCoordinatorsImpl @Inject constructor( // pipeline, such as this DataStoreCoordinator which cannot be removed, as it's a critical // glue between the pipeline and parts of SystemUI which depend on pipeline output via the // NotifLiveDataStore. - if (notifPipelineFlags.isNewPipelineEnabled()) { - mCoordinators.add(dataStoreCoordinator) - } + mCoordinators.add(dataStoreCoordinator) // Attach normal coordinators. mCoordinators.add(hideLocallyDismissedNotifsCoordinator) @@ -97,18 +95,14 @@ class NotifCoordinatorsImpl @Inject constructor( if (notifPipelineFlags.isSmartspaceDedupingEnabled()) { mCoordinators.add(smartspaceDedupingCoordinator) } - if (notifPipelineFlags.isNewPipelineEnabled()) { - mCoordinators.add(headsUpCoordinator) - mCoordinators.add(gutsCoordinator) - mCoordinators.add(preparationCoordinator) - mCoordinators.add(remoteInputCoordinator) - } + mCoordinators.add(headsUpCoordinator) + mCoordinators.add(gutsCoordinator) + mCoordinators.add(preparationCoordinator) + mCoordinators.add(remoteInputCoordinator) // Manually add Ordered Sections // HeadsUp > FGS > People > Alerting > Silent > Minimized > Unknown/Default - if (notifPipelineFlags.isNewPipelineEnabled()) { - mOrderedSections.add(headsUpCoordinator.sectioner) // HeadsUp - } + mOrderedSections.add(headsUpCoordinator.sectioner) mOrderedSections.add(appOpsCoordinator.sectioner) // ForegroundService mOrderedSections.add(conversationCoordinator.sectioner) // People mOrderedSections.add(rankingCoordinator.alertingSectioner) // Alerting diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SmartspaceDedupingCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SmartspaceDedupingCoordinator.kt index 48f00ac4bf55..ce361ea88bdc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SmartspaceDedupingCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SmartspaceDedupingCoordinator.kt @@ -65,13 +65,6 @@ class SmartspaceDedupingCoordinator @Inject constructor( statusBarStateController.addCallback(statusBarStateListener) smartspaceController.addListener(this::onNewSmartspaceTargets) - if (!pipeline.isNewPipelineEnabled) { - // TODO (b/173126564): Remove this once the old pipeline is no longer necessary - notificationLockscreenUserManager.addKeyguardNotificationSuppressor { entry -> - isDupedWithSmartspaceContent(entry) - } - } - recordStatusBarState(statusBarStateController.state) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt index bae16fe835f1..5a281b130347 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt @@ -70,11 +70,9 @@ class ViewConfigCoordinator @Inject internal constructor( override fun attach(pipeline: NotifPipeline) { mPipeline = pipeline - if (pipeline.isNewPipelineEnabled) { - mLockscreenUserManager.addUserChangedListener(mUserChangedListener) - mConfigurationController.addCallback(this) - mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateCallback) - } + mLockscreenUserManager.addUserChangedListener(mUserChangedListener) + mConfigurationController.addCallback(this) + mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateCallback) } override fun onDensityOrFontScaleChanged() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java index 70b11569f50b..24ef5808b2e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java @@ -22,7 +22,6 @@ import com.android.systemui.Dumpable; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dump.DumpManager; import com.android.systemui.statusbar.NotificationListener; -import com.android.systemui.statusbar.notification.NotifPipelineFlags; import com.android.systemui.statusbar.notification.collection.NotifCollection; import com.android.systemui.statusbar.notification.collection.NotifInflaterImpl; import com.android.systemui.statusbar.notification.collection.NotifPipeline; @@ -53,7 +52,6 @@ public class NotifPipelineInitializer implements Dumpable { private final NotifInflaterImpl mNotifInflater; private final DumpManager mDumpManager; private final ShadeViewManagerFactory mShadeViewManagerFactory; - private final NotifPipelineFlags mNotifPipelineFlags; @Inject @@ -66,8 +64,7 @@ public class NotifPipelineInitializer implements Dumpable { NotifCoordinators notifCoordinators, NotifInflaterImpl notifInflater, DumpManager dumpManager, - ShadeViewManagerFactory shadeViewManagerFactory, - NotifPipelineFlags notifPipelineFlags + ShadeViewManagerFactory shadeViewManagerFactory ) { mPipelineWrapper = pipelineWrapper; mGroupCoalescer = groupCoalescer; @@ -78,7 +75,6 @@ public class NotifPipelineInitializer implements Dumpable { mDumpManager = dumpManager; mNotifInflater = notifInflater; mShadeViewManagerFactory = shadeViewManagerFactory; - mNotifPipelineFlags = notifPipelineFlags; } /** Hooks the new pipeline up to NotificationManager */ @@ -91,26 +87,22 @@ public class NotifPipelineInitializer implements Dumpable { mDumpManager.registerDumpable("NotifPipeline", this); // Setup inflation - if (mNotifPipelineFlags.isNewPipelineEnabled()) { - mNotifInflater.setRowBinder(rowBinder); - } + mNotifInflater.setRowBinder(rowBinder); // Wire up coordinators mNotifPluggableCoordinators.attach(mPipelineWrapper); // Wire up pipeline - if (mNotifPipelineFlags.isNewPipelineEnabled()) { - mShadeViewManagerFactory - .create(listContainer, stackController) - .attach(mRenderStageManager); - } + mShadeViewManagerFactory + .create(listContainer, stackController) + .attach(mRenderStageManager); mRenderStageManager.attach(mListBuilder); mListBuilder.attach(mNotifCollection); mNotifCollection.attach(mGroupCoalescer); mGroupCoalescer.attach(notificationService); Log.d(TAG, "Notif pipeline initialized." - + " rendering=" + mNotifPipelineFlags.isNewPipelineEnabled()); + + " rendering=" + true); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java index c9c7fe9e0ab6..27a7cd779405 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java @@ -226,10 +226,8 @@ public interface NotificationsModule { static NotificationLogger provideNotificationLogger( NotificationListener notificationListener, @UiBackground Executor uiBgExecutor, - NotifPipelineFlags notifPipelineFlags, NotifLiveDataStore notifLiveDataStore, NotificationVisibilityProvider visibilityProvider, - NotificationEntryManager entryManager, NotifPipeline notifPipeline, StatusBarStateController statusBarStateController, NotificationLogger.ExpansionStateLogger expansionStateLogger, @@ -237,10 +235,8 @@ public interface NotificationsModule { return new NotificationLogger( notificationListener, uiBgExecutor, - notifPipelineFlags, notifLiveDataStore, visibilityProvider, - entryManager, notifPipeline, statusBarStateController, expansionStateLogger, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt index 11ffde625798..0e9f1cda73fe 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt @@ -23,31 +23,22 @@ import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.Snoo import com.android.systemui.statusbar.NotificationListener import com.android.systemui.statusbar.NotificationPresenter import com.android.systemui.statusbar.notification.AnimatedImageNotificationManager -import com.android.systemui.statusbar.notification.NotifPipelineFlags import com.android.systemui.statusbar.notification.NotificationActivityStarter import com.android.systemui.statusbar.notification.NotificationClicker import com.android.systemui.statusbar.notification.NotificationEntryManager import com.android.systemui.statusbar.notification.NotificationListController import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore import com.android.systemui.statusbar.notification.collection.NotifPipeline -import com.android.systemui.statusbar.notification.collection.NotificationRankingManager import com.android.systemui.statusbar.notification.collection.TargetSdkResolver -import com.android.systemui.statusbar.notification.collection.inflation.BindEventManagerImpl import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl import com.android.systemui.statusbar.notification.collection.init.NotifPipelineInitializer -import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection -import com.android.systemui.statusbar.notification.collection.provider.DebugModeFilterProvider import com.android.systemui.statusbar.notification.collection.render.NotifStackController -import com.android.systemui.statusbar.notification.interruption.HeadsUpController import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder import com.android.systemui.statusbar.notification.row.NotifBindPipelineInitializer import com.android.systemui.statusbar.notification.stack.NotificationListContainer import com.android.systemui.statusbar.phone.CentralSurfaces -import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper import com.android.systemui.statusbar.policy.DeviceProvisionedController -import com.android.systemui.statusbar.policy.HeadsUpManager -import com.android.systemui.statusbar.policy.RemoteInputUriController import com.android.wm.shell.bubbles.Bubbles import dagger.Lazy import java.io.PrintWriter @@ -64,30 +55,21 @@ import javax.inject.Inject @SysUISingleton class NotificationsControllerImpl @Inject constructor( private val centralSurfaces: Lazy<CentralSurfaces>, - private val notifPipelineFlags: NotifPipelineFlags, private val notificationListener: NotificationListener, private val entryManager: NotificationEntryManager, - private val debugModeFilterProvider: DebugModeFilterProvider, - private val legacyRanker: NotificationRankingManager, private val commonNotifCollection: Lazy<CommonNotifCollection>, private val notifPipeline: Lazy<NotifPipeline>, private val notifLiveDataStore: NotifLiveDataStore, private val targetSdkResolver: TargetSdkResolver, - private val newNotifPipelineInitializer: Lazy<NotifPipelineInitializer>, + private val notifPipelineInitializer: Lazy<NotifPipelineInitializer>, private val notifBindPipelineInitializer: NotifBindPipelineInitializer, private val deviceProvisionedController: DeviceProvisionedController, private val notificationRowBinder: NotificationRowBinderImpl, - private val bindEventManagerImpl: BindEventManagerImpl, - private val remoteInputUriController: RemoteInputUriController, - private val groupManagerLegacy: Lazy<NotificationGroupManagerLegacy>, - private val groupAlertTransferHelper: NotificationGroupAlertTransferHelper, - private val headsUpManager: HeadsUpManager, - private val headsUpController: HeadsUpController, private val headsUpViewBinder: HeadsUpViewBinder, private val clickerBuilder: NotificationClicker.Builder, private val animatedImageNotificationManager: AnimatedImageNotificationManager, private val peopleSpaceWidgetManager: PeopleSpaceWidgetManager, - private val bubblesOptional: Optional<Bubbles> + private val bubblesOptional: Optional<Bubbles>, ) : NotificationsController { override fun initialize( @@ -118,33 +100,13 @@ class NotificationsControllerImpl @Inject constructor( notifBindPipelineInitializer.initialize() animatedImageNotificationManager.bind() - if (INITIALIZE_NEW_PIPELINE) { - newNotifPipelineInitializer.get().initialize( - notificationListener, - notificationRowBinder, - listContainer, - stackController) - } + notifPipelineInitializer.get().initialize( + notificationListener, + notificationRowBinder, + listContainer, + stackController) - if (notifPipelineFlags.isNewPipelineEnabled()) { - targetSdkResolver.initialize(notifPipeline.get()) - // TODO - } else { - targetSdkResolver.initialize(entryManager) - remoteInputUriController.attach(entryManager) - groupAlertTransferHelper.bind(entryManager, groupManagerLegacy.get()) - bindEventManagerImpl.attachToLegacyPipeline(entryManager) - headsUpManager.addListener(groupManagerLegacy.get()) - headsUpManager.addListener(groupAlertTransferHelper) - headsUpController.attach(entryManager, headsUpManager) - groupManagerLegacy.get().setHeadsUpManager(headsUpManager) - groupAlertTransferHelper.setHeadsUpManager(headsUpManager) - debugModeFilterProvider.registerInvalidationListener { - entryManager.updateNotifications("debug mode filter changed") - } - - entryManager.initialize(notificationListener, legacyRanker) - } + targetSdkResolver.initialize(notifPipeline.get()) peopleSpaceWidgetManager.attach(notificationListener) } @@ -185,9 +147,4 @@ class NotificationsControllerImpl @Inject constructor( override fun getActiveNotificationsCount(): Int = notifLiveDataStore.activeNotifCount.value - - companion object { - // NOTE: The new pipeline is always active, even if the old pipeline is *rendering*. - private const val INITIALIZE_NEW_PIPELINE = true - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java index 8378b69bee9a..2dd95a3cbab8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java @@ -294,11 +294,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter * @return true if these checks pass, false if the notification should not alert */ private boolean canAlertCommon(NotificationEntry entry) { - if (!mFlags.isNewPipelineEnabled() && mNotificationFilter.shouldFilterOut(entry)) { - mLogger.logNoAlertingFilteredOut(entry); - return false; - } - for (int i = 0; i < mSuppressors.size(); i++) { if (mSuppressors.get(i).suppressInterruptions(entry)) { mLogger.logNoAlertingSuppressedBy(entry, mSuppressors.get(i), /* awake */ false); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java index 9fbd5c39dedd..639187790ae0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java @@ -22,7 +22,6 @@ import android.os.ServiceManager; import android.os.SystemClock; import android.os.Trace; import android.service.notification.NotificationListenerService; -import android.service.notification.StatusBarNotification; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; @@ -39,9 +38,6 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.StatusBarState; -import com.android.systemui.statusbar.notification.NotifPipelineFlags; -import com.android.systemui.statusbar.notification.NotificationEntryListener; -import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore; import com.android.systemui.statusbar.notification.collection.NotifPipeline; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -80,7 +76,6 @@ public class NotificationLogger implements StateListener { private final Executor mUiBgExecutor; private final NotifLiveDataStore mNotifLiveDataStore; private final NotificationVisibilityProvider mVisibilityProvider; - private final NotificationEntryManager mEntryManager; private final NotifPipeline mNotifPipeline; private final NotificationPanelLogger mNotificationPanelLogger; private final ExpansionStateLogger mExpansionStateLogger; @@ -220,10 +215,8 @@ public class NotificationLogger implements StateListener { */ public NotificationLogger(NotificationListener notificationListener, @UiBackground Executor uiBgExecutor, - NotifPipelineFlags notifPipelineFlags, NotifLiveDataStore notifLiveDataStore, NotificationVisibilityProvider visibilityProvider, - NotificationEntryManager entryManager, NotifPipeline notifPipeline, StatusBarStateController statusBarStateController, ExpansionStateLogger expansionStateLogger, @@ -232,7 +225,6 @@ public class NotificationLogger implements StateListener { mUiBgExecutor = uiBgExecutor; mNotifLiveDataStore = notifLiveDataStore; mVisibilityProvider = visibilityProvider; - mEntryManager = entryManager; mNotifPipeline = notifPipeline; mBarService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); @@ -241,36 +233,7 @@ public class NotificationLogger implements StateListener { // Not expected to be destroyed, don't need to unsubscribe statusBarStateController.addCallback(this); - if (notifPipelineFlags.isNewPipelineEnabled()) { - registerNewPipelineListener(); - } else { - registerLegacyListener(); - } - } - - private void registerLegacyListener() { - mEntryManager.addNotificationEntryListener(new NotificationEntryListener() { - @Override - public void onEntryRemoved( - NotificationEntry entry, - NotificationVisibility visibility, - boolean removedByUser, - int reason) { - mExpansionStateLogger.onEntryRemoved(entry.getKey()); - } - - @Override - public void onPreEntryUpdated(NotificationEntry entry) { - mExpansionStateLogger.onEntryUpdated(entry.getKey()); - } - - @Override - public void onInflationError( - StatusBarNotification notification, - Exception exception) { - logNotificationError(notification, exception); - } - }); + registerNewPipelineListener(); } private void registerNewPipelineListener() { @@ -333,26 +296,6 @@ public class NotificationLogger implements StateListener { } } - /** - * Logs Notification inflation error - */ - private void logNotificationError( - StatusBarNotification notification, - Exception exception) { - try { - mBarService.onNotificationError( - notification.getPackageName(), - notification.getTag(), - notification.getId(), - notification.getUid(), - notification.getInitialPid(), - exception.getMessage(), - notification.getUserId()); - } catch (RemoteException ex) { - // The end is nigh. - } - } - private void logNotificationVisibilityChanges( Collection<NotificationVisibility> newlyVisible, Collection<NotificationVisibility> noLongerVisible) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java index 2c22bc68c198..d25bbbd2a591 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java @@ -427,12 +427,6 @@ public interface CentralSurfaces extends Dumpable, ActivityStarter, LifecycleOwn void onHintFinished(); - void onCameraHintStarted(); - - void onVoiceAssistHintStarted(); - - void onPhoneHintStarted(); - void onTrackingStopped(boolean expand); // TODO: Figure out way to remove these. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java index 9060d5f67913..cb9afe887ab7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java @@ -45,6 +45,7 @@ import android.view.WindowInsetsController.Behavior; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.view.AppearanceRegion; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.R; @@ -388,8 +389,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba if (mStatusBarKeyguardViewManager.isBouncerShowing()) { mStatusBarKeyguardViewManager.reset(true /* hide */); } - mNotificationPanelViewController.launchCamera( - mCentralSurfaces.isDeviceInteractive() /* animate */, source); + mNotificationPanelViewController.launchCamera(source); mCentralSurfaces.updateScrimController(); } else { // We need to defer the camera launch until the screen comes on, since otherwise @@ -464,7 +464,8 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba @Override public void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, - @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName) { + @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName, + LetterboxDetails[] letterboxDetails) { if (displayId != mDisplayId) { return; } 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 5181af773d9a..2daa4759457d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -139,6 +139,7 @@ import com.android.systemui.assist.AssistManager; import com.android.systemui.biometrics.AuthRippleController; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.camera.CameraIntents; +import com.android.systemui.charging.WiredChargingRippleController; import com.android.systemui.charging.WirelessChargingAnimation; import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.colorextraction.SysuiColorExtractor; @@ -197,7 +198,6 @@ import com.android.systemui.statusbar.PowerButtonReveal; import com.android.systemui.statusbar.PulseExpansionHandler; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.SysuiStatusBarStateController; -import com.android.systemui.statusbar.charging.WiredChargingRippleController; import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.statusbar.core.StatusBarInitializer; import com.android.systemui.statusbar.notification.DynamicPrivacyController; @@ -974,7 +974,7 @@ public class CentralSurfacesImpl extends CoreStartable implements } mCommandQueueCallbacks.onSystemBarAttributesChanged(mDisplayId, result.mAppearance, result.mAppearanceRegions, result.mNavbarColorManagedByIme, result.mBehavior, - result.mRequestedVisibilities, result.mPackageName); + result.mRequestedVisibilities, result.mPackageName, result.mLetterboxDetails); // StatusBarManagerService has a back up of IME token and it's restored here. mCommandQueueCallbacks.setImeWindowStatus(mDisplayId, result.mImeToken, @@ -1285,8 +1285,6 @@ public class CentralSurfacesImpl extends CoreStartable implements backdrop.setScaleY(scale); }); - mNotificationPanelViewController.setUserSetupComplete(mUserSetup); - // Set up the quick settings tile panel final View container = mNotificationShadeWindowView.findViewById(R.id.qs_frame); if (container != null) { @@ -1761,6 +1759,7 @@ public class CentralSurfacesImpl extends CoreStartable implements // activity is exited. if (mKeyguardStateController.isShowing() && !mKeyguardStateController.isKeyguardGoingAway()) { + Log.d(TAG, "Setting occluded = true in #startActivity."); mKeyguardViewMediator.setOccluded(true /* isOccluded */, true /* animate */); } @@ -3024,8 +3023,7 @@ public class CentralSurfacesImpl extends CoreStartable implements @Override public boolean isInLaunchTransition() { - return mNotificationPanelViewController.isLaunchTransitionRunning() - || mNotificationPanelViewController.isLaunchTransitionFinished(); + return mNotificationPanelViewController.isLaunchTransitionFinished(); } /** @@ -3057,11 +3055,7 @@ public class CentralSurfacesImpl extends CoreStartable implements mCommandQueue.appTransitionStarting(mDisplayId, SystemClock.uptimeMillis(), LightBarTransitionsController.DEFAULT_TINT_ANIMATION_DURATION, true); }; - if (mNotificationPanelViewController.isLaunchTransitionRunning()) { - mNotificationPanelViewController.setLaunchTransitionEndRunnable(hideRunnable); - } else { - hideRunnable.run(); - } + hideRunnable.run(); } private void cancelAfterLaunchTransitionRunnables() { @@ -3070,7 +3064,6 @@ public class CentralSurfacesImpl extends CoreStartable implements } mLaunchTransitionEndRunnable = null; mLaunchTransitionCancelRunnable = null; - mNotificationPanelViewController.setLaunchTransitionEndRunnable(null); } /** @@ -3499,24 +3492,6 @@ public class CentralSurfacesImpl extends CoreStartable implements } @Override - public void onCameraHintStarted() { - mFalsingCollector.onCameraHintStarted(); - mKeyguardIndicationController.showTransientIndication(R.string.camera_hint); - } - - @Override - public void onVoiceAssistHintStarted() { - mFalsingCollector.onLeftAffordanceHintStarted(); - mKeyguardIndicationController.showTransientIndication(R.string.voice_hint); - } - - @Override - public void onPhoneHintStarted() { - mFalsingCollector.onLeftAffordanceHintStarted(); - mKeyguardIndicationController.showTransientIndication(R.string.phone_hint); - } - - @Override public void onTrackingStopped(boolean expand) { } @@ -3700,8 +3675,7 @@ public class CentralSurfacesImpl extends CoreStartable implements mWakeUpCoordinator.setFullyAwake(true); mWakeUpCoordinator.setWakingUp(false); if (mLaunchCameraWhenFinishedWaking) { - mNotificationPanelViewController.launchCamera( - false /* animate */, mLastCameraLaunchSource); + mNotificationPanelViewController.launchCamera(mLastCameraLaunchSource); mLaunchCameraWhenFinishedWaking = false; } if (mLaunchEmergencyActionWhenFinishedWaking) { @@ -4343,9 +4317,6 @@ public class CentralSurfacesImpl extends CoreStartable implements if (!mUserSetup) { animateCollapseQuickSettings(); } - if (mNotificationPanelViewController != null) { - mNotificationPanelViewController.setUserSetupComplete(mUserSetup); - } updateQsExpansionEnabled(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java deleted file mode 100644 index 2922b4c98d34..000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java +++ /dev/null @@ -1,587 +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 android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.ValueAnimator; -import android.content.Context; -import android.view.MotionEvent; -import android.view.VelocityTracker; -import android.view.View; -import android.view.ViewConfiguration; - -import com.android.systemui.R; -import com.android.systemui.animation.Interpolators; -import com.android.systemui.classifier.Classifier; -import com.android.systemui.plugins.FalsingManager; -import com.android.systemui.statusbar.KeyguardAffordanceView; -import com.android.wm.shell.animation.FlingAnimationUtils; - -/** - * A touch handler of the keyguard which is responsible for launching phone and camera affordances. - */ -public class KeyguardAffordanceHelper { - - public static final long HINT_PHASE1_DURATION = 200; - private static final long HINT_PHASE2_DURATION = 350; - private static final float BACKGROUND_RADIUS_SCALE_FACTOR = 0.25f; - private static final int HINT_CIRCLE_OPEN_DURATION = 500; - - private final Context mContext; - private final Callback mCallback; - - private FlingAnimationUtils mFlingAnimationUtils; - private VelocityTracker mVelocityTracker; - private boolean mSwipingInProgress; - private float mInitialTouchX; - private float mInitialTouchY; - private float mTranslation; - private float mTranslationOnDown; - private int mTouchSlop; - private int mMinTranslationAmount; - private int mMinFlingVelocity; - private int mHintGrowAmount; - private KeyguardAffordanceView mLeftIcon; - private KeyguardAffordanceView mRightIcon; - private Animator mSwipeAnimator; - private final FalsingManager mFalsingManager; - private int mMinBackgroundRadius; - private boolean mMotionCancelled; - private int mTouchTargetSize; - private View mTargetedView; - private boolean mTouchSlopExeeded; - private AnimatorListenerAdapter mFlingEndListener = new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mSwipeAnimator = null; - mSwipingInProgress = false; - mTargetedView = null; - } - }; - private Runnable mAnimationEndRunnable = new Runnable() { - @Override - public void run() { - mCallback.onAnimationToSideEnded(); - } - }; - - KeyguardAffordanceHelper(Callback callback, Context context, FalsingManager falsingManager) { - mContext = context; - mCallback = callback; - initIcons(); - updateIcon(mLeftIcon, 0.0f, mLeftIcon.getRestingAlpha(), false, false, true, false); - updateIcon(mRightIcon, 0.0f, mRightIcon.getRestingAlpha(), false, false, true, false); - mFalsingManager = falsingManager; - initDimens(); - } - - private void initDimens() { - final ViewConfiguration configuration = ViewConfiguration.get(mContext); - mTouchSlop = configuration.getScaledPagingTouchSlop(); - mMinFlingVelocity = configuration.getScaledMinimumFlingVelocity(); - mMinTranslationAmount = mContext.getResources().getDimensionPixelSize( - R.dimen.keyguard_min_swipe_amount); - mMinBackgroundRadius = mContext.getResources().getDimensionPixelSize( - R.dimen.keyguard_affordance_min_background_radius); - mTouchTargetSize = mContext.getResources().getDimensionPixelSize( - R.dimen.keyguard_affordance_touch_target_size); - mHintGrowAmount = - mContext.getResources().getDimensionPixelSize(R.dimen.hint_grow_amount_sideways); - mFlingAnimationUtils = new FlingAnimationUtils(mContext.getResources().getDisplayMetrics(), - 0.4f); - } - - private void initIcons() { - mLeftIcon = mCallback.getLeftIcon(); - mRightIcon = mCallback.getRightIcon(); - updatePreviews(); - } - - public void updatePreviews() { - mLeftIcon.setPreviewView(mCallback.getLeftPreview()); - mRightIcon.setPreviewView(mCallback.getRightPreview()); - } - - public boolean onTouchEvent(MotionEvent event) { - int action = event.getActionMasked(); - if (mMotionCancelled && action != MotionEvent.ACTION_DOWN) { - return false; - } - final float y = event.getY(); - final float x = event.getX(); - - boolean isUp = false; - switch (action) { - case MotionEvent.ACTION_DOWN: - View targetView = getIconAtPosition(x, y); - if (targetView == null || (mTargetedView != null && mTargetedView != targetView)) { - mMotionCancelled = true; - return false; - } - if (mTargetedView != null) { - cancelAnimation(); - } else { - mTouchSlopExeeded = false; - } - startSwiping(targetView); - mInitialTouchX = x; - mInitialTouchY = y; - mTranslationOnDown = mTranslation; - initVelocityTracker(); - trackMovement(event); - mMotionCancelled = false; - break; - case MotionEvent.ACTION_POINTER_DOWN: - mMotionCancelled = true; - endMotion(true /* forceSnapBack */, x, y); - break; - case MotionEvent.ACTION_MOVE: - trackMovement(event); - float xDist = x - mInitialTouchX; - float yDist = y - mInitialTouchY; - float distance = (float) Math.hypot(xDist, yDist); - if (!mTouchSlopExeeded && distance > mTouchSlop) { - mTouchSlopExeeded = true; - } - if (mSwipingInProgress) { - if (mTargetedView == mRightIcon) { - distance = mTranslationOnDown - distance; - distance = Math.min(0, distance); - } else { - distance = mTranslationOnDown + distance; - distance = Math.max(0, distance); - } - setTranslation(distance, false /* isReset */, false /* animateReset */); - } - break; - - case MotionEvent.ACTION_UP: - isUp = true; - case MotionEvent.ACTION_CANCEL: - boolean hintOnTheRight = mTargetedView == mRightIcon; - trackMovement(event); - endMotion(!isUp, x, y); - if (!mTouchSlopExeeded && isUp) { - mCallback.onIconClicked(hintOnTheRight); - } - break; - } - return true; - } - - private void startSwiping(View targetView) { - mCallback.onSwipingStarted(targetView == mRightIcon); - mSwipingInProgress = true; - mTargetedView = targetView; - } - - private View getIconAtPosition(float x, float y) { - if (leftSwipePossible() && isOnIcon(mLeftIcon, x, y)) { - return mLeftIcon; - } - if (rightSwipePossible() && isOnIcon(mRightIcon, x, y)) { - return mRightIcon; - } - return null; - } - - public boolean isOnAffordanceIcon(float x, float y) { - return isOnIcon(mLeftIcon, x, y) || isOnIcon(mRightIcon, x, y); - } - - private boolean isOnIcon(View icon, float x, float y) { - float iconX = icon.getX() + icon.getWidth() / 2.0f; - float iconY = icon.getY() + icon.getHeight() / 2.0f; - double distance = Math.hypot(x - iconX, y - iconY); - return distance <= mTouchTargetSize / 2; - } - - private void endMotion(boolean forceSnapBack, float lastX, float lastY) { - if (mSwipingInProgress) { - flingWithCurrentVelocity(forceSnapBack, lastX, lastY); - } else { - mTargetedView = null; - } - if (mVelocityTracker != null) { - mVelocityTracker.recycle(); - mVelocityTracker = null; - } - } - - private boolean rightSwipePossible() { - return mRightIcon.getVisibility() == View.VISIBLE; - } - - private boolean leftSwipePossible() { - return mLeftIcon.getVisibility() == View.VISIBLE; - } - - public boolean onInterceptTouchEvent(MotionEvent ev) { - return false; - } - - public void startHintAnimation(boolean right, - Runnable onFinishedListener) { - cancelAnimation(); - startHintAnimationPhase1(right, onFinishedListener); - } - - private void startHintAnimationPhase1(final boolean right, final Runnable onFinishedListener) { - final KeyguardAffordanceView targetView = right ? mRightIcon : mLeftIcon; - ValueAnimator animator = getAnimatorToRadius(right, mHintGrowAmount); - animator.addListener(new AnimatorListenerAdapter() { - private boolean mCancelled; - - @Override - public void onAnimationCancel(Animator animation) { - mCancelled = true; - } - - @Override - public void onAnimationEnd(Animator animation) { - if (mCancelled) { - mSwipeAnimator = null; - mTargetedView = null; - onFinishedListener.run(); - } else { - startUnlockHintAnimationPhase2(right, onFinishedListener); - } - } - }); - animator.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN); - animator.setDuration(HINT_PHASE1_DURATION); - animator.start(); - mSwipeAnimator = animator; - mTargetedView = targetView; - } - - /** - * Phase 2: Move back. - */ - private void startUnlockHintAnimationPhase2(boolean right, final Runnable onFinishedListener) { - ValueAnimator animator = getAnimatorToRadius(right, 0); - animator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mSwipeAnimator = null; - mTargetedView = null; - onFinishedListener.run(); - } - }); - animator.setInterpolator(Interpolators.FAST_OUT_LINEAR_IN); - animator.setDuration(HINT_PHASE2_DURATION); - animator.setStartDelay(HINT_CIRCLE_OPEN_DURATION); - animator.start(); - mSwipeAnimator = animator; - } - - private ValueAnimator getAnimatorToRadius(final boolean right, int radius) { - final KeyguardAffordanceView targetView = right ? mRightIcon : mLeftIcon; - ValueAnimator animator = ValueAnimator.ofFloat(targetView.getCircleRadius(), radius); - animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - float newRadius = (float) animation.getAnimatedValue(); - targetView.setCircleRadiusWithoutAnimation(newRadius); - float translation = getTranslationFromRadius(newRadius); - mTranslation = right ? -translation : translation; - updateIconsFromTranslation(targetView); - } - }); - return animator; - } - - private void cancelAnimation() { - if (mSwipeAnimator != null) { - mSwipeAnimator.cancel(); - } - } - - private void flingWithCurrentVelocity(boolean forceSnapBack, float lastX, float lastY) { - float vel = getCurrentVelocity(lastX, lastY); - - // We snap back if the current translation is not far enough - boolean snapBack = false; - if (mCallback.needsAntiFalsing()) { - snapBack = snapBack || mFalsingManager.isFalseTouch( - mTargetedView == mRightIcon - ? Classifier.RIGHT_AFFORDANCE : Classifier.LEFT_AFFORDANCE); - } - snapBack = snapBack || isBelowFalsingThreshold(); - - // or if the velocity is in the opposite direction. - boolean velIsInWrongDirection = vel * mTranslation < 0; - snapBack |= Math.abs(vel) > mMinFlingVelocity && velIsInWrongDirection; - vel = snapBack ^ velIsInWrongDirection ? 0 : vel; - fling(vel, snapBack || forceSnapBack, mTranslation < 0); - } - - private boolean isBelowFalsingThreshold() { - return Math.abs(mTranslation) < Math.abs(mTranslationOnDown) + getMinTranslationAmount(); - } - - private int getMinTranslationAmount() { - float factor = mCallback.getAffordanceFalsingFactor(); - return (int) (mMinTranslationAmount * factor); - } - - private void fling(float vel, final boolean snapBack, boolean right) { - float target = right ? -mCallback.getMaxTranslationDistance() - : mCallback.getMaxTranslationDistance(); - target = snapBack ? 0 : target; - - ValueAnimator animator = ValueAnimator.ofFloat(mTranslation, target); - mFlingAnimationUtils.apply(animator, mTranslation, target, vel); - animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - mTranslation = (float) animation.getAnimatedValue(); - } - }); - animator.addListener(mFlingEndListener); - if (!snapBack) { - startFinishingCircleAnimation(vel * 0.375f, mAnimationEndRunnable, right); - mCallback.onAnimationToSideStarted(right, mTranslation, vel); - } else { - reset(true); - } - animator.start(); - mSwipeAnimator = animator; - if (snapBack) { - mCallback.onSwipingAborted(); - } - } - - private void startFinishingCircleAnimation(float velocity, Runnable animationEndRunnable, - boolean right) { - KeyguardAffordanceView targetView = right ? mRightIcon : mLeftIcon; - targetView.finishAnimation(velocity, animationEndRunnable); - } - - private void setTranslation(float translation, boolean isReset, boolean animateReset) { - translation = rightSwipePossible() ? translation : Math.max(0, translation); - translation = leftSwipePossible() ? translation : Math.min(0, translation); - float absTranslation = Math.abs(translation); - if (translation != mTranslation || isReset) { - KeyguardAffordanceView targetView = translation > 0 ? mLeftIcon : mRightIcon; - KeyguardAffordanceView otherView = translation > 0 ? mRightIcon : mLeftIcon; - float alpha = absTranslation / getMinTranslationAmount(); - - // We interpolate the alpha of the other icons to 0 - float fadeOutAlpha = 1.0f - alpha; - fadeOutAlpha = Math.max(fadeOutAlpha, 0.0f); - - boolean animateIcons = isReset && animateReset; - boolean forceNoCircleAnimation = isReset && !animateReset; - float radius = getRadiusFromTranslation(absTranslation); - boolean slowAnimation = isReset && isBelowFalsingThreshold(); - if (!isReset) { - updateIcon(targetView, radius, alpha + fadeOutAlpha * targetView.getRestingAlpha(), - false, false, false, false); - } else { - updateIcon(targetView, 0.0f, fadeOutAlpha * targetView.getRestingAlpha(), - animateIcons, slowAnimation, true /* isReset */, forceNoCircleAnimation); - } - updateIcon(otherView, 0.0f, fadeOutAlpha * otherView.getRestingAlpha(), - animateIcons, slowAnimation, isReset, forceNoCircleAnimation); - - mTranslation = translation; - } - } - - private void updateIconsFromTranslation(KeyguardAffordanceView targetView) { - float absTranslation = Math.abs(mTranslation); - float alpha = absTranslation / getMinTranslationAmount(); - - // We interpolate the alpha of the other icons to 0 - float fadeOutAlpha = 1.0f - alpha; - fadeOutAlpha = Math.max(0.0f, fadeOutAlpha); - - // We interpolate the alpha of the targetView to 1 - KeyguardAffordanceView otherView = targetView == mRightIcon ? mLeftIcon : mRightIcon; - updateIconAlpha(targetView, alpha + fadeOutAlpha * targetView.getRestingAlpha(), false); - updateIconAlpha(otherView, fadeOutAlpha * otherView.getRestingAlpha(), false); - } - - private float getTranslationFromRadius(float circleSize) { - float translation = (circleSize - mMinBackgroundRadius) - / BACKGROUND_RADIUS_SCALE_FACTOR; - return translation > 0.0f ? translation + mTouchSlop : 0.0f; - } - - private float getRadiusFromTranslation(float translation) { - if (translation <= mTouchSlop) { - return 0.0f; - } - return (translation - mTouchSlop) * BACKGROUND_RADIUS_SCALE_FACTOR + mMinBackgroundRadius; - } - - public void animateHideLeftRightIcon() { - cancelAnimation(); - updateIcon(mRightIcon, 0f, 0f, true, false, false, false); - updateIcon(mLeftIcon, 0f, 0f, true, false, false, false); - } - - private void updateIcon(KeyguardAffordanceView view, float circleRadius, float alpha, - boolean animate, boolean slowRadiusAnimation, boolean force, - boolean forceNoCircleAnimation) { - if (view.getVisibility() != View.VISIBLE && !force) { - return; - } - if (forceNoCircleAnimation) { - view.setCircleRadiusWithoutAnimation(circleRadius); - } else { - view.setCircleRadius(circleRadius, slowRadiusAnimation); - } - updateIconAlpha(view, alpha, animate); - } - - private void updateIconAlpha(KeyguardAffordanceView view, float alpha, boolean animate) { - float scale = getScale(alpha, view); - alpha = Math.min(1.0f, alpha); - view.setImageAlpha(alpha, animate); - view.setImageScale(scale, animate); - } - - private float getScale(float alpha, KeyguardAffordanceView icon) { - float scale = alpha / icon.getRestingAlpha() * 0.2f + - KeyguardAffordanceView.MIN_ICON_SCALE_AMOUNT; - return Math.min(scale, KeyguardAffordanceView.MAX_ICON_SCALE_AMOUNT); - } - - private void trackMovement(MotionEvent event) { - if (mVelocityTracker != null) { - mVelocityTracker.addMovement(event); - } - } - - private void initVelocityTracker() { - if (mVelocityTracker != null) { - mVelocityTracker.recycle(); - } - mVelocityTracker = VelocityTracker.obtain(); - } - - private float getCurrentVelocity(float lastX, float lastY) { - if (mVelocityTracker == null) { - return 0; - } - mVelocityTracker.computeCurrentVelocity(1000); - float aX = mVelocityTracker.getXVelocity(); - float aY = mVelocityTracker.getYVelocity(); - float bX = lastX - mInitialTouchX; - float bY = lastY - mInitialTouchY; - float bLen = (float) Math.hypot(bX, bY); - // Project the velocity onto the distance vector: a * b / |b| - float projectedVelocity = (aX * bX + aY * bY) / bLen; - if (mTargetedView == mRightIcon) { - projectedVelocity = -projectedVelocity; - } - return projectedVelocity; - } - - public void onConfigurationChanged() { - initDimens(); - initIcons(); - } - - public void onRtlPropertiesChanged() { - initIcons(); - } - - public void reset(boolean animate) { - cancelAnimation(); - setTranslation(0.0f, true /* isReset */, animate); - mMotionCancelled = true; - if (mSwipingInProgress) { - mCallback.onSwipingAborted(); - mSwipingInProgress = false; - } - } - - public boolean isSwipingInProgress() { - return mSwipingInProgress; - } - - public void launchAffordance(boolean animate, boolean left) { - if (mSwipingInProgress) { - // We don't want to mess with the state if the user is actually swiping already. - return; - } - KeyguardAffordanceView targetView = left ? mLeftIcon : mRightIcon; - KeyguardAffordanceView otherView = left ? mRightIcon : mLeftIcon; - startSwiping(targetView); - - // Do not animate the circle expanding if the affordance isn't visible, - // otherwise the circle will be meaningless. - if (targetView.getVisibility() != View.VISIBLE) { - animate = false; - } - - if (animate) { - fling(0, false, !left); - updateIcon(otherView, 0.0f, 0, true, false, true, false); - } else { - mCallback.onAnimationToSideStarted(!left, mTranslation, 0); - mTranslation = left ? mCallback.getMaxTranslationDistance() - : mCallback.getMaxTranslationDistance(); - updateIcon(otherView, 0.0f, 0.0f, false, false, true, false); - targetView.instantFinishAnimation(); - mFlingEndListener.onAnimationEnd(null); - mAnimationEndRunnable.run(); - } - } - - public interface Callback { - - /** - * Notifies the callback when an animation to a side page was started. - * - * @param rightPage Is the page animated to the right page? - */ - void onAnimationToSideStarted(boolean rightPage, float translation, float vel); - - /** - * Notifies the callback the animation to a side page has ended. - */ - void onAnimationToSideEnded(); - - float getMaxTranslationDistance(); - - void onSwipingStarted(boolean rightIcon); - - void onSwipingAborted(); - - void onIconClicked(boolean rightIcon); - - KeyguardAffordanceView getLeftIcon(); - - KeyguardAffordanceView getRightIcon(); - - View getLeftPreview(); - - View getRightPreview(); - - /** - * @return The factor the minimum swipe amount should be multiplied with. - */ - float getAffordanceFalsingFactor(); - - boolean needsAntiFalsing(); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 93b2e41e595b..61113a05af16 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -16,47 +16,30 @@ package com.android.systemui.statusbar.phone; -import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK; -import static android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; - import static com.android.systemui.controls.dagger.ControlsComponent.Visibility.AVAILABLE; import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; -import static com.android.systemui.tuner.LockscreenFragment.LOCKSCREEN_LEFT_BUTTON; -import static com.android.systemui.tuner.LockscreenFragment.LOCKSCREEN_LEFT_UNLOCK; -import static com.android.systemui.tuner.LockscreenFragment.LOCKSCREEN_RIGHT_BUTTON; -import static com.android.systemui.tuner.LockscreenFragment.LOCKSCREEN_RIGHT_UNLOCK; import static com.android.systemui.wallet.controller.QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE; import static com.android.systemui.wallet.controller.QuickAccessWalletController.WalletChangeEvent.WALLET_PREFERENCE_CHANGE; -import android.app.ActivityOptions; import android.app.ActivityTaskManager; import android.app.admin.DevicePolicyManager; -import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; import android.content.res.ColorStateList; import android.content.res.Configuration; import android.graphics.drawable.Drawable; -import android.os.AsyncTask; -import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; import android.service.quickaccesswallet.GetWalletCardsError; import android.service.quickaccesswallet.GetWalletCardsResponse; import android.service.quickaccesswallet.QuickAccessWalletClient; -import android.telecom.TelecomManager; -import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; import android.view.WindowInsets; -import android.view.WindowManager; -import android.view.accessibility.AccessibilityNodeInfo; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; @@ -64,81 +47,35 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.widget.LockPatternUtils; -import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.settingslib.Utils; -import com.android.systemui.ActivityIntentHelper; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.animation.Interpolators; -import com.android.systemui.assist.AssistManager; -import com.android.systemui.camera.CameraIntents; -import com.android.systemui.controls.ControlsServiceInfo; import com.android.systemui.controls.dagger.ControlsComponent; import com.android.systemui.controls.management.ControlsListingController; import com.android.systemui.controls.ui.ControlsActivity; import com.android.systemui.controls.ui.ControlsUiController; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.FalsingManager; -import com.android.systemui.plugins.IntentButtonProvider; -import com.android.systemui.plugins.IntentButtonProvider.IntentButton; -import com.android.systemui.plugins.IntentButtonProvider.IntentButton.IconState; import com.android.systemui.qrcodescanner.controller.QRCodeScannerController; -import com.android.systemui.statusbar.KeyguardAffordanceView; -import com.android.systemui.statusbar.policy.AccessibilityController; -import com.android.systemui.statusbar.policy.ExtensionController; -import com.android.systemui.statusbar.policy.ExtensionController.Extension; -import com.android.systemui.statusbar.policy.FlashlightController; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.PreviewInflater; -import com.android.systemui.tuner.LockscreenFragment.LockButtonFactory; -import com.android.systemui.tuner.TunerService; import com.android.systemui.wallet.controller.QuickAccessWalletController; -import java.util.List; - /** * Implementation for the bottom area of the Keyguard, including camera/phone affordance and status * text. */ -public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickListener, - KeyguardStateController.Callback, - AccessibilityController.AccessibilityStateChangedCallback { - - final static String TAG = "CentralSurfaces/KeyguardBottomAreaView"; - - public static final String CAMERA_LAUNCH_SOURCE_AFFORDANCE = "lockscreen_affordance"; - public static final String CAMERA_LAUNCH_SOURCE_WIGGLE = "wiggle_gesture"; - public static final String CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP = "power_double_tap"; - public static final String CAMERA_LAUNCH_SOURCE_LIFT_TRIGGER = "lift_to_launch_ml"; - - public static final String EXTRA_CAMERA_LAUNCH_SOURCE - = "com.android.systemui.camera_launch_source"; - - private static final String LEFT_BUTTON_PLUGIN - = "com.android.systemui.action.PLUGIN_LOCKSCREEN_LEFT_BUTTON"; - private static final String RIGHT_BUTTON_PLUGIN - = "com.android.systemui.action.PLUGIN_LOCKSCREEN_RIGHT_BUTTON"; +public class KeyguardBottomAreaView extends FrameLayout { - private static final Intent PHONE_INTENT = new Intent(Intent.ACTION_DIAL); - private static final int DOZE_ANIMATION_STAGGER_DELAY = 48; + private static final String TAG = "CentralSurfaces/KeyguardBottomAreaView"; private static final int DOZE_ANIMATION_ELEMENT_DURATION = 250; - // TODO(b/179494051): May no longer be needed - private final boolean mShowLeftAffordance; - private final boolean mShowCameraAffordance; - - private KeyguardAffordanceView mRightAffordanceView; - private KeyguardAffordanceView mLeftAffordanceView; - private ImageView mWalletButton; private ImageView mQRCodeScannerButton; private ImageView mControlsButton; private boolean mHasCard = false; - private WalletCardRetriever mCardRetriever = new WalletCardRetriever(); + private final WalletCardRetriever mCardRetriever = new WalletCardRetriever(); private QuickAccessWalletController mQuickAccessWalletController; private QRCodeScannerController mQRCodeScannerController; private ControlsComponent mControlsComponent; @@ -148,54 +85,42 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL private ViewGroup mIndicationArea; private TextView mIndicationText; private TextView mIndicationTextBottom; - private ViewGroup mPreviewContainer; private ViewGroup mOverlayContainer; - private View mLeftPreview; - private View mCameraPreview; - private ActivityStarter mActivityStarter; private KeyguardStateController mKeyguardStateController; - private FlashlightController mFlashlightController; - private PreviewInflater mPreviewInflater; - private AccessibilityController mAccessibilityController; private CentralSurfaces mCentralSurfaces; - private KeyguardAffordanceHelper mAffordanceHelper; private FalsingManager mFalsingManager; - private boolean mUserSetupComplete; - private boolean mLeftIsVoiceAssist; - private Drawable mLeftAssistIcon; - - private IntentButton mRightButton = new DefaultRightButton(); - private Extension<IntentButton> mRightExtension; - private String mRightButtonStr; - private IntentButton mLeftButton = new DefaultLeftButton(); - private Extension<IntentButton> mLeftExtension; - private String mLeftButtonStr; private boolean mDozing; private int mIndicationBottomMargin; private int mIndicationPadding; private float mDarkAmount; private int mBurnInXOffset; private int mBurnInYOffset; - private ActivityIntentHelper mActivityIntentHelper; - private KeyguardUpdateMonitor mKeyguardUpdateMonitor; - - private ControlsListingController.ControlsListingCallback mListingCallback = - new ControlsListingController.ControlsListingCallback() { - public void onServicesUpdated(List<ControlsServiceInfo> serviceInfos) { - post(() -> { - boolean available = !serviceInfos.isEmpty(); - - if (available != mControlServicesAvailable) { - mControlServicesAvailable = available; - updateControlsVisibility(); - updateAffordanceColors(); - } - }); + + private final ControlsListingController.ControlsListingCallback mListingCallback = + serviceInfos -> post(() -> { + boolean available = !serviceInfos.isEmpty(); + + if (available != mControlServicesAvailable) { + mControlServicesAvailable = available; + updateControlsVisibility(); + updateAffordanceColors(); } - }; + }); + + private final KeyguardStateController.Callback mKeyguardStateCallback = + new KeyguardStateController.Callback() { + @Override + public void onKeyguardShowingChanged() { + if (mKeyguardStateController.isShowing()) { + if (mQuickAccessWalletController != null) { + mQuickAccessWalletController.queryWalletCards(mCardRetriever); + } + } + } + }; public KeyguardBottomAreaView(Context context) { this(context, null); @@ -212,43 +137,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL public KeyguardBottomAreaView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - mShowLeftAffordance = getResources().getBoolean(R.bool.config_keyguardShowLeftAffordance); - mShowCameraAffordance = getResources() - .getBoolean(R.bool.config_keyguardShowCameraAffordance); } - private AccessibilityDelegate mAccessibilityDelegate = new AccessibilityDelegate() { - @Override - public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) { - super.onInitializeAccessibilityNodeInfo(host, info); - String label = null; - if (host == mRightAffordanceView) { - label = getResources().getString(R.string.camera_label); - } else if (host == mLeftAffordanceView) { - if (mLeftIsVoiceAssist) { - label = getResources().getString(R.string.voice_assist_label); - } else { - label = getResources().getString(R.string.phone_label); - } - } - info.addAction(new AccessibilityAction(ACTION_CLICK, label)); - } - - @Override - public boolean performAccessibilityAction(View host, int action, Bundle args) { - if (action == ACTION_CLICK) { - if (host == mRightAffordanceView) { - launchCamera(CAMERA_LAUNCH_SOURCE_AFFORDANCE); - return true; - } else if (host == mLeftAffordanceView) { - launchLeftAffordance(); - return true; - } - } - return super.performAccessibilityAction(host, action, args); - } - }; - public void initFrom(KeyguardBottomAreaView oldBottomArea) { setCentralSurfaces(oldBottomArea.mCentralSurfaces); @@ -279,11 +169,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL @Override protected void onFinishInflate() { super.onFinishInflate(); - mPreviewInflater = new PreviewInflater(mContext, new LockPatternUtils(mContext), - new ActivityIntentHelper(mContext)); mOverlayContainer = findViewById(R.id.overlay_container); - mRightAffordanceView = findViewById(R.id.camera_button); - mLeftAffordanceView = findViewById(R.id.left_button); mWalletButton = findViewById(R.id.wallet_button); mQRCodeScannerButton = findViewById(R.id.qr_code_scanner_button); mControlsButton = findViewById(R.id.controls_button); @@ -295,18 +181,11 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL R.dimen.keyguard_indication_margin_bottom); mBurnInYOffset = getResources().getDimensionPixelSize( R.dimen.default_burn_in_prevention_offset); - updateCameraVisibility(); mKeyguardStateController = Dependency.get(KeyguardStateController.class); - mKeyguardStateController.addCallback(this); + mKeyguardStateController.addCallback(mKeyguardStateCallback); setClipChildren(false); setClipToPadding(false); - mRightAffordanceView.setOnClickListener(this); - mLeftAffordanceView.setOnClickListener(this); - initAccessibility(); mActivityStarter = Dependency.get(ActivityStarter.class); - mFlashlightController = Dependency.get(FlashlightController.class); - mAccessibilityController = Dependency.get(AccessibilityController.class); - mActivityIntentHelper = new ActivityIntentHelper(getContext()); mIndicationPadding = getResources().getDimensionPixelSize( R.dimen.keyguard_indication_area_padding); @@ -315,51 +194,18 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL updateControlsVisibility(); } - /** - * Set the container where the previews are rendered. - */ - public void setPreviewContainer(ViewGroup previewContainer) { - mPreviewContainer = previewContainer; - inflateCameraPreview(); - updateLeftAffordance(); - } - @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - mAccessibilityController.addStateChangedCallback(this); - mRightExtension = Dependency.get(ExtensionController.class).newExtension(IntentButton.class) - .withPlugin(IntentButtonProvider.class, RIGHT_BUTTON_PLUGIN, - p -> p.getIntentButton()) - .withTunerFactory(new LockButtonFactory(mContext, LOCKSCREEN_RIGHT_BUTTON)) - .withDefault(() -> new DefaultRightButton()) - .withCallback(button -> setRightButton(button)) - .build(); - mLeftExtension = Dependency.get(ExtensionController.class).newExtension(IntentButton.class) - .withPlugin(IntentButtonProvider.class, LEFT_BUTTON_PLUGIN, - p -> p.getIntentButton()) - .withTunerFactory(new LockButtonFactory(mContext, LOCKSCREEN_LEFT_BUTTON)) - .withDefault(() -> new DefaultLeftButton()) - .withCallback(button -> setLeftButton(button)) - .build(); final IntentFilter filter = new IntentFilter(); filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED); - getContext().registerReceiverAsUser(mDevicePolicyReceiver, - UserHandle.ALL, filter, null, null); - mKeyguardUpdateMonitor = Dependency.get(KeyguardUpdateMonitor.class); - mKeyguardUpdateMonitor.registerCallback(mUpdateMonitorCallback); - mKeyguardStateController.addCallback(this); + mKeyguardStateController.addCallback(mKeyguardStateCallback); } @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - mKeyguardStateController.removeCallback(this); - mAccessibilityController.removeStateChangedCallback(this); - mRightExtension.destroy(); - mLeftExtension.destroy(); - getContext().unregisterReceiver(mDevicePolicyReceiver); - mKeyguardUpdateMonitor.removeCallback(mUpdateMonitorCallback); + mKeyguardStateController.removeCallback(mKeyguardStateCallback); if (mQuickAccessWalletController != null) { mQuickAccessWalletController.unregisterWalletChangeObservers( @@ -378,11 +224,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL } } - private void initAccessibility() { - mLeftAffordanceView.setAccessibilityDelegate(mAccessibilityDelegate); - mRightAffordanceView.setAccessibilityDelegate(mAccessibilityDelegate); - } - @Override protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); @@ -404,19 +245,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL getResources().getDimensionPixelSize( com.android.internal.R.dimen.text_size_small_material)); - ViewGroup.LayoutParams lp = mRightAffordanceView.getLayoutParams(); - lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width); - lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height); - mRightAffordanceView.setLayoutParams(lp); - updateRightAffordanceIcon(); - - lp = mLeftAffordanceView.getLayoutParams(); - lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width); - lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height); - mLeftAffordanceView.setLayoutParams(lp); - updateLeftAffordanceIcon(); - - lp = mWalletButton.getLayoutParams(); + ViewGroup.LayoutParams lp = mWalletButton.getLayoutParams(); lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_fixed_width); lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_fixed_height); mWalletButton.setLayoutParams(lp); @@ -439,74 +268,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL updateAffordanceColors(); } - private void updateRightAffordanceIcon() { - IconState state = mRightButton.getIcon(); - mRightAffordanceView.setVisibility(!mDozing && state.isVisible ? View.VISIBLE : View.GONE); - if (state.drawable != mRightAffordanceView.getDrawable() - || state.tint != mRightAffordanceView.shouldTint()) { - mRightAffordanceView.setImageDrawable(state.drawable, state.tint); - } - mRightAffordanceView.setContentDescription(state.contentDescription); - } - public void setCentralSurfaces(CentralSurfaces centralSurfaces) { mCentralSurfaces = centralSurfaces; - updateCameraVisibility(); // in case onFinishInflate() was called too early - } - - public void setAffordanceHelper(KeyguardAffordanceHelper affordanceHelper) { - mAffordanceHelper = affordanceHelper; - } - - public void setUserSetupComplete(boolean userSetupComplete) { - mUserSetupComplete = userSetupComplete; - updateCameraVisibility(); - updateLeftAffordanceIcon(); - } - - private Intent getCameraIntent() { - return mRightButton.getIntent(); - } - - /** - * Resolves the intent to launch the camera application. - */ - public ResolveInfo resolveCameraIntent() { - return mContext.getPackageManager().resolveActivityAsUser(getCameraIntent(), - PackageManager.MATCH_DEFAULT_ONLY, - KeyguardUpdateMonitor.getCurrentUser()); - } - - private void updateCameraVisibility() { - if (mRightAffordanceView == null) { - // Things are not set up yet; reply hazy, ask again later - return; - } - mRightAffordanceView.setVisibility(!mDozing && mShowCameraAffordance - && mRightButton.getIcon().isVisible ? View.VISIBLE : View.GONE); - } - - /** - * Set an alternate icon for the left assist affordance (replace the mic icon) - */ - public void setLeftAssistIcon(Drawable drawable) { - mLeftAssistIcon = drawable; - updateLeftAffordanceIcon(); - } - - private void updateLeftAffordanceIcon() { - if (!mShowLeftAffordance || mDozing) { - mLeftAffordanceView.setVisibility(GONE); - return; - } - - IconState state = mLeftButton.getIcon(); - mLeftAffordanceView.setVisibility(state.isVisible ? View.VISIBLE : View.GONE); - if (state.drawable != mLeftAffordanceView.getDrawable() - || state.tint != mLeftAffordanceView.shouldTint()) { - mLeftAffordanceView.setImageDrawable(state.drawable, state.tint); - } - mLeftAffordanceView.setContentDescription(state.contentDescription); } private void updateWalletVisibility() { @@ -552,73 +315,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL } } - public boolean isLeftVoiceAssist() { - return mLeftIsVoiceAssist; - } - - private boolean isPhoneVisible() { - PackageManager pm = mContext.getPackageManager(); - return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) - && pm.resolveActivity(PHONE_INTENT, 0) != null; - } - - @Override - public void onStateChanged(boolean accessibilityEnabled, boolean touchExplorationEnabled) { - mRightAffordanceView.setClickable(touchExplorationEnabled); - mLeftAffordanceView.setClickable(touchExplorationEnabled); - mRightAffordanceView.setFocusable(accessibilityEnabled); - mLeftAffordanceView.setFocusable(accessibilityEnabled); - } - - @Override - public void onClick(View v) { - if (v == mRightAffordanceView) { - launchCamera(CAMERA_LAUNCH_SOURCE_AFFORDANCE); - } else if (v == mLeftAffordanceView) { - launchLeftAffordance(); - } - } - - public void launchCamera(String source) { - final Intent intent = getCameraIntent(); - intent.putExtra(EXTRA_CAMERA_LAUNCH_SOURCE, source); - boolean wouldLaunchResolverActivity = mActivityIntentHelper.wouldLaunchResolverActivity( - intent, KeyguardUpdateMonitor.getCurrentUser()); - if (CameraIntents.isSecureCameraIntent(intent) && !wouldLaunchResolverActivity) { - AsyncTask.execute(new Runnable() { - @Override - public void run() { - // Normally an activity will set it's requested rotation - // animation on its window. However when launching an activity - // causes the orientation to change this is too late. In these cases - // the default animation is used. This doesn't look good for - // the camera (as it rotates the camera contents out of sync - // with physical reality). So, we ask the WindowManager to - // force the crossfade animation if an orientation change - // happens to occur during the launch. - ActivityOptions o = ActivityOptions.makeBasic(); - o.setDisallowEnterPictureInPictureWhileLaunching(true); - o.setRotationAnimationHint( - WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS); - try { - ActivityTaskManager.getService().startActivityAsUser( - null, getContext().getBasePackageName(), - getContext().getAttributionTag(), intent, - intent.resolveTypeIfNeeded(getContext().getContentResolver()), - null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, o.toBundle(), - UserHandle.CURRENT.getIdentifier()); - } catch (RemoteException e) { - Log.w(TAG, "Unable to start camera activity", e); - } - } - }); - } else { - // We need to delay starting the activity because ResolverActivity finishes itself if - // launched behind lockscreen. - mActivityStarter.startActivity(intent, false /* dismissShade */); - } - } - public void setDarkAmount(float darkAmount) { if (darkAmount == mDarkAmount) { return; @@ -627,77 +323,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL dozeTimeTick(); } - public void launchLeftAffordance() { - if (mLeftIsVoiceAssist) { - launchVoiceAssist(); - } else { - launchPhone(); - } - } - - @VisibleForTesting - void launchVoiceAssist() { - Runnable runnable = new Runnable() { - @Override - public void run() { - Dependency.get(AssistManager.class).launchVoiceAssistFromKeyguard(); - } - }; - if (!mKeyguardStateController.canDismissLockScreen()) { - Dependency.get(Dependency.BACKGROUND_EXECUTOR).execute(runnable); - } else { - boolean dismissShade = !TextUtils.isEmpty(mRightButtonStr) - && Dependency.get(TunerService.class).getValue(LOCKSCREEN_RIGHT_UNLOCK, 1) != 0; - mCentralSurfaces.executeRunnableDismissingKeyguard(runnable, null /* cancelAction */, - dismissShade, false /* afterKeyguardGone */, true /* deferred */); - } - } - - private boolean canLaunchVoiceAssist() { - return Dependency.get(AssistManager.class).canVoiceAssistBeLaunchedFromKeyguard(); - } - - private void launchPhone() { - final TelecomManager tm = TelecomManager.from(mContext); - if (tm.isInCall()) { - AsyncTask.execute(new Runnable() { - @Override - public void run() { - tm.showInCallScreen(false /* showDialpad */); - } - }); - } else { - boolean dismissShade = !TextUtils.isEmpty(mLeftButtonStr) - && Dependency.get(TunerService.class).getValue(LOCKSCREEN_LEFT_UNLOCK, 1) != 0; - mActivityStarter.startActivity(mLeftButton.getIntent(), dismissShade); - } - } - - - @Override - protected void onVisibilityChanged(View changedView, int visibility) { - super.onVisibilityChanged(changedView, visibility); - if (changedView == this && visibility == VISIBLE) { - updateCameraVisibility(); - } - } - - public KeyguardAffordanceView getLeftView() { - return mLeftAffordanceView; - } - - public KeyguardAffordanceView getRightView() { - return mRightAffordanceView; - } - - public View getLeftPreview() { - return mLeftPreview; - } - - public View getRightPreview() { - return mCameraPreview; - } - public View getIndicationArea() { return mIndicationArea; } @@ -707,66 +332,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL return false; } - @Override - public void onUnlockedChanged() { - updateCameraVisibility(); - } - - @Override - public void onKeyguardShowingChanged() { - if (mKeyguardStateController.isShowing()) { - if (mQuickAccessWalletController != null) { - mQuickAccessWalletController.queryWalletCards(mCardRetriever); - } - } - } - - private void inflateCameraPreview() { - if (mPreviewContainer == null) { - return; - } - View previewBefore = mCameraPreview; - boolean visibleBefore = false; - if (previewBefore != null) { - mPreviewContainer.removeView(previewBefore); - visibleBefore = previewBefore.getVisibility() == View.VISIBLE; - } - mCameraPreview = mPreviewInflater.inflatePreview(getCameraIntent()); - if (mCameraPreview != null) { - mPreviewContainer.addView(mCameraPreview); - mCameraPreview.setVisibility(visibleBefore ? View.VISIBLE : View.INVISIBLE); - } - if (mAffordanceHelper != null) { - mAffordanceHelper.updatePreviews(); - } - } - - private void updateLeftPreview() { - if (mPreviewContainer == null) { - return; - } - View previewBefore = mLeftPreview; - if (previewBefore != null) { - mPreviewContainer.removeView(previewBefore); - } - - if (mLeftIsVoiceAssist) { - if (Dependency.get(AssistManager.class).getVoiceInteractorComponentName() != null) { - mLeftPreview = mPreviewInflater.inflatePreviewFromService( - Dependency.get(AssistManager.class).getVoiceInteractorComponentName()); - } - } else { - mLeftPreview = mPreviewInflater.inflatePreview(mLeftButton.getIntent()); - } - if (mLeftPreview != null) { - mPreviewContainer.addView(mLeftPreview); - mLeftPreview.setVisibility(View.INVISIBLE); - } - if (mAffordanceHelper != null) { - mAffordanceHelper.updatePreviews(); - } - } - public void startFinishDozeAnimation() { long delay = 0; if (mWalletButton.getVisibility() == View.VISIBLE) { @@ -778,13 +343,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL if (mControlsButton.getVisibility() == View.VISIBLE) { startFinishDozeAnimationElement(mControlsButton, delay); } - if (mLeftAffordanceView.getVisibility() == View.VISIBLE) { - startFinishDozeAnimationElement(mLeftAffordanceView, delay); - delay += DOZE_ANIMATION_STAGGER_DELAY; - } - if (mRightAffordanceView.getVisibility() == View.VISIBLE) { - startFinishDozeAnimationElement(mRightAffordanceView, delay); - } } private void startFinishDozeAnimationElement(View element, long delay) { @@ -798,58 +356,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL .setDuration(DOZE_ANIMATION_ELEMENT_DURATION); } - private final BroadcastReceiver mDevicePolicyReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - post(new Runnable() { - @Override - public void run() { - updateCameraVisibility(); - } - }); - } - }; - - private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback = - new KeyguardUpdateMonitorCallback() { - @Override - public void onUserSwitchComplete(int userId) { - updateCameraVisibility(); - } - - @Override - public void onUserUnlocked() { - inflateCameraPreview(); - updateCameraVisibility(); - updateLeftAffordance(); - } - }; - - public void updateLeftAffordance() { - updateLeftAffordanceIcon(); - updateLeftPreview(); - } - - private void setRightButton(IntentButton button) { - mRightButton = button; - updateRightAffordanceIcon(); - updateCameraVisibility(); - inflateCameraPreview(); - } - - private void setLeftButton(IntentButton button) { - mLeftButton = button; - if (!(mLeftButton instanceof DefaultLeftButton)) { - mLeftIsVoiceAssist = false; - } - updateLeftAffordance(); - } - public void setDozing(boolean dozing, boolean animate) { mDozing = dozing; - updateCameraVisibility(); - updateLeftAffordanceIcon(); updateWalletVisibility(); updateControlsVisibility(); updateQRCodeButtonVisibility(); @@ -888,77 +397,12 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL * Sets the alpha of the indication areas and affordances, excluding the lock icon. */ public void setAffordanceAlpha(float alpha) { - mLeftAffordanceView.setAlpha(alpha); - mRightAffordanceView.setAlpha(alpha); mIndicationArea.setAlpha(alpha); mWalletButton.setAlpha(alpha); mQRCodeScannerButton.setAlpha(alpha); mControlsButton.setAlpha(alpha); } - private class DefaultLeftButton implements IntentButton { - - private IconState mIconState = new IconState(); - - @Override - public IconState getIcon() { - mLeftIsVoiceAssist = canLaunchVoiceAssist(); - if (mLeftIsVoiceAssist) { - mIconState.isVisible = mUserSetupComplete && mShowLeftAffordance; - if (mLeftAssistIcon == null) { - mIconState.drawable = mContext.getDrawable(R.drawable.ic_mic_26dp); - } else { - mIconState.drawable = mLeftAssistIcon; - } - mIconState.contentDescription = mContext.getString( - R.string.accessibility_voice_assist_button); - } else { - mIconState.isVisible = mUserSetupComplete && mShowLeftAffordance - && isPhoneVisible(); - mIconState.drawable = mContext.getDrawable( - com.android.internal.R.drawable.ic_phone); - mIconState.contentDescription = mContext.getString( - R.string.accessibility_phone_button); - } - return mIconState; - } - - @Override - public Intent getIntent() { - return PHONE_INTENT; - } - } - - private class DefaultRightButton implements IntentButton { - - private IconState mIconState = new IconState(); - - @Override - public IconState getIcon() { - boolean isCameraDisabled = (mCentralSurfaces != null) - && !mCentralSurfaces.isCameraAllowedByAdmin(); - mIconState.isVisible = !isCameraDisabled - && mShowCameraAffordance - && mUserSetupComplete - && resolveCameraIntent() != null; - mIconState.drawable = mContext.getDrawable(R.drawable.ic_camera_alt_24dp); - mIconState.contentDescription = - mContext.getString(R.string.accessibility_camera_button); - return mIconState; - } - - @Override - public Intent getIntent() { - boolean canDismissLs = mKeyguardStateController.canDismissLockScreen(); - boolean secure = mKeyguardStateController.isMethodSecure(); - if (secure && !canDismissLs) { - return CameraIntents.getSecureCameraIntent(getContext()); - } else { - return CameraIntents.getInsecureCameraIntent(getContext()); - } - } - } - @Override public WindowInsets onApplyWindowInsets(WindowInsets insets) { int bottom = insets.getDisplayCutout() != null diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightsOutNotifController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightsOutNotifController.java index c61510cce10e..6e98c49e6d43 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightsOutNotifController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightsOutNotifController.java @@ -32,6 +32,7 @@ import android.view.animation.AccelerateInterpolator; import androidx.lifecycle.Observer; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.view.AppearanceRegion; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore; @@ -144,7 +145,7 @@ public class LightsOutNotifController extends ViewController<View> { public void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, @Behavior int behavior, InsetsVisibilities requestedVisibilities, - String packageName) { + String packageName, LetterboxDetails[] letterboxDetails) { if (displayId != mDisplayId) { return; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index fbbb587872b4..648bb0c0b8e6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -50,8 +50,6 @@ import android.app.ActivityManager; import android.app.Fragment; import android.app.StatusBarManager; import android.content.ContentResolver; -import android.content.pm.ResolveInfo; -import android.content.res.Configuration; import android.content.res.Resources; import android.database.ContentObserver; import android.graphics.Canvas; @@ -117,6 +115,7 @@ import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.animation.Interpolators; import com.android.systemui.animation.LaunchAnimator; import com.android.systemui.biometrics.AuthController; +import com.android.systemui.camera.CameraGestureHelper; import com.android.systemui.classifier.Classifier; import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.controls.dagger.ControlsComponent; @@ -145,7 +144,6 @@ import com.android.systemui.screenrecord.RecordingController; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.GestureRecorder; -import com.android.systemui.statusbar.KeyguardAffordanceView; import com.android.systemui.statusbar.KeyguardIndicationController; import com.android.systemui.statusbar.LockscreenShadeTransitionController; import com.android.systemui.statusbar.NotificationRemoteInputManager; @@ -252,9 +250,6 @@ public class NotificationPanelViewController extends PanelViewController { private final OnOverscrollTopChangedListener mOnOverscrollTopChangedListener = new OnOverscrollTopChangedListener(); - private final KeyguardAffordanceHelperCallback - mKeyguardAffordanceHelperCallback = - new KeyguardAffordanceHelperCallback(); private final OnEmptySpaceClickListener mOnEmptySpaceClickListener = new OnEmptySpaceClickListener(); @@ -338,8 +333,6 @@ public class NotificationPanelViewController extends PanelViewController { // Current max allowed keyguard notifications determined by measuring the panel private int mMaxAllowedKeyguardNotifications; - private ViewGroup mPreviewContainer; - private KeyguardAffordanceHelper mAffordanceHelper; private KeyguardQsUserSwitchController mKeyguardQsUserSwitchController; private KeyguardUserSwitcherController mKeyguardUserSwitcherController; private KeyguardStatusBarView mKeyguardStatusBar; @@ -437,8 +430,6 @@ public class NotificationPanelViewController extends PanelViewController { */ private boolean mQsAnimatorExpand; private boolean mIsLaunchTransitionFinished; - private boolean mIsLaunchTransitionRunning; - private Runnable mLaunchAnimationEndRunnable; private boolean mOnlyAffordanceInThisMotion; private ValueAnimator mQsSizeChangeAnimator; @@ -455,10 +446,8 @@ public class NotificationPanelViewController extends PanelViewController { private boolean mClosingWithAlphaFadeOut; private boolean mHeadsUpAnimatingAway; private boolean mLaunchingAffordance; - private boolean mAffordanceHasPreview; private final FalsingManager mFalsingManager; private final FalsingCollector mFalsingCollector; - private String mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_AFFORDANCE; private Runnable mHeadsUpExistenceChangedRunnable = () -> { setHeadsUpAnimatingAway(false); @@ -491,7 +480,6 @@ public class NotificationPanelViewController extends PanelViewController { private float mLinearDarkAmount; private boolean mPulsing; - private boolean mUserSetupComplete; private boolean mHideIconsDuringLaunchAnimation = true; private int mStackScrollerMeasuringPass; /** @@ -707,6 +695,8 @@ public class NotificationPanelViewController extends PanelViewController { } }; + private final CameraGestureHelper mCameraGestureHelper; + @Inject public NotificationPanelViewController(NotificationPanelView view, @Main Resources resources, @@ -777,7 +767,8 @@ public class NotificationPanelViewController extends PanelViewController { NotificationStackSizeCalculator notificationStackSizeCalculator, UnlockedScreenOffAnimationController unlockedScreenOffAnimationController, ShadeTransitionController shadeTransitionController, - SystemClock systemClock) { + SystemClock systemClock, + CameraGestureHelper cameraGestureHelper) { super(view, falsingManager, dozeLog, @@ -961,6 +952,7 @@ public class NotificationPanelViewController extends PanelViewController { } } }); + mCameraGestureHelper = cameraGestureHelper; } @VisibleForTesting @@ -1008,8 +1000,6 @@ public class NotificationPanelViewController extends PanelViewController { mOnEmptySpaceClickListener); addTrackingHeadsUpListener(mNotificationStackScrollLayoutController::setTrackingHeadsUp); mKeyguardBottomArea = mView.findViewById(R.id.keyguard_bottom_area); - mPreviewContainer = mView.findViewById(R.id.preview_container); - mKeyguardBottomArea.setPreviewContainer(mPreviewContainer); initBottomArea(); @@ -1033,7 +1023,6 @@ public class NotificationPanelViewController extends PanelViewController { mView.setRtlChangeListener(layoutDirection -> { if (layoutDirection != mOldLayoutDirection) { - mAffordanceHelper.onRtlPropertiesChanged(); mOldLayoutDirection = layoutDirection; } }); @@ -1267,7 +1256,6 @@ public class NotificationPanelViewController extends PanelViewController { mKeyguardBottomArea = (KeyguardBottomAreaView) mLayoutInflater.inflate( R.layout.keyguard_bottom_area, mView, false); mKeyguardBottomArea.initFrom(oldBottomArea); - mKeyguardBottomArea.setPreviewContainer(mPreviewContainer); mView.addView(mKeyguardBottomArea, index); initBottomArea(); mKeyguardIndicationController.setIndicationArea(mKeyguardBottomArea); @@ -1304,11 +1292,7 @@ public class NotificationPanelViewController extends PanelViewController { } private void initBottomArea() { - mAffordanceHelper = new KeyguardAffordanceHelper( - mKeyguardAffordanceHelperCallback, mView.getContext(), mFalsingManager); - mKeyguardBottomArea.setAffordanceHelper(mAffordanceHelper); mKeyguardBottomArea.setCentralSurfaces(mCentralSurfaces); - mKeyguardBottomArea.setUserSetupComplete(mUserSetupComplete); mKeyguardBottomArea.setFalsingManager(mFalsingManager); mKeyguardBottomArea.initWallet(mQuickAccessWalletController); mKeyguardBottomArea.initControls(mControlsComponent); @@ -1673,10 +1657,6 @@ public class NotificationPanelViewController extends PanelViewController { public void resetViews(boolean animate) { mIsLaunchTransitionFinished = false; mBlockTouches = false; - if (!mLaunchingAffordance) { - mAffordanceHelper.reset(false); - mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_AFFORDANCE; - } mCentralSurfaces.getGutsManager().closeAndSaveGuts(true /* leavebehind */, true /* force */, true /* controls */, -1 /* x */, -1 /* y */, true /* resetMenu */); if (animate && !isFullyCollapsed()) { @@ -2219,11 +2199,6 @@ public class NotificationPanelViewController extends PanelViewController { return isFullyCollapsed() || mBarState != StatusBarState.SHADE; } - @Override - protected boolean shouldGestureIgnoreXTouchSlop(float x, float y) { - return !mAffordanceHelper.isOnAffordanceIcon(x, y); - } - private void onQsTouch(MotionEvent event) { int pointerIndex = event.findPointerIndex(mTrackingPointer); if (pointerIndex < 0) { @@ -3388,9 +3363,6 @@ public class NotificationPanelViewController extends PanelViewController { mQsExpandImmediate = true; setShowShelfOnly(true); } - if (mBarState == KEYGUARD || mBarState == StatusBarState.SHADE_LOCKED) { - mAffordanceHelper.animateHideLeftRightIcon(); - } mNotificationStackScrollLayoutController.onPanelTrackingStarted(); cancelPendingPanelCollapse(); } @@ -3404,12 +3376,6 @@ public class NotificationPanelViewController extends PanelViewController { true /* animate */); } mNotificationStackScrollLayoutController.onPanelTrackingStopped(); - if (expand && (mBarState == KEYGUARD - || mBarState == StatusBarState.SHADE_LOCKED)) { - if (!mHintAnimationRunning) { - mAffordanceHelper.reset(true); - } - } // If we unlocked from a swipe, the user's finger might still be down after the // unlock animation ends. We need to wait until ACTION_UP to enable blurs again. @@ -3482,10 +3448,6 @@ public class NotificationPanelViewController extends PanelViewController { return mIsLaunchTransitionFinished; } - public boolean isLaunchTransitionRunning() { - return mIsLaunchTransitionRunning; - } - @Override public void setIsLaunchAnimationRunning(boolean running) { boolean wasRunning = mIsLaunchAnimationRunning; @@ -3504,10 +3466,6 @@ public class NotificationPanelViewController extends PanelViewController { } } - public void setLaunchTransitionEndRunnable(Runnable r) { - mLaunchAnimationEndRunnable = r; - } - private void updateDozingVisibilities(boolean animate) { mKeyguardBottomArea.setDozing(mDozing, animate); if (!mDozing && animate) { @@ -3686,30 +3644,13 @@ public class NotificationPanelViewController extends PanelViewController { && mBarState == StatusBarState.SHADE; } - public void launchCamera(boolean animate, int source) { - if (source == StatusBarManager.CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP) { - mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP; - } else if (source == StatusBarManager.CAMERA_LAUNCH_SOURCE_WIGGLE) { - mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_WIGGLE; - } else if (source == StatusBarManager.CAMERA_LAUNCH_SOURCE_LIFT_TRIGGER) { - mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_LIFT_TRIGGER; - } else { - - // Default. - mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_AFFORDANCE; - } - - // If we are launching it when we are occluded already we don't want it to animate, - // nor setting these flags, since the occluded state doesn't change anymore, hence it's - // never reset. + /** Launches the camera. */ + public void launchCamera(int source) { if (!isFullyCollapsed()) { setLaunchingAffordance(true); - } else { - animate = false; } - mAffordanceHasPreview = mKeyguardBottomArea.getRightPreview() != null; - mAffordanceHelper.launchAffordance( - animate, mView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL); + + mCameraGestureHelper.launchCamera(source); } public void onAffordanceLaunchEnded() { @@ -3722,9 +3663,6 @@ public class NotificationPanelViewController extends PanelViewController { */ private void setLaunchingAffordance(boolean launchingAffordance) { mLaunchingAffordance = launchingAffordance; - mKeyguardAffordanceHelperCallback.getLeftIcon().setLaunchingAffordance(launchingAffordance); - mKeyguardAffordanceHelperCallback.getRightIcon().setLaunchingAffordance( - launchingAffordance); mKeyguardBypassController.setLaunchingAffordance(launchingAffordance); } @@ -3732,34 +3670,14 @@ public class NotificationPanelViewController extends PanelViewController { * Return true when a bottom affordance is launching an occluded activity with a splash screen. */ public boolean isLaunchingAffordanceWithPreview() { - return mLaunchingAffordance && mAffordanceHasPreview; + return mLaunchingAffordance; } /** * Whether the camera application can be launched for the camera launch gesture. */ public boolean canCameraGestureBeLaunched() { - if (!mCentralSurfaces.isCameraAllowedByAdmin()) { - return false; - } - - ResolveInfo resolveInfo = mKeyguardBottomArea.resolveCameraIntent(); - String - packageToLaunch = - (resolveInfo == null || resolveInfo.activityInfo == null) ? null - : resolveInfo.activityInfo.packageName; - return packageToLaunch != null && (mBarState != StatusBarState.SHADE || !isForegroundApp( - packageToLaunch)) && !mAffordanceHelper.isSwipingInProgress(); - } - - /** - * Return true if the applications with the package name is running in foreground. - * - * @param pkgName application package name. - */ - private boolean isForegroundApp(String pkgName) { - List<ActivityManager.RunningTaskInfo> tasks = mActivityManager.getRunningTasks(1); - return !tasks.isEmpty() && pkgName.equals(tasks.get(0).topActivity.getPackageName()); + return mCameraGestureHelper.canCameraGestureBeLaunched(mBarState); } public boolean hideStatusBarIconsWhenExpanded() { @@ -3838,9 +3756,6 @@ public class NotificationPanelViewController extends PanelViewController { @Override public void setTouchAndAnimationDisabled(boolean disabled) { super.setTouchAndAnimationDisabled(disabled); - if (disabled && mAffordanceHelper.isSwipingInProgress() && !mIsLaunchTransitionRunning) { - mAffordanceHelper.reset(false /* animate */); - } mNotificationStackScrollLayoutController.setAnimationsEnabled(!disabled); } @@ -3923,11 +3838,6 @@ public class NotificationPanelViewController extends PanelViewController { return mKeyguardBottomArea; } - public void setUserSetupComplete(boolean userSetupComplete) { - mUserSetupComplete = userSetupComplete; - mKeyguardBottomArea.setUserSetupComplete(userSetupComplete); - } - public void applyLaunchAnimationProgress(float linearProgress) { boolean hideIcons = LaunchAnimator.getProgress(ActivityLaunchAnimator.TIMINGS, linearProgress, ANIMATION_DELAY_ICON_FADE_IN, 100) == 0.0f; @@ -4281,10 +4191,6 @@ public class NotificationPanelViewController extends PanelViewController { mMetricsLogger.count(COUNTER_PANEL_OPEN_PEEK, 1); } boolean handled = false; - if ((!mIsExpanding || mHintAnimationRunning) && !mQsExpanded - && mBarState != StatusBarState.SHADE && !mDozing) { - handled |= mAffordanceHelper.onTouchEvent(event); - } if (mOnlyAffordanceInThisMotion) { return true; } @@ -4527,139 +4433,6 @@ public class NotificationPanelViewController extends PanelViewController { } } - private class KeyguardAffordanceHelperCallback implements KeyguardAffordanceHelper.Callback { - @Override - public void onAnimationToSideStarted(boolean rightPage, float translation, float vel) { - boolean - start = - mView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL ? rightPage - : !rightPage; - mIsLaunchTransitionRunning = true; - mLaunchAnimationEndRunnable = null; - float displayDensity = mCentralSurfaces.getDisplayDensity(); - int lengthDp = Math.abs((int) (translation / displayDensity)); - int velocityDp = Math.abs((int) (vel / displayDensity)); - if (start) { - mLockscreenGestureLogger.write(MetricsEvent.ACTION_LS_DIALER, lengthDp, velocityDp); - mLockscreenGestureLogger.log(LockscreenUiEvent.LOCKSCREEN_DIALER); - mFalsingCollector.onLeftAffordanceOn(); - if (mFalsingCollector.shouldEnforceBouncer()) { - mCentralSurfaces.executeRunnableDismissingKeyguard( - () -> mKeyguardBottomArea.launchLeftAffordance(), null, - true /* dismissShade */, false /* afterKeyguardGone */, - true /* deferred */); - } else { - mKeyguardBottomArea.launchLeftAffordance(); - } - } else { - if (KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_AFFORDANCE.equals( - mLastCameraLaunchSource)) { - mLockscreenGestureLogger.write( - MetricsEvent.ACTION_LS_CAMERA, lengthDp, velocityDp); - mLockscreenGestureLogger.log(LockscreenUiEvent.LOCKSCREEN_CAMERA); - } - mFalsingCollector.onCameraOn(); - if (mFalsingCollector.shouldEnforceBouncer()) { - mCentralSurfaces.executeRunnableDismissingKeyguard( - () -> mKeyguardBottomArea.launchCamera(mLastCameraLaunchSource), null, - true /* dismissShade */, false /* afterKeyguardGone */, - true /* deferred */); - } else { - mKeyguardBottomArea.launchCamera(mLastCameraLaunchSource); - } - } - mCentralSurfaces.startLaunchTransitionTimeout(); - mBlockTouches = true; - } - - @Override - public void onAnimationToSideEnded() { - mIsLaunchTransitionRunning = false; - mIsLaunchTransitionFinished = true; - if (mLaunchAnimationEndRunnable != null) { - mLaunchAnimationEndRunnable.run(); - mLaunchAnimationEndRunnable = null; - } - mCentralSurfaces.readyForKeyguardDone(); - } - - @Override - public float getMaxTranslationDistance() { - return (float) Math.hypot(mView.getWidth(), getHeight()); - } - - @Override - public void onSwipingStarted(boolean rightIcon) { - mFalsingCollector.onAffordanceSwipingStarted(rightIcon); - mView.requestDisallowInterceptTouchEvent(true); - mOnlyAffordanceInThisMotion = true; - mQsTracking = false; - } - - @Override - public void onSwipingAborted() { - mFalsingCollector.onAffordanceSwipingAborted(); - } - - @Override - public void onIconClicked(boolean rightIcon) { - if (mHintAnimationRunning) { - return; - } - mHintAnimationRunning = true; - mAffordanceHelper.startHintAnimation(rightIcon, () -> { - mHintAnimationRunning = false; - mCentralSurfaces.onHintFinished(); - }); - rightIcon = - mView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL ? !rightIcon - : rightIcon; - if (rightIcon) { - mCentralSurfaces.onCameraHintStarted(); - } else { - if (mKeyguardBottomArea.isLeftVoiceAssist()) { - mCentralSurfaces.onVoiceAssistHintStarted(); - } else { - mCentralSurfaces.onPhoneHintStarted(); - } - } - } - - @Override - public KeyguardAffordanceView getLeftIcon() { - return mView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL - ? mKeyguardBottomArea.getRightView() : mKeyguardBottomArea.getLeftView(); - } - - @Override - public KeyguardAffordanceView getRightIcon() { - return mView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL - ? mKeyguardBottomArea.getLeftView() : mKeyguardBottomArea.getRightView(); - } - - @Override - public View getLeftPreview() { - return mView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL - ? mKeyguardBottomArea.getRightPreview() : mKeyguardBottomArea.getLeftPreview(); - } - - @Override - public View getRightPreview() { - return mView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL - ? mKeyguardBottomArea.getLeftPreview() : mKeyguardBottomArea.getRightPreview(); - } - - @Override - public float getAffordanceFalsingFactor() { - return mCentralSurfaces.isWakeUpComingFromTouch() ? 1.5f : 1.0f; - } - - @Override - public boolean needsAntiFalsing() { - return mBarState == KEYGUARD; - } - } - private class OnEmptySpaceClickListener implements NotificationStackScrollLayout.OnEmptySpaceClickListener { @Override @@ -5118,15 +4891,6 @@ public class NotificationPanelViewController extends PanelViewController { } } - private class OnConfigurationChangedListener extends - PanelViewController.OnConfigurationChangedListener { - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - mAffordanceHelper.onConfigurationChanged(); - } - } - private class OnApplyWindowInsetsListener implements View.OnApplyWindowInsetsListener { public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) { // the same types of insets that are handled in NotificationShadeWindowView diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java index ed12b00cc644..d2fc1af010b9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java @@ -484,8 +484,6 @@ public abstract class PanelViewController { protected abstract boolean shouldGestureWaitForTouchSlop(); - protected abstract boolean shouldGestureIgnoreXTouchSlop(float x, float y); - protected void onTrackingStopped(boolean expand) { mTracking = false; mCentralSurfaces.onTrackingStopped(expand); @@ -1333,7 +1331,7 @@ public abstract class PanelViewController { if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { mGestureWaitForTouchSlop = shouldGestureWaitForTouchSlop(); - mIgnoreXTouchSlop = isFullyCollapsed() || shouldGestureIgnoreXTouchSlop(x, y); + mIgnoreXTouchSlop = true; } switch (event.getActionMasked()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java index aa061d74f6c6..bd69cc3869c2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java @@ -212,8 +212,6 @@ class StatusBarNotificationPresenter implements NotificationPresenter, mEntryManager.setUpWithPresenter(this); mEntryManager.addNotificationLifetimeExtender(mHeadsUpManager); mEntryManager.addNotificationLifetimeExtender(mGutsManager); - mEntryManager.addNotificationLifetimeExtenders( - remoteInputManager.getLifetimeExtenders()); } notificationInterruptStateProvider.addSuppressor(mInterruptSuppressor); mLockscreenUserManager.setUpWithPresenter(this); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/PreviewInflater.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/PreviewInflater.java deleted file mode 100644 index 3d317143eb51..000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/PreviewInflater.java +++ /dev/null @@ -1,150 +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.policy; - -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.os.Bundle; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; - -import com.android.internal.widget.LockPatternUtils; -import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.systemui.ActivityIntentHelper; -import com.android.systemui.statusbar.phone.KeyguardPreviewContainer; - -import java.util.List; - -/** - * Utility class to inflate previews for phone and camera affordance. - */ -public class PreviewInflater { - - private static final String TAG = "PreviewInflater"; - - private static final String META_DATA_KEYGUARD_LAYOUT = "com.android.keyguard.layout"; - private final ActivityIntentHelper mActivityIntentHelper; - - private Context mContext; - private LockPatternUtils mLockPatternUtils; - - public PreviewInflater(Context context, LockPatternUtils lockPatternUtils, - ActivityIntentHelper activityIntentHelper) { - mContext = context; - mLockPatternUtils = lockPatternUtils; - mActivityIntentHelper = activityIntentHelper; - } - - public View inflatePreview(Intent intent) { - WidgetInfo info = getWidgetInfo(intent); - return inflatePreview(info); - } - - public View inflatePreviewFromService(ComponentName componentName) { - WidgetInfo info = getWidgetInfoFromService(componentName); - return inflatePreview(info); - } - - private KeyguardPreviewContainer inflatePreview(WidgetInfo info) { - if (info == null) { - return null; - } - View v = inflateWidgetView(info); - if (v == null) { - return null; - } - KeyguardPreviewContainer container = new KeyguardPreviewContainer(mContext, null); - container.addView(v); - return container; - } - - private View inflateWidgetView(WidgetInfo widgetInfo) { - View widgetView = null; - try { - Context appContext = mContext.createPackageContext( - widgetInfo.contextPackage, Context.CONTEXT_RESTRICTED); - LayoutInflater appInflater = (LayoutInflater) - appContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - appInflater = appInflater.cloneInContext(appContext); - widgetView = appInflater.inflate(widgetInfo.layoutId, null, false); - } catch (PackageManager.NameNotFoundException|RuntimeException e) { - Log.w(TAG, "Error creating widget view", e); - } - return widgetView; - } - - private WidgetInfo getWidgetInfoFromService(ComponentName componentName) { - PackageManager packageManager = mContext.getPackageManager(); - // Look for the preview specified in the service meta-data - try { - Bundle metaData = packageManager.getServiceInfo( - componentName, PackageManager.GET_META_DATA).metaData; - return getWidgetInfoFromMetaData(componentName.getPackageName(), metaData); - } catch (PackageManager.NameNotFoundException e) { - Log.w(TAG, "Failed to load preview; " + componentName.flattenToShortString() - + " not found", e); - } - return null; - } - - private WidgetInfo getWidgetInfoFromMetaData(String contextPackage, - Bundle metaData) { - if (metaData == null) { - return null; - } - int layoutId = metaData.getInt(META_DATA_KEYGUARD_LAYOUT); - if (layoutId == 0) { - return null; - } - WidgetInfo info = new WidgetInfo(); - info.contextPackage = contextPackage; - info.layoutId = layoutId; - return info; - } - - private WidgetInfo getWidgetInfo(Intent intent) { - PackageManager packageManager = mContext.getPackageManager(); - int flags = PackageManager.MATCH_DEFAULT_ONLY - | PackageManager.MATCH_DIRECT_BOOT_AWARE - | PackageManager.MATCH_DIRECT_BOOT_UNAWARE; - final List<ResolveInfo> appList = packageManager.queryIntentActivitiesAsUser( - intent, flags, KeyguardUpdateMonitor.getCurrentUser()); - if (appList.size() == 0) { - return null; - } - ResolveInfo resolved = packageManager.resolveActivityAsUser(intent, - flags | PackageManager.GET_META_DATA, - KeyguardUpdateMonitor.getCurrentUser()); - if (mActivityIntentHelper.wouldLaunchResolverActivity(resolved, appList)) { - return null; - } - if (resolved == null || resolved.activityInfo == null) { - return null; - } - return getWidgetInfoFromMetaData(resolved.activityInfo.packageName, - resolved.activityInfo.metaData); - } - - private static class WidgetInfo { - String contextPackage; - int layoutId; - } -} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index f151d291cda3..40281a194b12 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -68,6 +68,7 @@ import com.android.systemui.GuestResetOrExitSessionReceiver; import com.android.systemui.GuestResumeSessionReceiver; import com.android.systemui.R; import com.android.systemui.SystemUISecondaryUserService; +import com.android.systemui.animation.DialogCuj; import com.android.systemui.animation.DialogLaunchAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.broadcast.BroadcastSender; @@ -116,6 +117,9 @@ public class UserSwitcherController implements Dumpable { private static final String PERMISSION_SELF = "com.android.systemui.permission.SELF"; private static final long MULTI_USER_JOURNEY_TIMEOUT = 20000l; + private static final String INTERACTION_JANK_ADD_NEW_USER_TAG = "add_new_user"; + private static final String INTERACTION_JANK_EXIT_GUEST_MODE_TAG = "exit_guest_mode"; + protected final Context mContext; protected final UserTracker mUserTracker; protected final UserManager mUserManager; @@ -597,7 +601,9 @@ public class UserSwitcherController implements Dumpable { } mExitGuestDialog = new ExitGuestDialog(mContext, id, isGuestEphemeral, targetId); if (dialogShower != null) { - dialogShower.showDialog(mExitGuestDialog); + dialogShower.showDialog(mExitGuestDialog, new DialogCuj( + InteractionJankMonitor.CUJ_USER_DIALOG_OPEN, + INTERACTION_JANK_EXIT_GUEST_MODE_TAG)); } else { mExitGuestDialog.show(); } @@ -609,7 +615,11 @@ public class UserSwitcherController implements Dumpable { } mAddUserDialog = new AddUserDialog(mContext); if (dialogShower != null) { - dialogShower.showDialog(mAddUserDialog); + dialogShower.showDialog(mAddUserDialog, + new DialogCuj( + InteractionJankMonitor.CUJ_USER_DIALOG_OPEN, + INTERACTION_JANK_ADD_NEW_USER_TAG + )); } else { mAddUserDialog.show(); } diff --git a/packages/SystemUI/src/com/android/systemui/util/AsyncActivityLauncher.kt b/packages/SystemUI/src/com/android/systemui/util/AsyncActivityLauncher.kt new file mode 100644 index 000000000000..80d0e4b90359 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/util/AsyncActivityLauncher.kt @@ -0,0 +1,89 @@ +/* + * 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.util + +import android.app.IActivityTaskManager +import android.app.WaitResult +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.os.UserHandle +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.dagger.qualifiers.UiBackground +import java.util.concurrent.Executor +import javax.inject.Inject + +/** + * Helper class that allows to launch an activity and asynchronously wait + * for it to be launched. This class uses application context, so the intent + * will be launched with FLAG_ACTIVITY_NEW_TASK. + */ +class AsyncActivityLauncher @Inject constructor( + private val context: Context, + private val activityTaskManager: IActivityTaskManager, + @UiBackground private val backgroundExecutor: Executor, + @Main private val mainExecutor: Executor +) { + + private var pendingCallback: ((WaitResult) -> Unit)? = null + + /** + * Starts activity and notifies about the result using the provided [callback]. + * If there is already pending activity launch the call will be ignored. + * + * @return true if launch has started, false otherwise + */ + fun startActivityAsUser(intent: Intent, userHandle: UserHandle, + activityOptions: Bundle? = null, + callback: (WaitResult) -> Unit): Boolean { + if (pendingCallback != null) return false + + pendingCallback = callback + + intent.flags = intent.flags or Intent.FLAG_ACTIVITY_NEW_TASK + + backgroundExecutor.execute { + val waitResult = activityTaskManager.startActivityAndWait( + /* caller = */ null, + /* callingPackage = */ context.packageName, + /* callingFeatureId = */ context.attributionTag, + /* intent = */ intent, + /* resolvedType = */ null, + /* resultTo = */ null, + /* resultWho = */ null, + /* requestCode = */ 0, + /* flags = */ 0, + /* profilerInfo = */ null, + /* options = */ activityOptions, + /* userId = */ userHandle.identifier + ) + mainExecutor.execute { + pendingCallback?.invoke(waitResult) + } + } + + return true + } + + /** + * Cancels pending activity launches. It guarantees that the callback won't be fired + * but the activity will be launched anyway. + */ + fun destroy() { + pendingCallback = null + } +} 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 1e2074bfab98..4218e0904c43 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt @@ -170,19 +170,27 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { @Test fun testCujSpecificationLogsInteraction() { val touchSurface = createTouchSurface() - return runOnMainThreadAndWaitForIdleSync { + runOnMainThreadAndWaitForIdleSync { val dialog = TestDialog(context) dialogLaunchAnimator.showFromView( - dialog, touchSurface, - cuj = DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN) - ) + dialog, touchSurface, cuj = DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN)) } - verify(interactionJankMonitor).begin( - any() - ) - verify(interactionJankMonitor) - .end(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN) + verify(interactionJankMonitor).begin(any()) + verify(interactionJankMonitor).end(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN) + } + + @Test + fun testShowFromDialogCujSpecificationLogsInteraction() { + val firstDialog = createAndShowDialog() + runOnMainThreadAndWaitForIdleSync { + val dialog = TestDialog(context) + dialogLaunchAnimator.showFromDialog( + dialog, firstDialog, cuj = DialogCuj(InteractionJankMonitor.CUJ_USER_DIALOG_OPEN)) + dialog + } + verify(interactionJankMonitor).begin(any()) + verify(interactionJankMonitor).end(InteractionJankMonitor.CUJ_USER_DIALOG_OPEN) } private fun createAndShowDialog(): TestDialog { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/charging/WiredChargingRippleControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/charging/WiredChargingRippleControllerTest.kt index d0cf792b698d..6978490a1252 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/charging/WiredChargingRippleControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/charging/WiredChargingRippleControllerTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.charging +package com.android.systemui.charging import android.testing.AndroidTestingRunner import android.view.View @@ -24,6 +24,7 @@ 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.ripple.RippleView import com.android.systemui.statusbar.commandline.CommandRegistry import com.android.systemui.statusbar.policy.BatteryController import com.android.systemui.statusbar.policy.ConfigurationController @@ -50,7 +51,7 @@ class WiredChargingRippleControllerTest : SysuiTestCase() { @Mock private lateinit var batteryController: BatteryController @Mock private lateinit var featureFlags: FeatureFlags @Mock private lateinit var configurationController: ConfigurationController - @Mock private lateinit var rippleView: ChargingRippleView + @Mock private lateinit var rippleView: RippleView @Mock private lateinit var windowManager: WindowManager @Mock private lateinit var uiEventLogger: UiEventLogger private val systemClock = FakeSystemClock() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java index a80aed7a6d18..9b665555562a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java @@ -203,6 +203,13 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { mViewMediator.mViewMediatorCallback.getBouncerPromptReason()); } + @Test + public void testHideSurfaceBehindKeyguardMarksKeyguardNotGoingAway() { + mViewMediator.hideSurfaceBehindKeyguard(); + + verify(mKeyguardStateController).notifyKeyguardGoingAway(false); + } + private void createAndStartViewMediator() { mViewMediator = new KeyguardViewMediator( mContext, 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 fc4d9c42eb49..cf7f8dd26647 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java @@ -41,6 +41,7 @@ import android.view.WindowInsetsController.Behavior; import androidx.test.filters.SmallTest; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.view.AppearanceRegion; import com.android.systemui.SysuiTestCase; @@ -53,6 +54,13 @@ import org.junit.Test; @SmallTest public class CommandQueueTest extends SysuiTestCase { + private static final LetterboxDetails[] TEST_LETTERBOX_DETAILS = new LetterboxDetails[] { + new LetterboxDetails( + /* letterboxInnerBounds= */ new Rect(100, 0, 200, 500), + /* letterboxFullBounds= */ new Rect(0, 0, 500, 100), + /* appAppearance= */ 123) + }; + private CommandQueue mCommandQueue; private Callbacks mCallbacks; private static final int SECONDARY_DISPLAY = 1; @@ -127,25 +135,27 @@ public class CommandQueueTest extends SysuiTestCase { public void testOnSystemBarAttributesChanged() { doTestOnSystemBarAttributesChanged(DEFAULT_DISPLAY, 1, new AppearanceRegion[]{new AppearanceRegion(2, new Rect())}, false, - BEHAVIOR_DEFAULT, new InsetsVisibilities(), "test"); + BEHAVIOR_DEFAULT, new InsetsVisibilities(), "test", TEST_LETTERBOX_DETAILS); } @Test public void testOnSystemBarAttributesChangedForSecondaryDisplay() { doTestOnSystemBarAttributesChanged(SECONDARY_DISPLAY, 1, new AppearanceRegion[]{new AppearanceRegion(2, new Rect())}, false, - BEHAVIOR_DEFAULT, new InsetsVisibilities(), "test"); + BEHAVIOR_DEFAULT, new InsetsVisibilities(), "test", TEST_LETTERBOX_DETAILS); } private void doTestOnSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, - @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName) { + @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName, + LetterboxDetails[] letterboxDetails) { mCommandQueue.onSystemBarAttributesChanged(displayId, appearance, appearanceRegions, - navbarColorManagedByIme, behavior, requestedVisibilities, packageName); + navbarColorManagedByIme, behavior, requestedVisibilities, packageName, + letterboxDetails); waitForIdleSync(); verify(mCallbacks).onSystemBarAttributesChanged(eq(displayId), eq(appearance), eq(appearanceRegions), eq(navbarColorManagedByIme), eq(behavior), - eq(requestedVisibilities), eq(packageName)); + eq(requestedVisibilities), eq(packageName), eq(letterboxDetails)); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java index 2691ff98f4ee..34d13c76399a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java @@ -16,12 +16,9 @@ package com.android.systemui.statusbar; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Notification; @@ -30,19 +27,14 @@ import android.os.Handler; import android.os.Looper; import android.os.SystemClock; import android.os.UserHandle; -import android.service.notification.NotificationListenerService; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; -import androidx.annotation.NonNull; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.dump.DumpManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.statusbar.NotificationRemoteInputManager.LegacyRemoteInputLifetimeExtender.RemoteInputActiveExtender; -import com.android.systemui.statusbar.NotificationRemoteInputManager.LegacyRemoteInputLifetimeExtender.RemoteInputHistoryExtender; -import com.android.systemui.statusbar.NotificationRemoteInputManager.LegacyRemoteInputLifetimeExtender.SmartReplyHistoryExtender; import com.android.systemui.statusbar.notification.NotifPipelineFlags; import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -52,8 +44,6 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.policy.RemoteInputUriController; -import com.google.android.collect.Sets; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -76,23 +66,15 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { @Mock private NotificationRemoteInputManager.Callback mCallback; @Mock private RemoteInputController mController; @Mock private SmartReplyController mSmartReplyController; - @Mock private NotificationListenerService.RankingMap mRanking; @Mock private ExpandableNotificationRow mRow; @Mock private StatusBarStateController mStateController; @Mock private RemoteInputUriController mRemoteInputUriController; @Mock private NotificationClickNotifier mClickNotifier; - - // Dependency mocks: @Mock private NotificationEntryManager mEntryManager; @Mock private NotificationLockscreenUserManager mLockscreenUserManager; private TestableNotificationRemoteInputManager mRemoteInputManager; private NotificationEntry mEntry; - private RemoteInputHistoryExtender mRemoteInputHistoryExtender; - private SmartReplyHistoryExtender mSmartReplyHistoryExtender; - private RemoteInputActiveExtender mRemoteInputActiveExtender; - private TestableNotificationRemoteInputManager.FakeLegacyRemoteInputLifetimeExtender - mLegacyRemoteInputLifetimeExtender; @Before public void setUp() { @@ -121,21 +103,7 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { .build(); mEntry.setRow(mRow); - mRemoteInputManager.setUpWithPresenterForTest(mCallback, - mDelegate, mController); - for (NotificationLifetimeExtender extender : mRemoteInputManager.getLifetimeExtenders()) { - extender.setCallback( - mock(NotificationLifetimeExtender.NotificationSafeToRemoveCallback.class)); - } - } - - @Test - public void testPerformOnRemoveNotification() { - when(mController.isRemoteInputActive(mEntry)).thenReturn(true); - mRemoteInputManager.onPerformRemoveNotification(mEntry, mEntry.getKey()); - - assertFalse(mEntry.mRemoteEditImeVisible); - verify(mController).removeRemoteInput(mEntry, null); + mRemoteInputManager.setUpWithPresenterForTest(mCallback, mDelegate, mController); } @Test @@ -143,7 +111,6 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { when(mController.isRemoteInputActive(mEntry)).thenReturn(true); assertTrue(mRemoteInputManager.isRemoteInputActive(mEntry)); - assertTrue(mRemoteInputActiveExtender.shouldExtendLifetime(mEntry)); } @Test @@ -152,7 +119,6 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { when(mController.isSpinning(mEntry.getKey())).thenReturn(true); assertTrue(mRemoteInputManager.shouldKeepForRemoteInputHistory(mEntry)); - assertTrue(mRemoteInputHistoryExtender.shouldExtendLifetime(mEntry)); } @Test @@ -161,7 +127,6 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { mEntry.lastRemoteInputSent = SystemClock.elapsedRealtime(); assertTrue(mRemoteInputManager.shouldKeepForRemoteInputHistory(mEntry)); - assertTrue(mRemoteInputHistoryExtender.shouldExtendLifetime(mEntry)); } @Test @@ -170,20 +135,6 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { when(mSmartReplyController.isSendingSmartReply(mEntry.getKey())).thenReturn(true); assertTrue(mRemoteInputManager.shouldKeepForSmartReplyHistory(mEntry)); - assertTrue(mSmartReplyHistoryExtender.shouldExtendLifetime(mEntry)); - } - - @Test - public void testNotificationWithRemoteInputActiveIsRemovedOnCollapse() { - mRemoteInputActiveExtender.setShouldManageLifetime(mEntry, true /* shouldManage */); - - assertEquals(mLegacyRemoteInputLifetimeExtender.getEntriesKeptForRemoteInputActive(), - Sets.newArraySet(mEntry)); - - mRemoteInputManager.onPanelCollapsed(); - - assertTrue( - mLegacyRemoteInputLifetimeExtender.getEntriesKeptForRemoteInputActive().isEmpty()); } private class TestableNotificationRemoteInputManager extends NotificationRemoteInputManager { @@ -227,28 +178,5 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { mRemoteInputController = controller; } - @NonNull - @Override - protected LegacyRemoteInputLifetimeExtender createLegacyRemoteInputLifetimeExtender( - Handler mainHandler, - NotificationEntryManager notificationEntryManager, - SmartReplyController smartReplyController) { - mLegacyRemoteInputLifetimeExtender = new FakeLegacyRemoteInputLifetimeExtender(); - return mLegacyRemoteInputLifetimeExtender; - } - - class FakeLegacyRemoteInputLifetimeExtender extends LegacyRemoteInputLifetimeExtender { - - @Override - protected void addLifetimeExtenders() { - mRemoteInputActiveExtender = new RemoteInputActiveExtender(); - mRemoteInputHistoryExtender = new RemoteInputHistoryExtender(); - mSmartReplyHistoryExtender = new SmartReplyHistoryExtender(); - mLifetimeExtenders.add(mRemoteInputHistoryExtender); - mLifetimeExtenders.add(mSmartReplyHistoryExtender); - mLifetimeExtenders.add(mRemoteInputActiveExtender); - } - } - } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/SmartReplyControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/SmartReplyControllerTest.java index 3500e4d5f701..c75aa81e4c43 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/SmartReplyControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/SmartReplyControllerTest.java @@ -17,15 +17,15 @@ package com.android.systemui.statusbar; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.app.ActivityManager; import android.app.Notification; import android.os.Handler; -import android.os.Looper; import android.os.RemoteException; import android.os.UserHandle; import android.service.notification.StatusBarNotification; @@ -39,14 +39,12 @@ import com.android.internal.statusbar.IStatusBarService; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.dump.DumpManager; -import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.statusbar.notification.NotifPipelineFlags; -import com.android.systemui.statusbar.notification.NotificationEntryManager; +import com.android.systemui.statusbar.notification.collection.NotifPipeline; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; +import com.android.systemui.statusbar.notification.collection.coordinator.RemoteInputCoordinator; +import com.android.systemui.statusbar.notification.collection.notifcollection.InternalNotifUpdater; import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider; -import com.android.systemui.statusbar.phone.CentralSurfaces; -import com.android.systemui.statusbar.policy.RemoteInputUriController; import org.junit.Before; import org.junit.Test; @@ -54,8 +52,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.util.Optional; - @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest @@ -67,57 +63,50 @@ public class SmartReplyControllerTest extends SysuiTestCase { private static final int TEST_CHOICE_COUNT = 4; private static final int TEST_ACTION_COUNT = 3; - private Notification mNotification; private NotificationEntry mEntry; private SmartReplyController mSmartReplyController; - private NotificationRemoteInputManager mRemoteInputManager; @Mock private NotificationVisibilityProvider mVisibilityProvider; - @Mock private RemoteInputController.Delegate mDelegate; - @Mock private NotificationRemoteInputManager.Callback mCallback; @Mock private StatusBarNotification mSbn; - @Mock private NotificationEntryManager mNotificationEntryManager; @Mock private IStatusBarService mIStatusBarService; - @Mock private StatusBarStateController mStatusBarStateController; - @Mock private RemoteInputUriController mRemoteInputUriController; @Mock private NotificationClickNotifier mClickNotifier; + @Mock private InternalNotifUpdater mInternalNotifUpdater; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mDependency.injectTestDependency(NotificationEntryManager.class, - mNotificationEntryManager); mSmartReplyController = new SmartReplyController( mock(DumpManager.class), mVisibilityProvider, mIStatusBarService, mClickNotifier); - mDependency.injectTestDependency(SmartReplyController.class, + RemoteInputCoordinator remoteInputCoordinator = new RemoteInputCoordinator( + mock(DumpManager.class), + new RemoteInputNotificationRebuilder(mContext), + mock(NotificationRemoteInputManager.class), + mock(Handler.class), mSmartReplyController); + remoteInputCoordinator.setRemoteInputController(mock(RemoteInputController.class)); + NotifPipeline notifPipeline = mock(NotifPipeline.class); + when(notifPipeline.getInternalNotifUpdater(anyString())).thenReturn(mInternalNotifUpdater); + remoteInputCoordinator.attach(notifPipeline); - mRemoteInputManager = new NotificationRemoteInputManager(mContext, - mock(NotifPipelineFlags.class), - mock(NotificationLockscreenUserManager.class), - mSmartReplyController, - mVisibilityProvider, - mNotificationEntryManager, - new RemoteInputNotificationRebuilder(mContext), - () -> Optional.of(mock(CentralSurfaces.class)), - mStatusBarStateController, - Handler.createAsync(Looper.myLooper()), - mRemoteInputUriController, - mClickNotifier, - mock(ActionClickLogger.class), - mock(DumpManager.class)); - mRemoteInputManager.setUpWithCallback(mCallback, mDelegate); - mNotification = new Notification.Builder(mContext, "") + Notification notification = new Notification.Builder(mContext, "") .setSmallIcon(R.drawable.ic_person) .setContentTitle("Title") .setContentText("Text").build(); - - mSbn = new StatusBarNotification(TEST_PACKAGE_NAME, TEST_PACKAGE_NAME, 0, null, TEST_UID, - 0, mNotification, new UserHandle(ActivityManager.getCurrentUser()), null, 0); + mSbn = new StatusBarNotification( + TEST_PACKAGE_NAME, + TEST_PACKAGE_NAME, + 0, + null, + TEST_UID, + 0, + notification, + new UserHandle(ActivityManager.getCurrentUser()), + null, + 0); mEntry = new NotificationEntryBuilder() .setSbn(mSbn) .build(); @@ -128,10 +117,9 @@ public class SmartReplyControllerTest extends SysuiTestCase { mSmartReplyController.smartReplySent(mEntry, TEST_CHOICE_INDEX, TEST_CHOICE_TEXT, MetricsEvent.LOCATION_UNKNOWN, false /* modifiedBeforeSending */); - // Sending smart reply should make calls to NotificationEntryManager - // to update the notification with reply and spinner. - verify(mNotificationEntryManager).updateNotification( - argThat(sbn -> sbn.getKey().equals(mSbn.getKey())), isNull()); + // Sending smart reply should update the notification with reply and spinner. + verify(mInternalNotifUpdater).onInternalNotificationUpdate( + argThat(sbn -> sbn.getKey().equals(mSbn.getKey())), anyString()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java index af43826091a0..ef763d9f8b30 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java @@ -152,8 +152,6 @@ public class NotifCollectionTest extends SysuiTestCase { MockitoAnnotations.initMocks(this); allowTestableLooperAsMainThread(); - when(mNotifPipelineFlags.isNewPipelineEnabled()).thenReturn(true); - when(mEulogizer.record(any(Exception.class))).thenAnswer(i -> i.getArguments()[0]); mListenerInOrder = inOrder(mCollectionListener); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt index 5ba926e29087..0830191fe035 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt @@ -60,7 +60,6 @@ class ViewConfigCoordinatorTest : SysuiTestCase() { @Before fun setUp() { - whenever(pipeline.isNewPipelineEnabled).thenReturn(true) whenever(pipeline.allNotifs).thenReturn(listOf(entry)) whenever(entry.row).thenReturn(row) coordinator = ViewConfigCoordinator( diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImplTest.java index 3f56cf9cb8ad..54cbe24df732 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImplTest.java @@ -206,11 +206,9 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { @Test public void testDoNotRunFilterOnNewPipeline() { - when(mFlags.isNewPipelineEnabled()).thenReturn(true); // WHEN this entry should be filtered out NotificationEntry entry = createNotification(IMPORTANCE_DEFAULT); mNotifInterruptionStateProvider.shouldHeadsUp(entry); - verify(mFlags, times(1)).isNewPipelineEnabled(); verify(mNotificationFilter, times(0)).shouldFilterOut(eq(entry)); } @@ -326,7 +324,8 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { public void testShouldNotHeadsUp_filtered() throws RemoteException { ensureStateForHeadsUpWhenAwake(); // Make canAlertCommon false by saying it's filtered out - when(mNotificationFilter.shouldFilterOut(any())).thenReturn(true); + when(mKeyguardNotificationVisibilityProvider.shouldHideNotification(any())) + .thenReturn(true); NotificationEntry entry = createNotification(IMPORTANCE_HIGH); assertThat(mNotifInterruptionStateProvider.shouldHeadsUp(entry)).isFalse(); @@ -504,7 +503,8 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { ensureStateForBubbleUp(); // Make canAlertCommon false by saying it's filtered out - when(mNotificationFilter.shouldFilterOut(any())).thenReturn(true); + when(mKeyguardNotificationVisibilityProvider.shouldHideNotification(any())) + .thenReturn(true); assertThat(mNotifInterruptionStateProvider.shouldBubbleUp(createBubble())).isFalse(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerLegacyTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerLegacyTest.java deleted file mode 100644 index 429d2ed36cc7..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerLegacyTest.java +++ /dev/null @@ -1,299 +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.notification.logging; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.app.Notification; -import android.os.Handler; -import android.os.Looper; -import android.os.UserHandle; -import android.testing.AndroidTestingRunner; -import android.testing.TestableLooper; - -import androidx.test.filters.SmallTest; - -import com.android.internal.logging.InstanceId; -import com.android.internal.statusbar.IStatusBarService; -import com.android.internal.statusbar.NotificationVisibility; -import com.android.systemui.SysuiTestCase; -import com.android.systemui.statusbar.NotificationListener; -import com.android.systemui.statusbar.StatusBarState; -import com.android.systemui.statusbar.StatusBarStateControllerImpl; -import com.android.systemui.statusbar.notification.NotifPipelineFlags; -import com.android.systemui.statusbar.notification.NotificationEntryManager; -import com.android.systemui.statusbar.notification.collection.NotifLiveData; -import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore; -import com.android.systemui.statusbar.notification.collection.NotifPipeline; -import com.android.systemui.statusbar.notification.collection.NotificationEntry; -import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; -import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider; -import com.android.systemui.statusbar.notification.logging.nano.Notifications; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; -import com.android.systemui.statusbar.notification.stack.NotificationListContainer; -import com.android.systemui.util.concurrency.FakeExecutor; -import com.android.systemui.util.time.FakeSystemClock; - -import com.google.android.collect.Lists; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - -import java.util.List; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.Executor; - -@SmallTest -@RunWith(AndroidTestingRunner.class) -@TestableLooper.RunWithLooper -public class NotificationLoggerLegacyTest extends SysuiTestCase { - private static final String TEST_PACKAGE_NAME = "test"; - private static final int TEST_UID = 0; - - @Mock private NotificationListContainer mListContainer; - @Mock private IStatusBarService mBarService; - @Mock private ExpandableNotificationRow mRow; - @Mock private NotificationLogger.ExpansionStateLogger mExpansionStateLogger; - - // Dependency mocks: - @Mock private NotifPipelineFlags mNotifPipelineFlags; - @Mock private NotifLiveDataStore mNotifLiveDataStore; - @Mock private NotifLiveData<List<NotificationEntry>> mActiveNotifList; - @Mock private NotificationVisibilityProvider mVisibilityProvider; - @Mock private NotificationEntryManager mEntryManager; - @Mock private NotifPipeline mNotifPipeline; - @Mock private NotificationListener mListener; - - private NotificationEntry mEntry; - private TestableNotificationLogger mLogger; - private ConcurrentLinkedQueue<AssertionError> mErrorQueue = new ConcurrentLinkedQueue<>(); - private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock()); - private NotificationPanelLoggerFake mNotificationPanelLoggerFake = - new NotificationPanelLoggerFake(); - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - when(mNotifLiveDataStore.getActiveNotifList()).thenReturn(mActiveNotifList); - - mEntry = new NotificationEntryBuilder() - .setPkg(TEST_PACKAGE_NAME) - .setOpPkg(TEST_PACKAGE_NAME) - .setUid(TEST_UID) - .setNotification(new Notification()) - .setUser(UserHandle.CURRENT) - .setInstanceId(InstanceId.fakeInstanceId(1)) - .build(); - mEntry.setRow(mRow); - - mLogger = new TestableNotificationLogger( - mListener, - mUiBgExecutor, - mNotifPipelineFlags, - mNotifLiveDataStore, - mVisibilityProvider, - mEntryManager, - mNotifPipeline, - mock(StatusBarStateControllerImpl.class), - mBarService, - mExpansionStateLogger - ); - mLogger.setUpWithContainer(mListContainer); - verify(mEntryManager).addNotificationEntryListener(any()); - verify(mNotifPipeline, never()).addCollectionListener(any()); - } - - @After - public void tearDown() { - mLogger.mHandler.removeCallbacksAndMessages(null); - } - - @Test - public void testOnChildLocationsChangedReportsVisibilityChanged() throws Exception { - NotificationVisibility[] newlyVisibleKeys = { - NotificationVisibility.obtain(mEntry.getKey(), 0, 1, true) - }; - NotificationVisibility[] noLongerVisibleKeys = {}; - doAnswer(invocation -> { - try { - assertArrayEquals(newlyVisibleKeys, - (NotificationVisibility[]) invocation.getArguments()[0]); - assertArrayEquals(noLongerVisibleKeys, - (NotificationVisibility[]) invocation.getArguments()[1]); - } catch (AssertionError error) { - mErrorQueue.offer(error); - } - return null; - } - ).when(mBarService).onNotificationVisibilityChanged(any(NotificationVisibility[].class), - any(NotificationVisibility[].class)); - - when(mListContainer.isInVisibleLocation(any())).thenReturn(true); - when(mActiveNotifList.getValue()).thenReturn(Lists.newArrayList(mEntry)); - mLogger.getChildLocationsChangedListenerForTest().onChildLocationsChanged(); - TestableLooper.get(this).processAllMessages(); - mUiBgExecutor.runAllReady(); - - if (!mErrorQueue.isEmpty()) { - throw mErrorQueue.poll(); - } - - // |mEntry| won't change visibility, so it shouldn't be reported again: - Mockito.reset(mBarService); - mLogger.getChildLocationsChangedListenerForTest().onChildLocationsChanged(); - TestableLooper.get(this).processAllMessages(); - mUiBgExecutor.runAllReady(); - - verify(mBarService, never()).onNotificationVisibilityChanged(any(), any()); - } - - @Test - public void testStoppingNotificationLoggingReportsCurrentNotifications() - throws Exception { - when(mListContainer.isInVisibleLocation(any())).thenReturn(true); - when(mActiveNotifList.getValue()).thenReturn(Lists.newArrayList(mEntry)); - mLogger.getChildLocationsChangedListenerForTest().onChildLocationsChanged(); - TestableLooper.get(this).processAllMessages(); - mUiBgExecutor.runAllReady(); - Mockito.reset(mBarService); - - setStateAsleep(); - mLogger.onDozingChanged(false); // Wake to lockscreen - mLogger.onDozingChanged(true); // And go back to sleep, turning off logging - mUiBgExecutor.runAllReady(); - // The visibility objects are recycled by NotificationLogger, so we can't use specific - // matchers here. - verify(mBarService, times(1)).onNotificationVisibilityChanged(any(), any()); - } - - private void setStateAsleep() { - mLogger.onPanelExpandedChanged(true); - mLogger.onDozingChanged(true); - mLogger.onStateChanged(StatusBarState.KEYGUARD); - } - - private void setStateAwake() { - mLogger.onPanelExpandedChanged(false); - mLogger.onDozingChanged(false); - mLogger.onStateChanged(StatusBarState.SHADE); - } - - @Test - public void testLogPanelShownOnWake() { - when(mActiveNotifList.getValue()).thenReturn(Lists.newArrayList(mEntry)); - setStateAsleep(); - mLogger.onDozingChanged(false); // Wake to lockscreen - assertEquals(1, mNotificationPanelLoggerFake.getCalls().size()); - assertTrue(mNotificationPanelLoggerFake.get(0).isLockscreen); - assertEquals(1, mNotificationPanelLoggerFake.get(0).list.notifications.length); - Notifications.Notification n = mNotificationPanelLoggerFake.get(0).list.notifications[0]; - assertEquals(TEST_PACKAGE_NAME, n.packageName); - assertEquals(TEST_UID, n.uid); - assertEquals(1, n.instanceId); - assertFalse(n.isGroupSummary); - assertEquals(Notifications.Notification.SECTION_ALERTING, n.section); - } - - @Test - public void testLogPanelShownOnShadePull() { - when(mActiveNotifList.getValue()).thenReturn(Lists.newArrayList(mEntry)); - setStateAwake(); - // Now expand panel - mLogger.onPanelExpandedChanged(true); - assertEquals(1, mNotificationPanelLoggerFake.getCalls().size()); - assertFalse(mNotificationPanelLoggerFake.get(0).isLockscreen); - assertEquals(1, mNotificationPanelLoggerFake.get(0).list.notifications.length); - Notifications.Notification n = mNotificationPanelLoggerFake.get(0).list.notifications[0]; - assertEquals(TEST_PACKAGE_NAME, n.packageName); - assertEquals(TEST_UID, n.uid); - assertEquals(1, n.instanceId); - assertFalse(n.isGroupSummary); - assertEquals(Notifications.Notification.SECTION_ALERTING, n.section); - } - - - @Test - public void testLogPanelShownHandlesNullInstanceIds() { - // Construct a NotificationEntry like mEntry, but with a null instance id. - NotificationEntry entry = new NotificationEntryBuilder() - .setPkg(TEST_PACKAGE_NAME) - .setOpPkg(TEST_PACKAGE_NAME) - .setUid(TEST_UID) - .setNotification(new Notification()) - .setUser(UserHandle.CURRENT) - .build(); - entry.setRow(mRow); - - when(mActiveNotifList.getValue()).thenReturn(Lists.newArrayList(entry)); - setStateAsleep(); - mLogger.onDozingChanged(false); // Wake to lockscreen - assertEquals(1, mNotificationPanelLoggerFake.getCalls().size()); - assertEquals(1, mNotificationPanelLoggerFake.get(0).list.notifications.length); - Notifications.Notification n = mNotificationPanelLoggerFake.get(0).list.notifications[0]; - assertEquals(0, n.instanceId); - } - - private class TestableNotificationLogger extends NotificationLogger { - - TestableNotificationLogger(NotificationListener notificationListener, - Executor uiBgExecutor, - NotifPipelineFlags notifPipelineFlags, - NotifLiveDataStore notifLiveDataStore, - NotificationVisibilityProvider visibilityProvider, - NotificationEntryManager entryManager, - NotifPipeline notifPipeline, - StatusBarStateControllerImpl statusBarStateController, - IStatusBarService barService, - ExpansionStateLogger expansionStateLogger) { - super( - notificationListener, - uiBgExecutor, - notifPipelineFlags, - notifLiveDataStore, - visibilityProvider, - entryManager, - notifPipeline, - statusBarStateController, - expansionStateLogger, - mNotificationPanelLoggerFake - ); - mBarService = barService; - mHandler.removeCallbacksAndMessages(null); - // Make this on the current thread so we can wait for it during tests. - mHandler = Handler.createAsync(Looper.myLooper()); - } - - OnChildLocationsChangedListener getChildLocationsChangedListenerForTest() { - return mNotificationLocationsChangedListener; - } - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java index b69bd8dfca9c..8a7b9d3b6024 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java @@ -103,7 +103,6 @@ public class NotificationLoggerTest extends SysuiTestCase { @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mNotifPipelineFlags.isNewPipelineEnabled()).thenReturn(true); when(mNotifLiveDataStore.getActiveNotifList()).thenReturn(mActiveNotifEntries); mEntry = new NotificationEntryBuilder() @@ -278,10 +277,8 @@ public class NotificationLoggerTest extends SysuiTestCase { super( notificationListener, uiBgExecutor, - notifPipelineFlags, notifLiveDataStore, visibilityProvider, - entryManager, notifPipeline, statusBarStateController, expansionStateLogger, 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 2faff0ced70a..b4532c431415 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 @@ -84,6 +84,7 @@ import com.android.systemui.accessibility.floatingmenu.AccessibilityFloatingMenu import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.assist.AssistManager; import com.android.systemui.broadcast.BroadcastDispatcher; +import com.android.systemui.charging.WiredChargingRippleController; import com.android.systemui.classifier.FalsingCollectorFake; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.colorextraction.SysuiColorExtractor; @@ -117,7 +118,6 @@ import com.android.systemui.statusbar.OperatorNameViewController; import com.android.systemui.statusbar.PulseExpansionHandler; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.StatusBarStateControllerImpl; -import com.android.systemui.statusbar.charging.WiredChargingRippleController; import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.statusbar.notification.DynamicPrivacyController; import com.android.systemui.statusbar.notification.NotifPipelineFlags; @@ -322,10 +322,8 @@ public class CentralSurfacesImplTest extends SysuiTestCase { NotificationLogger notificationLogger = new NotificationLogger( mNotificationListener, mUiBgExecutor, - mNotifPipelineFlags, mNotifLiveDataStore, mVisibilityProvider, - mock(NotificationEntryManager.class), mock(NotifPipeline.class), mStatusBarStateController, mExpansionStateLogger, @@ -848,7 +846,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { mCentralSurfaces.showKeyguardImpl(); // Starting a pulse should change the scrim controller to the pulsing state - when(mNotificationPanelViewController.isLaunchTransitionRunning()).thenReturn(true); when(mNotificationPanelViewController.isLaunchingAffordanceWithPreview()).thenReturn(true); mCentralSurfaces.updateScrimController(); verify(mScrimController).transitionTo(eq(ScrimState.UNLOCKED), any()); @@ -885,7 +882,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { mCentralSurfaces.showKeyguardImpl(); // Starting a pulse should change the scrim controller to the pulsing state - when(mNotificationPanelViewController.isLaunchTransitionRunning()).thenReturn(true); when(mNotificationPanelViewController.isLaunchingAffordanceWithPreview()).thenReturn(false); mCentralSurfaces.updateScrimController(); verify(mScrimController).transitionTo(eq(ScrimState.KEYGUARD)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaTest.kt index 31465f45af42..4b557dc423ff 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaTest.kt @@ -12,12 +12,12 @@ import com.android.systemui.statusbar.policy.AccessibilityController import com.android.systemui.statusbar.policy.FlashlightController import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.tuner.TunerService +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.MockitoAnnotations -import java.util.concurrent.Executor @SmallTest @RunWith(AndroidTestingRunner::class) @@ -51,6 +51,5 @@ class KeyguardBottomAreaTest : SysuiTestCase() { null, false) as KeyguardBottomAreaView other.initFrom(mKeyguardBottomArea) - other.launchVoiceAssist() } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java index 9664035e1e1b..fca9771648ea 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LightsOutNotifControllerTest.java @@ -108,7 +108,8 @@ public class LightsOutNotifControllerTest extends SysuiTestCase { false /* navbarColorManagedByIme */, BEHAVIOR_DEFAULT, null /* requestedVisibilities */, - null /* packageName */); + null /* packageName */, + null /* letterboxDetails */); assertTrue(mLightsOutNotifController.areLightsOut()); } @@ -121,7 +122,8 @@ public class LightsOutNotifControllerTest extends SysuiTestCase { false /* navbarColorManagedByIme */, BEHAVIOR_DEFAULT, null /* requestedVisibilities */, - null /* packageName */); + null /* packageName */, + null /* letterboxDetails */); assertFalse(mLightsOutNotifController.areLightsOut()); } @@ -152,7 +154,8 @@ public class LightsOutNotifControllerTest extends SysuiTestCase { false /* navbarColorManagedByIme */, BEHAVIOR_DEFAULT, null /* requestedVisibilities */, - null /* packageName */); + null /* packageName */, + null /* letterboxDetails */); // THEN we should show dot assertTrue(mLightsOutNotifController.shouldShowDot()); @@ -172,7 +175,8 @@ public class LightsOutNotifControllerTest extends SysuiTestCase { false /* navbarColorManagedByIme */, BEHAVIOR_DEFAULT, null /* requestedVisibilities */, - null /* packageName */); + null /* packageName */, + null /* letterboxDetails */); // THEN we shouldn't show the dot assertFalse(mLightsOutNotifController.shouldShowDot()); @@ -192,7 +196,8 @@ public class LightsOutNotifControllerTest extends SysuiTestCase { false /* navbarColorManagedByIme */, BEHAVIOR_DEFAULT, null /* requestedVisibilities */, - null /* packageName */); + null /* packageName */, + null /* letterboxDetails */); // THEN we shouldn't show the dot assertFalse(mLightsOutNotifController.shouldShowDot()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java index 79c7e55d4d09..686718a96dd2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java @@ -87,6 +87,7 @@ import com.android.systemui.DejankUtils; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.biometrics.AuthController; +import com.android.systemui.camera.CameraGestureHelper; import com.android.systemui.classifier.FalsingCollectorFake; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.controls.dagger.ControlsComponent; @@ -106,7 +107,6 @@ import com.android.systemui.plugins.qs.QS; import com.android.systemui.qrcodescanner.controller.QRCodeScannerController; import com.android.systemui.screenrecord.RecordingController; import com.android.systemui.statusbar.CommandQueue; -import com.android.systemui.statusbar.KeyguardAffordanceView; import com.android.systemui.statusbar.KeyguardIndicationController; import com.android.systemui.statusbar.LockscreenShadeTransitionController; import com.android.systemui.statusbar.NotificationRemoteInputManager; @@ -401,8 +401,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { when(mNotificationStackScrollLayoutController.getHeadsUpCallback()) .thenReturn(mHeadsUpCallback); when(mView.findViewById(R.id.keyguard_bottom_area)).thenReturn(mKeyguardBottomArea); - when(mKeyguardBottomArea.getLeftView()).thenReturn(mock(KeyguardAffordanceView.class)); - when(mKeyguardBottomArea.getRightView()).thenReturn(mock(KeyguardAffordanceView.class)); when(mKeyguardBottomArea.animate()).thenReturn(mock(ViewPropertyAnimator.class)); when(mView.findViewById(R.id.qs_frame)).thenReturn(mQsFrame); when(mView.findViewById(R.id.keyguard_status_view)) @@ -544,7 +542,8 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { mNotificationStackSizeCalculator, mUnlockedScreenOffAnimationController, mShadeTransitionController, - mSystemClock); + mSystemClock, + mock(CameraGestureHelper.class)); mNotificationPanelViewController.initDependencies( mCentralSurfaces, () -> {}, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt index e0bf9e7b0081..1af8a77b1610 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt @@ -44,6 +44,7 @@ import com.android.systemui.GuestResumeSessionReceiver import com.android.systemui.GuestSessionNotification import com.android.systemui.R import com.android.systemui.SysuiTestCase +import com.android.systemui.animation.DialogCuj import com.android.systemui.animation.DialogLaunchAnimator import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.broadcast.BroadcastSender @@ -72,12 +73,12 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.anyInt import org.mockito.Mock -import org.mockito.Mockito.`when` import org.mockito.Mockito.doNothing import org.mockito.Mockito.doReturn import org.mockito.Mockito.eq import org.mockito.Mockito.mock import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations @RunWith(AndroidTestingRunner::class) @@ -362,7 +363,10 @@ class UserSwitcherControllerTest : SysuiTestCase() { userSwitcherController.onUserListItemClicked(currentGuestUserRecord, dialogShower) assertNotNull(userSwitcherController.mExitGuestDialog) testableLooper.processAllMessages() - verify(dialogShower).showDialog(userSwitcherController.mExitGuestDialog) + verify(dialogShower) + .showDialog( + userSwitcherController.mExitGuestDialog, + DialogCuj(InteractionJankMonitor.CUJ_USER_DIALOG_OPEN, "exit_guest_mode")) } @Test diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java index 966d887d11f7..dc39b01cf6b6 100644 --- a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java +++ b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java @@ -184,7 +184,12 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH mPanningScalingState.mScrollGestureDetector.onTouchEvent(event); mPanningScalingState.mScaleGestureDetector.onTouchEvent(event); - stateHandler.onMotionEvent(event, rawEvent, policyFlags); + try { + stateHandler.onMotionEvent(event, rawEvent, policyFlags); + } catch (GestureException e) { + Slog.e(mLogTag, "Error processing motion event", e); + clearAndTransitionToStateDetecting(); + } } @Override @@ -281,7 +286,8 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH } interface State { - void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags); + void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) + throws GestureException; default void clear() {} @@ -439,7 +445,8 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH private boolean mLastMoveOutsideMagnifiedRegion; @Override - public void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) { + public void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) + throws GestureException { final int action = event.getActionMasked(); switch (action) { case ACTION_POINTER_DOWN: { @@ -449,7 +456,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH break; case ACTION_MOVE: { if (event.getPointerCount() != 1) { - throw new IllegalStateException("Should have one pointer down."); + throw new GestureException("Should have one pointer down."); } final float eventX = event.getX(); final float eventY = event.getY(); @@ -475,7 +482,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH case ACTION_DOWN: case ACTION_POINTER_UP: { - throw new IllegalArgumentException( + throw new GestureException( "Unexpected event type: " + MotionEvent.actionToString(action)); } } @@ -1087,4 +1094,13 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH mGestureHandler.mDetectingState.setShortcutTriggered(false); } } + + /** + * Indicates an error with a gesture handler or state. + */ + private static class GestureException extends Exception { + GestureException(String message) { + super(message); + } + } } diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java index b00d8b47906a..53b8b53e2b6c 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java @@ -27,6 +27,7 @@ import android.view.InsetsVisibilities; import android.view.WindowInsetsController.Appearance; import android.view.WindowInsetsController.Behavior; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.view.AppearanceRegion; import com.android.server.notification.NotificationDelegate; @@ -133,7 +134,8 @@ public interface StatusBarManagerInternal { /** @see com.android.internal.statusbar.IStatusBar#onSystemBarAttributesChanged */ void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, - @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName); + @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName, + LetterboxDetails[] letterboxDetails); /** @see com.android.internal.statusbar.IStatusBar#showTransient */ void showTransient(int displayId, @InternalInsetsType int[] types, diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 46e7574e1c8a..71b1bc2e24bc 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -96,6 +96,7 @@ import com.android.internal.statusbar.ISessionListener; import com.android.internal.statusbar.IStatusBar; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.IUndoMediaTransferCallback; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.statusbar.NotificationVisibility; import com.android.internal.statusbar.RegisterStatusBarResult; import com.android.internal.statusbar.StatusBarIcon; @@ -596,13 +597,15 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D public void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, @Behavior int behavior, InsetsVisibilities requestedVisibilities, - String packageName) { + String packageName, LetterboxDetails[] letterboxDetails) { getUiState(displayId).setBarAttributes(appearance, appearanceRegions, - navbarColorManagedByIme, behavior, requestedVisibilities, packageName); + navbarColorManagedByIme, behavior, requestedVisibilities, packageName, + letterboxDetails); if (mBar != null) { try { mBar.onSystemBarAttributesChanged(displayId, appearance, appearanceRegions, - navbarColorManagedByIme, behavior, requestedVisibilities, packageName); + navbarColorManagedByIme, behavior, requestedVisibilities, packageName, + letterboxDetails); } catch (RemoteException ex) { } } } @@ -1204,17 +1207,20 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D private int mImeBackDisposition = 0; private boolean mShowImeSwitcher = false; private IBinder mImeToken = null; + private LetterboxDetails[] mLetterboxDetails; private void setBarAttributes(@Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, @Behavior int behavior, InsetsVisibilities requestedVisibilities, - String packageName) { + String packageName, + LetterboxDetails[] letterboxDetails) { mAppearance = appearance; mAppearanceRegions = appearanceRegions; mNavbarColorManagedByIme = navbarColorManagedByIme; mBehavior = behavior; mRequestedVisibilities = requestedVisibilities; mPackageName = packageName; + mLetterboxDetails = letterboxDetails; } private void showTransient(@InternalInsetsType int[] types) { @@ -1341,7 +1347,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D state.mImeBackDisposition, state.mShowImeSwitcher, gatherDisableActionsLocked(mCurrentUserId, 2), state.mImeToken, state.mNavbarColorManagedByIme, state.mBehavior, state.mRequestedVisibilities, - state.mPackageName, transientBarTypes); + state.mPackageName, transientBarTypes, state.mLetterboxDetails); } } diff --git a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java index a452013bf42a..7d84bdf78056 100644 --- a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java +++ b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java @@ -49,6 +49,7 @@ import android.content.pm.ResolveInfo; import android.content.pm.SuspendDialogInfo; import android.content.pm.UserInfo; import android.os.Bundle; +import android.os.IBinder; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; @@ -64,7 +65,7 @@ import com.android.server.am.ActivityManagerService; import com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptResult; /** - * A class that contains activity intercepting logic for {@link ActivityStarter#startActivityLocked} + * A class that contains activity intercepting logic for {@link ActivityStarter#execute()} * It's initialized via setStates and interception occurs via the intercept method. * * Note that this class is instantiated when {@link ActivityManagerService} gets created so there @@ -104,6 +105,7 @@ class ActivityStartInterceptor { ActivityInfo mAInfo; String mResolvedType; Task mInTask; + TaskFragment mInTaskFragment; ActivityOptions mActivityOptions; ActivityStartInterceptor( @@ -135,15 +137,46 @@ class ActivityStartInterceptor { } private IntentSender createIntentSenderForOriginalIntent(int callingUid, int flags) { - Bundle activityOptions = deferCrossProfileAppsAnimationIfNecessary(); + Bundle bOptions = deferCrossProfileAppsAnimationIfNecessary(); + final TaskFragment taskFragment = getLaunchTaskFragment(); + // If the original intent is going to be embedded, try to forward the embedding TaskFragment + // and its task id to embed back the original intent. + if (taskFragment != null) { + ActivityOptions activityOptions = bOptions != null + ? ActivityOptions.fromBundle(bOptions) + : ActivityOptions.makeBasic(); + activityOptions.setLaunchTaskFragmentToken(taskFragment.getFragmentToken()); + bOptions = activityOptions.toBundle(); + } final IIntentSender target = mService.getIntentSenderLocked( INTENT_SENDER_ACTIVITY, mCallingPackage, mCallingFeatureId, callingUid, mUserId, null /*token*/, null /*resultCode*/, 0 /*requestCode*/, new Intent[] { mIntent }, new String[] { mResolvedType }, - flags, activityOptions); + flags, bOptions); return new IntentSender(target); } + + /** + * A helper function to obtain the targeted {@link TaskFragment} during + * {@link #intercept(Intent, ResolveInfo, ActivityInfo, String, Task, TaskFragment, int, int, + * ActivityOptions)} if any. + */ + @Nullable + private TaskFragment getLaunchTaskFragment() { + if (mInTaskFragment != null) { + return mInTaskFragment; + } + if (mActivityOptions == null) { + return null; + } + final IBinder taskFragToken = mActivityOptions.getLaunchTaskFragmentToken(); + if (taskFragToken == null) { + return null; + } + return TaskFragment.fromTaskFragmentToken(taskFragToken, mService); + } + /** * Intercept the launch intent based on various signals. If an interception happened the * internal variables get assigned and need to be read explicitly by the caller. @@ -151,7 +184,8 @@ class ActivityStartInterceptor { * @return true if an interception occurred */ boolean intercept(Intent intent, ResolveInfo rInfo, ActivityInfo aInfo, String resolvedType, - Task inTask, int callingPid, int callingUid, ActivityOptions activityOptions) { + Task inTask, TaskFragment inTaskFragment, int callingPid, int callingUid, + ActivityOptions activityOptions) { mUserManager = UserManager.get(mServiceContext); mIntent = intent; @@ -161,6 +195,7 @@ class ActivityStartInterceptor { mAInfo = aInfo; mResolvedType = resolvedType; mInTask = inTask; + mInTaskFragment = inTaskFragment; mActivityOptions = activityOptions; if (interceptQuietProfileIfNeeded()) { @@ -332,12 +367,21 @@ class ActivityStartInterceptor { mCallingPid = mRealCallingPid; mCallingUid = mRealCallingUid; mResolvedType = null; + final TaskFragment taskFragment = getLaunchTaskFragment(); // If we are intercepting and there was a task, convert it into an extra for the // ConfirmCredentials intent and unassign it, as otherwise the task will move to // front even if ConfirmCredentials is cancelled. if (mInTask != null) { mIntent.putExtra(EXTRA_TASK_ID, mInTask.mTaskId); mInTask = null; + } else if (taskFragment != null) { + // If the original intent is started to an embedded TaskFragment, append its parent task + // id to extra. It is to embed back the original intent to the TaskFragment with the + // same task. + final Task parentTask = taskFragment.getTask(); + if (parentTask != null) { + mIntent.putExtra(EXTRA_TASK_ID, parentTask.mTaskId); + } } if (mActivityOptions == null) { mActivityOptions = ActivityOptions.makeBasic(); diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index a7c09a4f9739..d5362a070d8e 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1060,8 +1060,8 @@ class ActivityStarter { mInterceptor.setStates(userId, realCallingPid, realCallingUid, startFlags, callingPackage, callingFeatureId); - if (mInterceptor.intercept(intent, rInfo, aInfo, resolvedType, inTask, callingPid, - callingUid, checkedOptions)) { + if (mInterceptor.intercept(intent, rInfo, aInfo, resolvedType, inTask, inTaskFragment, + callingPid, callingUid, checkedOptions)) { // activity start was intercepted, e.g. because the target user is currently in quiet // mode (turn off work) or the target application is suspended intent = mInterceptor.mIntent; diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index cff8b93ac947..95f76180c600 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -46,6 +46,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_INTERCEPT_GLOBAL_DRAG_AND_DROP; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; @@ -145,6 +146,7 @@ import com.android.internal.policy.GestureNavigationSettingsObserver; import com.android.internal.policy.ScreenDecorationsUtils; import com.android.internal.policy.SystemBarUtils; import com.android.internal.protolog.common.ProtoLog; +import com.android.internal.statusbar.LetterboxDetails; import com.android.internal.util.ScreenshotHelper; import com.android.internal.util.function.TriConsumer; import com.android.internal.view.AppearanceRegion; @@ -1165,7 +1167,8 @@ public class DisplayPolicy { continue; } calculateInsetsFrame(displayFrames, win, inOutFrame, - provider.source, provider.insetsSize + provider.source, provider.insetsSize, + lp.privateFlags, lp.gravity ); } } @@ -1240,21 +1243,25 @@ public class DisplayPolicy { provider.insetsSize != null ? (displayFrames, windowContainer, inOutFrame) -> { inOutFrame.inset(win.mGivenContentInsets); + final LayoutParams lp = + win.mAttrs.forRotation(displayFrames.mRotation); final InsetsFrameProvider ifp = - win.mAttrs.forRotation(displayFrames.mRotation) - .providedInsets[index]; + lp.providedInsets[index]; calculateInsetsFrame(displayFrames, windowContainer, - inOutFrame, ifp.source, ifp.insetsSize); + inOutFrame, ifp.source, ifp.insetsSize, + lp.privateFlags, lp.gravity); } : null; final TriConsumer<DisplayFrames, WindowContainer, Rect> imeFrameProvider = provider.imeInsetsSize != null ? (displayFrames, windowContainer, inOutFrame) -> { inOutFrame.inset(win.mGivenContentInsets); + final LayoutParams lp = + win.mAttrs.forRotation(displayFrames.mRotation); final InsetsFrameProvider ifp = - win.mAttrs.forRotation(displayFrames.mRotation) - .providedInsets[index]; + lp.providedInsets[index]; calculateInsetsFrame(displayFrames, windowContainer, - inOutFrame, ifp.source, ifp.imeInsetsSize); + inOutFrame, ifp.source, ifp.imeInsetsSize, + lp.privateFlags, lp.gravity); } : null; mDisplayContent.setInsetProvider(provider.type, win, frameProvider, imeFrameProvider); @@ -1266,11 +1273,15 @@ public class DisplayPolicy { } private void calculateInsetsFrame(DisplayFrames df, WindowContainer container, Rect inOutFrame, - int source, Insets insetsSize) { + int source, Insets insetsSize, @LayoutParams.PrivateFlags int privateFlags, + int windowGravity) { + boolean extendByCutout = false; if (source == InsetsFrameProvider.SOURCE_DISPLAY) { inOutFrame.set(df.mUnrestricted); } else if (source == InsetsFrameProvider.SOURCE_CONTAINER_BOUNDS) { inOutFrame.set(container.getBounds()); + } else { + extendByCutout = (privateFlags & PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT) != 0; } if (insetsSize == null) { return; @@ -1288,6 +1299,11 @@ public class DisplayPolicy { } else { inOutFrame.setEmpty(); } + + if (extendByCutout) { + WindowLayout.extendFrameByCutout(windowGravity, df.mDisplayCutoutSafe, + df.mUnrestricted, inOutFrame, sTmpRect); + } } @WindowManagerPolicy.AltBarPosition @@ -2399,7 +2415,7 @@ public class DisplayPolicy { mLastStatusBarAppearanceRegions = statusBarAppearanceRegions; callStatusBarSafely(statusBar -> statusBar.onSystemBarAttributesChanged(displayId, appearance, statusBarAppearanceRegions, isNavbarColorManagedByIme, behavior, - requestedVisibilities, focusedApp)); + requestedVisibilities, focusedApp, new LetterboxDetails[]{})); } private void callStatusBarSafely(Consumer<StatusBarManagerInternal> consumer) { diff --git a/services/core/java/com/android/server/wm/EventLogTags.logtags b/services/core/java/com/android/server/wm/EventLogTags.logtags index 6d63331622b9..1e5a219e5e52 100644 --- a/services/core/java/com/android/server/wm/EventLogTags.logtags +++ b/services/core/java/com/android/server/wm/EventLogTags.logtags @@ -66,4 +66,4 @@ option java_package com.android.server.wm 31007 wm_boot_animation_done (time|2|3) # Request surface flinger to show / hide the wallpaper surface. -33001 wm_wallpaper_surface (Display Id|1|5),(visible|1) +33001 wm_wallpaper_surface (Display Id|1|5),(Visible|1),(Target|3) diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index db2ee2de06ca..ee1ff2cd61ff 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -265,7 +265,7 @@ class InsetsPolicy { state = originalState; } state = adjustVisibilityForIme(target, state, state == originalState); - return adjustInsetsForRoundedCorners(target, state, state == originalState); + return adjustInsetsForRoundedCorners(target.mToken, state, state == originalState); } InsetsState adjustInsetsForWindow(WindowState target, InsetsState originalState) { @@ -290,7 +290,8 @@ class InsetsPolicy { final InsetsState originalState = mDisplayContent.getInsetsPolicy() .enforceInsetsPolicyForTarget(type, WINDOWING_MODE_FULLSCREEN, alwaysOnTop, mStateController.getRawInsetsState()); - return adjustVisibilityForTransientTypes(originalState); + InsetsState state = adjustVisibilityForTransientTypes(originalState); + return adjustInsetsForRoundedCorners(token, state, state == originalState); } /** @@ -465,15 +466,19 @@ class InsetsPolicy { return originalState; } - private InsetsState adjustInsetsForRoundedCorners(WindowState w, InsetsState originalState, + private InsetsState adjustInsetsForRoundedCorners(WindowToken token, InsetsState originalState, boolean copyState) { - final Task task = w.getTask(); - if (task != null && !task.getWindowConfiguration().tasksAreFloating()) { - // Use task bounds to calculating rounded corners if the task is not floating. - final Rect roundedCornerFrame = new Rect(task.getBounds()); - final InsetsState state = copyState ? new InsetsState(originalState) : originalState; - state.setRoundedCornerFrame(roundedCornerFrame); - return state; + if (token != null) { + final ActivityRecord activityRecord = token.asActivityRecord(); + final Task task = activityRecord != null ? activityRecord.getTask() : null; + if (task != null && !task.getWindowConfiguration().tasksAreFloating()) { + // Use task bounds to calculating rounded corners if the task is not floating. + final Rect roundedCornerFrame = new Rect(task.getBounds()); + final InsetsState state = copyState ? new InsetsState(originalState) + : originalState; + state.setRoundedCornerFrame(roundedCornerFrame); + return state; + } } return originalState; } diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 3d127742d7bd..3b97e637a20a 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -738,8 +738,9 @@ class Task extends TaskFragment { "removeTask:" + reason + " deferring removing taskId=" + mTaskId); return; } + final boolean isLeafTask = isLeafTask(); removeImmediately(reason); - if (isLeafTask()) { + if (isLeafTask) { mAtmService.getTaskChangeNotificationController().notifyTaskRemoved(mTaskId); final TaskDisplayArea taskDisplayArea = getDisplayArea(); diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java index fd379bf1d9f4..4a5c4737cbbc 100644 --- a/services/core/java/com/android/server/wm/WindowSurfaceController.java +++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java @@ -126,8 +126,10 @@ class WindowSurfaceController { try { transaction.hide(mSurfaceControl); if (mAnimator.mIsWallpaper) { + final DisplayContent dc = mAnimator.mWin.getDisplayContent(); EventLog.writeEvent(EventLogTags.WM_WALLPAPER_SURFACE, - mAnimator.mWin.getDisplayId(), 0 /* request hidden */); + dc.mDisplayId, 0 /* request hidden */, + String.valueOf(dc.mWallpaperController.getWallpaperTarget())); } } catch (RuntimeException e) { Slog.w(TAG, "Exception hiding surface in " + this); @@ -266,8 +268,10 @@ class WindowSurfaceController { setShown(true); t.show(mSurfaceControl); if (mAnimator.mIsWallpaper) { + final DisplayContent dc = mAnimator.mWin.getDisplayContent(); EventLog.writeEvent(EventLogTags.WM_WALLPAPER_SURFACE, - mAnimator.mWin.getDisplayId(), 1 /* request shown */); + dc.mDisplayId, 1 /* request shown */, + String.valueOf(dc.mWallpaperController.getWallpaperTarget())); } return true; } diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java index 73e409abf0c1..1575336600b4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java @@ -192,7 +192,7 @@ public class ActivityStartInterceptorTest { .thenReturn(PLATFORM_PACKAGE_NAME); // THEN calling intercept returns true - assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); // THEN the returned intent is the admin support intent assertEquals(ADMIN_SUPPORT_INTENT, mInterceptor.mIntent); @@ -203,7 +203,7 @@ public class ActivityStartInterceptorTest { final String suspendingPackage = "com.test.suspending.package"; final SuspendDialogInfo dialogInfo = suspendPackage(suspendingPackage); // THEN calling intercept returns true - assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); // Check intent parameters assertEquals(dialogInfo, @@ -234,7 +234,7 @@ public class ActivityStartInterceptorTest { TEST_USER_ID, TEST_PACKAGE_NAME, LOCK_TASK_LAUNCH_MODE_DEFAULT)) .thenReturn(false); - assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); assertTrue(BlockedAppActivity.createIntent(TEST_USER_ID, TEST_PACKAGE_NAME) .filterEquals(mInterceptor.mIntent)); @@ -246,7 +246,7 @@ public class ActivityStartInterceptorTest { when(mUserManager.isQuietModeEnabled(eq(UserHandle.of(TEST_USER_ID)))).thenReturn(true); // THEN calling intercept returns true - assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); // THEN the returned intent is the quiet mode intent assertTrue(UnlaunchableAppActivity.createInQuietModeDialogIntent(TEST_USER_ID) @@ -260,7 +260,7 @@ public class ActivityStartInterceptorTest { when(mUserManager.isQuietModeEnabled(eq(UserHandle.of(TEST_USER_ID)))).thenReturn(true); // THEN calling intercept returns true - assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); // THEN the returned intent is the quiet mode intent assertTrue(UnlaunchableAppActivity.createInQuietModeDialogIntent(TEST_USER_ID) @@ -273,7 +273,7 @@ public class ActivityStartInterceptorTest { when(mAmInternal.shouldConfirmCredentials(TEST_USER_ID)).thenReturn(true); // THEN calling intercept returns true - mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null); + mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null); // THEN the returned intent is the quiet mode intent assertTrue(CONFIRM_CREDENTIALS_INTENT.filterEquals(mInterceptor.mIntent)); @@ -286,7 +286,7 @@ public class ActivityStartInterceptorTest { .thenReturn("This app is bad"); // THEN calling intercept returns true - assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); // THEN the returned intent is the harmful app warning intent assertEquals(HarmfulAppWarningActivity.class.getName(), @@ -298,7 +298,7 @@ public class ActivityStartInterceptorTest { // GIVEN that none of the interception conditions are met // THEN calling intercept returns false - assertFalse(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertFalse(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); } public void addMockInterceptorCallback( @@ -323,7 +323,7 @@ public class ActivityStartInterceptorTest { new Intent("android.test.foo"), ActivityOptions.makeBasic().setLaunchDisplayId(3)); - assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); assertEquals("android.test.foo", mInterceptor.mIntent.getAction()); assertEquals(3, mInterceptor.mActivityOptions.getLaunchDisplayId()); } @@ -332,7 +332,7 @@ public class ActivityStartInterceptorTest { public void testInterceptionCallback_singleCallbackReturnsNull() { addMockInterceptorCallback(null, null); - assertFalse(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertFalse(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); } @Test @@ -340,7 +340,7 @@ public class ActivityStartInterceptorTest { addMockInterceptorCallback(null, null); addMockInterceptorCallback(new Intent("android.test.second"), null); - assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, 0, 0, null)); + assertTrue(mInterceptor.intercept(null, null, mAInfo, null, null, null, 0, 0, null)); assertEquals("android.test.second", mInterceptor.mIntent.getAction()); } |