diff options
986 files changed, 14401 insertions, 3145 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 4d9fdf041d58..1b0ee6397784 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -265,6 +265,7 @@ java_aconfig_library { cc_aconfig_library { name: "com.android.window.flags.window-aconfig_flags_c_lib", aconfig_declarations: "com.android.window.flags.window-aconfig", + host_supported: true, } // DeviceStateManager diff --git a/apct-tests/perftests/core/src/android/input/OWNERS b/apct-tests/perftests/core/src/android/input/OWNERS deleted file mode 100644 index 95e3f0213f49..000000000000 --- a/apct-tests/perftests/core/src/android/input/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -include platform/frameworks/base:/INPUT_OWNERS - -# Bug component: 136048 diff --git a/apct-tests/perftests/input/Android.bp b/apct-tests/perftests/input/Android.bp new file mode 100644 index 000000000000..21b66cf3245c --- /dev/null +++ b/apct-tests/perftests/input/Android.bp @@ -0,0 +1,44 @@ +// Copyright 2025 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 { + default_team: "trendy_team_input_framework", + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + +android_test { + name: "InputPerfTests", + srcs: ["src/**/*.kt"], + kotlincflags: [ + "-Werror", + ], + static_libs: [ + "androidx.annotation_annotation", + "androidx.test.rules", + "apct-perftests-utils", + "collector-device-lib", + "compatibility-device-util-axt", + "cts-input-lib", + "platform-test-annotations", + ], + test_suites: ["device-tests"], + data: [":perfetto_artifacts"], + platform_apis: true, + certificate: "platform", +} diff --git a/apct-tests/perftests/input/AndroidManifest.xml b/apct-tests/perftests/input/AndroidManifest.xml new file mode 100644 index 000000000000..e9e4fd071b47 --- /dev/null +++ b/apct-tests/perftests/input/AndroidManifest.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright 2025 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.perftests.input"> + + <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + + <application> + <uses-library android:name="android.test.runner" /> + <activity android:name="com.android.cts.input.CaptureEventActivity" + android:label="Capture events" + android:configChanges="touchscreen|uiMode|orientation|screenSize|screenLayout|keyboardHidden|uiMode|navigation|keyboard|density|fontScale|layoutDirection|locale|mcc|mnc|smallestScreenSize" + android:enableOnBackInvokedCallback="false" + android:turnScreenOn="true" + android:exported="true"> + </activity> + </application> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.perftests.input"> + <meta-data android:name="listener" android:value="android.input.InputPerfRunPrecondition" /> + </instrumentation> +</manifest> diff --git a/apct-tests/perftests/input/OWNERS b/apct-tests/perftests/input/OWNERS new file mode 100644 index 000000000000..3cffce960b1c --- /dev/null +++ b/apct-tests/perftests/input/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 136048 +include /core/java/android/hardware/input/OWNERS diff --git a/apct-tests/perftests/input/src/android/input/InputPerfRunPrecondition.kt b/apct-tests/perftests/input/src/android/input/InputPerfRunPrecondition.kt new file mode 100644 index 000000000000..d992380241a4 --- /dev/null +++ b/apct-tests/perftests/input/src/android/input/InputPerfRunPrecondition.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.input + +import android.perftests.utils.WindowPerfRunPreconditionBase + +/** Prepare the preconditions before running performance test. */ +class InputPerfRunPrecondition : WindowPerfRunPreconditionBase() diff --git a/apct-tests/perftests/core/src/android/input/MotionPredictorBenchmark.kt b/apct-tests/perftests/input/src/android/input/MotionPredictorBenchmark.kt index cf93331d87c2..cf93331d87c2 100644 --- a/apct-tests/perftests/core/src/android/input/MotionPredictorBenchmark.kt +++ b/apct-tests/perftests/input/src/android/input/MotionPredictorBenchmark.kt diff --git a/apct-tests/perftests/input/src/android/input/TouchPerfTest.kt b/apct-tests/perftests/input/src/android/input/TouchPerfTest.kt new file mode 100644 index 000000000000..26f101d91573 --- /dev/null +++ b/apct-tests/perftests/input/src/android/input/TouchPerfTest.kt @@ -0,0 +1,66 @@ +/* + * Copyright 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.input + +import android.cts.input.EventVerifier +import android.perftests.utils.PerfStatusReporter +import android.view.MotionEvent.ACTION_DOWN +import android.view.MotionEvent.ACTION_MOVE +import android.view.MotionEvent.ACTION_UP +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import com.android.cts.input.CaptureEventActivity +import com.android.cts.input.UinputTouchScreen +import com.android.cts.input.VirtualDisplayActivityScenario +import com.android.cts.input.inputeventmatchers.withMotionAction +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TestName +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class TouchPerfTest { + @get:Rule val testName = TestName() + @get:Rule val perfStatusReporter = PerfStatusReporter() + @get:Rule + val virtualDisplayRule = VirtualDisplayActivityScenario.Rule<CaptureEventActivity>(testName) + + private val instrumentation = InstrumentationRegistry.getInstrumentation() + + @Test + fun testDownMoveUp() { + UinputTouchScreen(instrumentation, virtualDisplayRule.virtualDisplay.display).use { + touchScreen -> + val verifier = EventVerifier(virtualDisplayRule.activity::getInputEvent) + val state = perfStatusReporter.benchmarkState + + while (state.keepRunning()) { + val x = 100 + val y = 100 + + val pointer = touchScreen.touchDown(x, y) + verifier.assertReceivedMotion(withMotionAction(ACTION_DOWN)) + + pointer.moveTo(x + 1, y + 1) + verifier.assertReceivedMotion(withMotionAction(ACTION_MOVE)) + + pointer.lift() + verifier.assertReceivedMotion(withMotionAction(ACTION_UP)) + } + } + } +} diff --git a/apct-tests/perftests/core/src/android/input/VelocityTrackerBenchmarkTest.kt b/apct-tests/perftests/input/src/android/input/VelocityTrackerBenchmarkTest.kt index c6fe32467099..df58cca42d44 100644 --- a/apct-tests/perftests/core/src/android/input/VelocityTrackerBenchmarkTest.kt +++ b/apct-tests/perftests/input/src/android/input/VelocityTrackerBenchmarkTest.kt @@ -19,8 +19,8 @@ import android.perftests.utils.PerfStatusReporter import android.view.InputDevice import android.view.MotionEvent import android.view.VelocityTracker +import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest -import androidx.test.runner.AndroidJUnit4 import java.time.Duration import org.junit.Assert import org.junit.Before diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java index 251776e907d8..44e4999ccf44 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -5369,7 +5369,9 @@ public class AlarmManagerService extends SystemService { // to do any wakelock or stats tracking, so we have nothing // left to do here but go on to the next thing. mSendFinishCount++; - if (Flags.acquireWakelockBeforeSend()) { + if (Flags.acquireWakelockBeforeSend() && mBroadcastRefCount == 0) { + // No other alarms are in-flight and this dispatch failed. We will + // acquire the wakelock again before the next dispatch. mWakeLock.release(); } return; @@ -5409,7 +5411,9 @@ public class AlarmManagerService extends SystemService { // stats management to do. It threw before we posted the delayed // timeout message, so we're done here. mListenerFinishCount++; - if (Flags.acquireWakelockBeforeSend()) { + if (Flags.acquireWakelockBeforeSend() && mBroadcastRefCount == 0) { + // No other alarms are in-flight and this dispatch failed. We will + // acquire the wakelock again before the next dispatch. mWakeLock.release(); } return; diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java index ae150aece432..378bb2d8e6b7 100644 --- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java +++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java @@ -1138,6 +1138,10 @@ public class Bmgr { } out.append("]"); } + if (event.containsKey(BackupManagerMonitor.EXTRA_LOG_CANCELLATION_REASON)) { + out.append(" cancellationReason: "); + out.append(event.getInt(BackupManagerMonitor.EXTRA_LOG_CANCELLATION_REASON)); + } if (mVerbose) { Set<String> remainingKeys = new ArraySet<>(event.keySet()); remainingKeys.remove(BackupManagerMonitor.EXTRA_LOG_EVENT_ID); diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 132c65cc26ee..526a213a6003 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -410,7 +410,6 @@ package android.os { method public void invalidateCache(); method public static void invalidateCache(@NonNull String, @NonNull String); method @Nullable public Result query(@NonNull Query); - method @FlaggedApi("android.os.ipc_data_cache_test_apis") public static void setTestMode(boolean); field public static final String MODULE_BLUETOOTH = "bluetooth"; } diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 12bfccf2172c..4c8283907712 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2460,7 +2460,7 @@ package android.os { method public static void invalidateCache(@NonNull String, @NonNull String); method public final boolean isDisabled(); method @Nullable public Result query(@NonNull Query); - method @FlaggedApi("android.os.ipc_data_cache_test_apis") public static void setTestMode(boolean); + method public static void setTestMode(boolean); field public static final String MODULE_BLUETOOTH = "bluetooth"; field public static final String MODULE_SYSTEM = "system_server"; field public static final String MODULE_TEST = "test"; diff --git a/core/java/android/animation/AnimationHandler.java b/core/java/android/animation/AnimationHandler.java index d5b2f980e1a6..9f789328d8e0 100644 --- a/core/java/android/animation/AnimationHandler.java +++ b/core/java/android/animation/AnimationHandler.java @@ -110,7 +110,7 @@ public class AnimationHandler { } }; - public final static ThreadLocal<AnimationHandler> sAnimatorHandler = new ThreadLocal<>(); + public static final ThreadLocal<AnimationHandler> sAnimatorHandler = new ThreadLocal<>(); private static AnimationHandler sTestHandler = null; private boolean mListDirty = false; @@ -118,10 +118,12 @@ public class AnimationHandler { if (sTestHandler != null) { return sTestHandler; } - if (sAnimatorHandler.get() == null) { - sAnimatorHandler.set(new AnimationHandler()); + AnimationHandler animatorHandler = sAnimatorHandler.get(); + if (animatorHandler == null) { + animatorHandler = new AnimationHandler(); + sAnimatorHandler.set(animatorHandler); } - return sAnimatorHandler.get(); + return animatorHandler; } /** diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 54ab3b8f185b..62816a2fa0f5 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -3099,7 +3099,8 @@ public class ActivityManager { /** * Flag for {@link #moveTaskToFront(int, int)}: also move the "home" * activity along with the task, so it is positioned immediately behind - * the task. + * the task. This flag is ignored if the task's windowing mode is + * {@link WindowConfiguration#WINDOWING_MODE_MULTI_WINDOW}. */ public static final int MOVE_TASK_WITH_HOME = 0x00000001; diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 2c1df73cc6cc..0a2b1eaaad6b 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -273,6 +273,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.lang.ref.WeakReference; +import java.lang.reflect.Executable; import java.lang.reflect.Method; import java.net.InetAddress; import java.nio.file.DirectoryStream; @@ -2268,10 +2269,16 @@ public final class ActivityThread extends ClientTransactionHandler public void getExecutableMethodFileOffsets( @NonNull MethodDescriptor methodDescriptor, @NonNull IOffsetCallback resultCallback) { - Method method = MethodDescriptorParser.parseMethodDescriptor( + Executable executable = MethodDescriptorParser.parseMethodDescriptor( getClass().getClassLoader(), methodDescriptor); - VMDebug.ExecutableMethodFileOffsets location = - VMDebug.getExecutableMethodFileOffsets(method); + VMDebug.ExecutableMethodFileOffsets location; + if (com.android.art.flags.Flags.executableMethodFileOffsetsV2()) { + location = VMDebug.getExecutableMethodFileOffsets(executable); + } else if (executable instanceof Method) { + location = VMDebug.getExecutableMethodFileOffsets((Method) executable); + } else { + throw new UnsupportedOperationException(); + } try { if (location == null) { resultCallback.onResult(null); @@ -3995,6 +4002,10 @@ public final class ActivityThread extends ClientTransactionHandler + (fromIpc ? " (from ipc" : "")); } } + if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) { + Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, + "updateProcessState: processState=" + processState); + } } /** Converts a process state to a VM process state. */ diff --git a/core/java/android/app/AppCompatTaskInfo.java b/core/java/android/app/AppCompatTaskInfo.java index ea4646aa9eb9..3fd9d8b26611 100644 --- a/core/java/android/app/AppCompatTaskInfo.java +++ b/core/java/android/app/AppCompatTaskInfo.java @@ -104,6 +104,8 @@ public class AppCompatTaskInfo implements Parcelable { public static final int FLAG_HAS_MIN_ASPECT_RATIO_OVERRIDE = FLAG_BASE << 9; /** Top activity flag for whether restart menu is shown due to display move. */ private static final int FLAG_ENABLE_RESTART_MENU_FOR_DISPLAY_MOVE = FLAG_BASE << 10; + /** Top activity flag for whether activity opted out of edge to edge. */ + public static final int FLAG_OPT_OUT_EDGE_TO_EDGE = FLAG_BASE << 11; @Retention(RetentionPolicy.SOURCE) @IntDef(flag = true, value = { @@ -118,7 +120,8 @@ public class AppCompatTaskInfo implements Parcelable { FLAG_FULLSCREEN_OVERRIDE_SYSTEM, FLAG_FULLSCREEN_OVERRIDE_USER, FLAG_HAS_MIN_ASPECT_RATIO_OVERRIDE, - FLAG_ENABLE_RESTART_MENU_FOR_DISPLAY_MOVE + FLAG_ENABLE_RESTART_MENU_FOR_DISPLAY_MOVE, + FLAG_OPT_OUT_EDGE_TO_EDGE }) public @interface TopActivityFlag {} @@ -132,7 +135,8 @@ public class AppCompatTaskInfo implements Parcelable { @TopActivityFlag private static final int FLAGS_ORGANIZER_INTERESTED = FLAG_IS_FROM_LETTERBOX_DOUBLE_TAP | FLAG_ELIGIBLE_FOR_USER_ASPECT_RATIO_BUTTON | FLAG_FULLSCREEN_OVERRIDE_SYSTEM - | FLAG_FULLSCREEN_OVERRIDE_USER | FLAG_HAS_MIN_ASPECT_RATIO_OVERRIDE; + | FLAG_FULLSCREEN_OVERRIDE_USER | FLAG_HAS_MIN_ASPECT_RATIO_OVERRIDE + | FLAG_OPT_OUT_EDGE_TO_EDGE; @TopActivityFlag private static final int FLAGS_COMPAT_UI_INTERESTED = FLAGS_ORGANIZER_INTERESTED @@ -347,6 +351,20 @@ public class AppCompatTaskInfo implements Parcelable { setTopActivityFlag(FLAG_HAS_MIN_ASPECT_RATIO_OVERRIDE, enable); } + /** + * Sets the top activity flag for whether the activity has opted out of edge to edge. + */ + public void setOptOutEdgeToEdge(boolean enable) { + setTopActivityFlag(FLAG_OPT_OUT_EDGE_TO_EDGE, enable); + } + + /** + * @return {@code true} if the top activity has opted out of edge to edge. + */ + public boolean hasOptOutEdgeToEdge() { + return isTopActivityFlagEnabled(FLAG_OPT_OUT_EDGE_TO_EDGE); + } + /** Clear all top activity flags and set to false. */ public void clearTopActivityFlags() { mTopActivityFlags = FLAG_UNDEFINED; diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 127a08b04e87..feaa98f644a0 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -6453,45 +6453,47 @@ public class Notification implements Parcelable return mN.showsTime() || mN.showsChronometer(); } - private void resetStandardTemplateWithActions(RemoteViews big) { + private void resetStandardTemplateWithActions(RemoteViews contentView) { // actions_container is only reset when there are no actions to avoid focus issues with // remote inputs. - big.setViewVisibility(R.id.actions, View.GONE); - big.removeAllViews(R.id.actions); - - big.setViewVisibility(R.id.notification_material_reply_container, View.GONE); - big.setTextViewText(R.id.notification_material_reply_text_1, null); - big.setViewVisibility(R.id.notification_material_reply_text_1_container, View.GONE); - big.setViewVisibility(R.id.notification_material_reply_progress, View.GONE); - - big.setViewVisibility(R.id.notification_material_reply_text_2, View.GONE); - big.setTextViewText(R.id.notification_material_reply_text_2, null); - big.setViewVisibility(R.id.notification_material_reply_text_3, View.GONE); - big.setTextViewText(R.id.notification_material_reply_text_3, null); - - // This may get erased by bindSnoozeAction - big.setViewLayoutMarginDimen(R.id.notification_action_list_margin_target, + contentView.setViewVisibility(R.id.actions, View.GONE); + contentView.removeAllViews(R.id.actions); + + contentView.setViewVisibility(R.id.notification_material_reply_container, View.GONE); + contentView.setTextViewText(R.id.notification_material_reply_text_1, null); + contentView.setViewVisibility(R.id.notification_material_reply_text_1_container, + View.GONE); + contentView.setViewVisibility(R.id.notification_material_reply_progress, View.GONE); + + contentView.setViewVisibility(R.id.notification_material_reply_text_2, View.GONE); + contentView.setTextViewText(R.id.notification_material_reply_text_2, null); + contentView.setViewVisibility(R.id.notification_material_reply_text_3, View.GONE); + contentView.setTextViewText(R.id.notification_material_reply_text_3, null); + + // This may get erased by bindSnoozeAction, or if we're showing the bubble icon + contentView.setViewLayoutMarginDimen(R.id.notification_action_list_margin_target, RemoteViews.MARGIN_BOTTOM, R.dimen.notification_content_margin); } - private void bindSnoozeAction(RemoteViews big, StandardTemplateParams p) { + private boolean bindSnoozeAction(RemoteViews contentView, StandardTemplateParams p) { boolean hideSnoozeButton = mN.isFgsOrUij() || mN.fullScreenIntent != null || isBackgroundColorized(p) || p.mViewType != StandardTemplateParams.VIEW_TYPE_EXPANDED; - big.setBoolean(R.id.snooze_button, "setEnabled", !hideSnoozeButton); + contentView.setBoolean(R.id.snooze_button, "setEnabled", !hideSnoozeButton); if (hideSnoozeButton) { // Only hide; NotificationContentView will show it when it adds the click listener - big.setViewVisibility(R.id.snooze_button, View.GONE); + contentView.setViewVisibility(R.id.snooze_button, View.GONE); } final boolean snoozeEnabled = !hideSnoozeButton && mContext.getContentResolver() != null && isSnoozeSettingEnabled(); if (snoozeEnabled) { - big.setViewLayoutMarginDimen(R.id.notification_action_list_margin_target, + contentView.setViewLayoutMarginDimen(R.id.notification_action_list_margin_target, RemoteViews.MARGIN_BOTTOM, 0); } + return snoozeEnabled; } private boolean isSnoozeSettingEnabled() { @@ -6526,16 +6528,14 @@ public class Notification implements Parcelable private RemoteViews applyStandardTemplateWithActions(int layoutId, StandardTemplateParams p, TemplateBindResult result) { - RemoteViews big = applyStandardTemplate(layoutId, p, result); + RemoteViews contentView = applyStandardTemplate(layoutId, p, result); - resetStandardTemplateWithActions(big); - bindSnoozeAction(big, p); + resetStandardTemplateWithActions(contentView); + boolean snoozeEnabled = bindSnoozeAction(contentView, p); // color the snooze and bubble actions with the theme color ColorStateList actionColor = ColorStateList.valueOf(getStandardActionColor(p)); - big.setColorStateList(R.id.snooze_button, "setImageTintList", actionColor); - big.setColorStateList(R.id.bubble_button, "setImageTintList", actionColor); - - boolean validRemoteInput = false; + contentView.setColorStateList(R.id.snooze_button, "setImageTintList", actionColor); + contentView.setColorStateList(R.id.bubble_button, "setImageTintList", actionColor); // In the UI, contextual actions appear separately from the standard actions, so we // filter them out here. @@ -6549,47 +6549,64 @@ public class Notification implements Parcelable if (p.mCallStyleActions) { // Clear view padding to allow buttons to start on the left edge. // This must be done before 'setEmphasizedMode' which sets top/bottom margins. - big.setViewPadding(R.id.actions, 0, 0, 0, 0); + contentView.setViewPadding(R.id.actions, 0, 0, 0, 0); if (!Flags.notificationsRedesignTemplates()) { // Add an optional indent that will make buttons start at the correct column // when there is enough space to do so (and fall back to the left edge if not). // This is handled directly in NotificationActionListLayout in the new design. - big.setInt(R.id.actions, "setCollapsibleIndentDimen", + contentView.setInt(R.id.actions, "setCollapsibleIndentDimen", R.dimen.call_notification_collapsible_indent); } if (evenlyDividedCallStyleActionLayout()) { if (CallStyle.DEBUG_NEW_ACTION_LAYOUT) { Log.d(TAG, "setting evenly divided mode on action list"); } - big.setBoolean(R.id.actions, "setEvenlyDividedMode", true); + contentView.setBoolean(R.id.actions, "setEvenlyDividedMode", true); } } - big.setBoolean(R.id.actions, "setEmphasizedMode", emphasizedMode); + if (!notificationsRedesignTemplates()) { + contentView.setBoolean(R.id.actions, "setEmphasizedMode", emphasizedMode); + } + + boolean validRemoteInput = false; if (numActions > 0 && !p.mHideActions) { - big.setViewVisibility(R.id.actions_container, View.VISIBLE); - big.setViewVisibility(R.id.actions, View.VISIBLE); - big.setViewLayoutMarginDimen(R.id.notification_action_list_margin_target, + contentView.setViewVisibility(R.id.actions_container, View.VISIBLE); + contentView.setViewVisibility(R.id.actions, View.VISIBLE); + contentView.setViewLayoutMarginDimen(R.id.notification_action_list_margin_target, RemoteViews.MARGIN_BOTTOM, 0); - for (int i = 0; i < numActions; i++) { - Action action = nonContextualActions.get(i); - - boolean actionHasValidInput = hasValidRemoteInput(action); - validRemoteInput |= actionHasValidInput; - - final RemoteViews button = generateActionButton(action, emphasizedMode, p); - if (actionHasValidInput && !emphasizedMode) { - // Clear the drawable - button.setInt(R.id.action0, "setBackgroundResource", 0); - } - if (emphasizedMode && i > 0) { - // Clear start margin from non-first buttons to reduce the gap between them. - // (8dp remaining gap is from all buttons' standard 4dp inset). - button.setViewLayoutMarginDimen(R.id.action0, RemoteViews.MARGIN_START, 0); + if (notificationsRedesignTemplates()) { + // No need for additional space under smart replies/smart actions. + contentView.setViewLayoutMarginDimen(R.id.smart_reply_container, + RemoteViews.MARGIN_BOTTOM, 0); + if (emphasizedMode) { + // Emphasized actions look similar to smart replies, so let's use the same + // margins. + contentView.setViewLayoutMarginDimen(R.id.actions_container, + RemoteViews.MARGIN_TOP, + R.dimen.notification_2025_smart_reply_container_margin); + contentView.setViewLayoutMarginDimen(R.id.actions_container, + RemoteViews.MARGIN_BOTTOM, + R.dimen.notification_2025_smart_reply_container_margin); + } else { + contentView.setViewLayoutMarginDimen(R.id.actions_container, + RemoteViews.MARGIN_TOP, 0); + contentView.setViewLayoutMarginDimen(R.id.actions_container, + RemoteViews.MARGIN_BOTTOM, + R.dimen.notification_2025_action_list_margin_bottom); } - big.addView(R.id.actions, button); } + validRemoteInput = populateActionsContainer(contentView, p, nonContextualActions, + numActions, emphasizedMode); } else { - big.setViewVisibility(R.id.actions_container, View.GONE); + contentView.setViewVisibility(R.id.actions_container, View.GONE); + if (notificationsRedesignTemplates() && !snoozeEnabled) { + // Make sure smart replies & smart actions have enough space at the bottom + // (if present) when there are no actions. This should be set to 0 if we're + // showing the snooze or bubble buttons. + contentView.setViewLayoutMarginDimen(R.id.smart_reply_container, + RemoteViews.MARGIN_BOTTOM, + R.dimen.notification_2025_smart_reply_container_margin); + } } RemoteInputHistoryItem[] replyText = getParcelableArrayFromBundle( @@ -6598,37 +6615,65 @@ public class Notification implements Parcelable && !TextUtils.isEmpty(replyText[0].getText()) && p.maxRemoteInputHistory > 0) { boolean showSpinner = mN.extras.getBoolean(EXTRA_SHOW_REMOTE_INPUT_SPINNER); - big.setViewVisibility(R.id.notification_material_reply_container, View.VISIBLE); - big.setViewVisibility(R.id.notification_material_reply_text_1_container, + contentView.setViewVisibility(R.id.notification_material_reply_container, + View.VISIBLE); + contentView.setViewVisibility(R.id.notification_material_reply_text_1_container, View.VISIBLE); - big.setTextViewText(R.id.notification_material_reply_text_1, + contentView.setTextViewText(R.id.notification_material_reply_text_1, ensureColorSpanContrastOrStripStyling(replyText[0].getText(), p)); - setTextViewColorSecondary(big, R.id.notification_material_reply_text_1, p); - big.setViewVisibility(R.id.notification_material_reply_progress, + setTextViewColorSecondary(contentView, R.id.notification_material_reply_text_1, p); + contentView.setViewVisibility(R.id.notification_material_reply_progress, showSpinner ? View.VISIBLE : View.GONE); - big.setProgressIndeterminateTintList( + contentView.setProgressIndeterminateTintList( R.id.notification_material_reply_progress, ColorStateList.valueOf(getPrimaryAccentColor(p))); if (replyText.length > 1 && !TextUtils.isEmpty(replyText[1].getText()) && p.maxRemoteInputHistory > 1) { - big.setViewVisibility(R.id.notification_material_reply_text_2, View.VISIBLE); - big.setTextViewText(R.id.notification_material_reply_text_2, + contentView.setViewVisibility(R.id.notification_material_reply_text_2, + View.VISIBLE); + contentView.setTextViewText(R.id.notification_material_reply_text_2, ensureColorSpanContrastOrStripStyling(replyText[1].getText(), p)); - setTextViewColorSecondary(big, R.id.notification_material_reply_text_2, p); + setTextViewColorSecondary(contentView, R.id.notification_material_reply_text_2, + p); if (replyText.length > 2 && !TextUtils.isEmpty(replyText[2].getText()) && p.maxRemoteInputHistory > 2) { - big.setViewVisibility( + contentView.setViewVisibility( R.id.notification_material_reply_text_3, View.VISIBLE); - big.setTextViewText(R.id.notification_material_reply_text_3, + contentView.setTextViewText(R.id.notification_material_reply_text_3, ensureColorSpanContrastOrStripStyling(replyText[2].getText(), p)); - setTextViewColorSecondary(big, R.id.notification_material_reply_text_3, p); + setTextViewColorSecondary(contentView, + R.id.notification_material_reply_text_3, p); } } } - return big; + return contentView; + } + + private boolean populateActionsContainer(RemoteViews contentView, StandardTemplateParams p, + List<Action> nonContextualActions, int numActions, boolean emphasizedMode) { + boolean validRemoteInput = false; + for (int i = 0; i < numActions; i++) { + Action action = nonContextualActions.get(i); + + boolean actionHasValidInput = hasValidRemoteInput(action); + validRemoteInput |= actionHasValidInput; + + final RemoteViews button = generateActionButton(action, emphasizedMode, p); + if (actionHasValidInput && !emphasizedMode) { + // Clear the drawable + button.setInt(R.id.action0, "setBackgroundResource", 0); + } + if (emphasizedMode && i > 0) { + // Clear start margin from non-first buttons to reduce the gap between them. + // (8dp remaining gap is from all buttons' standard 4dp inset). + button.setViewLayoutMarginDimen(R.id.action0, RemoteViews.MARGIN_START, 0); + } + contentView.addView(R.id.actions, button); + } + return validRemoteInput; } /** diff --git a/core/java/android/app/PropertyInvalidatedCache.java b/core/java/android/app/PropertyInvalidatedCache.java index 6e495768bfd4..38141cf20ce3 100644 --- a/core/java/android/app/PropertyInvalidatedCache.java +++ b/core/java/android/app/PropertyInvalidatedCache.java @@ -1417,36 +1417,7 @@ public class PropertyInvalidatedCache<Query, Result> { } /** - * Throw if the current process is not allowed to use test APIs. - */ - @android.ravenwood.annotation.RavenwoodReplace - private static void throwIfNotTest() { - final ActivityThread activityThread = ActivityThread.currentActivityThread(); - if (activityThread == null) { - // Only tests can reach here. - return; - } - final Instrumentation instrumentation = activityThread.getInstrumentation(); - if (instrumentation == null) { - // Only tests can reach here. - return; - } - if (instrumentation.isInstrumenting()) { - return; - } - if (Flags.enforcePicTestmodeProtocol()) { - throw new IllegalStateException("Test-only API called not from a test."); - } - } - - /** - * Do not throw if running under ravenwood. - */ - private static void throwIfNotTest$ravenwood() { - } - - /** - * Enable or disable test mode. The protocol requires that the mode toggle: for instance, it is + * Enable or disable testing. The protocol requires that the mode toggle: for instance, it is * illegal to clear the test mode if the test mode is already off. Enabling test mode puts * all caches in the process into test mode; all nonces are initialized to UNSET and * subsequent reads and writes are to process memory. This has the effect of disabling all @@ -1454,12 +1425,10 @@ public class PropertyInvalidatedCache<Query, Result> { * operation. * @param mode The desired test mode. * @throws IllegalStateException if the supplied mode is already set. - * @throws IllegalStateException if the process is not running an instrumentation test. * @hide */ @VisibleForTesting public static void setTestMode(boolean mode) { - throwIfNotTest(); synchronized (sGlobalLock) { if (sTestMode == mode) { final String msg = "cannot set test mode redundantly: mode=" + mode; @@ -1495,11 +1464,9 @@ public class PropertyInvalidatedCache<Query, Result> { * for which it would not otherwise have permission. Caches in test mode do NOT write their * values to the system properties. The effect is local to the current process. Test mode * must be true when this method is called. - * @throws IllegalStateException if the process is not running an instrumentation test. * @hide */ public void testPropertyName() { - throwIfNotTest(); synchronized (sGlobalLock) { if (sTestMode == false) { throw new IllegalStateException("cannot test property name with test mode off"); @@ -1810,12 +1777,10 @@ public class PropertyInvalidatedCache<Query, Result> { * When multiple caches share a single property value, using an instance method on one of * the cache objects to invalidate all of the cache objects becomes confusing and you should * just use the static version of this function. - * @throws IllegalStateException if the process is not running an instrumentation test. * @hide */ @VisibleForTesting public void disableSystemWide() { - throwIfNotTest(); disableSystemWide(mPropertyName); } diff --git a/core/java/android/app/appfunctions/AppFunctionManagerHelper.java b/core/java/android/app/appfunctions/AppFunctionManagerHelper.java index 83abc048af8a..e05ede580d3f 100644 --- a/core/java/android/app/appfunctions/AppFunctionManagerHelper.java +++ b/core/java/android/app/appfunctions/AppFunctionManagerHelper.java @@ -31,6 +31,7 @@ import android.app.appsearch.AppSearchManager; import android.app.appsearch.AppSearchResult; import android.app.appsearch.GlobalSearchSession; import android.app.appsearch.JoinSpec; +import android.app.appsearch.PropertyPath; import android.app.appsearch.SearchResult; import android.app.appsearch.SearchResults; import android.app.appsearch.SearchSpec; @@ -141,6 +142,9 @@ public class AppFunctionManagerHelper { .addFilterSchemas( AppFunctionStaticMetadataHelper.getStaticSchemaNameForPackage( targetPackage)) + .addProjectionPaths( + SearchSpec.SCHEMA_TYPE_WILDCARD, + List.of(new PropertyPath(STATIC_PROPERTY_ENABLED_BY_DEFAULT))) .setJoinSpec(joinSpec) .setVerbatimSearchEnabled(true) .build(); diff --git a/core/java/android/app/backup/BackupManagerMonitor.java b/core/java/android/app/backup/BackupManagerMonitor.java index 19c24cd8a14a..ca14fce6706a 100644 --- a/core/java/android/app/backup/BackupManagerMonitor.java +++ b/core/java/android/app/backup/BackupManagerMonitor.java @@ -164,6 +164,15 @@ public class BackupManagerMonitor { public static final String EXTRA_LOG_V_TO_U_ALLOWLIST = "android.app.backup.extra.V_TO_U_ALLOWLIST"; + /** + * An int indicating why a backup was cancelled. One of {@link + * com.android.server.backup.BackupRestoreTask.CancellationReason}. + * + * @hide + */ + public static final String EXTRA_LOG_CANCELLATION_REASON = + "android.app.backup.extra.CANCELLATION_REASON"; + // TODO complete this list with all log messages. And document properly. public static final int LOG_EVENT_ID_FULL_BACKUP_CANCEL = 4; public static final int LOG_EVENT_ID_ILLEGAL_KEY = 5; diff --git a/core/java/android/app/notification.aconfig b/core/java/android/app/notification.aconfig index 4afe75f7814c..5891bddfbbe6 100644 --- a/core/java/android/app/notification.aconfig +++ b/core/java/android/app/notification.aconfig @@ -63,6 +63,16 @@ flag { } flag { + name: "modes_ui_dnd_tile" + namespace: "systemui" + description: "Shows a dedicated tile for the DND mode; dependent on modes_ui" + bug: "401217520" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "modes_hsum" namespace: "systemui" description: "Fixes for modes (and DND/Zen in general) with HSUM or secondary users" @@ -357,6 +367,7 @@ flag { namespace: "systemui" description: "Allows the NAS to summarize notifications" bug: "390417189" + is_exported: true } flag { diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 038756148a32..bb62ac321202 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -12426,6 +12426,8 @@ public class Intent implements Parcelable, Cloneable { } private void collectNestedIntentKeysRecur(Set<Intent> visited, boolean forceUnparcel) { + // if forceUnparcel is false, do not unparcel the mExtras bundle. + // forceUnparcel will only be true when this method is called from system server. if (mExtras != null && (forceUnparcel || !mExtras.isParcelled()) && !mExtras.isEmpty()) { addExtendedFlags(EXTENDED_FLAG_NESTED_INTENT_KEYS_COLLECTED); for (String key : mExtras.keySet()) { @@ -12440,6 +12442,7 @@ public class Intent implements Parcelable, Cloneable { value = mExtras.get(key); } else { value = null; + removeExtendedFlags(EXTENDED_FLAG_NESTED_INTENT_KEYS_COLLECTED); } } catch (BadParcelableException e) { // This may still happen if the keys are collected on the system server side, in @@ -12459,6 +12462,13 @@ public class Intent implements Parcelable, Cloneable { } } + // if there is no extras in the bundle, we also mark the intent as keys are collected. + // isDefinitelyEmpty() will not unparceled the mExtras. This is the best we can do without + // unparceling the extra bundle. + if (mExtras == null || mExtras.isDefinitelyEmpty()) { + addExtendedFlags(EXTENDED_FLAG_NESTED_INTENT_KEYS_COLLECTED); + } + if (mClipData != null) { for (int i = 0; i < mClipData.getItemCount(); i++) { Intent intent = mClipData.getItemAt(i).mIntent; diff --git a/core/java/android/os/IpcDataCache.java b/core/java/android/os/IpcDataCache.java index e888f520b842..2e7c3be53d90 100644 --- a/core/java/android/os/IpcDataCache.java +++ b/core/java/android/os/IpcDataCache.java @@ -718,7 +718,7 @@ public class IpcDataCache<Query, Result> extends PropertyInvalidatedCache<Query, } /** - * Enable or disable test mode. The protocol requires that the mode toggle: for instance, it is + * Enable or disable testing. The protocol requires that the mode toggle: for instance, it is * illegal to clear the test mode if the test mode is already off. Enabling test mode puts * all caches in the process into test mode; all nonces are initialized to UNSET and * subsequent reads and writes are to process memory. This has the effect of disabling all @@ -726,11 +726,8 @@ public class IpcDataCache<Query, Result> extends PropertyInvalidatedCache<Query, * operation. * @param mode The desired test mode. * @throws IllegalStateException if the supplied mode is already set. - * @throws IllegalStateException if the process is not running an instrumentation test. * @hide */ - @FlaggedApi(android.os.Flags.FLAG_IPC_DATA_CACHE_TEST_APIS) - @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) @TestApi public static void setTestMode(boolean mode) { PropertyInvalidatedCache.setTestMode(mode); diff --git a/core/java/android/os/LegacyMessageQueue/MessageQueue.java b/core/java/android/os/LegacyMessageQueue/MessageQueue.java index 132bdd1e56b8..1cf57de08d5f 100644 --- a/core/java/android/os/LegacyMessageQueue/MessageQueue.java +++ b/core/java/android/os/LegacyMessageQueue/MessageQueue.java @@ -786,8 +786,8 @@ public final class MessageQueue { } /** - * Get the timestamp of the next executable message in our priority queue. - * Returns null if there are no messages ready for delivery. + * Get the timestamp of the next message in our priority queue. + * Returns null if there are no messages in the queue. * * Caller must ensure that this doesn't race 'next' from the Looper thread. */ @@ -799,8 +799,8 @@ public final class MessageQueue { } /** - * Return the next executable message in our priority queue. - * Returns null if there are no messages ready for delivery + * Return the next message in our priority queue. + * Returns null if there are no messages in the queue. * * Caller must ensure that this doesn't race 'next' from the Looper thread. */ diff --git a/core/java/android/os/TestLooperManager.java b/core/java/android/os/TestLooperManager.java index 1a54f4df58fb..204e3444c547 100644 --- a/core/java/android/os/TestLooperManager.java +++ b/core/java/android/os/TestLooperManager.java @@ -96,8 +96,8 @@ public class TestLooperManager { } /** - * Retrieves and removes the next message that should be executed by this queue. - * If the queue is empty or no messages are deliverable, returns null. + * Retrieves and removes the next message in this queue. + * If the queue is empty, returns null. * This method never blocks. * * <p>Callers should always call {@link #recycle(Message)} on the message when all interactions @@ -112,9 +112,9 @@ public class TestLooperManager { } /** - * Retrieves, but does not remove, the values of {@link Message#when} of next message that - * should be executed by this queue. - * If the queue is empty or no messages are deliverable, returns null. + * Retrieves, but does not remove, the values of {@link Message#when} of next message in the + * queue. + * If the queue is empty, returns null. * This method never blocks. */ @FlaggedApi(Flags.FLAG_MESSAGE_QUEUE_TESTABILITY) diff --git a/core/java/android/os/flags.aconfig b/core/java/android/os/flags.aconfig index 5d80119410e1..86acb2b21cfa 100644 --- a/core/java/android/os/flags.aconfig +++ b/core/java/android/os/flags.aconfig @@ -227,14 +227,6 @@ flag { } flag { - name: "ipc_data_cache_test_apis" - namespace: "system_performance" - description: "Expose IpcDataCache test apis to mainline modules." - bug: "396173886" - is_exported: true -} - -flag { name: "mainline_vcn_platform_api" namespace: "vcn" description: "Expose platform APIs to mainline VCN" diff --git a/core/java/android/os/instrumentation/MethodDescriptorParser.java b/core/java/android/os/instrumentation/MethodDescriptorParser.java index 57fc44ff623e..3264c041213b 100644 --- a/core/java/android/os/instrumentation/MethodDescriptorParser.java +++ b/core/java/android/os/instrumentation/MethodDescriptorParser.java @@ -18,7 +18,7 @@ package android.os.instrumentation; import android.annotation.NonNull; -import java.lang.reflect.Method; +import java.lang.reflect.Executable; /** * A utility class for dynamic instrumentation / uprobestats. @@ -28,9 +28,9 @@ import java.lang.reflect.Method; public final class MethodDescriptorParser { /** - * Parses a {@link MethodDescriptor} (in string representation) into a {@link Method}. + * Parses a {@link MethodDescriptor} (in string representation) into a {@link Executable}. */ - public static Method parseMethodDescriptor(ClassLoader classLoader, + public static Executable parseMethodDescriptor(ClassLoader classLoader, @NonNull MethodDescriptor descriptor) { try { Class<?> javaClass = classLoader.loadClass(descriptor.fullyQualifiedClassName); @@ -72,6 +72,10 @@ public final class MethodDescriptorParser { } } + if (com.android.art.flags.Flags.executableMethodFileOffsetsV2() + && descriptor.methodName.equals("<init>")) { + return javaClass.getDeclaredConstructor(parameters); + } return javaClass.getDeclaredMethod(descriptor.methodName, parameters); } catch (ClassNotFoundException | NoSuchMethodException e) { throw new IllegalArgumentException( diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index da4709b4b8b1..5b708b382a96 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4184,7 +4184,6 @@ public final class Settings { MOVED_TO_SECURE.add(Secure.PARENTAL_CONTROL_REDIRECT_URL); MOVED_TO_SECURE.add(Secure.SETTINGS_CLASSNAME); MOVED_TO_SECURE.add(Secure.USE_GOOGLE_MAIL); - MOVED_TO_SECURE.add(Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON); MOVED_TO_SECURE.add(Secure.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY); MOVED_TO_SECURE.add(Secure.WIFI_NUM_OPEN_NETWORKS_KEPT); MOVED_TO_SECURE.add(Secure.WIFI_ON); @@ -4223,6 +4222,7 @@ public final class Settings { MOVED_TO_SECURE_THEN_GLOBAL.add(Global.USB_MASS_STORAGE_ENABLED); MOVED_TO_SECURE_THEN_GLOBAL.add(Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS); MOVED_TO_SECURE_THEN_GLOBAL.add(Global.WIFI_MAX_DHCP_RETRY_COUNT); + MOVED_TO_SECURE_THEN_GLOBAL.add(Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON); // these are moving directly from system to global MOVED_TO_GLOBAL.add(Settings.Global.AIRPLANE_MODE_ON); @@ -12822,6 +12822,22 @@ public final class Settings { public static final String ADAPTIVE_CONNECTIVITY_ENABLED = "adaptive_connectivity_enabled"; /** + * Whether the Adaptive wifi scorer switch is enabled. + * + * @hide + */ + public static final String ADAPTIVE_CONNECTIVITY_WIFI_ENABLED = + "adaptive_connectivity_wifi_enabled"; + + /** + * Whether the Adaptive 5G PM switch is enabled. + * + * @hide + */ + public static final String ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED = + "adaptive_connectivity_mobile_network_enabled"; + + /** * Controls the 'Sunlight boost' toggle in wearable devices (high brightness mode). * * Valid values for this key are: '0' (disabled) or '1' (enabled). diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index ce31e1ea7e38..df3b8baa40c8 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -455,7 +455,7 @@ public class DreamService extends Service implements Window.Callback { // Simply wake up in the case the device is not locked. if (!keyguardManager.isKeyguardLocked()) { - wakeUp(); + wakeUp(false); return true; } @@ -477,11 +477,11 @@ public class DreamService extends Service implements Window.Callback { if (!mInteractive) { if (mDebug) Slog.v(mTag, "Waking up on keyEvent"); - wakeUp(); + wakeUp(false); return true; } else if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) { if (mDebug) Slog.v(mTag, "Waking up on back key"); - wakeUp(); + wakeUp(false); return true; } return mWindow.superDispatchKeyEvent(event); @@ -492,7 +492,7 @@ public class DreamService extends Service implements Window.Callback { public boolean dispatchKeyShortcutEvent(KeyEvent event) { if (!mInteractive) { if (mDebug) Slog.v(mTag, "Waking up on keyShortcutEvent"); - wakeUp(); + wakeUp(false); return true; } return mWindow.superDispatchKeyShortcutEvent(event); @@ -505,7 +505,7 @@ public class DreamService extends Service implements Window.Callback { // but finish()es on any other kind of activity if (!mInteractive && event.getActionMasked() == MotionEvent.ACTION_UP) { if (mDebug) Slog.v(mTag, "Waking up on touchEvent"); - wakeUp(); + wakeUp(false); return true; } return mWindow.superDispatchTouchEvent(event); @@ -516,7 +516,7 @@ public class DreamService extends Service implements Window.Callback { public boolean dispatchTrackballEvent(MotionEvent event) { if (!mInteractive) { if (mDebug) Slog.v(mTag, "Waking up on trackballEvent"); - wakeUp(); + wakeUp(false); return true; } return mWindow.superDispatchTrackballEvent(event); @@ -527,7 +527,7 @@ public class DreamService extends Service implements Window.Callback { public boolean dispatchGenericMotionEvent(MotionEvent event) { if (!mInteractive) { if (mDebug) Slog.v(mTag, "Waking up on genericMotionEvent"); - wakeUp(); + wakeUp(false); return true; } return mWindow.superDispatchGenericMotionEvent(event); @@ -925,32 +925,37 @@ public class DreamService extends Service implements Window.Callback { } } - private synchronized void updateDoze() { - if (mDreamToken == null) { - Slog.w(mTag, "Updating doze without a dream token."); - return; - } + /** + * Updates doze state. Note that this must be called on the mHandler. + */ + private void updateDoze() { + mHandler.post(() -> { + if (mDreamToken == null) { + Slog.w(mTag, "Updating doze without a dream token."); + return; + } - if (mDozing) { - try { - Slog.v(mTag, "UpdateDoze mDozeScreenState=" + mDozeScreenState - + " mDozeScreenBrightness=" + mDozeScreenBrightness - + " mDozeScreenBrightnessFloat=" + mDozeScreenBrightnessFloat); - if (startAndStopDozingInBackground()) { - mDreamManager.startDozingOneway( - mDreamToken, mDozeScreenState, mDozeScreenStateReason, - mDozeScreenBrightnessFloat, mDozeScreenBrightness, - mUseNormalBrightnessForDoze); - } else { - mDreamManager.startDozing( - mDreamToken, mDozeScreenState, mDozeScreenStateReason, - mDozeScreenBrightnessFloat, mDozeScreenBrightness, - mUseNormalBrightnessForDoze); + if (mDozing) { + try { + Slog.v(mTag, "UpdateDoze mDozeScreenState=" + mDozeScreenState + + " mDozeScreenBrightness=" + mDozeScreenBrightness + + " mDozeScreenBrightnessFloat=" + mDozeScreenBrightnessFloat); + if (startAndStopDozingInBackground()) { + mDreamManager.startDozingOneway( + mDreamToken, mDozeScreenState, mDozeScreenStateReason, + mDozeScreenBrightnessFloat, mDozeScreenBrightness, + mUseNormalBrightnessForDoze); + } else { + mDreamManager.startDozing( + mDreamToken, mDozeScreenState, mDozeScreenStateReason, + mDozeScreenBrightnessFloat, mDozeScreenBrightness, + mUseNormalBrightnessForDoze); + } + } catch (RemoteException ex) { + // system server died } - } catch (RemoteException ex) { - // system server died } - } + }); } /** @@ -966,14 +971,20 @@ public class DreamService extends Service implements Window.Callback { */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void stopDozing() { - if (mDozing) { - mDozing = false; - try { - mDreamManager.stopDozing(mDreamToken); - } catch (RemoteException ex) { - // system server died + mHandler.post(() -> { + if (mDreamToken == null) { + return; } - } + + if (mDozing) { + mDozing = false; + try { + mDreamManager.stopDozing(mDreamToken); + } catch (RemoteException ex) { + // system server died + } + } + }); } /** @@ -1201,7 +1212,7 @@ public class DreamService extends Service implements Window.Callback { @Override public void onExitRequested() { // Simply finish dream when exit is requested. - mHandler.post(() -> finish()); + mHandler.post(() -> finishInternal()); } @Override @@ -1299,9 +1310,13 @@ public class DreamService extends Service implements Window.Callback { * </p> */ public final void finish() { + mHandler.post(this::finishInternal); + } + + private void finishInternal() { // If there is an active overlay connection, signal that the dream is ending before - // continuing. Note that the overlay cannot rely on the unbound state, since another dream - // might have bound to it in the meantime. + // continuing. Note that the overlay cannot rely on the unbound state, since another + // dream might have bound to it in the meantime. if (mOverlayConnection != null) { mOverlayConnection.addConsumer(overlay -> { try { @@ -1357,7 +1372,7 @@ public class DreamService extends Service implements Window.Callback { * </p> */ public final void wakeUp() { - wakeUp(false); + mHandler.post(()-> wakeUp(false)); } /** @@ -1559,7 +1574,7 @@ public class DreamService extends Service implements Window.Callback { if (mActivity != null && !mActivity.isFinishing()) { mActivity.finishAndRemoveTask(); } else { - finish(); + finishInternal(); } mDreamToken = null; @@ -1719,7 +1734,7 @@ public class DreamService extends Service implements Window.Callback { // the window reference in order to fully release the DreamActivity. mWindow = null; mActivity = null; - finish(); + finishInternal(); } if (mOverlayConnection != null && mDreamStartOverlayConsumer != null) { diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 7dc96f21b5ae..da91e8d2d256 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3474,6 +3474,9 @@ public final class ViewRootImpl implements ViewParent, * TODO(b/260382739): Apply this to all windows. */ private static boolean shouldOptimizeMeasure(final WindowManager.LayoutParams lp) { + if (com.android.window.flags.Flags.reduceUnnecessaryMeasure()) { + return true; + } return (lp.privateFlags & PRIVATE_FLAG_OPTIMIZE_MEASURE) != 0; } diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 83dc79beb75e..315f1ba58529 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1514,6 +1514,44 @@ public interface WindowManager extends ViewManager { "android.window.PROPERTY_COMPAT_ALLOW_RESTRICTED_RESIZABILITY"; /** + * Application or Activity level + * {@link android.content.pm.PackageManager.Property PackageManager.Property} that specifies + * whether this package or activity wants to allow safe region letterboxing. A safe + * region policy may be applied by the system to improve the user experience by ensuring that + * the activity does not have any content that is occluded and has the correct current + * window metrics. + * + * <p>Not setting the property at all defaults it to {@code true}. In such a case, the activity + * will be letterboxed in the safe region. + * + * <p>To not allow the safe region letterboxing, add this property to your app + * manifest and set the value to {@code false}. An app should ignore safe region + * letterboxing if it can handle bounds and insets from all four directions correctly when a + * request to go immersive is denied by the system. If the application does not allow safe + * region letterboxing, the system will not override this behavior. + * + * <p><b>Syntax:</b> + * <pre> + * <application> + * <property + * android:name="android.window.PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING" + * android:value="false"/> + * </application> + * </pre>or + * <pre> + * <activity> + * <property + * android:name="android.window.PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING" + * android:value="false"/> + * </activity> + * </pre> + * @hide + */ + @FlaggedApi(Flags.FLAG_SAFE_REGION_LETTERBOXING) + String PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING = + "android.window.PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING"; + + /** * @hide */ public static final String PARCEL_KEY_SHORTCUTS_ARRAY = "shortcuts_array"; diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index e43fb48527a1..c97c4acf706c 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -866,31 +866,18 @@ public final class AccessibilityManager { } /** - * Returns the {@link AccessibilityServiceInfo}s of the enabled accessibility services - * for a given feedback type. - * - * @param feedbackTypeFlags The feedback type flags. - * @return An unmodifiable list with {@link AccessibilityServiceInfo}s. - * - * @see AccessibilityServiceInfo#FEEDBACK_AUDIBLE - * @see AccessibilityServiceInfo#FEEDBACK_GENERIC - * @see AccessibilityServiceInfo#FEEDBACK_HAPTIC - * @see AccessibilityServiceInfo#FEEDBACK_SPOKEN - * @see AccessibilityServiceInfo#FEEDBACK_VISUAL - * @see AccessibilityServiceInfo#FEEDBACK_BRAILLE + * @see #getEnabledAccessibilityServiceList(int) + * @hide */ public List<AccessibilityServiceInfo> getEnabledAccessibilityServiceList( - int feedbackTypeFlags) { + int feedbackTypeFlags, int userId) { final IAccessibilityManager service; - final int userId; synchronized (mLock) { service = getServiceLocked(); if (service == null) { return Collections.emptyList(); } - userId = mUserId; } - List<AccessibilityServiceInfo> services = null; try { services = service.getEnabledAccessibilityServiceList(feedbackTypeFlags, userId); @@ -912,6 +899,29 @@ public final class AccessibilityManager { } /** + * Returns the {@link AccessibilityServiceInfo}s of the enabled accessibility services + * for a given feedback type. + * + * @param feedbackTypeFlags The feedback type flags. + * @return An unmodifiable list with {@link AccessibilityServiceInfo}s. + * + * @see AccessibilityServiceInfo#FEEDBACK_AUDIBLE + * @see AccessibilityServiceInfo#FEEDBACK_GENERIC + * @see AccessibilityServiceInfo#FEEDBACK_HAPTIC + * @see AccessibilityServiceInfo#FEEDBACK_SPOKEN + * @see AccessibilityServiceInfo#FEEDBACK_VISUAL + * @see AccessibilityServiceInfo#FEEDBACK_BRAILLE + */ + public List<AccessibilityServiceInfo> getEnabledAccessibilityServiceList( + int feedbackTypeFlags) { + final int userId; + synchronized (mLock) { + userId = mUserId; + } + return getEnabledAccessibilityServiceList(feedbackTypeFlags, userId); + } + + /** * Returns whether the user must be shown the AccessibilityService warning dialog * before the AccessibilityService (or any shortcut for the service) can be enabled. * @hide diff --git a/core/java/android/view/contentcapture/flags/content_capture_flags.aconfig b/core/java/android/view/contentcapture/flags/content_capture_flags.aconfig index 8c98fa455cc8..3780db38ec84 100644 --- a/core/java/android/view/contentcapture/flags/content_capture_flags.aconfig +++ b/core/java/android/view/contentcapture/flags/content_capture_flags.aconfig @@ -21,6 +21,7 @@ flag { namespace: "pixel_state_server" description: "Feature flag to send a flush event after each frame" bug: "380381249" + is_exported: true is_fixed_read_only: true metadata { purpose: PURPOSE_BUGFIX diff --git a/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java b/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java index 3557f16a6dc8..ced27d6d4886 100644 --- a/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java +++ b/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java @@ -28,7 +28,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; import android.annotation.AnyThread; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.UiThread; import android.app.UriGrantsManager; import android.content.ContentProvider; import android.content.Intent; @@ -38,6 +37,7 @@ import android.os.Binder; import android.os.Bundle; import android.os.CancellationSignal; import android.os.CancellationSignalBeamer; +import android.os.Debug; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -468,13 +468,27 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { }); } + /** + * Returns {@code false} if there is a sessionId mismatch and logs the event. + */ + private boolean checkSessionId(@NonNull InputConnectionCommandHeader header) { + if (header.mSessionId != mCurrentSessionId.get()) { + Log.w(TAG, "Session id mismatch header.sessionId: " + header.mSessionId + + " currentSessionId: " + mCurrentSessionId.get() + " while calling " + + Debug.getCaller()); + //TODO(b/396066692): log metrics. + return false; // cancelled + } + return true; + } + @Dispatching(cancellable = true) @Override public void getTextAfterCursor(InputConnectionCommandHeader header, int length, int flags, AndroidFuture future /* T=CharSequence */) { dispatchWithTracing("getTextAfterCursor", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return null; // cancelled + if (!checkSessionId(header)) { + return null; } final InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -495,8 +509,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void getTextBeforeCursor(InputConnectionCommandHeader header, int length, int flags, AndroidFuture future /* T=CharSequence */) { dispatchWithTracing("getTextBeforeCursor", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return null; // cancelled + if (!checkSessionId(header)) { + return null; } final InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -517,8 +531,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void getSelectedText(InputConnectionCommandHeader header, int flags, AndroidFuture future /* T=CharSequence */) { dispatchWithTracing("getSelectedText", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return null; // cancelled + if (!checkSessionId(header)) { + return null; } final InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -539,8 +553,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void getSurroundingText(InputConnectionCommandHeader header, int beforeLength, int afterLength, int flags, AndroidFuture future /* T=SurroundingText */) { dispatchWithTracing("getSurroundingText", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return null; // cancelled + if (!checkSessionId(header)) { + return null; } final InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -567,8 +581,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void getCursorCapsMode(InputConnectionCommandHeader header, int reqModes, AndroidFuture future /* T=Integer */) { dispatchWithTracing("getCursorCapsMode", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return 0; // cancelled + if (!checkSessionId(header)) { + return 0; } final InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -584,8 +598,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void getExtractedText(InputConnectionCommandHeader header, ExtractedTextRequest request, int flags, AndroidFuture future /* T=ExtractedText */) { dispatchWithTracing("getExtractedText", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return null; // cancelled + if (!checkSessionId(header)) { + return null; } final InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -601,8 +615,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void commitText(InputConnectionCommandHeader header, CharSequence text, int newCursorPosition) { dispatchWithTracing("commitText", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -618,8 +632,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void commitTextWithTextAttribute(InputConnectionCommandHeader header, CharSequence text, int newCursorPosition, @Nullable TextAttribute textAttribute) { dispatchWithTracing("commitTextWithTextAttribute", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -634,8 +648,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void commitCompletion(InputConnectionCommandHeader header, CompletionInfo text) { dispatchWithTracing("commitCompletion", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -650,8 +664,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void commitCorrection(InputConnectionCommandHeader header, CorrectionInfo info) { dispatchWithTracing("commitCorrection", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -670,8 +684,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void setSelection(InputConnectionCommandHeader header, int start, int end) { dispatchWithTracing("setSelection", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -686,8 +700,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void performEditorAction(InputConnectionCommandHeader header, int id) { dispatchWithTracing("performEditorAction", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -702,8 +716,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void performContextMenuAction(InputConnectionCommandHeader header, int id) { dispatchWithTracing("performContextMenuAction", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -718,8 +732,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void setComposingRegion(InputConnectionCommandHeader header, int start, int end) { dispatchWithTracing("setComposingRegion", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -739,8 +753,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void setComposingRegionWithTextAttribute(InputConnectionCommandHeader header, int start, int end, @Nullable TextAttribute textAttribute) { dispatchWithTracing("setComposingRegionWithTextAttribute", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -756,8 +770,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void setComposingText(InputConnectionCommandHeader header, CharSequence text, int newCursorPosition) { dispatchWithTracing("setComposingText", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -773,8 +787,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void setComposingTextWithTextAttribute(InputConnectionCommandHeader header, CharSequence text, int newCursorPosition, @Nullable TextAttribute textAttribute) { dispatchWithTracing("setComposingTextWithTextAttribute", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -826,8 +840,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { } return; } - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null && mDeactivateRequested.get()) { @@ -842,8 +856,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void sendKeyEvent(InputConnectionCommandHeader header, KeyEvent event) { dispatchWithTracing("sendKeyEvent", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -858,8 +872,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void clearMetaKeyStates(InputConnectionCommandHeader header, int states) { dispatchWithTracing("clearMetaKeyStates", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -875,8 +889,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void deleteSurroundingText(InputConnectionCommandHeader header, int beforeLength, int afterLength) { dispatchWithTracing("deleteSurroundingText", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -892,8 +906,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void deleteSurroundingTextInCodePoints(InputConnectionCommandHeader header, int beforeLength, int afterLength) { dispatchWithTracing("deleteSurroundingTextInCodePoints", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -912,8 +926,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void beginBatchEdit(InputConnectionCommandHeader header) { dispatchWithTracing("beginBatchEdit", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -928,8 +942,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void endBatchEdit(InputConnectionCommandHeader header) { dispatchWithTracing("endBatchEdit", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -944,8 +958,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void performSpellCheck(InputConnectionCommandHeader header) { dispatchWithTracing("performSpellCheck", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -961,8 +975,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void performPrivateCommand(InputConnectionCommandHeader header, String action, Bundle data) { dispatchWithTracing("performPrivateCommand", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -995,12 +1009,12 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { } } dispatchWithTracing("performHandwritingGesture", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { + if (!checkSessionId(header)) { if (resultReceiver != null) { resultReceiver.send( InputConnection.HANDWRITING_GESTURE_RESULT_CANCELLED, null); } - return; // cancelled + return; // cancelled } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1038,9 +1052,9 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { (PreviewableHandwritingGesture) gestureContainer.get(); dispatchWithTracing("previewHandwritingGesture", () -> { - if (header.mSessionId != mCurrentSessionId.get() + if (!checkSessionId(header) || (cancellationSignal != null && cancellationSignal.isCanceled())) { - return; // cancelled + return; // cancelled } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1065,8 +1079,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void requestCursorUpdates(InputConnectionCommandHeader header, int cursorUpdateMode, int imeDisplayId, AndroidFuture future /* T=Boolean */) { dispatchWithTracing("requestCursorUpdates", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return false; // cancelled + if (!checkSessionId(header)) { + return false; // cancelled. } return requestCursorUpdatesInternal( cursorUpdateMode, 0 /* cursorUpdateFilter */, imeDisplayId); @@ -1079,8 +1093,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { int cursorUpdateMode, int cursorUpdateFilter, int imeDisplayId, AndroidFuture future /* T=Boolean */) { dispatchWithTracing("requestCursorUpdates", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return false; // cancelled + if (!checkSessionId(header)) { + return false; // cancelled. } return requestCursorUpdatesInternal( cursorUpdateMode, cursorUpdateFilter, imeDisplayId); @@ -1123,9 +1137,9 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { InputConnectionCommandHeader header, RectF bounds, @NonNull ResultReceiver resultReceiver) { dispatchWithTracing("requestTextBoundsInfo", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { + if (!checkSessionId(header)) { resultReceiver.send(TextBoundsInfoResult.CODE_CANCELLED, null); - return; // cancelled + return; // cancelled } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1168,8 +1182,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { return false; } - if (header.mSessionId != mCurrentSessionId.get()) { - return false; // cancelled + if (!checkSessionId(header)) { + return false; // cancelled. } final InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1193,8 +1207,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void setImeConsumesInput(InputConnectionCommandHeader header, boolean imeConsumesInput) { dispatchWithTracing("setImeConsumesInput", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1217,8 +1231,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { dispatchWithTracing( "replaceText", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1236,8 +1250,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void commitText(InputConnectionCommandHeader header, CharSequence text, int newCursorPosition, @Nullable TextAttribute textAttribute) { dispatchWithTracing("commitTextFromA11yIme", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1256,8 +1270,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void setSelection(InputConnectionCommandHeader header, int start, int end) { dispatchWithTracing("setSelectionFromA11yIme", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1273,8 +1287,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void getSurroundingText(InputConnectionCommandHeader header, int beforeLength, int afterLength, int flags, AndroidFuture future /* T=SurroundingText */) { dispatchWithTracing("getSurroundingTextFromA11yIme", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return null; // cancelled + if (!checkSessionId(header)) { + return null; // cancelled. } final InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1301,8 +1315,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void deleteSurroundingText(InputConnectionCommandHeader header, int beforeLength, int afterLength) { dispatchWithTracing("deleteSurroundingTextFromA11yIme", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1317,8 +1331,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void sendKeyEvent(InputConnectionCommandHeader header, KeyEvent event) { dispatchWithTracing("sendKeyEventFromA11yIme", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1333,8 +1347,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void performEditorAction(InputConnectionCommandHeader header, int id) { dispatchWithTracing("performEditorActionFromA11yIme", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1349,8 +1363,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void performContextMenuAction(InputConnectionCommandHeader header, int id) { dispatchWithTracing("performContextMenuActionFromA11yIme", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1366,8 +1380,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void getCursorCapsMode(InputConnectionCommandHeader header, int reqModes, AndroidFuture future /* T=Integer */) { dispatchWithTracing("getCursorCapsModeFromA11yIme", future, () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return 0; // cancelled + if (!checkSessionId(header)) { + return 0; // cancelled. } final InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { @@ -1382,8 +1396,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { @Override public void clearMetaKeyStates(InputConnectionCommandHeader header, int states) { dispatchWithTracing("clearMetaKeyStatesFromA11yIme", () -> { - if (header.mSessionId != mCurrentSessionId.get()) { - return; // cancelled + if (!checkSessionId(header)) { + return; // cancelled. } InputConnection ic = getInputConnection(); if (ic == null || mDeactivateRequested.get()) { diff --git a/core/java/android/view/inputmethod/flags.aconfig b/core/java/android/view/inputmethod/flags.aconfig index a4ea64e5811e..67e54423414c 100644 --- a/core/java/android/view/inputmethod/flags.aconfig +++ b/core/java/android/view/inputmethod/flags.aconfig @@ -214,3 +214,13 @@ flag { purpose: PURPOSE_BUGFIX } } + +flag { + name: "invalidate_input_calls_restart" + namespace: "input_method" + description: "Feature flag to fix the race between invalidateInput and restartInput" + bug: "396066692" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/core/java/android/window/WindowContainerTransaction.java b/core/java/android/window/WindowContainerTransaction.java index 485e7b33f3a7..2ed9c3a48add 100644 --- a/core/java/android/window/WindowContainerTransaction.java +++ b/core/java/android/window/WindowContainerTransaction.java @@ -445,6 +445,27 @@ public final class WindowContainerTransaction implements Parcelable { return this; } + /** + * Sets a given safe region {@code Rect} on the {@code container}. Set {@code null} to reset + * safe region bounds. When a safe region is set on a WindowContainer, the activities which + * need to be within a safe region will be letterboxed within the set safe region bounds. + * <p>Note that if the position of the WindowContainer changes, the caller needs to update the + * safe region bounds. + * + * @param container The window container that the safe region bounds are set on + * @param safeRegionBounds The rect for the safe region bounds which are absolute in nature. + * @hide + */ + @NonNull + @FlaggedApi(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public WindowContainerTransaction setSafeRegionBounds( + @NonNull WindowContainerToken container, + @Nullable Rect safeRegionBounds) { + mHierarchyOps.add( + HierarchyOp.createForSetSafeRegionBounds(container.asBinder(), safeRegionBounds)); + return this; + } + /* * =========================================================================================== * Hierarchy updates (create/destroy/reorder/reparent containers) @@ -1597,6 +1618,7 @@ public final class WindowContainerTransaction implements Parcelable { public static final int HIERARCHY_OP_TYPE_SET_DISABLE_LAUNCH_ADJACENT = 23; public static final int HIERARCHY_OP_TYPE_REMOVE_ROOT_TASK = 24; public static final int HIERARCHY_OP_TYPE_APP_COMPAT_REACHABILITY = 25; + public static final int HIERARCHY_OP_TYPE_SET_SAFE_REGION_BOUNDS = 26; @IntDef(prefix = {"HIERARCHY_OP_TYPE_"}, value = { HIERARCHY_OP_TYPE_REPARENT, @@ -1625,6 +1647,7 @@ public final class WindowContainerTransaction implements Parcelable { HIERARCHY_OP_TYPE_SET_DISABLE_LAUNCH_ADJACENT, HIERARCHY_OP_TYPE_REMOVE_ROOT_TASK, HIERARCHY_OP_TYPE_APP_COMPAT_REACHABILITY, + HIERARCHY_OP_TYPE_SET_SAFE_REGION_BOUNDS, }) @Retention(RetentionPolicy.SOURCE) public @interface HierarchyOpType { @@ -1710,6 +1733,9 @@ public final class WindowContainerTransaction implements Parcelable { private boolean mLaunchAdjacentDisabled; + @Nullable + private Rect mSafeRegionBounds; + /** Creates a hierarchy operation for reparenting a container within the hierarchy. */ @NonNull public static HierarchyOp createForReparent( @@ -1873,6 +1899,17 @@ public final class WindowContainerTransaction implements Parcelable { .build(); } + /** Creates a hierarchy op for setting the safe region bounds. */ + @NonNull + @FlaggedApi(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public static HierarchyOp createForSetSafeRegionBounds(@NonNull IBinder container, + @Nullable Rect safeRegionBounds) { + return new Builder(HIERARCHY_OP_TYPE_SET_SAFE_REGION_BOUNDS) + .setContainer(container) + .setSafeRegionBounds(safeRegionBounds) + .build(); + } + /** Only creates through {@link Builder}. */ private HierarchyOp(@HierarchyOpType int type) { mType = type; @@ -1903,6 +1940,7 @@ public final class WindowContainerTransaction implements Parcelable { mIsTrimmableFromRecents = copy.mIsTrimmableFromRecents; mExcludeInsetsTypes = copy.mExcludeInsetsTypes; mLaunchAdjacentDisabled = copy.mLaunchAdjacentDisabled; + mSafeRegionBounds = copy.mSafeRegionBounds; } private HierarchyOp(@NonNull Parcel in) { @@ -1930,6 +1968,7 @@ public final class WindowContainerTransaction implements Parcelable { mIsTrimmableFromRecents = in.readBoolean(); mExcludeInsetsTypes = in.readInt(); mLaunchAdjacentDisabled = in.readBoolean(); + mSafeRegionBounds = in.readTypedObject(Rect.CREATOR); } @HierarchyOpType @@ -2051,6 +2090,12 @@ public final class WindowContainerTransaction implements Parcelable { return mLaunchAdjacentDisabled; } + /** Denotes the safe region bounds */ + @Nullable + public Rect getSafeRegionBounds() { + return mSafeRegionBounds; + } + /** Gets a string representation of a hierarchy-op type. */ public static String hopToString(@HierarchyOpType int type) { switch (type) { @@ -2084,6 +2129,7 @@ public final class WindowContainerTransaction implements Parcelable { case HIERARCHY_OP_TYPE_RESTORE_BACK_NAVIGATION: return "restoreBackNav"; case HIERARCHY_OP_TYPE_SET_EXCLUDE_INSETS_TYPES: return "setExcludeInsetsTypes"; case HIERARCHY_OP_TYPE_SET_KEYGUARD_STATE: return "setKeyguardState"; + case HIERARCHY_OP_TYPE_SET_SAFE_REGION_BOUNDS: return "setSafeRegionBounds"; default: return "HOP(" + type + ")"; } } @@ -2184,6 +2230,11 @@ public final class WindowContainerTransaction implements Parcelable { sb.append("container= ").append(mContainer) .append(" isTrimmable= ") .append(mIsTrimmableFromRecents); + break; + case HIERARCHY_OP_TYPE_SET_SAFE_REGION_BOUNDS: + sb.append("container= ").append(mContainer) + .append(" safeRegionBounds= ") + .append(mSafeRegionBounds); default: sb.append("container=").append(mContainer) .append(" reparent=").append(mReparent) @@ -2220,6 +2271,7 @@ public final class WindowContainerTransaction implements Parcelable { dest.writeBoolean(mIsTrimmableFromRecents); dest.writeInt(mExcludeInsetsTypes); dest.writeBoolean(mLaunchAdjacentDisabled); + dest.writeTypedObject(mSafeRegionBounds, flags); } @Override @@ -2305,6 +2357,9 @@ public final class WindowContainerTransaction implements Parcelable { private boolean mLaunchAdjacentDisabled; + @Nullable + private Rect mSafeRegionBounds; + Builder(@HierarchyOpType int type) { mType = type; } @@ -2426,6 +2481,11 @@ public final class WindowContainerTransaction implements Parcelable { return this; } + Builder setSafeRegionBounds(Rect safeRegionBounds) { + mSafeRegionBounds = safeRegionBounds; + return this; + } + @NonNull HierarchyOp build() { final HierarchyOp hierarchyOp = new HierarchyOp(mType); @@ -2456,7 +2516,7 @@ public final class WindowContainerTransaction implements Parcelable { hierarchyOp.mIsTrimmableFromRecents = mIsTrimmableFromRecents; hierarchyOp.mExcludeInsetsTypes = mExcludeInsetsTypes; hierarchyOp.mLaunchAdjacentDisabled = mLaunchAdjacentDisabled; - + hierarchyOp.mSafeRegionBounds = mSafeRegionBounds; return hierarchyOp; } } diff --git a/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig b/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig index a42759e9e23f..cc07616412b6 100644 --- a/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig +++ b/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig @@ -155,4 +155,12 @@ flag { metadata { purpose: PURPOSE_BUGFIX } +} + +flag { + name: "backup_and_restore_for_user_aspect_ratio_settings" + namespace: "large_screen_experiences_app_compat" + description: "Whether B&R for user aspect ratio settings is enabled" + bug: "396650383" + is_fixed_read_only: true }
\ No newline at end of file diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig index 3927c713e500..816270235446 100644 --- a/core/java/android/window/flags/windowing_frontend.aconfig +++ b/core/java/android/window/flags/windowing_frontend.aconfig @@ -9,16 +9,6 @@ flag { } flag { - name: "wait_for_transition_on_display_switch" - namespace: "windowing_frontend" - description: "Waits for Shell transition to start before unblocking the screen after display switch" - bug: "301420598" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "apply_lifecycle_on_pip_change" namespace: "windowing_frontend" description: "Make pip activity lifecyle change with windowing mode" @@ -29,17 +19,6 @@ flag { } flag { - name: "respect_animation_clip" - namespace: "windowing_frontend" - description: "Fix missing clip transformation of animation" - bug: "376601866" - is_fixed_read_only: true - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "cache_window_style" namespace: "windowing_frontend" description: "Cache common window styles" @@ -297,6 +276,17 @@ flag { } flag { + name: "reduce_unnecessary_measure" + namespace: "windowing_frontend" + description: "Skip measuring view hierarchy if the size is known" + bug: "260382739" + is_fixed_read_only: true + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "ensure_wallpaper_in_transitions" namespace: "windowing_frontend" description: "Ensure that wallpaper window tokens are always present/available for collection in transitions" diff --git a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java index 1281a78d4fa2..24e80209e9e9 100644 --- a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java +++ b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java @@ -136,7 +136,8 @@ public class AccessibilityShortcutController { private final Context mContext; private final Handler mHandler; - private final UserSetupCompleteObserver mUserSetupCompleteObserver; + @VisibleForTesting + public final UserSetupCompleteObserver mUserSetupCompleteObserver; private AlertDialog mAlertDialog; private boolean mIsShortcutEnabled; @@ -471,7 +472,7 @@ public class AccessibilityShortcutController { AccessibilityManager accessibilityManager = mFrameworkObjectProvider.getAccessibilityManagerInstance(mContext); return accessibilityManager.getEnabledAccessibilityServiceList( - FEEDBACK_ALL_MASK).contains(serviceInfo); + FEEDBACK_ALL_MASK, mUserId).contains(serviceInfo); } private boolean hasFeatureLeanback() { @@ -676,7 +677,8 @@ public class AccessibilityShortcutController { } } - private class UserSetupCompleteObserver extends ContentObserver { + @VisibleForTesting + public class UserSetupCompleteObserver extends ContentObserver { private boolean mIsRegistered = false; private int mUserId; @@ -749,7 +751,8 @@ public class AccessibilityShortcutController { R.string.config_defaultAccessibilityService); final List<AccessibilityServiceInfo> enabledServices = mFrameworkObjectProvider.getAccessibilityManagerInstance( - mContext).getEnabledAccessibilityServiceList(FEEDBACK_ALL_MASK); + mContext).getEnabledAccessibilityServiceList( + FEEDBACK_ALL_MASK, mUserId); for (int i = enabledServices.size() - 1; i >= 0; i--) { if (TextUtils.equals(defaultShortcutTarget, enabledServices.get(i).getId())) { return; diff --git a/core/java/com/android/internal/app/MediaRouteChooserContentManager.java b/core/java/com/android/internal/app/MediaRouteChooserContentManager.java new file mode 100644 index 000000000000..09c6f5e6caaa --- /dev/null +++ b/core/java/com/android/internal/app/MediaRouteChooserContentManager.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2025 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.app; + +import android.content.Context; +import android.view.Gravity; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.ListView; + +import com.android.internal.R; + +public class MediaRouteChooserContentManager { + Context mContext; + + private final boolean mShowProgressBarWhenEmpty; + + public MediaRouteChooserContentManager(Context context, boolean showProgressBarWhenEmpty) { + mContext = context; + mShowProgressBarWhenEmpty = showProgressBarWhenEmpty; + } + + /** + * Starts binding all the views (list view, empty view, etc.) using the + * given container view. + */ + public void bindViews(View containerView) { + View emptyView = containerView.findViewById(android.R.id.empty); + ListView listView = containerView.findViewById(R.id.media_route_list); + listView.setEmptyView(emptyView); + + if (!mShowProgressBarWhenEmpty) { + containerView.findViewById(R.id.media_route_progress_bar).setVisibility(View.GONE); + + // Center the empty view when the progress bar is not shown. + LinearLayout.LayoutParams params = + (LinearLayout.LayoutParams) emptyView.getLayoutParams(); + params.gravity = Gravity.CENTER; + emptyView.setLayoutParams(params); + } + } +} diff --git a/core/java/com/android/internal/app/MediaRouteChooserDialog.java b/core/java/com/android/internal/app/MediaRouteChooserDialog.java index 23d966fdbc0d..5030a143ea94 100644 --- a/core/java/com/android/internal/app/MediaRouteChooserDialog.java +++ b/core/java/com/android/internal/app/MediaRouteChooserDialog.java @@ -23,14 +23,12 @@ import android.media.MediaRouter.RouteInfo; import android.os.Bundle; import android.text.TextUtils; import android.util.TypedValue; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; -import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TextView; @@ -52,15 +50,15 @@ import java.util.Comparator; public class MediaRouteChooserDialog extends AlertDialog { private final MediaRouter mRouter; private final MediaRouterCallback mCallback; - private final boolean mShowProgressBarWhenEmpty; private int mRouteTypes; private View.OnClickListener mExtendedSettingsClickListener; private RouteAdapter mAdapter; - private ListView mListView; private Button mExtendedSettingsButton; private boolean mAttachedToWindow; + private final MediaRouteChooserContentManager mContentManager; + public MediaRouteChooserDialog(Context context, int theme) { this(context, theme, true); } @@ -70,7 +68,7 @@ public class MediaRouteChooserDialog extends AlertDialog { mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE); mCallback = new MediaRouterCallback(); - mShowProgressBarWhenEmpty = showProgressBarWhenEmpty; + mContentManager = new MediaRouteChooserContentManager(context, showProgressBarWhenEmpty); } /** @@ -128,8 +126,9 @@ public class MediaRouteChooserDialog extends AlertDialog { @Override protected void onCreate(Bundle savedInstanceState) { // Note: setView must be called before super.onCreate(). - setView(LayoutInflater.from(getContext()).inflate(R.layout.media_route_chooser_dialog, - null)); + View containerView = LayoutInflater.from(getContext()).inflate( + R.layout.media_route_chooser_dialog, null); + setView(containerView); setTitle(mRouteTypes == MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY ? R.string.media_route_chooser_title_for_remote_display @@ -140,25 +139,15 @@ public class MediaRouteChooserDialog extends AlertDialog { super.onCreate(savedInstanceState); - View emptyView = findViewById(android.R.id.empty); mAdapter = new RouteAdapter(getContext()); - mListView = (ListView) findViewById(R.id.media_route_list); - mListView.setAdapter(mAdapter); - mListView.setOnItemClickListener(mAdapter); - mListView.setEmptyView(emptyView); + ListView listView = findViewById(R.id.media_route_list); + listView.setAdapter(mAdapter); + listView.setOnItemClickListener(mAdapter); - mExtendedSettingsButton = (Button) findViewById(R.id.media_route_extended_settings_button); + mExtendedSettingsButton = findViewById(R.id.media_route_extended_settings_button); updateExtendedSettingsButton(); - if (!mShowProgressBarWhenEmpty) { - findViewById(R.id.media_route_progress_bar).setVisibility(View.GONE); - - // Center the empty view when the progress bar is not shown. - LinearLayout.LayoutParams params = - (LinearLayout.LayoutParams) emptyView.getLayoutParams(); - params.gravity = Gravity.CENTER; - emptyView.setLayoutParams(params); - } + mContentManager.bindViews(containerView); } private void updateExtendedSettingsButton() { @@ -240,8 +229,8 @@ public class MediaRouteChooserDialog extends AlertDialog { view = mInflater.inflate(R.layout.media_route_list_item, parent, false); } MediaRouter.RouteInfo route = getItem(position); - TextView text1 = (TextView)view.findViewById(android.R.id.text1); - TextView text2 = (TextView)view.findViewById(android.R.id.text2); + TextView text1 = view.findViewById(android.R.id.text1); + TextView text2 = view.findViewById(android.R.id.text2); text1.setText(route.getName()); CharSequence description = route.getDescription(); if (TextUtils.isEmpty(description)) { diff --git a/core/java/com/android/internal/policy/DesktopModeCompatUtils.java b/core/java/com/android/internal/policy/DesktopModeCompatUtils.java new file mode 100644 index 000000000000..d7cfbdfed99c --- /dev/null +++ b/core/java/com/android/internal/policy/DesktopModeCompatUtils.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2025 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.policy; + +import static android.content.pm.ActivityInfo.INSETS_DECOUPLED_CONFIGURATION_ENFORCED; +import static android.content.pm.ActivityInfo.OVERRIDE_EXCLUDE_CAPTION_INSETS_FROM_APP_BOUNDS; + +import android.annotation.NonNull; +import android.content.pm.ActivityInfo; +import android.window.DesktopModeFlags; + +/** + * Utility functions for app compat in desktop windowing used by both window manager and System UI. + * @hide + */ +public final class DesktopModeCompatUtils { + + /** + * Whether the caption insets should be excluded from configuration for system to handle. + * The caller should ensure the activity is in or entering desktop view. + * + * <p> The treatment is enabled when all the of the following is true: + * <li> Any flags to forcibly consume caption insets are enabled. + * <li> Top activity have configuration coupled with insets. + * <li> Task is not resizeable or per-app override + * {@link ActivityInfo#OVERRIDE_EXCLUDE_CAPTION_INSETS_FROM_APP_BOUNDS} is enabled. + */ + public static boolean shouldExcludeCaptionFromAppBounds(@NonNull ActivityInfo info, + boolean isResizeable, boolean optOutEdgeToEdge) { + return DesktopModeFlags.EXCLUDE_CAPTION_FROM_APP_BOUNDS.isTrue() + && isAnyForceConsumptionFlagsEnabled() + && !isConfigurationDecoupled(info, optOutEdgeToEdge) + && (!isResizeable + || info.isChangeEnabled(OVERRIDE_EXCLUDE_CAPTION_INSETS_FROM_APP_BOUNDS)); + } + + private static boolean isConfigurationDecoupled(@NonNull ActivityInfo info, + boolean optOutEdgeToEdge) { + return info.isChangeEnabled(INSETS_DECOUPLED_CONFIGURATION_ENFORCED) && !optOutEdgeToEdge; + } + + private static boolean isAnyForceConsumptionFlagsEnabled() { + return DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS.isTrue() + || DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION.isTrue(); + } +} diff --git a/core/java/com/android/internal/policy/SystemBarUtils.java b/core/java/com/android/internal/policy/SystemBarUtils.java index 4ed15faf8b89..783c68695fb3 100644 --- a/core/java/com/android/internal/policy/SystemBarUtils.java +++ b/core/java/com/android/internal/policy/SystemBarUtils.java @@ -16,6 +16,8 @@ package com.android.internal.policy; +import android.annotation.DimenRes; +import android.annotation.NonNull; import android.content.Context; import android.content.res.Resources; import android.graphics.Insets; @@ -99,4 +101,19 @@ public final class SystemBarUtils { public static int getTaskbarHeight(Resources res) { return res.getDimensionPixelSize(R.dimen.taskbar_frame_height); } + + /** + * Gets the default app header height in desktop view in pixels. + */ + public static int getDesktopViewAppHeaderHeightPx(@NonNull Context context) { + return context.getResources().getDimensionPixelSize(getDesktopViewAppHeaderHeightId()); + } + + /** + * Gets the dimen resource id of the default app header height in desktop view. + */ + @DimenRes + public static int getDesktopViewAppHeaderHeightId() { + return R.dimen.desktop_view_default_header_height; + } } diff --git a/core/java/com/android/internal/widget/NotificationActionListLayout.java b/core/java/com/android/internal/widget/NotificationActionListLayout.java index cac2024f548d..cf9f1c8b380a 100644 --- a/core/java/com/android/internal/widget/NotificationActionListLayout.java +++ b/core/java/com/android/internal/widget/NotificationActionListLayout.java @@ -16,6 +16,7 @@ package com.android.internal.widget; +import static android.app.Flags.notificationsRedesignTemplates; import static android.app.Notification.CallStyle.DEBUG_NEW_ACTION_LAYOUT; import static android.app.Flags.evenlyDividedCallStyleActionLayout; @@ -368,12 +369,17 @@ public class NotificationActionListLayout extends LinearLayout { @Override protected void onFinishInflate() { super.onFinishInflate(); - mDefaultPaddingBottom = getPaddingBottom(); - mDefaultPaddingTop = getPaddingTop(); - updateHeights(); + if (!notificationsRedesignTemplates()) { + mDefaultPaddingBottom = getPaddingBottom(); + mDefaultPaddingTop = getPaddingTop(); + updateHeights(); + } } private void updateHeights() { + if (notificationsRedesignTemplates()) { + return; + } int inset = getResources().getDimensionPixelSize( com.android.internal.R.dimen.button_inset_vertical_material); mEmphasizedPaddingTop = getResources().getDimensionPixelSize( @@ -440,6 +446,9 @@ public class NotificationActionListLayout extends LinearLayout { */ @RemotableViewMethod public void setEmphasizedMode(boolean emphasizedMode) { + if (notificationsRedesignTemplates()) { + return; + } mEmphasizedMode = emphasizedMode; int height; if (emphasizedMode) { @@ -462,7 +471,9 @@ public class NotificationActionListLayout extends LinearLayout { } public int getExtraMeasureHeight() { - if (mEmphasizedMode) { + // Note: the emphasized height is no longer different from the regular height when the + // notificationsRedesignTemplates flag is on. + if (!notificationsRedesignTemplates() && mEmphasizedMode) { return mEmphasizedHeight - mRegularHeight; } return 0; diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/CoreDocumentAccessibility.java b/core/java/com/android/internal/widget/remotecompose/accessibility/CoreDocumentAccessibility.java index d3a496db2ca9..f70f4cbceb70 100644 --- a/core/java/com/android/internal/widget/remotecompose/accessibility/CoreDocumentAccessibility.java +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/CoreDocumentAccessibility.java @@ -179,7 +179,7 @@ public class CoreDocumentAccessibility implements RemoteComposeDocumentAccessibi * @return */ public boolean performClick(Component component) { - mDocument.performClick(mRemoteContext, component.getComponentId()); + mDocument.performClick(mRemoteContext, component.getComponentId(), ""); return true; } diff --git a/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java b/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java index 796ea8d1538f..caf19e1ed34a 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java +++ b/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java @@ -19,7 +19,10 @@ import android.annotation.NonNull; import android.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.widget.remotecompose.core.operations.BitmapData; import com.android.internal.widget.remotecompose.core.operations.ComponentValue; +import com.android.internal.widget.remotecompose.core.operations.DrawContent; +import com.android.internal.widget.remotecompose.core.operations.FloatConstant; import com.android.internal.widget.remotecompose.core.operations.FloatExpression; import com.android.internal.widget.remotecompose.core.operations.Header; import com.android.internal.widget.remotecompose.core.operations.IntegerExpression; @@ -28,9 +31,12 @@ import com.android.internal.widget.remotecompose.core.operations.RootContentBeha import com.android.internal.widget.remotecompose.core.operations.ShaderData; import com.android.internal.widget.remotecompose.core.operations.TextData; import com.android.internal.widget.remotecompose.core.operations.Theme; +import com.android.internal.widget.remotecompose.core.operations.Utils; +import com.android.internal.widget.remotecompose.core.operations.layout.CanvasOperations; import com.android.internal.widget.remotecompose.core.operations.layout.Component; import com.android.internal.widget.remotecompose.core.operations.layout.Container; import com.android.internal.widget.remotecompose.core.operations.layout.ContainerEnd; +import com.android.internal.widget.remotecompose.core.operations.layout.LayoutComponent; import com.android.internal.widget.remotecompose.core.operations.layout.LoopOperation; import com.android.internal.widget.remotecompose.core.operations.layout.RootLayoutComponent; import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ComponentModifiers; @@ -39,6 +45,8 @@ import com.android.internal.widget.remotecompose.core.operations.utilities.IntMa import com.android.internal.widget.remotecompose.core.operations.utilities.StringSerializer; import com.android.internal.widget.remotecompose.core.serialize.MapSerializer; import com.android.internal.widget.remotecompose.core.serialize.Serializable; +import com.android.internal.widget.remotecompose.core.types.IntegerConstant; +import com.android.internal.widget.remotecompose.core.types.LongConstant; import java.util.ArrayList; import java.util.HashMap; @@ -65,7 +73,7 @@ public class CoreDocument implements Serializable { // We also keep a more fine-grained BUILD number, exposed as // ID_API_LEVEL = DOCUMENT_API_LEVEL + BUILD - static final float BUILD = 0.3f; + static final float BUILD = 0.5f; @NonNull ArrayList<Operation> mOperations = new ArrayList<>(); @@ -102,6 +110,8 @@ public class CoreDocument implements Serializable { private IntMap<Object> mDocProperties; + boolean mFirstPaint = true; + /** Returns a version number that is monotonically increasing. */ public static int getDocumentApiLevel() { return DOCUMENT_API_LEVEL; @@ -437,6 +447,94 @@ public class CoreDocument implements Serializable { return mDocProperties.get(key); } + /** + * Apply a collection of operations to the document + * + * @param delta the delta to apply + */ + public void applyUpdate(CoreDocument delta) { + HashMap<Integer, TextData> txtData = new HashMap<Integer, TextData>(); + HashMap<Integer, BitmapData> imgData = new HashMap<Integer, BitmapData>(); + HashMap<Integer, FloatConstant> fltData = new HashMap<Integer, FloatConstant>(); + HashMap<Integer, IntegerConstant> intData = new HashMap<Integer, IntegerConstant>(); + HashMap<Integer, LongConstant> longData = new HashMap<Integer, LongConstant>(); + recursiveTreverse( + mOperations, + (op) -> { + if (op instanceof TextData) { + TextData d = (TextData) op; + txtData.put(d.mTextId, d); + } else if (op instanceof BitmapData) { + BitmapData d = (BitmapData) op; + imgData.put(d.mImageId, d); + } else if (op instanceof FloatConstant) { + FloatConstant d = (FloatConstant) op; + fltData.put(d.mId, d); + } else if (op instanceof IntegerConstant) { + IntegerConstant d = (IntegerConstant) op; + intData.put(d.mId, d); + } else if (op instanceof LongConstant) { + LongConstant d = (LongConstant) op; + longData.put(d.mId, d); + } + }); + + recursiveTreverse( + delta.mOperations, + (op) -> { + if (op instanceof TextData) { + TextData t = (TextData) op; + TextData txtInDoc = txtData.get(t.mTextId); + if (txtInDoc != null) { + txtInDoc.update(t); + Utils.log("update" + t.mText); + txtInDoc.markDirty(); + } + } else if (op instanceof BitmapData) { + BitmapData b = (BitmapData) op; + BitmapData imgInDoc = imgData.get(b.mImageId); + if (imgInDoc != null) { + imgInDoc.update(b); + imgInDoc.markDirty(); + } + } else if (op instanceof FloatConstant) { + FloatConstant f = (FloatConstant) op; + FloatConstant fltInDoc = fltData.get(f.mId); + if (fltInDoc != null) { + fltInDoc.update(f); + fltInDoc.markDirty(); + } + } else if (op instanceof IntegerConstant) { + IntegerConstant ic = (IntegerConstant) op; + IntegerConstant intInDoc = intData.get(ic.mId); + if (intInDoc != null) { + intInDoc.update(ic); + intInDoc.markDirty(); + } + } else if (op instanceof LongConstant) { + LongConstant lc = (LongConstant) op; + LongConstant longInDoc = longData.get(lc.mId); + if (longInDoc != null) { + longInDoc.update(lc); + longInDoc.markDirty(); + } + } + }); + } + + private interface Visitor { + void visit(Operation op); + } + + private void recursiveTreverse(ArrayList<Operation> mOperations, Visitor visitor) { + for (Operation op : mOperations) { + if (op instanceof Container) { + recursiveTreverse(((Component) op).mList, visitor); + } + visitor.visit(op); + } + } + // ============== Haptic support ================== public interface HapticEngine { /** @@ -678,6 +776,7 @@ public class CoreDocument implements Serializable { ArrayList<Operation> ops = finalOperationsList; ArrayList<Container> containers = new ArrayList<>(); + LayoutComponent lastLayoutComponent = null; mLastId = -1; for (Operation o : operations) { @@ -697,6 +796,9 @@ public class CoreDocument implements Serializable { if (component.getComponentId() < mLastId) { mLastId = component.getComponentId(); } + if (component instanceof LayoutComponent) { + lastLayoutComponent = (LayoutComponent) component; + } } containers.add(container); ops = container.getList(); @@ -723,7 +825,13 @@ public class CoreDocument implements Serializable { } ops.add((Operation) container); } + if (container instanceof CanvasOperations) { + ((CanvasOperations) container).setComponent(lastLayoutComponent); + } } else { + if (o instanceof DrawContent) { + ((DrawContent) o).setComponent(lastLayoutComponent); + } ops.add(o); } } @@ -784,6 +892,7 @@ public class CoreDocument implements Serializable { registerVariables(context, mOperations); context.mMode = RemoteContext.ContextMode.UNSET; + mFirstPaint = true; } /////////////////////////////////////////////////////////////////////////////////////////////// @@ -895,7 +1004,7 @@ public class CoreDocument implements Serializable { * * @param id the click area id */ - public void performClick(@NonNull RemoteContext context, int id) { + public void performClick(@NonNull RemoteContext context, int id, @NonNull String metadata) { for (ClickAreaRepresentation clickArea : mClickAreas) { if (clickArea.mId == id) { warnClickListeners(clickArea); @@ -904,7 +1013,7 @@ public class CoreDocument implements Serializable { } for (IdActionCallback listener : mIdActionListeners) { - listener.onAction(id, ""); + listener.onAction(id, metadata); } Component component = getComponent(id); @@ -1093,6 +1202,28 @@ public class CoreDocument implements Serializable { } /** + * Traverse the list of operations to update the variables. TODO: this should walk the + * dependency tree instead + * + * @param context + * @param operations + */ + private void updateVariables( + @NonNull RemoteContext context, int theme, List<Operation> operations) { + for (int i = 0; i < operations.size(); i++) { + Operation op = operations.get(i); + if (op.isDirty() && op instanceof VariableSupport) { + ((VariableSupport) op).updateVariables(context); + op.apply(context); + op.markNotDirty(); + } + if (op instanceof Container) { + updateVariables(context, theme, ((Container) op).getList()); + } + } + } + + /** * Paint the document * * @param context the provided PaintContext @@ -1110,6 +1241,13 @@ public class CoreDocument implements Serializable { context.mRemoteComposeState = mRemoteComposeState; context.mRemoteComposeState.setContext(context); + // Update any dirty variables + if (mFirstPaint) { + mFirstPaint = false; + } else { + updateVariables(context, theme, mOperations); + } + // If we have a content sizing set, we are going to take the original document // dimension into account and apply scale+translate according to the RootContentBehavior // rules. diff --git a/core/java/com/android/internal/widget/remotecompose/core/Operations.java b/core/java/com/android/internal/widget/remotecompose/core/Operations.java index 9cbafab07a43..ac9f98bd6b15 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/Operations.java +++ b/core/java/com/android/internal/widget/remotecompose/core/Operations.java @@ -25,6 +25,7 @@ import com.android.internal.widget.remotecompose.core.operations.ClipRect; import com.android.internal.widget.remotecompose.core.operations.ColorConstant; import com.android.internal.widget.remotecompose.core.operations.ColorExpression; import com.android.internal.widget.remotecompose.core.operations.ComponentValue; +import com.android.internal.widget.remotecompose.core.operations.ConditionalOperations; import com.android.internal.widget.remotecompose.core.operations.DataListFloat; import com.android.internal.widget.remotecompose.core.operations.DataListIds; import com.android.internal.widget.remotecompose.core.operations.DataMapIds; @@ -50,6 +51,7 @@ import com.android.internal.widget.remotecompose.core.operations.FloatConstant; import com.android.internal.widget.remotecompose.core.operations.FloatExpression; import com.android.internal.widget.remotecompose.core.operations.FloatFunctionCall; import com.android.internal.widget.remotecompose.core.operations.FloatFunctionDefine; +import com.android.internal.widget.remotecompose.core.operations.HapticFeedback; import com.android.internal.widget.remotecompose.core.operations.Header; import com.android.internal.widget.remotecompose.core.operations.ImageAttribute; import com.android.internal.widget.remotecompose.core.operations.IntegerExpression; @@ -64,6 +66,7 @@ import com.android.internal.widget.remotecompose.core.operations.PaintData; import com.android.internal.widget.remotecompose.core.operations.ParticlesCreate; import com.android.internal.widget.remotecompose.core.operations.ParticlesLoop; import com.android.internal.widget.remotecompose.core.operations.PathAppend; +import com.android.internal.widget.remotecompose.core.operations.PathCombine; import com.android.internal.widget.remotecompose.core.operations.PathCreate; import com.android.internal.widget.remotecompose.core.operations.PathData; import com.android.internal.widget.remotecompose.core.operations.PathTween; @@ -101,6 +104,7 @@ import com.android.internal.widget.remotecompose.core.operations.layout.managers import com.android.internal.widget.remotecompose.core.operations.layout.managers.CollapsibleRowLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.ColumnLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.FitBoxLayout; +import com.android.internal.widget.remotecompose.core.operations.layout.managers.ImageLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.RowLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.StateLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.TextLayout; @@ -112,6 +116,7 @@ import com.android.internal.widget.remotecompose.core.operations.layout.modifier import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.GraphicsLayerModifierOperation; import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.HeightInModifierOperation; import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.HeightModifierOperation; +import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.HostActionMetadataOperation; import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.HostActionOperation; import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.HostNamedActionOperation; import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.MarqueeModifierOperation; @@ -222,6 +227,9 @@ public class Operations { public static final int ATTRIBUTE_TIME = 172; public static final int CANVAS_OPERATIONS = 173; public static final int MODIFIER_DRAW_CONTENT = 174; + public static final int PATH_COMBINE = 175; + public static final int HAPTIC_FEEDBACK = 177; + public static final int CONDITIONAL_OPERATIONS = 178; ///////////////////////////////////////// ====================== @@ -241,6 +249,7 @@ public class Operations { public static final int LAYOUT_CANVAS_CONTENT = 207; public static final int LAYOUT_TEXT = 208; public static final int LAYOUT_STATE = 217; + public static final int LAYOUT_IMAGE = 234; public static final int COMPONENT_START = 2; @@ -272,6 +281,7 @@ public class Operations { public static final int MODIFIER_VISIBILITY = 211; public static final int HOST_ACTION = 209; + public static final int HOST_METADATA_ACTION = 216; public static final int HOST_NAMED_ACTION = 210; public static final int VALUE_INTEGER_CHANGE_ACTION = 212; @@ -379,6 +389,7 @@ public class Operations { map.put(CONTAINER_END, ContainerEnd::read); map.put(HOST_ACTION, HostActionOperation::read); + map.put(HOST_METADATA_ACTION, HostActionMetadataOperation::read); map.put(HOST_NAMED_ACTION, HostNamedActionOperation::read); map.put(VALUE_INTEGER_CHANGE_ACTION, ValueIntegerChangeActionOperation::read); map.put( @@ -401,7 +412,7 @@ public class Operations { map.put(LAYOUT_CANVAS, CanvasLayout::read); map.put(LAYOUT_CANVAS_CONTENT, CanvasContent::read); map.put(LAYOUT_TEXT, TextLayout::read); - + map.put(LAYOUT_IMAGE, ImageLayout::read); map.put(LAYOUT_STATE, StateLayout::read); map.put(DRAW_CONTENT, DrawContent::read); @@ -426,6 +437,9 @@ public class Operations { map.put(ATTRIBUTE_IMAGE, ImageAttribute::read); map.put(ATTRIBUTE_TEXT, TextAttribute::read); map.put(ATTRIBUTE_TIME, TimeAttribute::read); + map.put(PATH_COMBINE, PathCombine::read); + map.put(HAPTIC_FEEDBACK, HapticFeedback::read); + map.put(CONDITIONAL_OPERATIONS, ConditionalOperations::read); // map.put(ACCESSIBILITY_CUSTOM_ACTION, CoreSemantics::read); } diff --git a/core/java/com/android/internal/widget/remotecompose/core/PaintContext.java b/core/java/com/android/internal/widget/remotecompose/core/PaintContext.java index 1b0b9d783dff..e61ca4c1ee13 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/PaintContext.java +++ b/core/java/com/android/internal/widget/remotecompose/core/PaintContext.java @@ -340,6 +340,17 @@ public abstract class PaintContext { public abstract void tweenPath(int out, int path1, int path2, float tween); /** + * Perform a between two path and return the resulting path + * + * @param out the interpolated path + * @param path1 start path + * @param path2 end path + * @param operation 0 = difference , 1 = intersection, 2 = reverse_difference, 3 = union, 4 = + * xor + */ + public abstract void combinePath(int out, int path1, int path2, byte operation); + + /** * This applies changes to the current paint * * @param mPaintData the list of changes diff --git a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeBuffer.java b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeBuffer.java index c249adf5bd58..1f026687680f 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeBuffer.java +++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeBuffer.java @@ -28,6 +28,7 @@ import com.android.internal.widget.remotecompose.core.operations.ClipRect; import com.android.internal.widget.remotecompose.core.operations.ColorConstant; import com.android.internal.widget.remotecompose.core.operations.ColorExpression; import com.android.internal.widget.remotecompose.core.operations.ComponentValue; +import com.android.internal.widget.remotecompose.core.operations.ConditionalOperations; import com.android.internal.widget.remotecompose.core.operations.DataListFloat; import com.android.internal.widget.remotecompose.core.operations.DataListIds; import com.android.internal.widget.remotecompose.core.operations.DataMapIds; @@ -53,6 +54,7 @@ import com.android.internal.widget.remotecompose.core.operations.FloatConstant; import com.android.internal.widget.remotecompose.core.operations.FloatExpression; import com.android.internal.widget.remotecompose.core.operations.FloatFunctionCall; import com.android.internal.widget.remotecompose.core.operations.FloatFunctionDefine; +import com.android.internal.widget.remotecompose.core.operations.HapticFeedback; import com.android.internal.widget.remotecompose.core.operations.Header; import com.android.internal.widget.remotecompose.core.operations.ImageAttribute; import com.android.internal.widget.remotecompose.core.operations.IntegerExpression; @@ -67,6 +69,7 @@ import com.android.internal.widget.remotecompose.core.operations.PaintData; import com.android.internal.widget.remotecompose.core.operations.ParticlesCreate; import com.android.internal.widget.remotecompose.core.operations.ParticlesLoop; import com.android.internal.widget.remotecompose.core.operations.PathAppend; +import com.android.internal.widget.remotecompose.core.operations.PathCombine; import com.android.internal.widget.remotecompose.core.operations.PathCreate; import com.android.internal.widget.remotecompose.core.operations.PathData; import com.android.internal.widget.remotecompose.core.operations.PathTween; @@ -99,6 +102,7 @@ import com.android.internal.widget.remotecompose.core.operations.layout.managers import com.android.internal.widget.remotecompose.core.operations.layout.managers.CollapsibleRowLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.ColumnLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.FitBoxLayout; +import com.android.internal.widget.remotecompose.core.operations.layout.managers.ImageLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.RowLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.StateLayout; import com.android.internal.widget.remotecompose.core.operations.layout.managers.TextLayout; @@ -890,7 +894,7 @@ public class RemoteComposeBuffer { * @return new id that merges the two text */ public int textMerge(int id1, int id2) { - int textId = addText(id1 + "+" + id2); + int textId = nextId(); TextMerge.apply(mBuffer, textId, id1, id2); return textId; } @@ -2091,6 +2095,19 @@ public class RemoteComposeBuffer { } /** + * Add an imagelayout command + * + * @param componentId component id + * @param animationId animation id + * @param bitmapId bitmap id + */ + public void addImage( + int componentId, int animationId, int bitmapId, int scaleType, float alpha) { + mLastComponentId = getComponentId(componentId); + ImageLayout.apply(mBuffer, componentId, animationId, bitmapId, scaleType, alpha); + } + + /** * Add a row start tag * * @param componentId component id @@ -2273,8 +2290,6 @@ public class RemoteComposeBuffer { return mRemoteComposeState.nextId(); } - private boolean mInImpulseProcess = false; - /** * add an impulse. (must be followed by impulse end) * @@ -2283,22 +2298,16 @@ public class RemoteComposeBuffer { */ public void addImpulse(float duration, float start) { ImpulseOperation.apply(mBuffer, duration, start); - mInImpulseProcess = false; } /** add an impulse process */ public void addImpulseProcess() { ImpulseProcess.apply(mBuffer); - mInImpulseProcess = true; } /** Add an impulse end */ public void addImpulseEnd() { ContainerEnd.apply(mBuffer); - if (mInImpulseProcess) { - ContainerEnd.apply(mBuffer); - } - mInImpulseProcess = false; } /** @@ -2422,4 +2431,37 @@ public class RemoteComposeBuffer { return imageId; } + + /** + * Combine two paths + * + * @param id output id + * @param path1 first path + * @param path2 second path + * @param op operation to perform OP_DIFFERENCE, OP_INTERSECT, OP_REVERSE_DIFFERENCE, OP_UNION, + * OP_XOR + */ + public void pathCombine(int id, int path1, int path2, byte op) { + PathCombine.apply(mBuffer, id, path1, path2, op); + } + + /** + * Perform a haptic feedback + * + * @param feedbackConstant + */ + public void performHaptic(int feedbackConstant) { + HapticFeedback.apply(mBuffer, feedbackConstant); + } + + /** + * Add a conditional operation + * + * @param type type of comparison + * @param a first value + * @param b second value + */ + public void addConditionalOperations(byte type, float a, float b) { + ConditionalOperations.apply(mBuffer, type, a, b); + } } diff --git a/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java b/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java index c6b17e4116d6..e37833f33fa5 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java +++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java @@ -552,6 +552,14 @@ public abstract class RemoteContext { public abstract int getInteger(int id); /** + * Get a Long given an id + * + * @param id of the long + * @return the value + */ + public abstract long getLong(int id); + + /** * Get the color given and ID * * @param id of the color @@ -629,6 +637,8 @@ public abstract class RemoteContext { /** The delta between current and last Frame */ public static final int ID_ANIMATION_DELTA_TIME = 31; + public static final int ID_EPOCH_SECOND = 32; + public static final float FLOAT_DENSITY = Utils.asNan(ID_DENSITY); /** CONTINUOUS_SEC is seconds from midnight looping every hour 0-3600 */ @@ -714,6 +724,9 @@ public abstract class RemoteContext { /** When was this player built */ public static final float FLOAT_API_LEVEL = Utils.asNan(ID_API_LEVEL); + /** The time in seconds since the epoch. */ + public static final long INT_EPOCH_SECOND = ((long) ID_EPOCH_SECOND) + 0x100000000L; + /////////////////////////////////////////////////////////////////////////////////////////////// // Click handling /////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/java/com/android/internal/widget/remotecompose/core/TimeVariables.java b/core/java/com/android/internal/widget/remotecompose/core/TimeVariables.java index cd5b202f5a79..57300364e0b5 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/TimeVariables.java +++ b/core/java/com/android/internal/widget/remotecompose/core/TimeVariables.java @@ -49,9 +49,12 @@ public class TimeVariables { OffsetDateTime offsetDateTime = dateTime.atZone(zoneId).toOffsetDateTime(); ZoneOffset offset = offsetDateTime.getOffset(); + long epochSec = dateTime.toEpochSecond(offset); context.loadFloat(RemoteContext.ID_OFFSET_TO_UTC, offset.getTotalSeconds()); context.loadFloat(RemoteContext.ID_CONTINUOUS_SEC, sec); + // This will overflow in 2038. + context.loadInteger(RemoteContext.ID_EPOCH_SECOND, (int) epochSec); context.loadFloat(RemoteContext.ID_TIME_IN_SEC, currentSeconds); context.loadFloat(RemoteContext.ID_TIME_IN_MIN, currentMinute); context.loadFloat(RemoteContext.ID_TIME_IN_HR, hour); diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/BitmapData.java b/core/java/com/android/internal/widget/remotecompose/core/operations/BitmapData.java index 255d7a46e49e..90929e06ecd0 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/BitmapData.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/BitmapData.java @@ -41,12 +41,12 @@ import java.util.List; public class BitmapData extends Operation implements SerializableToString, Serializable { private static final int OP_CODE = Operations.DATA_BITMAP; private static final String CLASS_NAME = "BitmapData"; - int mImageId; + public final int mImageId; int mImageWidth; int mImageHeight; short mType; short mEncoding; - @NonNull final byte[] mBitmap; + @NonNull byte[] mBitmap; /** The max size of width or height */ public static final int MAX_IMAGE_DIMENSION = 8000; @@ -91,6 +91,19 @@ public class BitmapData extends Operation implements SerializableToString, Seria } /** + * Update the bitmap data + * + * @param from the bitmap to copy + */ + public void update(BitmapData from) { + this.mImageWidth = from.mImageWidth; + this.mImageHeight = from.mImageHeight; + this.mBitmap = from.mBitmap; + this.mType = from.mType; + this.mEncoding = from.mEncoding; + } + + /** * The width of the image * * @return the width diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/ConditionalOperations.java b/core/java/com/android/internal/widget/remotecompose/core/operations/ConditionalOperations.java new file mode 100644 index 000000000000..da6035e1e87e --- /dev/null +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/ConditionalOperations.java @@ -0,0 +1,240 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.internal.widget.remotecompose.core.operations; + +import android.annotation.NonNull; + +import com.android.internal.widget.remotecompose.core.Operation; +import com.android.internal.widget.remotecompose.core.Operations; +import com.android.internal.widget.remotecompose.core.PaintContext; +import com.android.internal.widget.remotecompose.core.PaintOperation; +import com.android.internal.widget.remotecompose.core.RemoteContext; +import com.android.internal.widget.remotecompose.core.VariableSupport; +import com.android.internal.widget.remotecompose.core.WireBuffer; +import com.android.internal.widget.remotecompose.core.documentation.DocumentationBuilder; +import com.android.internal.widget.remotecompose.core.documentation.DocumentedOperation; +import com.android.internal.widget.remotecompose.core.operations.layout.Container; +import com.android.internal.widget.remotecompose.core.serialize.MapSerializer; +import com.android.internal.widget.remotecompose.core.serialize.Serializable; + +import java.util.ArrayList; +import java.util.List; + +/** Represents conditional execution of a block of commands */ +public class ConditionalOperations extends PaintOperation + implements Container, VariableSupport, Serializable { + private static final String CLASS_NAME = "ConditionalOperations"; + + private static final int OP_CODE = Operations.CONDITIONAL_OPERATIONS; + + @NonNull public ArrayList<Operation> mList = new ArrayList<>(); + + int mIndexVariableId; + byte mType; + float mVarA; + float mVarB; + float mVarAOut; + float mVarBOut; + + /** Equality comparison */ + public static final byte TYPE_EQ = 0; + + /** Not equal comparison */ + public static final byte TYPE_NEQ = 1; + + /** Less than comparison */ + public static final byte TYPE_LT = 2; + + /** Less than or equal comparison */ + public static final byte TYPE_LTE = 3; + + /** Greater than comparison */ + public static final byte TYPE_GT = 4; + + /** Greater than or equal comparison */ + public static final byte TYPE_GTE = 5; + + private static final String[] TYPE_STR = {"EQ", "NEQ", "LT", "LTE", "GT", "GTE"}; + + @Override + public void registerListening(RemoteContext context) { + if (Float.isNaN(mVarA)) { + context.listensTo(Utils.idFromNan(mVarA), this); + } + if (Float.isNaN(mVarB)) { + context.listensTo(Utils.idFromNan(mVarB), this); + } + } + + @Override + public void updateVariables(RemoteContext context) { + mVarAOut = Float.isNaN(mVarA) ? context.getFloat(Utils.idFromNan(mVarA)) : mVarA; + mVarBOut = Float.isNaN(mVarB) ? context.getFloat(Utils.idFromNan(mVarB)) : mVarB; + } + + /** + * Constructor + * + * @param type type of comparison + * @param a first value + * @param b second value + */ + public ConditionalOperations(byte type, float a, float b) { + mType = type; + mVarAOut = mVarA = a; + mVarBOut = mVarB = b; + } + + @Override + @NonNull + public ArrayList<Operation> getList() { + return mList; + } + + @Override + public void write(@NonNull WireBuffer buffer) { + apply(buffer, mType, mVarA, mVarB); + } + + @NonNull + @Override + public String toString() { + StringBuilder builder = + new StringBuilder( + CLASS_NAME + + " " + + TYPE_STR[mType] + + "(" + + Utils.idFromNan(mVarA) + + "," + + Utils.idFromNan(mVarB) + + ")\n"); + for (Operation operation : mList) { + builder.append(" "); + builder.append(operation); + builder.append("\n"); + } + return builder.toString(); + } + + @NonNull + @Override + public String deepToString(@NonNull String indent) { + return (indent != null ? indent : "") + toString(); + } + + @Override + public void paint(@NonNull PaintContext context) { + RemoteContext remoteContext = context.getContext(); + boolean run = false; + switch (mType) { + case TYPE_EQ: + run = mVarAOut == mVarBOut; + break; + case TYPE_NEQ: + run = mVarAOut != mVarBOut; + break; + case TYPE_LT: + run = mVarAOut < mVarBOut; + break; + case TYPE_LTE: + run = mVarAOut <= mVarBOut; + break; + case TYPE_GT: + run = mVarAOut > mVarBOut; + break; + case TYPE_GTE: + run = mVarAOut >= mVarBOut; + break; + } + if (run) { + for (Operation op : mList) { + remoteContext.incrementOpCount(); + op.apply(context.getContext()); + } + } + } + + /** + * The name of the class + * + * @return the name + */ + @NonNull + public static String name() { + return CLASS_NAME; + } + + /** + * Write the operation on the buffer + * + * @param type type of operation + * @param a first value + * @param b second value + * @param buffer the buffer to write to + */ + public static void apply(@NonNull WireBuffer buffer, byte type, float a, float b) { + buffer.start(OP_CODE); + buffer.writeByte(type); + buffer.writeFloat(a); + buffer.writeFloat(b); + } + + /** + * Read this operation and add it to the list of operations + * + * @param buffer the buffer to read + * @param operations the list of operations that will be added to + */ + public static void read(@NonNull WireBuffer buffer, @NonNull List<Operation> operations) { + byte type = (byte) buffer.readByte(); + float a = buffer.readFloat(); + float b = buffer.readFloat(); + operations.add(new ConditionalOperations(type, a, b)); + } + + /** + * Populate the documentation with a description of this operation + * + * @param doc to append the description to. + */ + public static void documentation(@NonNull DocumentationBuilder doc) { + doc.operation("Operations", OP_CODE, name()) + .description("Run if the condition is true") + .field(DocumentedOperation.BYTE, "type", "type of comparison") + .field(DocumentedOperation.FLOAT, "a", "first value") + .field(DocumentedOperation.FLOAT, "b", "second value"); + } + + /** + * Calculate and estimate of the number of iterations + * + * @return number of loops or 10 if based on variables + */ + public int estimateIterations() { + return 1; // this is a generic estmate if the values are variables; + } + + @Override + public void serialize(MapSerializer serializer) { + serializer + .addType(CLASS_NAME) + .add("type", mType) + .add("varA", mVarA, mVarAOut) + .add("VarB", mVarB, mVarBOut) + .add("list", mList); + } +} diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawContent.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawContent.java index 4d2a939eb948..326f0600854e 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawContent.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawContent.java @@ -46,7 +46,7 @@ public class DrawContent extends PaintOperation implements Serializable { * * @param component */ - public void setComponent(LayoutComponent component) { + public void setComponent(@Nullable LayoutComponent component) { mComponent = component; } diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawRoundRect.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawRoundRect.java index 31d9b6ac124d..5853578ab31e 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawRoundRect.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawRoundRect.java @@ -110,7 +110,7 @@ public class DrawRoundRect extends DrawBase6 { "The x-radius of the oval used to round the corners") .field( DocumentedOperation.FLOAT, - "sweepAngle", + "ry", "The y-radius of the oval used to round the corners"); } @@ -126,7 +126,6 @@ public class DrawRoundRect extends DrawBase6 { @Override public void serialize(MapSerializer serializer) { - serialize(serializer, "left", "top", "right", "bottom", "rx", "sweepAngle") - .addType(CLASS_NAME); + serialize(serializer, "left", "top", "right", "bottom", "rx", "ry").addType(CLASS_NAME); } } diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawText.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawText.java index ee1689c21fe3..cec01c4e5b65 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawText.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawText.java @@ -211,6 +211,7 @@ public class DrawText extends PaintOperation implements VariableSupport { public void serialize(MapSerializer serializer) { serializer .addType(CLASS_NAME) + .add("textId", mTextID) .add("start", mStart) .add("end", mEnd) .add("contextStart", mContextStart) diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/FloatConstant.java b/core/java/com/android/internal/widget/remotecompose/core/operations/FloatConstant.java index 233e246d3868..5096aaf03c9d 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/FloatConstant.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/FloatConstant.java @@ -42,6 +42,15 @@ public class FloatConstant extends Operation implements Serializable { this.mValue = value; } + /** + * Copy the value from another operation + * + * @param from value to copy from + */ + public void update(FloatConstant from) { + mValue = from.mValue; + } + @Override public void write(@NonNull WireBuffer buffer) { apply(buffer, mId, mValue); diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/HapticFeedback.java b/core/java/com/android/internal/widget/remotecompose/core/operations/HapticFeedback.java new file mode 100644 index 000000000000..1b7f5e84b171 --- /dev/null +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/HapticFeedback.java @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2025 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.widget.remotecompose.core.operations; + +import android.annotation.NonNull; + +import com.android.internal.widget.remotecompose.core.Operation; +import com.android.internal.widget.remotecompose.core.Operations; +import com.android.internal.widget.remotecompose.core.RemoteContext; +import com.android.internal.widget.remotecompose.core.SerializableToString; +import com.android.internal.widget.remotecompose.core.WireBuffer; +import com.android.internal.widget.remotecompose.core.documentation.DocumentationBuilder; +import com.android.internal.widget.remotecompose.core.documentation.DocumentedOperation; +import com.android.internal.widget.remotecompose.core.operations.utilities.StringSerializer; +import com.android.internal.widget.remotecompose.core.serialize.MapSerializer; +import com.android.internal.widget.remotecompose.core.serialize.Serializable; + +import java.util.List; + +/** Generate HapticFeedback */ +public class HapticFeedback extends Operation implements SerializableToString, Serializable { + private static final int OP_CODE = Operations.HAPTIC_FEEDBACK; + private static final String CLASS_NAME = "HapticFeedback"; + private int mHapticFeedbackType; + + public HapticFeedback(int hapticFeedbackType) { + this.mHapticFeedbackType = hapticFeedbackType; + } + + @Override + public void write(@NonNull WireBuffer buffer) { + apply(buffer, mHapticFeedbackType); + } + + @NonNull + @Override + public String toString() { + return CLASS_NAME + "(" + mHapticFeedbackType + ")"; + } + + /** + * The name of the class + * + * @return the name + */ + @NonNull + public static String name() { + return CLASS_NAME; + } + + /** + * The OP_CODE for this command + * + * @return the opcode + */ + public static int id() { + return OP_CODE; + } + + /** + * add a text data operation + * + * @param buffer buffer to add to + * @param hapticFeedbackType the vibration effect + */ + public static void apply(@NonNull WireBuffer buffer, int hapticFeedbackType) { + buffer.start(OP_CODE); + buffer.writeInt(hapticFeedbackType); + } + + /** + * Read this operation and add it to the list of operations + * + * @param buffer the buffer to read + * @param operations the list of operations that will be added to + */ + public static void read(@NonNull WireBuffer buffer, @NonNull List<Operation> operations) { + int hapticFeedbackType = buffer.readInt(); + + operations.add(new HapticFeedback(hapticFeedbackType)); + } + + /** + * Populate the documentation with a description of this operation + * + * @param doc to append the description to. + */ + public static void documentation(@NonNull DocumentationBuilder doc) { + doc.operation("Data Operations", OP_CODE, CLASS_NAME) + .description("Generate an haptic feedback") + .field(DocumentedOperation.INT, "HapticFeedbackType", "Type of haptic feedback"); + } + + @Override + public void apply(@NonNull RemoteContext context) { + context.hapticEffect(mHapticFeedbackType); + } + + @NonNull + @Override + public String deepToString(@NonNull String indent) { + return indent + toString(); + } + + @Override + public void serializeToString(int indent, @NonNull StringSerializer serializer) { + serializer.append(indent, getSerializedName() + "<" + mHapticFeedbackType + ">"); + } + + @NonNull + private String getSerializedName() { + return "HAPTIC_FEEDBACK"; + } + + @Override + public void serialize(MapSerializer serializer) { + serializer.addType(CLASS_NAME).add("hapticFeedbackType", mHapticFeedbackType); + } +} diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/PathCombine.java b/core/java/com/android/internal/widget/remotecompose/core/operations/PathCombine.java new file mode 100644 index 000000000000..5f761d184e29 --- /dev/null +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/PathCombine.java @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.internal.widget.remotecompose.core.operations; + +import static com.android.internal.widget.remotecompose.core.documentation.DocumentedOperation.INT; + +import android.annotation.NonNull; + +import com.android.internal.widget.remotecompose.core.Operation; +import com.android.internal.widget.remotecompose.core.Operations; +import com.android.internal.widget.remotecompose.core.PaintContext; +import com.android.internal.widget.remotecompose.core.PaintOperation; +import com.android.internal.widget.remotecompose.core.RemoteContext; +import com.android.internal.widget.remotecompose.core.VariableSupport; +import com.android.internal.widget.remotecompose.core.WireBuffer; +import com.android.internal.widget.remotecompose.core.documentation.DocumentationBuilder; +import com.android.internal.widget.remotecompose.core.documentation.DocumentedOperation; +import com.android.internal.widget.remotecompose.core.serialize.MapSerializer; +import com.android.internal.widget.remotecompose.core.serialize.Serializable; + +import java.util.List; + +/** Operation to perform Constructive area geometry operations, combining two Paths */ +public class PathCombine extends PaintOperation implements VariableSupport, Serializable { + private static final int OP_CODE = Operations.PATH_COMBINE; + private static final String CLASS_NAME = "PathCombine"; + public int mOutId; + public int mPathId1; + public int mPathId2; + private byte mOperation; + + /** Subtract the second path from the first path. */ + public static final byte OP_DIFFERENCE = 0; + + /** Intersect the second path with the first path. */ + public static final byte OP_INTERSECT = 1; + + /** Subtract the first path from the second path. */ + public static final byte OP_REVERSE_DIFFERENCE = 2; + + /** Union (inclusive-or) the two paths. */ + public static final byte OP_UNION = 3; + + /** Exclusive-or the two paths. */ + public static final byte OP_XOR = 4; + + public PathCombine(int outId, int pathId1, int pathId2, byte operation) { + this.mOutId = outId; + this.mPathId1 = pathId1; + this.mPathId2 = pathId2; + this.mOperation = operation; + } + + @Override + public void updateVariables(@NonNull RemoteContext context) {} + + @Override + public void registerListening(@NonNull RemoteContext context) {} + + @Override + public void write(@NonNull WireBuffer buffer) { + apply(buffer, mOutId, mPathId1, mPathId2, mOperation); + } + + @NonNull + @Override + public String toString() { + return CLASS_NAME + + "[" + + mOutId + + "] = [" + + mPathId1 + + " ] + [ " + + mPathId2 + + "], " + + mOperation; + } + + /** + * The name of the class + * + * @return the name + */ + @NonNull + public static String name() { + return CLASS_NAME; + } + + /** + * The OP_CODE for this command + * + * @return the opcode + */ + public static int id() { + return OP_CODE; + } + + /** + * Writes out the operation to the buffer + * + * @param buffer buffer to write to + * @param outId id of the path + * @param pathId1 source path 1 + * @param pathId2 source path 2 + * @param op the operation to perform + */ + public static void apply( + @NonNull WireBuffer buffer, int outId, int pathId1, int pathId2, byte op) { + buffer.start(OP_CODE); + buffer.writeInt(outId); + buffer.writeInt(pathId1); + buffer.writeInt(pathId2); + buffer.writeByte(op); + } + + /** + * Read this operation and add it to the list of operations + * + * @param buffer the buffer to read + * @param operations the list of operations that will be added to + */ + public static void read(@NonNull WireBuffer buffer, @NonNull List<Operation> operations) { + int outId1 = buffer.readInt(); + int pathId1 = buffer.readInt(); + int pathId2 = buffer.readInt(); + byte op = (byte) buffer.readByte(); + operations.add(new PathCombine(outId1, pathId1, pathId2, op)); + } + + /** + * Populate the documentation with a description of this operation + * + * @param doc to append the description to. + */ + public static void documentation(@NonNull DocumentationBuilder doc) { + doc.operation("Data Operations", OP_CODE, CLASS_NAME) + .description("Merge two string into one") + .field(INT, "srcPathId1", "id of the path") + .field(INT, "srcPathId1", "x Shift of the path") + .field(DocumentedOperation.BYTE, "operation", "the operation"); + } + + @NonNull + @Override + public String deepToString(String indent) { + return indent + toString(); + } + + @Override + public void paint(PaintContext context) { + context.combinePath(mOutId, mPathId1, mPathId2, mOperation); + } + + @Override + public void serialize(MapSerializer serializer) { + serializer + .addType(CLASS_NAME) + .add("outId", mOutId) + .add("pathId1", mPathId1) + .add("pathId2", mPathId2) + .add("operation", mOperation); + } +} diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/TextData.java b/core/java/com/android/internal/widget/remotecompose/core/operations/TextData.java index 67773d1d6187..d8ef4cbba4d6 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/TextData.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/TextData.java @@ -37,7 +37,7 @@ public class TextData extends Operation implements SerializableToString, Seriali private static final int OP_CODE = Operations.DATA_TEXT; private static final String CLASS_NAME = "TextData"; public final int mTextId; - @NonNull public final String mText; + @NonNull public String mText; public static final int MAX_STRING_SIZE = 4000; public TextData(int textId, @NonNull String text) { @@ -45,6 +45,15 @@ public class TextData extends Operation implements SerializableToString, Seriali this.mText = text; } + /** + * Copy the data from another text data + * + * @param from source to copy from + */ + public void update(TextData from) { + mText = from.mText; + } + @Override public void write(@NonNull WireBuffer buffer) { apply(buffer, mTextId, mText); diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/TextMerge.java b/core/java/com/android/internal/widget/remotecompose/core/operations/TextMerge.java index 1239b5648446..2bc77cc48839 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/TextMerge.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/TextMerge.java @@ -22,6 +22,7 @@ import android.annotation.NonNull; import com.android.internal.widget.remotecompose.core.Operation; import com.android.internal.widget.remotecompose.core.Operations; import com.android.internal.widget.remotecompose.core.RemoteContext; +import com.android.internal.widget.remotecompose.core.VariableSupport; import com.android.internal.widget.remotecompose.core.WireBuffer; import com.android.internal.widget.remotecompose.core.documentation.DocumentationBuilder; import com.android.internal.widget.remotecompose.core.documentation.DocumentedOperation; @@ -31,7 +32,7 @@ import com.android.internal.widget.remotecompose.core.serialize.Serializable; import java.util.List; /** Operation to deal with Text data */ -public class TextMerge extends Operation implements Serializable { +public class TextMerge extends Operation implements VariableSupport, Serializable { private static final int OP_CODE = Operations.TEXT_MERGE; private static final String CLASS_NAME = "TextMerge"; public int mTextId; @@ -123,10 +124,21 @@ public class TextMerge extends Operation implements Serializable { context.loadText(mTextId, str1 + str2); } + @Override + public void updateVariables(@NonNull RemoteContext context) { + apply(context); + } + + @Override + public void registerListening(@NonNull RemoteContext context) { + context.listensTo(mSrcId1, this); + context.listensTo(mSrcId2, this); + } + @NonNull @Override public String deepToString(@NonNull String indent) { - return indent + toString(); + return indent + this; } @Override diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/TimeAttribute.java b/core/java/com/android/internal/widget/remotecompose/core/operations/TimeAttribute.java index fd9a2bf5e435..e9cc26f58c9b 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/TimeAttribute.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/TimeAttribute.java @@ -275,7 +275,7 @@ public class TimeAttribute extends PaintOperation { ctx.loadFloat(mId, time.getSecond()); break; case TIME_IN_MIN: - ctx.loadFloat(mId, time.getDayOfMonth()); + ctx.loadFloat(mId, time.getMinute()); break; case TIME_IN_HR: ctx.loadFloat(mId, time.getHour()); diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/CanvasOperations.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/CanvasOperations.java index 25a10ab7dbeb..e473d9e392d2 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/CanvasOperations.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/CanvasOperations.java @@ -27,7 +27,6 @@ import com.android.internal.widget.remotecompose.core.VariableSupport; import com.android.internal.widget.remotecompose.core.WireBuffer; import com.android.internal.widget.remotecompose.core.documentation.DocumentationBuilder; import com.android.internal.widget.remotecompose.core.operations.ComponentValue; -import com.android.internal.widget.remotecompose.core.operations.DrawContent; import com.android.internal.widget.remotecompose.core.serialize.MapSerializer; import com.android.internal.widget.remotecompose.core.serialize.Serializable; @@ -164,12 +163,10 @@ public class CanvasOperations extends PaintOperation * * @param layoutComponent */ - public void setComponent(LayoutComponent layoutComponent) { + public void setComponent(@Nullable LayoutComponent layoutComponent) { mComponent = layoutComponent; - for (Operation op : mList) { - if (op instanceof DrawContent) { - ((DrawContent) op).setComponent(layoutComponent); - } + if (layoutComponent != null) { + layoutComponent.setCanvasOperations(this); } } } diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/Component.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/Component.java index b30dade828a7..f1158d91f94b 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/Component.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/Component.java @@ -27,6 +27,7 @@ import com.android.internal.widget.remotecompose.core.SerializableToString; import com.android.internal.widget.remotecompose.core.TouchListener; import com.android.internal.widget.remotecompose.core.VariableSupport; import com.android.internal.widget.remotecompose.core.WireBuffer; +import com.android.internal.widget.remotecompose.core.operations.BitmapData; import com.android.internal.widget.remotecompose.core.operations.ComponentValue; import com.android.internal.widget.remotecompose.core.operations.TextData; import com.android.internal.widget.remotecompose.core.operations.TouchExpression; @@ -556,6 +557,7 @@ public class Component extends PaintOperation ComponentMeasure m = measure.get(this); if (!mFirstLayout && context.isAnimationEnabled() + && mAnimationSpec.isAnimationEnabled() && !(this instanceof LayoutComponentContent)) { if (mAnimateMeasure == null) { ComponentMeasure origin = @@ -1129,26 +1131,15 @@ public class Component extends PaintOperation } } - /** Extract CanvasOperations if present */ - public @Nullable CanvasOperations getCanvasOperations(LayoutComponent layoutComponent) { - for (Operation op : mList) { - if (op instanceof CanvasOperations) { - ((CanvasOperations) op).setComponent(layoutComponent); - return (CanvasOperations) op; - } - } - return null; - } - /** - * Extract child TextData elements + * Extract child Data elements * - * @param data an ArrayList that will be populated with the TextData elements (if any) + * @param data an ArrayList that will be populated with the Data elements (if any) */ - public void getData(@NonNull ArrayList<TextData> data) { + public void getData(@NonNull ArrayList<Operation> data) { for (Operation op : mList) { - if (op instanceof TextData) { - data.add((TextData) op); + if (op instanceof TextData || op instanceof BitmapData) { + data.add(op); } } } diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/ImpulseOperation.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/ImpulseOperation.java index 0e629c5d2448..3e1cf35e153a 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/ImpulseOperation.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/ImpulseOperation.java @@ -117,7 +117,7 @@ public class ImpulseOperation extends PaintOperation implements VariableSupport, @NonNull @Override public String toString() { - StringBuilder builder = new StringBuilder("LoopOperation\n"); + StringBuilder builder = new StringBuilder("ImpulseOperation\n"); for (Operation operation : mList) { builder.append(" startAt: "); builder.append(mStartAt); diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/LayoutComponent.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/LayoutComponent.java index 7e2a4ccec222..6163d8099b8c 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/LayoutComponent.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/LayoutComponent.java @@ -30,7 +30,6 @@ import com.android.internal.widget.remotecompose.core.operations.MatrixRestore; import com.android.internal.widget.remotecompose.core.operations.MatrixSave; import com.android.internal.widget.remotecompose.core.operations.MatrixTranslate; import com.android.internal.widget.remotecompose.core.operations.PaintData; -import com.android.internal.widget.remotecompose.core.operations.TextData; import com.android.internal.widget.remotecompose.core.operations.TouchExpression; import com.android.internal.widget.remotecompose.core.operations.layout.animation.AnimationSpec; import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ComponentModifiers; @@ -127,9 +126,18 @@ public class LayoutComponent extends Component { // Should be removed after ImageLayout is in private static final boolean USE_IMAGE_TEMP_FIX = true; + /** + * Set canvas operations op on this component + * + * @param operations + */ + public void setCanvasOperations(@Nullable CanvasOperations operations) { + mDrawContentOperations = operations; + } + @Override public void inflate() { - ArrayList<TextData> data = new ArrayList<>(); + ArrayList<Operation> data = new ArrayList<>(); ArrayList<Operation> supportedOperations = new ArrayList<>(); for (Operation op : mList) { @@ -139,7 +147,6 @@ public class LayoutComponent extends Component { mChildrenComponents.clear(); LayoutComponentContent content = (LayoutComponentContent) op; content.getComponents(mChildrenComponents); - mDrawContentOperations = content.getCanvasOperations(this); if (USE_IMAGE_TEMP_FIX) { if (mChildrenComponents.isEmpty() && !mContent.mList.isEmpty()) { CanvasContent canvasContent = @@ -178,8 +185,6 @@ public class LayoutComponent extends Component { ((ScrollModifierOperation) op).inflate(this); } mComponentModifiers.add((ModifierOperation) op); - } else if (op instanceof TextData) { - data.add((TextData) op); } else if (op instanceof TouchExpression || (op instanceof PaintData) || (op instanceof FloatExpression)) { diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/LoopOperation.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/LoopOperation.java index dda328f57a3b..e5914eb7fd28 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/LoopOperation.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/LoopOperation.java @@ -211,7 +211,6 @@ public class LoopOperation extends PaintOperation .add("until", mUntil, mUntilOut) .add("from", mFrom, mFromOut) .add("step", mStep, mStepOut) - .add("untilOut", mUntilOut) .add("list", mList); } } diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/animation/AnimationSpec.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/animation/AnimationSpec.java index c87bbdc9809d..4f552e7a9aaa 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/animation/AnimationSpec.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/animation/AnimationSpec.java @@ -35,6 +35,7 @@ import java.util.List; /** Basic component animation spec */ public class AnimationSpec extends Operation implements ModifierOperation { public static final AnimationSpec DEFAULT = new AnimationSpec(); + public static final AnimationSpec DISABLED = new AnimationSpec(0); int mAnimationId = -1; float mMotionDuration = 300; int mMotionEasingType = GeneralEasing.CUBIC_STANDARD; @@ -71,6 +72,15 @@ public class AnimationSpec extends Operation implements ModifierOperation { ANIMATION.FADE_OUT); } + public AnimationSpec(int value) { + this(); + mAnimationId = value; + } + + public boolean isAnimationEnabled() { + return mAnimationId != 0; + } + public int getAnimationId() { return mAnimationId; } @@ -130,6 +140,7 @@ public class AnimationSpec extends Operation implements ModifierOperation { public void serialize(MapSerializer serializer) { serializer .addType("AnimationSpec") + .add("animationId", mAnimationId) .add("motionDuration", getMotionDuration()) .add("motionEasingType", Easing.getString(getMotionEasingType())) .add("visibilityDuration", getVisibilityDuration()) diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/CanvasLayout.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/CanvasLayout.java index f9111dffe2c4..8e1c872aec1f 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/CanvasLayout.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/CanvasLayout.java @@ -155,23 +155,5 @@ public class CanvasLayout extends BoxLayout { public void serialize(MapSerializer serializer) { super.serialize(serializer); serializer.addType(getSerializedName()); - serializer.add("horizontalPositioning", mHorizontalPositioning); - } - - private String getPositioningString(int pos) { - switch (pos) { - case START: - return "START"; - case CENTER: - return "CENTER"; - case END: - return "END"; - case TOP: - return "TOP"; - case BOTTOM: - return "BOTTOM"; - default: - return "NONE"; - } } } diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/ImageLayout.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/ImageLayout.java new file mode 100644 index 000000000000..a4ed0c1319d4 --- /dev/null +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/ImageLayout.java @@ -0,0 +1,314 @@ +/* + * Copyright (C) 2025 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.widget.remotecompose.core.operations.layout.managers; + +import static com.android.internal.widget.remotecompose.core.documentation.DocumentedOperation.FLOAT; +import static com.android.internal.widget.remotecompose.core.documentation.DocumentedOperation.INT; + +import android.annotation.NonNull; +import android.annotation.Nullable; + +import com.android.internal.widget.remotecompose.core.Operation; +import com.android.internal.widget.remotecompose.core.Operations; +import com.android.internal.widget.remotecompose.core.PaintContext; +import com.android.internal.widget.remotecompose.core.RemoteContext; +import com.android.internal.widget.remotecompose.core.VariableSupport; +import com.android.internal.widget.remotecompose.core.WireBuffer; +import com.android.internal.widget.remotecompose.core.documentation.DocumentationBuilder; +import com.android.internal.widget.remotecompose.core.operations.BitmapData; +import com.android.internal.widget.remotecompose.core.operations.layout.Component; +import com.android.internal.widget.remotecompose.core.operations.layout.measure.ComponentMeasure; +import com.android.internal.widget.remotecompose.core.operations.layout.measure.MeasurePass; +import com.android.internal.widget.remotecompose.core.operations.layout.measure.Size; +import com.android.internal.widget.remotecompose.core.operations.paint.PaintBundle; +import com.android.internal.widget.remotecompose.core.operations.utilities.ImageScaling; +import com.android.internal.widget.remotecompose.core.operations.utilities.StringSerializer; + +import java.util.List; + +public class ImageLayout extends LayoutManager implements VariableSupport { + + private static final boolean DEBUG = false; + private int mBitmapId = -1; + private int mScaleType; + private float mAlpha = 1f; + + @NonNull ImageScaling mScaling = new ImageScaling(); + @NonNull PaintBundle mPaint = new PaintBundle(); + + @Override + public void registerListening(@NonNull RemoteContext context) { + if (mBitmapId != -1) { + context.listensTo(mBitmapId, this); + } + } + + public ImageLayout( + @Nullable Component parent, + int componentId, + int animationId, + int bitmapId, + float x, + float y, + float width, + float height, + int scaleType, + float alpha) { + super(parent, componentId, animationId, x, y, width, height); + mBitmapId = bitmapId; + mScaleType = scaleType & 0xFF; + mAlpha = alpha; + } + + public ImageLayout( + @Nullable Component parent, + int componentId, + int animationId, + int bitmapId, + int scaleType, + float alpha) { + this(parent, componentId, animationId, bitmapId, 0, 0, 0, 0, scaleType, alpha); + } + + @Override + public void computeWrapSize( + @NonNull PaintContext context, + float maxWidth, + float maxHeight, + boolean horizontalWrap, + boolean verticalWrap, + @NonNull MeasurePass measure, + @NonNull Size size) { + + BitmapData bitmapData = (BitmapData) context.getContext().getObject(mBitmapId); + if (bitmapData != null) { + size.setWidth(bitmapData.getWidth()); + size.setHeight(bitmapData.getHeight()); + } + } + + @Override + public void computeSize( + @NonNull PaintContext context, + float minWidth, + float maxWidth, + float minHeight, + float maxHeight, + @NonNull MeasurePass measure) { + float modifiersWidth = computeModifierDefinedWidth(context.getContext()); + float modifiersHeight = computeModifierDefinedHeight(context.getContext()); + ComponentMeasure m = measure.get(this); + m.setW(modifiersWidth); + m.setH(modifiersHeight); + } + + @Override + public void paintingComponent(@NonNull PaintContext context) { + context.save(); + context.translate(mX, mY); + mComponentModifiers.paint(context); + float tx = mPaddingLeft; + float ty = mPaddingTop; + context.translate(tx, ty); + float w = mWidth - mPaddingLeft - mPaddingRight; + float h = mHeight - mPaddingTop - mPaddingBottom; + context.clipRect(0f, 0f, w, h); + + BitmapData bitmapData = (BitmapData) context.getContext().getObject(mBitmapId); + if (bitmapData != null) { + mScaling.setup( + 0f, + 0f, + bitmapData.getWidth(), + bitmapData.getHeight(), + 0f, + 0f, + w, + h, + mScaleType, + 1f); + + context.savePaint(); + if (mAlpha == 1f) { + context.drawBitmap( + mBitmapId, + (int) 0f, + (int) 0f, + (int) bitmapData.getWidth(), + (int) bitmapData.getHeight(), + (int) mScaling.mFinalDstLeft, + (int) mScaling.mFinalDstTop, + (int) mScaling.mFinalDstRight, + (int) mScaling.mFinalDstBottom, + -1); + } else { + context.savePaint(); + mPaint.reset(); + mPaint.setColor(0f, 0f, 0f, mAlpha); + context.applyPaint(mPaint); + context.drawBitmap( + mBitmapId, + (int) 0f, + (int) 0f, + (int) bitmapData.getWidth(), + (int) bitmapData.getHeight(), + (int) mScaling.mFinalDstLeft, + (int) mScaling.mFinalDstTop, + (int) mScaling.mFinalDstRight, + (int) mScaling.mFinalDstBottom, + -1); + context.restorePaint(); + } + context.restorePaint(); + } + + // debugBox(this, context); + context.translate(-tx, -ty); + context.restore(); + } + + @NonNull + @Override + public String toString() { + return "IMAGE_LAYOUT [" + + mComponentId + + ":" + + mAnimationId + + "] (" + + mX + + ", " + + mY + + " - " + + mWidth + + " x " + + mHeight + + ") " + + mVisibility; + } + + @NonNull + @Override + protected String getSerializedName() { + return "IMAGE_LAYOUT"; + } + + @Override + public void serializeToString(int indent, @NonNull StringSerializer serializer) { + serializer.append( + indent, + getSerializedName() + + " [" + + mComponentId + + ":" + + mAnimationId + + "] = " + + "[" + + mX + + ", " + + mY + + ", " + + mWidth + + ", " + + mHeight + + "] " + + mVisibility + + " (" + + mBitmapId + + "\")"); + } + + /** + * The name of the class + * + * @return the name + */ + @NonNull + public static String name() { + return "ImageLayout"; + } + + /** + * The OP_CODE for this command + * + * @return the opcode + */ + public static int id() { + return Operations.LAYOUT_IMAGE; + } + + /** + * Write the operation to the buffer + * + * @param buffer + * @param componentId + * @param animationId + * @param bitmapId + * @param scaleType + * @param alpha + */ + public static void apply( + @NonNull WireBuffer buffer, + int componentId, + int animationId, + int bitmapId, + int scaleType, + float alpha) { + buffer.start(id()); + buffer.writeInt(componentId); + buffer.writeInt(animationId); + buffer.writeInt(bitmapId); + buffer.writeInt(scaleType); + buffer.writeFloat(alpha); + } + + /** + * Read this operation and add it to the list of operations + * + * @param buffer the buffer to read + * @param operations the list of operations that will be added to + */ + public static void read(@NonNull WireBuffer buffer, @NonNull List<Operation> operations) { + int componentId = buffer.readInt(); + int animationId = buffer.readInt(); + int bitmapId = buffer.readInt(); + int scaleType = buffer.readInt(); + float alpha = buffer.readFloat(); + operations.add(new ImageLayout(null, componentId, animationId, bitmapId, scaleType, alpha)); + } + + /** + * Populate the documentation with a description of this operation + * + * @param doc to append the description to. + */ + public static void documentation(@NonNull DocumentationBuilder doc) { + doc.operation("Layout Operations", id(), name()) + .description("Image layout implementation.\n\n") + .field(INT, "COMPONENT_ID", "unique id for this component") + .field( + INT, + "ANIMATION_ID", + "id used to match components," + " for animation purposes") + .field(INT, "BITMAP_ID", "bitmap id") + .field(INT, "SCALE_TYPE", "scale type") + .field(FLOAT, "ALPHA", "alpha"); + } + + @Override + public void write(@NonNull WireBuffer buffer) { + apply(buffer, mComponentId, mAnimationId, mBitmapId, mScaleType, mAlpha); + } +} diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/TextLayout.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/TextLayout.java index 2595a71abaa5..d383ee9e4fc9 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/TextLayout.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/managers/TextLayout.java @@ -31,6 +31,7 @@ import com.android.internal.widget.remotecompose.core.WireBuffer; import com.android.internal.widget.remotecompose.core.documentation.DocumentationBuilder; import com.android.internal.widget.remotecompose.core.operations.Utils; import com.android.internal.widget.remotecompose.core.operations.layout.Component; +import com.android.internal.widget.remotecompose.core.operations.layout.measure.ComponentMeasure; import com.android.internal.widget.remotecompose.core.operations.layout.measure.MeasurePass; import com.android.internal.widget.remotecompose.core.operations.layout.measure.Size; import com.android.internal.widget.remotecompose.core.operations.paint.PaintBundle; @@ -73,6 +74,8 @@ public class TextLayout extends LayoutManager implements VariableSupport, Access private float mTextW = -1; private float mTextH = -1; + private final Size mCachedSize = new Size(0f, 0f); + @Nullable private String mCachedString = ""; Platform.ComputedTextLayout mComputedTextLayout; @@ -230,6 +233,7 @@ public class TextLayout extends LayoutManager implements VariableSupport, Access case TEXT_ALIGN_START: default: } + if (mTextW > (mWidth - mPaddingLeft - mPaddingRight)) { context.save(); context.clipRect( @@ -317,6 +321,21 @@ public class TextLayout extends LayoutManager implements VariableSupport, Access } @Override + public void computeSize( + @NonNull PaintContext context, + float minWidth, + float maxWidth, + float minHeight, + float maxHeight, + @NonNull MeasurePass measure) { + super.computeSize(context, minWidth, maxWidth, minHeight, maxHeight, measure); + computeWrapSize(context, maxWidth, maxHeight, true, true, measure, mCachedSize); + ComponentMeasure m = measure.get(this); + m.setW(mCachedSize.getWidth()); + m.setH(mCachedSize.getHeight()); + } + + @Override public void computeWrapSize( @NonNull PaintContext context, float maxWidth, @@ -335,6 +354,8 @@ public class TextLayout extends LayoutManager implements VariableSupport, Access if (mCachedString == null) { return; } + + boolean forceComplex = false; int flags = PaintContext.TEXT_MEASURE_FONT_HEIGHT | PaintContext.TEXT_MEASURE_SPACES; if (mMaxLines == 1 && (mOverflow == OVERFLOW_START_ELLIPSIS @@ -342,8 +363,20 @@ public class TextLayout extends LayoutManager implements VariableSupport, Access || mOverflow == OVERFLOW_ELLIPSIS)) { flags |= PaintContext.TEXT_COMPLEX; } - context.getTextBounds(mTextId, 0, mCachedString.length(), flags, bounds); - if (bounds[2] - bounds[1] > maxWidth && mMaxLines > 1 && maxWidth > 0f) { + if ((flags & PaintContext.TEXT_COMPLEX) != PaintContext.TEXT_COMPLEX) { + for (int i = 0; i < mCachedString.length(); i++) { + char c = mCachedString.charAt(i); + if ((c == '\n') || (c == '\t')) { + flags |= PaintContext.TEXT_COMPLEX; + forceComplex = true; + break; + } + } + } + if (!forceComplex) { + context.getTextBounds(mTextId, 0, mCachedString.length(), flags, bounds); + } + if (forceComplex || bounds[2] - bounds[1] > maxWidth && mMaxLines > 1 && maxWidth > 0f) { mComputedTextLayout = context.layoutComplexText( mTextId, diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/BorderModifierOperation.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/BorderModifierOperation.java index 656a3c0fca68..b3d76b765143 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/BorderModifierOperation.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/BorderModifierOperation.java @@ -250,7 +250,7 @@ public class BorderModifierOperation extends DecoratorModifierOperation { context.savePaint(); paint.reset(); paint.setColor(mR, mG, mB, mA); - paint.setStrokeWidth(mBorderWidth); + paint.setStrokeWidth(mBorderWidth * context.getContext().getDensity()); paint.setStyle(PaintBundle.STYLE_STROKE); context.replacePaint(paint); if (mShapeType == ShapeType.RECTANGLE) { diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/HostActionMetadataOperation.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/HostActionMetadataOperation.java new file mode 100644 index 000000000000..2170efd68a64 --- /dev/null +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/HostActionMetadataOperation.java @@ -0,0 +1,146 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.internal.widget.remotecompose.core.operations.layout.modifiers; + +import static com.android.internal.widget.remotecompose.core.documentation.DocumentedOperation.INT; + +import android.annotation.NonNull; + +import com.android.internal.widget.remotecompose.core.CoreDocument; +import com.android.internal.widget.remotecompose.core.Operation; +import com.android.internal.widget.remotecompose.core.Operations; +import com.android.internal.widget.remotecompose.core.RemoteContext; +import com.android.internal.widget.remotecompose.core.SerializableToString; +import com.android.internal.widget.remotecompose.core.WireBuffer; +import com.android.internal.widget.remotecompose.core.documentation.DocumentationBuilder; +import com.android.internal.widget.remotecompose.core.operations.layout.ActionOperation; +import com.android.internal.widget.remotecompose.core.operations.layout.Component; +import com.android.internal.widget.remotecompose.core.operations.utilities.StringSerializer; +import com.android.internal.widget.remotecompose.core.serialize.MapSerializer; +import com.android.internal.widget.remotecompose.core.serialize.Serializable; +import com.android.internal.widget.remotecompose.core.serialize.SerializeTags; + +import java.util.List; + +/** Capture a host action information. This can be triggered on eg. a click. */ +public class HostActionMetadataOperation extends Operation + implements ActionOperation, SerializableToString, Serializable { + private static final int OP_CODE = Operations.HOST_METADATA_ACTION; + + int mActionId = -1; + int mMetadataId = -1; + + public HostActionMetadataOperation(int id, int metadataId) { + mActionId = id; + mMetadataId = metadataId; + } + + @NonNull + @Override + public String toString() { + return "HostMetadataActionOperation(" + mActionId + ":" + mMetadataId + ")"; + } + + public int getActionId() { + return mActionId; + } + + /** + * Returns the serialized name for this operation + * + * @return the serialized name + */ + @NonNull + public String serializedName() { + return "HOST_METADATA_ACTION"; + } + + @Override + public void serializeToString(int indent, @NonNull StringSerializer serializer) { + serializer.append(indent, serializedName() + " = " + mActionId + ", " + mMetadataId); + } + + @Override + public void apply(@NonNull RemoteContext context) {} + + @NonNull + @Override + public String deepToString(@NonNull String indent) { + return (indent != null ? indent : "") + toString(); + } + + @Override + public void write(@NonNull WireBuffer buffer) {} + + @Override + public void runAction( + @NonNull RemoteContext context, + @NonNull CoreDocument document, + @NonNull Component component, + float x, + float y) { + String metadata = context.getText(mMetadataId); + if (metadata == null) { + metadata = ""; + } + context.runAction(mActionId, metadata); + } + + /** + * Write the operation to the buffer + * + * @param buffer a WireBuffer + * @param actionId the action id + */ + public static void apply(@NonNull WireBuffer buffer, int actionId, int metadataId) { + buffer.start(OP_CODE); + buffer.writeInt(actionId); + buffer.writeInt(metadataId); + } + + /** + * Read this operation and add it to the list of operations + * + * @param buffer the buffer to read + * @param operations the list of operations that will be added to + */ + public static void read(@NonNull WireBuffer buffer, @NonNull List<Operation> operations) { + int actionId = buffer.readInt(); + int metadataId = buffer.readInt(); + operations.add(new HostActionMetadataOperation(actionId, metadataId)); + } + + /** + * Populate the documentation with a description of this operation + * + * @param doc to append the description to. + */ + public static void documentation(@NonNull DocumentationBuilder doc) { + doc.operation("Layout Operations", OP_CODE, "HostAction") + .description("Host action. This operation represents a host action") + .field(INT, "ACTION_ID", "Host Action ID") + .field(INT, "METADATA", "Host Action Text Metadata ID"); + } + + @Override + public void serialize(MapSerializer serializer) { + serializer + .addTags(SerializeTags.MODIFIER) + .addType("HostActionOperation") + .add("id", mActionId) + .add("metadata", mMetadataId); + } +} diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/ScrollModifierOperation.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/ScrollModifierOperation.java index 466e435e20cf..3e1f32de66e4 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/ScrollModifierOperation.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/ScrollModifierOperation.java @@ -401,10 +401,8 @@ public class ScrollModifierOperation extends ListActionsOperation .add("direction", mDirection) .add("max", mMax) .add("notchMax", mNotchMax) - .add("scrollX", mScrollX) - .add("scrollY", mScrollY) - .add("maxScrollX", mMaxScrollX) - .add("maxScrollY", mMaxScrollY) + .add("scrollValue", isVerticalScroll() ? mScrollY : mScrollX) + .add("maxScrollValue", isVerticalScroll() ? mMaxScrollY : mMaxScrollX) .add("contentDimension", mContentDimension) .add("hostDimension", mHostDimension); } diff --git a/core/java/com/android/internal/widget/remotecompose/core/types/IntegerConstant.java b/core/java/com/android/internal/widget/remotecompose/core/types/IntegerConstant.java index bdc765968387..25dcb67fe9e2 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/types/IntegerConstant.java +++ b/core/java/com/android/internal/widget/remotecompose/core/types/IntegerConstant.java @@ -34,14 +34,23 @@ import java.util.List; public class IntegerConstant extends Operation implements Serializable { private static final String CLASS_NAME = "IntegerConstant"; - private final int mValue; - private final int mId; + private int mValue; + public final int mId; IntegerConstant(int id, int value) { mId = id; mValue = value; } + /** + * Updates the value of the integer constant + * + * @param ic the integer constant to copy + */ + public void update(IntegerConstant ic) { + mValue = ic.mValue; + } + @Override public void write(@NonNull WireBuffer buffer) { apply(buffer, mId, mValue); diff --git a/core/java/com/android/internal/widget/remotecompose/core/types/LongConstant.java b/core/java/com/android/internal/widget/remotecompose/core/types/LongConstant.java index d071e0a21d22..ab0f7352182a 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/types/LongConstant.java +++ b/core/java/com/android/internal/widget/remotecompose/core/types/LongConstant.java @@ -36,7 +36,7 @@ public class LongConstant extends Operation implements Serializable { private static final int OP_CODE = Operations.DATA_LONG; private long mValue; - private final int mId; + public final int mId; /** * @param id the id of the constant @@ -48,6 +48,15 @@ public class LongConstant extends Operation implements Serializable { } /** + * Copy the value from another longConstant + * + * @param from the constant to copy from + */ + public void update(LongConstant from) { + mValue = from.mValue; + } + + /** * Get the value of the long constant * * @return the value of the long diff --git a/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java b/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java index 1f9a27429067..f5b2cca15e43 100644 --- a/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java +++ b/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java @@ -41,6 +41,7 @@ import com.android.internal.widget.remotecompose.core.RemoteContext; import com.android.internal.widget.remotecompose.core.RemoteContextAware; import com.android.internal.widget.remotecompose.core.operations.NamedVariable; import com.android.internal.widget.remotecompose.core.operations.RootContentBehavior; +import com.android.internal.widget.remotecompose.player.platform.AndroidRemoteContext; import com.android.internal.widget.remotecompose.player.platform.RemoteComposeCanvas; /** A view to to display and play RemoteCompose documents */ @@ -114,6 +115,23 @@ public class RemoteComposePlayer extends FrameLayout implements RemoteContextAwa return mInner.getDocument(); } + /** + * This will update values in the already loaded document. + * + * @param value the document to update variables in the current document width + */ + public void updateDocument(RemoteComposeDocument value) { + RemoteComposeDocument document = value; + AndroidRemoteContext tmpContext = new AndroidRemoteContext(); + document.initializeContext(tmpContext); + float density = getContext().getResources().getDisplayMetrics().density; + tmpContext.setAnimationEnabled(true); + tmpContext.setDensity(density); + tmpContext.setUseChoreographer(false); + mInner.getDocument().mDocument.applyUpdate(document.mDocument); + mInner.invalidate(); + } + public void setDocument(RemoteComposeDocument value) { if (value != null) { if (value.canBeDisplayed( @@ -312,7 +330,8 @@ public class RemoteComposePlayer extends FrameLayout implements RemoteContextAwa } /** - * Add a callback for handling id actions events on the document + * Add a callback for handling id actions events on the document. Can only be added after the + * document has been loaded. * * @param callback the callback lambda that will be used when a action is executed * <p>The parameter of the callback are: diff --git a/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidPaintContext.java b/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidPaintContext.java index b5aedd8d0231..680a221cc2db 100644 --- a/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidPaintContext.java +++ b/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidPaintContext.java @@ -808,6 +808,24 @@ public class AndroidPaintContext extends PaintContext { } @Override + public void combinePath(int out, int path1, int path2, byte operation) { + Path p1 = getPath(path1, 0, 1); + Path p2 = getPath(path2, 0, 1); + Path.Op[] op = { + Path.Op.DIFFERENCE, + Path.Op.INTERSECT, + Path.Op.REVERSE_DIFFERENCE, + Path.Op.UNION, + Path.Op.XOR, + }; + Path p = new Path(p1); + p.op(p2, op[operation]); + + AndroidRemoteContext androidContext = (AndroidRemoteContext) mContext; + androidContext.mRemoteComposeState.putPath(out, p); + } + + @Override public void reset() { mPaint.reset(); } diff --git a/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidRemoteContext.java b/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidRemoteContext.java index b31c76056e38..e1f2924021a4 100644 --- a/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidRemoteContext.java +++ b/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidRemoteContext.java @@ -197,7 +197,7 @@ public class AndroidRemoteContext extends RemoteContext { @Override public void runAction(int id, @NonNull String metadata) { - mDocument.performClick(this, id); + mDocument.performClick(this, id, metadata); } @Override @@ -392,6 +392,11 @@ public class AndroidRemoteContext extends RemoteContext { } @Override + public long getLong(int id) { + return ((LongConstant) mRemoteComposeState.getObject(id)).getValue(); + } + + @Override public int getColor(int id) { return mRemoteComposeState.getColor(id); } diff --git a/core/java/com/android/internal/widget/remotecompose/player/platform/RemoteComposeCanvas.java b/core/java/com/android/internal/widget/remotecompose/player/platform/RemoteComposeCanvas.java index 29cd40def562..0bc99abc17bc 100644 --- a/core/java/com/android/internal/widget/remotecompose/player/platform/RemoteComposeCanvas.java +++ b/core/java/com/android/internal/widget/remotecompose/player/platform/RemoteComposeCanvas.java @@ -154,7 +154,11 @@ public class RemoteComposeCanvas extends FrameLayout implements View.OnAttachSta param.leftMargin = (int) area.getLeft(); param.topMargin = (int) area.getTop(); viewArea.setOnClickListener( - view1 -> mDocument.getDocument().performClick(mARContext, area.getId())); + view1 -> + mDocument + .getDocument() + .performClick( + mARContext, area.getId(), area.getMetadata())); addView(viewArea, param); } if (!clickAreas.isEmpty()) { diff --git a/core/jni/android_view_InputChannel.cpp b/core/jni/android_view_InputChannel.cpp index e874163943b6..a6a748c3deb7 100644 --- a/core/jni/android_view_InputChannel.cpp +++ b/core/jni/android_view_InputChannel.cpp @@ -55,41 +55,25 @@ public: inline std::shared_ptr<InputChannel> getInputChannel() { return mInputChannel; } - void setDisposeCallback(InputChannelObjDisposeCallback callback, void* data); void dispose(JNIEnv* env, jobject obj); private: std::shared_ptr<InputChannel> mInputChannel; - InputChannelObjDisposeCallback mDisposeCallback; - void* mDisposeData; }; // ---------------------------------------------------------------------------- NativeInputChannel::NativeInputChannel(std::unique_ptr<InputChannel> inputChannel) - : mInputChannel(std::move(inputChannel)), mDisposeCallback(nullptr) {} + : mInputChannel(std::move(inputChannel)) {} NativeInputChannel::~NativeInputChannel() { } -void NativeInputChannel::setDisposeCallback(InputChannelObjDisposeCallback callback, void* data) { - if (input_flags::remove_input_channel_from_windowstate()) { - return; - } - mDisposeCallback = callback; - mDisposeData = data; -} - void NativeInputChannel::dispose(JNIEnv* env, jobject obj) { if (!mInputChannel) { return; } - if (mDisposeCallback) { - mDisposeCallback(env, obj, mInputChannel, mDisposeData); - mDisposeCallback = nullptr; - mDisposeData = nullptr; - } mInputChannel.reset(); } @@ -108,17 +92,6 @@ std::shared_ptr<InputChannel> android_view_InputChannel_getInputChannel(JNIEnv* return nativeInputChannel != nullptr ? nativeInputChannel->getInputChannel() : nullptr; } -void android_view_InputChannel_setDisposeCallback(JNIEnv* env, jobject inputChannelObj, - InputChannelObjDisposeCallback callback, void* data) { - NativeInputChannel* nativeInputChannel = - android_view_InputChannel_getNativeInputChannel(env, inputChannelObj); - if (!nativeInputChannel || !nativeInputChannel->getInputChannel()) { - ALOGW("Cannot set dispose callback because input channel object has not been initialized."); - } else { - nativeInputChannel->setDisposeCallback(callback, data); - } -} - static jlong android_view_InputChannel_createInputChannel( JNIEnv* env, std::unique_ptr<InputChannel> inputChannel) { std::unique_ptr<NativeInputChannel> nativeInputChannel = diff --git a/core/proto/android/providers/settings/secure.proto b/core/proto/android/providers/settings/secure.proto index 1caa9e7af348..5831a0bfc39e 100644 --- a/core/proto/android/providers/settings/secure.proto +++ b/core/proto/android/providers/settings/secure.proto @@ -239,6 +239,10 @@ message SecureSettingsProto { repeated SettingProto completed_categories = 15; optional SettingProto connectivity_release_pending_intent_delay_ms = 16 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto adaptive_connectivity_enabled = 84 [ (android.privacy).dest = DEST_AUTOMATIC ]; + optional SettingProto adaptive_connectivity_wifi_enabled = 105 [ (android.privacy).dest = + DEST_AUTOMATIC ]; + optional SettingProto adaptive_connectivity_mobile_network_enabled = 106 [ (android.privacy) + .dest = DEST_AUTOMATIC ]; message Controls { option (android.msg_privacy).dest = DEST_EXPLICIT; @@ -741,5 +745,5 @@ message SecureSettingsProto { // Please insert fields in alphabetical order and group them into messages // if possible (to avoid reaching the method limit). - // Next tag = 105; + // Next tag = 107; } diff --git a/core/res/res/layout/notification_2025_action_list.xml b/core/res/res/layout/notification_2025_action_list.xml new file mode 100644 index 000000000000..053aca068027 --- /dev/null +++ b/core/res/res/layout/notification_2025_action_list.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2025 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/actions_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_marginBottom="@dimen/notification_2025_action_list_margin_bottom" + > + + <LinearLayout + android:id="@+id/actions_container_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="end" + android:layout_gravity="bottom" + android:orientation="horizontal" + android:background="@color/notification_action_list_background_color" + > + + <com.android.internal.widget.NotificationActionListLayout + android:id="@+id/actions" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:minHeight="@dimen/notification_2025_action_list_height" + android:orientation="horizontal" + android:gravity="center_vertical" + android:visibility="gone" + > + <!-- actions will be added here --> + </com.android.internal.widget.NotificationActionListLayout> + + <!-- + This nested linear layout exists to ensure that if the neither of the contained + actions is visible we have some minimum padding at the end of the actions is present, + then there will be 12dp of padding at the end of the actions list. + + The end padding exists to match the bottom margin of the actions, for symmetry when the icon + is shown in the corner of the notification. + --> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:orientation="horizontal" + android:paddingEnd="@dimen/notification_2025_action_list_margin_bottom" + android:minWidth="@dimen/snooze_and_bubble_gone_padding_end" + > + <ImageView + android:id="@+id/snooze_button" + android:layout_width="@dimen/notification_2025_actions_icon_size" + android:layout_height="@dimen/notification_2025_actions_icon_size" + android:layout_gravity="center_vertical|end" + android:visibility="gone" + android:scaleType="centerInside" + /> + + <ImageView + android:id="@+id/bubble_button" + android:layout_width="@dimen/notification_2025_actions_icon_size" + android:layout_height="@dimen/notification_2025_actions_icon_size" + android:layout_gravity="center_vertical|end" + android:visibility="gone" + android:scaleType="centerInside" + /> + </LinearLayout> + </LinearLayout> +</FrameLayout> diff --git a/core/res/res/layout/notification_2025_template_collapsed_call.xml b/core/res/res/layout/notification_2025_template_collapsed_call.xml index fbea10d42b2b..732021c65742 100644 --- a/core/res/res/layout/notification_2025_template_collapsed_call.xml +++ b/core/res/res/layout/notification_2025_template_collapsed_call.xml @@ -32,11 +32,12 @@ android:orientation="vertical" > - <com.android.internal.widget.NotificationMaxHeightFrameLayout + <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="@dimen/notification_2025_min_height" android:clipChildren="false" + android:layout_weight="1" > <ImageView @@ -170,7 +171,7 @@ android:layout_height="@dimen/notification_close_button_size" android:layout_gravity="top|end" /> - </com.android.internal.widget.NotificationMaxHeightFrameLayout> + </FrameLayout> <LinearLayout android:id="@+id/notification_action_list_margin_target" @@ -182,10 +183,10 @@ <include layout="@layout/notification_template_smart_reply_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </LinearLayout> </LinearLayout> diff --git a/core/res/res/layout/notification_2025_template_collapsed_conversation.xml b/core/res/res/layout/notification_2025_template_collapsed_conversation.xml index a6fdcd95399e..1ee7ddc8d060 100644 --- a/core/res/res/layout/notification_2025_template_collapsed_conversation.xml +++ b/core/res/res/layout/notification_2025_template_collapsed_conversation.xml @@ -32,12 +32,12 @@ android:orientation="vertical" > - - <com.android.internal.widget.NotificationMaxHeightFrameLayout + <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="@dimen/notification_2025_min_height" android:clipChildren="false" + android:layout_weight="1" > <ImageView @@ -194,7 +194,7 @@ android:layout_height="@dimen/notification_close_button_size" android:layout_gravity="top|end" /> - </com.android.internal.widget.NotificationMaxHeightFrameLayout> + </FrameLayout> <LinearLayout android:id="@+id/notification_action_list_margin_target" @@ -206,10 +206,10 @@ <include layout="@layout/notification_template_smart_reply_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </LinearLayout> </LinearLayout> </com.android.internal.widget.ConversationLayout> diff --git a/core/res/res/layout/notification_2025_template_collapsed_messaging.xml b/core/res/res/layout/notification_2025_template_collapsed_messaging.xml index 3716fa6825b3..af660254d172 100644 --- a/core/res/res/layout/notification_2025_template_collapsed_messaging.xml +++ b/core/res/res/layout/notification_2025_template_collapsed_messaging.xml @@ -35,11 +35,12 @@ > - <com.android.internal.widget.NotificationMaxHeightFrameLayout + <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="@dimen/notification_2025_min_height" android:clipChildren="false" + android:layout_weight="1" > <ImageView @@ -204,7 +205,7 @@ android:layout_height="@dimen/notification_close_button_size" android:layout_gravity="top|end" /> - </com.android.internal.widget.NotificationMaxHeightFrameLayout> + </FrameLayout> <LinearLayout android:id="@+id/notification_action_list_margin_target" @@ -216,10 +217,10 @@ <include layout="@layout/notification_template_smart_reply_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </LinearLayout> </LinearLayout> </com.android.internal.widget.MessagingLayout> diff --git a/core/res/res/layout/notification_2025_template_compact_heads_up_messaging.xml b/core/res/res/layout/notification_2025_template_compact_heads_up_messaging.xml index cf9ff6bef6f8..be6404609f25 100644 --- a/core/res/res/layout/notification_2025_template_compact_heads_up_messaging.xml +++ b/core/res/res/layout/notification_2025_template_compact_heads_up_messaging.xml @@ -96,7 +96,7 @@ <FrameLayout android:id="@+id/reply_action_container" android:layout_width="wrap_content" - android:layout_height="@dimen/notification_action_list_height" + android:layout_height="@dimen/notification_2025_action_list_height" android:gravity="center_vertical" android:orientation="horizontal" /> <FrameLayout diff --git a/core/res/res/layout/notification_2025_template_expanded_base.xml b/core/res/res/layout/notification_2025_template_expanded_base.xml index 8d99e47c5386..76a85813b980 100644 --- a/core/res/res/layout/notification_2025_template_expanded_base.xml +++ b/core/res/res/layout/notification_2025_template_expanded_base.xml @@ -79,9 +79,9 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </LinearLayout> </FrameLayout> diff --git a/core/res/res/layout/notification_2025_template_expanded_big_picture.xml b/core/res/res/layout/notification_2025_template_expanded_big_picture.xml index e8e460d1b4ae..999afa66c65b 100644 --- a/core/res/res/layout/notification_2025_template_expanded_big_picture.xml +++ b/core/res/res/layout/notification_2025_template_expanded_big_picture.xml @@ -86,9 +86,9 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </LinearLayout> </FrameLayout> diff --git a/core/res/res/layout/notification_2025_template_expanded_big_text.xml b/core/res/res/layout/notification_2025_template_expanded_big_text.xml index b68db7f0a638..c9206eddbcde 100644 --- a/core/res/res/layout/notification_2025_template_expanded_big_text.xml +++ b/core/res/res/layout/notification_2025_template_expanded_big_text.xml @@ -85,10 +85,10 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </com.android.internal.widget.RemeasuringLinearLayout> <include layout="@layout/notification_2025_right_icon" /> diff --git a/core/res/res/layout/notification_2025_template_expanded_call.xml b/core/res/res/layout/notification_2025_template_expanded_call.xml index 7b45b55ba15b..ec214554a30b 100644 --- a/core/res/res/layout/notification_2025_template_expanded_call.xml +++ b/core/res/res/layout/notification_2025_template_expanded_call.xml @@ -60,11 +60,11 @@ <include layout="@layout/notification_template_smart_reply_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </com.android.internal.widget.RemeasuringLinearLayout> diff --git a/core/res/res/layout/notification_2025_template_expanded_conversation.xml b/core/res/res/layout/notification_2025_template_expanded_conversation.xml index 592785d53018..6ee82fa116ff 100644 --- a/core/res/res/layout/notification_2025_template_expanded_conversation.xml +++ b/core/res/res/layout/notification_2025_template_expanded_conversation.xml @@ -62,11 +62,11 @@ <include layout="@layout/notification_template_smart_reply_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </com.android.internal.widget.RemeasuringLinearLayout> diff --git a/core/res/res/layout/notification_2025_template_expanded_inbox.xml b/core/res/res/layout/notification_2025_template_expanded_inbox.xml index 6459e1eab862..1eaef228aaca 100644 --- a/core/res/res/layout/notification_2025_template_expanded_inbox.xml +++ b/core/res/res/layout/notification_2025_template_expanded_inbox.xml @@ -127,8 +127,8 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginTop="@dimen/notification_content_margin" /> - <include layout="@layout/notification_material_action_list" /> + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" /> + <include layout="@layout/notification_2025_action_list" /> </LinearLayout> <include layout="@layout/notification_2025_right_icon" /> </FrameLayout> diff --git a/core/res/res/layout/notification_2025_template_expanded_messaging.xml b/core/res/res/layout/notification_2025_template_expanded_messaging.xml index 82c71527a291..62059af7f056 100644 --- a/core/res/res/layout/notification_2025_template_expanded_messaging.xml +++ b/core/res/res/layout/notification_2025_template_expanded_messaging.xml @@ -62,11 +62,11 @@ <include layout="@layout/notification_template_smart_reply_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </com.android.internal.widget.RemeasuringLinearLayout> diff --git a/core/res/res/layout/notification_2025_template_expanded_progress.xml b/core/res/res/layout/notification_2025_template_expanded_progress.xml index 2ff252747fd2..cf39d8b08c4f 100644 --- a/core/res/res/layout/notification_2025_template_expanded_progress.xml +++ b/core/res/res/layout/notification_2025_template_expanded_progress.xml @@ -115,9 +115,9 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </LinearLayout> </FrameLayout>
\ No newline at end of file diff --git a/core/res/res/layout/notification_2025_template_heads_up_base.xml b/core/res/res/layout/notification_2025_template_heads_up_base.xml index 084ec7daa683..4d3b2453637d 100644 --- a/core/res/res/layout/notification_2025_template_heads_up_base.xml +++ b/core/res/res/layout/notification_2025_template_heads_up_base.xml @@ -57,10 +57,10 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/notification_2025_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin" /> - <include layout="@layout/notification_material_action_list" /> + <include layout="@layout/notification_2025_action_list" /> </LinearLayout> </LinearLayout> </FrameLayout> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 9967209c3f49..59ac5c68f9a5 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Rollees"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Onderbreek"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posisie"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> is in die BEPERK-groep geplaas"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"het \'n prent gestuur"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Werk 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Toets"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Gemeenskaplik"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Werkprofiel"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privaat ruimte"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Kloon"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index bdaf5a18a5ba..169e0208cf34 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"ሸብልል"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"ባለበት አቁም"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"አቀማመጥ"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ወደ የRESTRICTED ባልዲ ተከትቷል"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>፦"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"አንድ ምስል ልከዋል"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ሥራ 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"ሙከራ"</string> <string name="profile_label_communal" msgid="8743921499944800427">"የጋራ"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"የሥራ መገለጫ"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"የግል ቦታ"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"አባዛ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 3b0e78dbada1..1d2bd776b505 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -2278,6 +2278,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"الانتقال للأسفل أو للأعلى"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"إيقاف مؤقت"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"تعديل الموضع"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"تم وضع <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> في الحزمة \"محظورة\"."</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"هذا المستخدم أرسل صورة"</string> @@ -2485,6 +2497,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ملف العمل 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"ملف شخصي تجريبي"</string> <string name="profile_label_communal" msgid="8743921499944800427">"ملف شخصي مشترك"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"ملف العمل"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"المساحة الخاصة"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"نسخة طبق الأصل"</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index 5d93b655d741..606161c29f12 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"স্ক্ৰ’ল কৰক"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"পজ কৰক"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"স্থান"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>ক সীমাবদ্ধ বাকেটটোত ৰখা হৈছে"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"এখন প্ৰতিচ্ছবি পঠিয়াইছে"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"কৰ্মস্থান ৩"</string> <string name="profile_label_test" msgid="9168641926186071947">"পৰীক্ষা"</string> <string name="profile_label_communal" msgid="8743921499944800427">"শ্বেয়াৰ কৰা"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"কৰ্মস্থানৰ প্ৰ’ফাইল"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"প্ৰাইভেট স্পে’চ"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ক্ল’ন"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index c6a0adea6d6f..904194f122b8 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Sürüşdürün"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Durdurun"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Mövqe"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> MƏHDUDLAŞDIRILMIŞ səbətinə yerləşdirilib"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"şəkil göndərdi"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"İş 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Kommunal"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"İş profili"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Məxfi sahə"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 2b4dc578e610..e7fff52222f1 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Skrolujte"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pauziraj"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Pozicija"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Paket <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> je dodat u segment OGRANIČENO"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"je poslao/la sliku"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Posao 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Zajedničko"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Poslovni profil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privatan prostor"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klonirano"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 8230b1c45757..94739b353de9 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -2276,6 +2276,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Гартанне"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Прыпыніць"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Пазіцыя"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Пакет \"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>\" дададзены ў АБМЕЖАВАНУЮ групу"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"адпраўлены відарыс"</string> @@ -2483,6 +2495,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Працоўны 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Тэставы"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Супольны"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Працоўны профіль"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Прыватная прастора"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клон"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 1b0477f09538..2bd7d1d8ac60 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Запитване за фигура за отключване преди освобождаване"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Запитване за парола преди освобождаване"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Инсталирано от администратора ви.\nОтворете настройките, за да прегледате предоставените разрешения"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Актуализирано от администратора ви.\nОтворете настройките, за да прегледате предоставените разрешения"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Изтрито от администратора ви"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ОК"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Режимът за запазване на батерията включва тъмната тема и ограничава или изключва активността на заден план, някои визуални ефекти, определени функции и някои връзки с мрежата."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Превъртане"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Пауза"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Позиция"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Пакетът <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> е поставен в ОГРАНИЧЕНИЯ контейнер"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"изпратено изображение"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Служебни 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Тестване"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Общи"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Служебен потребителски профил"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Частно пространство"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клониране"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 2461a70e1ab8..16a7e9aad04a 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"স্ক্রল করুন"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"পজ করুন"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"পজিশন"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> সীমাবদ্ধ গ্রুপে অন্তর্ভুক্ত করা হয়েছে"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"একটি ছবি পাঠানো হয়েছে"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"৩য় অফিস"</string> <string name="profile_label_test" msgid="9168641926186071947">"পরীক্ষা"</string> <string name="profile_label_communal" msgid="8743921499944800427">"কমিউনাল"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"অফিস প্রোফাইল"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"প্রাইভেট স্পেস"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ক্লোন"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index b8d3283491c3..e5a78a34d5d6 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Klizanje"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pauziraj"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Položaj"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Paket <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> je stavljen u odjeljak OGRANIČENO"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"je poslao/la sliku"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"3. poslovno"</string> <string name="profile_label_test" msgid="9168641926186071947">"Testno"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Opće"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Radni profil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privatni prostor"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index cbfa521c96e4..b70bb3337b7c 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Desplaça"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Posa en pausa"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posició"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> s\'ha transferit al segment RESTRINGIT"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ha enviat una imatge"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Treball 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Prova"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Compartit"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Perfil de treball"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espai privat"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clon"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 356cdc71b54a..c4e69ab37ef7 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -2276,6 +2276,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Posunutí"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pozastavit"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Pozice"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Balíček <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> byl vložen do sekce OMEZENO"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"posílá obrázek"</string> @@ -2483,6 +2495,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Práce 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Komunální"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Pracovní profil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Soukromý prostor"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index efe3e103d0e1..c0447239859d 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Rul"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Sæt på pause"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Placering"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> er blevet placeret i samlingen BEGRÆNSET"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"sendte et billede"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Arbejde 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Fælles"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Arbejdsprofil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privat område"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index fc0e9ed19b9d..0d371cceba6b 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Scrollen"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pausieren"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Position"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> wurde in den BESCHRÄNKT-Bucket gelegt"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"hat ein Bild gesendet"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Geschäftlich 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Gemeinsam genutzt"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Arbeitsprofil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Vertrauliches Profil"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 58f5d9db4d68..55d28c500b2d 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Κύλιση"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Παύση"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Θέση"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Το πακέτο <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> τοποθετήθηκε στον κάδο ΠΕΡΙΟΡΙΣΜΕΝΗΣ ΠΡΟΣΒΑΣΗΣ."</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"έστειλε μια εικόνα"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Εργασία 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Δοκιμή"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Κοινόχρηστο"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Προφίλ εργασίας"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Ιδιωτικός χώρος"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Κλώνος"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 320e63935fc9..b94840430e60 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Ask for unlock pattern before unpinning"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Ask for password before unpinning"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Installed by your admin.\nGo to Settings to view granted permissions"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Updated by your admin.\nGo to settings to view granted permissions"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Deleted by your admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features and some network connections."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Scroll"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pause"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Position"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> has been put into the RESTRICTED bucket"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"sent an image"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Work 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Communal"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Work profile"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Private space"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 85471d8a5efb..30843adab245 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -2273,6 +2273,12 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Scroll"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pause"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Position"</string> + <string name="accessibility_autoclick_scroll_up" msgid="2044948780797117443">"Scroll Up"</string> + <string name="accessibility_autoclick_scroll_down" msgid="3733401063292018116">"Scroll Down"</string> + <string name="accessibility_autoclick_scroll_left" msgid="8564421367992824198">"Scroll Left"</string> + <string name="accessibility_autoclick_scroll_right" msgid="8932417330753984265">"Scroll Right"</string> + <string name="accessibility_autoclick_scroll_exit" msgid="3788610039146769696">"Exit Scroll Mode"</string> + <string name="accessibility_autoclick_scroll_panel_title" msgid="7120598166296447036">"Scroll Panel"</string> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> has been put into the RESTRICTED bucket"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"sent an image"</string> @@ -2480,6 +2486,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Work 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Communal"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Work profile"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Private space"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 730dd3b808e8..bcfc861932fb 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Ask for unlock pattern before unpinning"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Ask for password before unpinning"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Installed by your admin.\nGo to Settings to view granted permissions"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Updated by your admin.\nGo to settings to view granted permissions"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Deleted by your admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features and some network connections."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Scroll"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pause"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Position"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> has been put into the RESTRICTED bucket"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"sent an image"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Work 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Communal"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Work profile"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Private space"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index a9654e525df4..15ea9bf0007c 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Ask for unlock pattern before unpinning"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Ask for password before unpinning"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Installed by your admin.\nGo to Settings to view granted permissions"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Updated by your admin.\nGo to settings to view granted permissions"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Deleted by your admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features and some network connections."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Scroll"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pause"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Position"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> has been put into the RESTRICTED bucket"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"sent an image"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Work 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Communal"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Work profile"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Private space"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 036ecfc59d87..1e10140e2bf1 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1966,8 +1966,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Solicitar desbloqueo para quitar fijación"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Solicitar contraseña para quitar fijación"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Tu administrador realizó la instalación.\nVe a la configuración para ver los permisos otorgados"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Tu administrador realizó la actualización.\nVe a la configuración para ver los permisos otorgados"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Tu administrador borró este paquete"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Aceptar"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"El Ahorro de batería activa el Tema oscuro y desactiva o restringe la actividad en segundo plano, algunos efectos visuales, algunas conexiones de red y otras funciones determinadas."</string> @@ -2275,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Desplazamiento"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pausar"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posición"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Se colocó <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> en el bucket RESTRICTED"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"envió una imagen"</string> @@ -2482,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Trabajo 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Probar"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Compartido"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Perfil de trabajo"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espacio privado"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clon"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 3553aea44c2d..189a027350bb 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Desplazarse"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pausar"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posición"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> se ha incluido en el grupo de restringidos"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ha enviado una imagen"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Trabajo 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Prueba"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Común"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Perfil de trabajo"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espacio privado"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clon"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index abecc1a76d3f..893bc4e755fa 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Keri"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Peata"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Asukoht"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> on lisatud salve PIIRANGUTEGA"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"saatis kujutise"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Töö 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Jagatud"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Tööprofiil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privaatne ruum"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Kloon"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 64dc7303e8c1..fb60c8dc6e8d 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Egin gora eta behera"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pausatu"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Ezarri posizioan"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Murriztuen edukiontzian ezarri da <xliff:g id="PACKAGE_NAME">%1$s</xliff:g>"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"erabiltzaileak irudi bat bidali du"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Lanekoa 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Probakoa"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Partekatua"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Laneko profila"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Eremu pribatua"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klona"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 13083d0c04d4..24db15aa7b26 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"درخواست الگوی بازگشایی قفل قبلاز برداشتن سنجاق"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"درخواست گذرواژه قبل از برداشتن سنجاق"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"سرپرست شما آن را نصب کرده است.\nبرای مشاهده اجازههای اعطاشده به تنظیمات بروید"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"سرپرستتان آن را بهروز کرده است.\nبرای مشاهده اجازههای اعطاشده به تنظیمات بروید"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"توسط سرپرست سیستم حذف شد"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"تأیید"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"«بهینهسازی باتری» «زمینه تاریک» را روشن میکند و فعالیت پسزمینه، برخی از جلوههای بصری، ویژگیهایی خاص، و برخی از اتصالهای شبکه را محدود یا خاموش میکند."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"پیمایش"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"توقف موقت"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"موقعیت"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> در سطل «محدودشده» قرار گرفت"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"تصویری ارسال کرد"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"کار ۳"</string> <string name="profile_label_test" msgid="9168641926186071947">"آزمایش"</string> <string name="profile_label_communal" msgid="8743921499944800427">"عمومی"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"نمایه کاری"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"فضای خصوصی"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"همسانهسازی"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 145c5ee4bef1..cb16427bd351 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Vieritä"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Keskeytä"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Sijainti"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> on nyt rajoitettujen ryhmässä"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"lähetti kuvan"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Työ 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Testi"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Jaettu"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Työprofiili"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Yksityinen tila"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klooni"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 0ee4112ed458..c2b368e7c02c 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -1966,8 +1966,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Demander le schéma de déverrouillage avant d\'annuler l\'épinglage"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Demander le mot de passe avant d\'annuler l\'épinglage"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Installé par votre administrateur.\nAccédez aux paramètres pour consulter les autorisations accordées"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Installé par votre administrateur.\nAccédez aux paramètres pour consulter les autorisations accordées"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Supprimé par votre administrateur"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Le mode Économiseur de pile active le thème sombre et limite ou désactive l\'activité en arrière-plan, certains effets visuels, certaines fonctionnalités et certaines connexions réseau."</string> @@ -2275,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Faire défiler"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pause"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Position"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> a été placé dans le compartiment RESTREINT"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> :"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"a envoyé une image"</string> @@ -2482,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Professionnel 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Commun"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Profil professionnel"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espace privé"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index a5b6f9a92dce..1cf540905515 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Faire défiler"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pause"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Position"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> a été placé dans le bucket RESTRICTED"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> :"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"a envoyé une image"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Professionnel 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Commun"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Profil professionnel"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espace privé"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index 332387ad0131..ecd2d4b197d2 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Desprazar"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pausa"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posición"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> incluíuse no grupo RESTRINXIDO"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"enviouse unha imaxe"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Traballo 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Proba"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Compartido"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Perfil de traballo"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espazo privado"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clonado"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 7a39d634508e..b4095ef8dbd3 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"સ્ક્રોલ કરો"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"થોભાવો"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"સ્થિતિ"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>ને પ્રતિબંધિત સમૂહમાં મૂકવામાં આવ્યું છે"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"છબી મોકલી"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ઑફિસ 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"પરીક્ષણ કરો"</string> <string name="profile_label_communal" msgid="8743921499944800427">"કૉમ્યુનલ"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"ઑફિસની પ્રોફાઇલ"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"ખાનગી સ્પેસ"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ક્લોન"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 2c43996064ea..f93b8a2ec269 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"स्क्रोल करें"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"रोकें"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"पोज़िशन"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> को प्रतिबंधित बकेट में रखा गया है"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"एक इमेज भेजी गई"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ऑफ़िस 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"टेस्ट"</string> <string name="profile_label_communal" msgid="8743921499944800427">"कम्यूनिटी"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"वर्क प्रोफ़ाइल"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"प्राइवेट स्पेस"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"क्लोन"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index d870a1dbda61..336e37956783 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Pomakni se"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pauziraj"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Pozicija"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Paket <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> premješten je u spremnik OGRANIČENO"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"šalje sliku"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Posao 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Zajedničko"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Radni profil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privatni prostor"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 350d51dee68c..1519326cdb6b 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Feloldási minta kérése a kitűzés feloldásához"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Jelszó kérése a rögzítés feloldásához"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"A rendszergazda által telepítve.\nLépjen a beállításokhoz a megadott engedélyek megtekintéséhez."</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"A rendszergazda által frissítve.\nLépjen a beállításokhoz a megadott engedélyek megtekintéséhez."</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"A rendszergazda által törölve"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Az Akkumulátorkímélő mód bekapcsolja a Sötét témát, és korlátozza vagy kikapcsolja a háttérbeli tevékenységeket, valamint bizonyos vizuális effekteket, funkciókat és hálózati kapcsolatokat."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Görgetés"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Szüneteltetés"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Pozíció"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"A következő csomag a KORLÁTOZOTT csoportba került: <xliff:g id="PACKAGE_NAME">%1$s</xliff:g>"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"képet küldött"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"3. munkahelyi"</string> <string name="profile_label_test" msgid="9168641926186071947">"Teszt"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Közös"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Munkaprofil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privát terület"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klón"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 655af9395fa3..af9ee628e4b1 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Հարցնել ապակողպող նախշը"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Հարցնել գաղտնաբառը"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Տեղադրվել է ադմինիստրատորի կողմից։\nԱնցեք կարգավորումներ՝ տրամադրված թույլտվությունները դիտելու համար"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Թարմացվել է ձեր ադմինիստրատորի կողմից։\nԱնցեք կարգավորումներ՝ տրամադրված թույլտվությունները դիտելու համար"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Ջնջվել է ձեր ադմինիստրատորի կողմից"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Եղավ"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"«Մարտկոցի տնտեսում» գործառույթը միացնում է մուգ թեման և անջատում կամ սահմանափակում է աշխատանքը ֆոնային ռեժիմում, որոշ վիզուալ էֆեկտներ, ցանցային միացումներ և այլ գործառույթներ։"</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Ոլորել"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Դադարեցնել"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Դիրքը"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> փաթեթը գցվեց ՍԱՀՄԱՆԱՓԱԿՎԱԾ զամբյուղի մեջ"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>՝"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"օգտատերը պատկեր է ուղարկել"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Աշխատանքային 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Փորձնական"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Ընդհանուր"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Աշխատանքային պրոֆիլ"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Մասնավոր տարածք"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Կլոն"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 305d23a15c00..90b1ddfcc2cb 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Scroll"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Jeda"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posisi"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> telah dimasukkan ke dalam bucket DIBATASI"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"mengirim gambar"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Kerja 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Pengujian"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Umum"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Profil kerja"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Ruang privasi"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index cdf89ad4424d..772be761426d 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Biðja um opnunarmynstur til að losa"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Biðja um aðgangsorð til að losa"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Sett upp af stjórnanda.\nFarðu í stillingar til að sjá heimildir"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Uppfært af stjórnanda.\nFarðu í stillingarnar þínar til að sjá þær heimildir sem hafa verið veittar"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Kerfisstjóri eyddi"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Í lagi"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Rafhlöðusparnaður kveikir á dökku þema og takmarkar eða slekkur á bakgrunnsvirkni, sumum myndáhrifum, tilteknum eiginleikum og sumum nettengingum."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Fletta"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Hlé"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Staðsetning"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> var sett í flokkinn TAKMARKAÐ"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"sendi mynd"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Vinna 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Prófun"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Sameiginlegt"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Vinnusnið"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Leynirými"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Afrit"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 3b7d1ec750ee..dd10d1d3688d 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1966,8 +1966,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Richiedi sequenza di sblocco prima di sbloccare"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Richiedi password prima di sbloccare"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Installato dall\'amministratore.\nVai alle impostazioni per visualizzare le autorizzazioni concesse"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Aggiornato dall\'amministratore.\nVai alle impostazioni per visualizzare le autorizzazioni concesse"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Eliminato dall\'amministratore"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Ok"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Il risparmio energetico attiva il tema scuro e limita o disattiva l\'attività in background, nonché alcuni effetti visivi, funzionalità e connessioni di rete."</string> @@ -2275,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Scorri"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Metti in pausa"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posizione"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> è stato inserito nel bucket RESTRICTED"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ha inviato un\'immagine"</string> @@ -2482,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Lavoro 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Condiviso"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Profilo di lavoro"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Spazio privato"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index cf7374868a50..1055612ff636 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1804,8 +1804,7 @@ <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"מצב שימוש ביד אחת"</string> <string name="reduce_bright_colors_feature_name" msgid="3222994553174604132">"מעומעם במיוחד"</string> <string name="hearing_aids_feature_name" msgid="1125892105105852542">"מכשירי שמיעה"</string> - <!-- no translation found for autoclick_feature_name (8149248738736949630) --> - <skip /> + <string name="autoclick_feature_name" msgid="8149248738736949630">"קליק אוטומטי"</string> <string name="hearing_device_status_disconnected" msgid="497547752953543832">"מנותק"</string> <string name="hearing_device_status_connected" msgid="2149385149669918764">"מחובר"</string> <string name="hearing_device_status_active" msgid="4770378695482566032">"מצב פעיל"</string> @@ -2276,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"גלילה"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"השהיה"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"מיקום"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> התווספה לקטגוריה \'מוגבל\'"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"נשלחה תמונה"</string> @@ -2483,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"פרופיל עבודה 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"בדיקה"</string> <string name="profile_label_communal" msgid="8743921499944800427">"שיתופי"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"פרופיל העבודה"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"המרחב הפרטי"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"שכפול"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index f8bc2413fca0..ea101ec8ee84 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"画面固定を解除する前にロック解除パターンの入力を求める"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"オフライン再生を解除する前にパスワードの入力を求める"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"管理者によりインストールされています。\n付与された権限を確認するには、設定に移動してください"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"管理者により更新されています。\n付与された権限を確認するには、設定に移動してください"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"管理者により削除されています"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"バッテリー セーバーを ON にすると、ダークモードが ON になります。また、バックグラウンド アクティビティ、一部の視覚効果、特定の機能、一部のネットワーク接続が制限されるか OFF になります。"</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"スクロール"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"一時停止"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"位置"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> は RESTRICTED バケットに移動しました。"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"画像を送信しました"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"仕事用 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"テスト"</string> <string name="profile_label_communal" msgid="8743921499944800427">"共用"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"仕事用プロファイル"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"プライベート スペース"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"複製"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 8aa0af3efc44..055c41201ced 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"ფიქსაციის მოხსნამდე განბლოკვის ნიმუშის მოთხოვნა"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"ფიქსაციის მოხსნამდე პაროლის მოთხოვნა"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"დაინსტალირებულია თქვენი ადმინისტრატორის მიერ.\nდაშვებული ნებართვების სანახავად გადადით პარამეტრებზე"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"განახლებულია თქვენი ადმინისტრატორის მიერ.\nდაშვებული ნებართვების სანახავად გადადით პარამეტრებზე"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"წაიშალა თქვენი ადმინისტრატორის მიერ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"კარგი"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"ბატარეის დამზოგი ჩართავს მუქ თემას და შეზღუდავს ან გამორთავს ფონურ აქტივობას, ზოგიერთ ვიზუალურ ეფექტს, გარკვეულ ფუნქციებსა და ზოგიერთ ქსელთან კავშირს."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"გადაადგილება"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"პაუზა"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"პოზიცია"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> მოთავსდა კალათაში „შეზღუდული“"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"გაიგზავნა სურათი"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"სამსახური 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"სატესტო"</string> <string name="profile_label_communal" msgid="8743921499944800427">"საერთო"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"სამსახურის პროფილი"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"კერძო სივრცე"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"კლონის შექმნა"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 3908427d9f97..176645fb1a9a 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Айналдыру"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Кідірту"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Орналастыру"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ШЕКТЕЛГЕН себетке салынды."</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"сурет жіберілді"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Жұмыс 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Сынақ"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Жалпы"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Жұмыс профилі"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Құпия кеңістік"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клон"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index dee23f65e8ca..63b05e670513 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"រំកិល"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"ផ្អាក"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"ទីតាំង"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ត្រូវបានដាក់ទៅក្នុងធុងដែលបានដាក់កំហិត"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>៖"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"បានផ្ញើរូបភាព"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ការងារទី 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"ការធ្វើតេស្ត"</string> <string name="profile_label_communal" msgid="8743921499944800427">"ទូទៅ"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"កម្រងព័ត៌មានការងារ"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"លំហឯកជន"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ក្លូន"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index c1a70b0f7276..f56f2c8571cb 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"ಅನ್ಪಿನ್ ಮಾಡಲು ಅನ್ಲಾಕ್ ಪ್ಯಾಟರ್ನ್ ಕೇಳಿ"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"ಅನ್ಪಿನ್ ಮಾಡಲು ಪಾಸ್ವರ್ಡ್ ಕೇಳು"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿದ್ದಾರೆ.\nನೀಡಲಾದ ಅನುಮತಿಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಹೋಗಿ"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಅಪ್ಡೇಟ್ ಮಾಡಿದ್ದಾರೆ.\nನೀಡಲಾದ ಅನುಮತಿಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಹೋಗಿ"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಅಳಿಸಿದ್ದಾರೆ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ಸರಿ"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"ಬ್ಯಾಟರಿ ಸೇವರ್, ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ ಮತ್ತು ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ, ಕೆಲವು ವಿಷುವಲ್ ಎಫೆಕ್ಟ್ಗಳು, ಕೆಲವು ಫೀಚರ್ಗಳು ಮತ್ತು ಇತರ ನೆಟ್ವರ್ಕ್ ಸಂಪರ್ಕಗಳನ್ನು ಮಿತಿಗೊಳಿಸುತ್ತದೆ ಅಥವಾ ಆಫ್ ಮಾಡುತ್ತದೆ."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"ಸ್ಕ್ರಾಲ್ ಮಾಡಿ"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"ವಿರಾಮಗೊಳಿಸಿ"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"ಸ್ಥಾನ"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ಅನ್ನು ನಿರ್ಬಂಧಿತ ಬಕೆಟ್ಗೆ ಹಾಕಲಾಗಿದೆ"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ಚಿತ್ರವನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ಕೆಲಸ 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"ಪರೀಕ್ಷೆ"</string> <string name="profile_label_communal" msgid="8743921499944800427">"ಸಮುದಾಯ"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ಕ್ಲೋನ್"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index be4a28423a93..253d162427fa 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"스크롤"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"일시중지"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"위치"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> 항목이 RESTRICTED 버킷으로 이동함"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"이미지 보냄"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"직장 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"테스트"</string> <string name="profile_label_communal" msgid="8743921499944800427">"공동"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"직장 프로필"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"비공개 스페이스"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"클론"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 121908a416a4..96f01ffcb93a 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Бошотуудан мурун графикалык ачкыч суралсын"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Бошотуудан мурун сырсөз суралсын"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Администраторуңуз орнотту.\nБерилген уруксаттарды көрүү үчүн параметрлерге өтүңүз"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Администраторуңуз орнотту.\nБерилген уруксаттарды көрүү үчүн параметрлерге өтүңүз"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Администраторуңуз жок кылып салган"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ЖАРАЙТ"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Батареяны үнөмдөөчү режимде Караңгы тема күйгүзүлүп, фондогу аракеттер, айрым визуалдык эффекттер, белгилүү бир функциялар жана айрым тармакка туташуулар чектелип же өчүрүлөт."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Сыдыруу"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Тындыруу"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Орду"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ЧЕКТЕЛГЕН чакага коюлган"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"сүрөт жөнөттү"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Жумуш 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Сыноо"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Жалпы"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Жумуш профили"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Жеке мейкиндик"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клон"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index ad62671d5e5b..4905a53b06f6 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"ເລື່ອນ"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"ຢຸດຊົ່ວຄາວ"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"ຕຳແໜ່ງ"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ຖືກວາງໄວ້ໃນກະຕ່າ \"ຈຳກັດ\" ແລ້ວ"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ສົ່ງຮູບແລ້ວ"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ວຽກ 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"ທົດສອບ"</string> <string name="profile_label_communal" msgid="8743921499944800427">"ສ່ວນກາງ"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"ພື້ນທີ່ສ່ວນບຸກຄົນ"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ໂຄລນ"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 27a08c25a84e..07a6c6e663d2 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1967,8 +1967,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Prašyti atrakinimo piešinio prieš atsegant"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Prašyti slaptažodžio prieš atsegant"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Įdiegė administratorius.\nEikite į nustatymus ir peržiūrėkite suteiktus leidimus"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Atnaujino administratorius.\nEikite į nustatymus ir peržiūrėkite suteiktus leidimus"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Ištrynė administratorius"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Gerai"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Akumuliatoriaus tausojimo priemonė įjungia tamsiąją temą ir apriboja arba išjungia veiklą fone, kai kuriuos vaizdinius efektus, tam tikras funkcijas bei kai kuriuos tinklo ryšius."</string> @@ -2276,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Slinkti"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pristabdyti"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Pozicija"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"„<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>“ įkeltas į grupę APRIBOTA"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"išsiuntė vaizdą"</string> @@ -2483,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Darbas (3)"</string> <string name="profile_label_test" msgid="9168641926186071947">"Bandymas"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Bendruomenės"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Darbo profilis"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privati erdvė"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klonuoti"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 78c7ebdb4587..60a99b3fd338 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Ritināt"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pārtraukt"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Pozīcija"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Pakotne “<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>” ir ievietota ierobežotā kopā."</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"nosūtīts attēls"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Darbam (3.)"</string> <string name="profile_label_test" msgid="9168641926186071947">"Testēšanai"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Kopīgs"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Darba profils"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privātā telpa"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klons"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 146de01e7951..6d98869e7b60 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Лизгање"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Паузирај"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Позиционирај"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> е ставен во корпата ОГРАНИЧЕНИ"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"испрати слика"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Работен профил 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Профил за тестирање"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Профил на заедницата"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Работен профил"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Приватен простор"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клониран профил"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 3bb425ec9351..fca58a113c7b 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"അൺപിന്നിനുമുമ്പ് അൺലോക്ക് പാറ്റേൺ ആവശ്യപ്പെടൂ"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"അൺപിന്നിനുമുമ്പ് പാസ്വേഡ് ആവശ്യപ്പെടൂ"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"നിങ്ങളുടെ അഡ്മിൻ ഇൻസ്റ്റാൾ ചെയ്തത്.\nനൽകിയ അനുമതികൾ കാണാൻ ക്രമീകരണത്തിലേക്ക് പോകുക"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"നിങ്ങളുടെ അഡ്മിൻ അപ്ഡേറ്റ് ചെയ്തത്.\nനൽകിയ അനുമതികൾ കാണാൻ ക്രമീകരണത്തിലേക്ക് പോകുക"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"നിങ്ങളുടെ അഡ്മിൻ ഇല്ലാതാക്കുന്നത്"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ശരി"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"\'ബാറ്ററി സേവർ\' ഡാർക്ക് തീം ഓണാക്കുന്നു, ഒപ്പം പശ്ചാത്തല ആക്റ്റിവിറ്റിയും ചില വിഷ്വൽ ഇഫക്റ്റുകളും ചില ഫീച്ചറുകളും ചില നെറ്റ്വർക്ക് കണക്ഷനുകളും പരിമിതപ്പെടുത്തുകയോ ഓഫാക്കുകയോ ചെയ്യുന്നു."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"സ്ക്രോൾ ചെയ്യുക"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"താൽക്കാലികമായി നിർത്തുക"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"സ്ഥാനം"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> നിയന്ത്രിത ബക്കറ്റിലേക്ക് നീക്കി"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ചിത്രം അയച്ചു"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ഔദ്യോഗികം 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"ടെസ്റ്റ്"</string> <string name="profile_label_communal" msgid="8743921499944800427">"കമ്മ്യൂണൽ"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"സ്വകാര്യ സ്പേസ്"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ക്ലോൺ ചെയ്യുക"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 1ad9685a23d1..58f4cf7b83cb 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Гүйлгэх"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Түр зогсоох"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Байрлал"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>-г ХЯЗГААРЛАСАН сагс руу орууллаа"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"зураг илгээсэн"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Ажил 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Туршилт"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Нийтийн"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Ажлын профайл"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Хаалттай орон зай"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клон"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 82f217ff21b2..c37884d4473c 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"स्क्रोल करा"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"थांबवा"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"स्थिती"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> हे प्रतिबंधित बादलीमध्ये ठेवण्यात आले आहे"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"इमेज पाठवली आहे"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ऑफिस ३"</string> <string name="profile_label_test" msgid="9168641926186071947">"चाचणी"</string> <string name="profile_label_communal" msgid="8743921499944800427">"सामुदायिक"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"कार्य प्रोफाइल"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"खाजगी स्पेस"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"क्लोन"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index bda439a187a2..d675246df729 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Tatal"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Jeda"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Kedudukan"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> telah diletakkan dalam baldi TERHAD"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"menghantar imej"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Kerja 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Ujian"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Umum"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Profil kerja"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Ruang persendirian"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 9a8041644d5f..1a5bc7af86ca 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"လှိမ့်ရန်"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"ခဏရပ်ရန်"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"နေရာ"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ကို တားမြစ်ထားသော သိမ်းဆည်းမှုအတွင်းသို့ ထည့်ပြီးပါပြီ"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>-"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ပုံပို့ထားသည်"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"အလုပ် ၃"</string> <string name="profile_label_test" msgid="9168641926186071947">"စမ်းသပ်မှု"</string> <string name="profile_label_communal" msgid="8743921499944800427">"အများသုံး"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"အလုပ်ပရိုဖိုင်"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"သီးသန့်နေရာ"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ပုံတူပွားရန်"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index d8e785f742d5..4b44dd6c67ce 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Rull"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Sett på pause"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Plassér"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> er blitt plassert i TILGANGSBEGRENSET-toppmappen"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"har sendt et bilde"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Jobb 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Felles"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Jobbprofil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privat område"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 88e93709453e..16e48d547a55 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"स्क्रोल गर्नुहोस्"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"पज गर्नुहोस्"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"स्थिति"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> लाई प्रतिबन्धित बाल्टीमा राखियो"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"फोटो पठाइयो"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"कार्य प्रोफाइल ३"</string> <string name="profile_label_test" msgid="9168641926186071947">"परीक्षण"</string> <string name="profile_label_communal" msgid="8743921499944800427">"सामुदायिक"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"कार्य प्रोफाइल"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"निजी स्पेस"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"क्लोन"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index a43c0c443c8c..11c40fdbfce4 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Scrollen"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pauzeren"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Positie"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> is in de bucket RESTRICTED geplaatst"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"heeft een afbeelding gestuurd"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Werk 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Gemeenschappelijk"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Werkprofiel"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privégedeelte"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Kloon"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index f61e10919209..eca778a24c8a 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"ସ୍କ୍ରୋଲ କରନ୍ତୁ"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"ବିରତ କରନ୍ତୁ"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"ସ୍ଥିତି"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>କୁ ପ୍ରତିବନ୍ଧିତ ବକେଟରେ ରଖାଯାଇଛି"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ଏକ ଛବି ପଠାଯାଇଛି"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ୱାର୍କ 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"ଟେଷ୍ଟ"</string> <string name="profile_label_communal" msgid="8743921499944800427">"କମ୍ୟୁନାଲ"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"ୱାର୍କ ପ୍ରୋଫାଇଲ"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"ପ୍ରାଇଭେଟ ସ୍ପେସ"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"କ୍ଲୋନ"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 5d2cc7be3039..2da2a608bf97 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"ਸਕ੍ਰੋਲ ਕਰੋ"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"ਰੋਕੋ"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"ਸਥਿਤੀ"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ਨੂੰ ਪ੍ਰਤਿਬੰਧਿਤ ਖਾਨੇ ਵਿੱਚ ਪਾਇਆ ਗਿਆ ਹੈ"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ਚਿੱਤਰ ਭੇਜਿਆ ਗਿਆ"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ਕੰਮ ਸੰਬੰਧੀ 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"ਜਾਂਚ"</string> <string name="profile_label_communal" msgid="8743921499944800427">"ਭਾਈਚਾਰਕ"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ਕਲੋਨ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index bb7edb8a79ad..730429da67d2 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -2276,6 +2276,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Przewijanie"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Wstrzymaj"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Pozycja"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Umieszczono pakiet <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> w zasobniku danych RESTRICTED"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"wysłano obraz"</string> @@ -2483,6 +2495,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Służbowy 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Testowy"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Wspólny"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Profil służbowy"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Przestrzeń prywatna"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 0440e39a9dd5..cea3b73b2070 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Rolar"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pausar"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posição"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> foi colocado no intervalo \"RESTRITO\""</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"enviou uma imagem"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Trabalho 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Teste"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Público"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Perfil de trabalho"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espaço privado"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 745e17be6c28..2951d482a490 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1966,8 +1966,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Pedir padrão de desbloqueio antes de soltar"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Pedir palavra-passe antes de soltar"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Instalado pelo seu administrador.\nAceda às definições para ver as autorizações concedidas"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Atualizado pelo seu administrador.\nAceda às definições para ver as autorizações concedidas"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Eliminado pelo seu gestor"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"A Poupança de bateria ativa o tema escuro e limita ou desativa a atividade em segundo plano, alguns efeitos visuais, determinadas funcionalidades e algumas ligações de rede."</string> @@ -2275,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Deslocar"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pausar"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posição"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> foi colocado no contentor RESTRITO."</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"enviou uma imagem"</string> @@ -2482,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Trabalho 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Teste"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Comum"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Perfil de trabalho"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espaço privado"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 0440e39a9dd5..cea3b73b2070 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Rolar"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pausar"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posição"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> foi colocado no intervalo \"RESTRITO\""</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"enviou uma imagem"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Trabalho 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Teste"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Público"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Perfil de trabalho"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espaço privado"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 4ef0423b327b..19158cc47ae2 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Derulează"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Întrerupe"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Poziție"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> a fost adăugat la grupul RESTRICȚIONATE"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"a trimis o imagine"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Serviciu 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Comun"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Profil de serviciu"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Spațiu privat"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clonă"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index a03963ef9924..136f76ae55ce 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -2276,6 +2276,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Прокрутить"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Приостановить"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Положение"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Приложение \"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>\" помещено в категорию с ограниченным доступом."</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"Отправлено изображение"</string> @@ -2483,6 +2495,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Рабочий 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Тестовый"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Совместный"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Рабочий профиль"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Частное пространство"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клонированный"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 571706e325c9..7a4de0eca678 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"අනුචලනය කරන්න"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"විරාම කරන්න"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"ස්ථානය"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> අවහිර කළ බාල්දියට දමා ඇත"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"රූපයක් එව්වා"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"කාර්යාලය 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"පරීක්ෂණය"</string> <string name="profile_label_communal" msgid="8743921499944800427">"වාර්ගික"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"කාර්යාල පැතිකඩ"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"රහසිගත අවකාශය"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ක්ලෝන කරන්න"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index bcbd66f55412..c47ce658c1a8 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1967,8 +1967,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Pred uvoľnením požiadať o bezpečnostný vzor"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Pred odopnutím požiadať o heslo"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Nainštaloval správca.\nAk si chcete zobraziť udelené povolenia, prejdite do nastavení."</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Aktualizoval správca.\nAk si chcete zobraziť udelené povolenia, prejdite do nastavení."</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Odstránil správca"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Šetrič batérie zapne tmavý motív a obmedzí alebo vypne aktivitu na pozadí, niektoré vizuálne efekty, určité funkcie a niektoré pripojenia k sieti."</string> @@ -2276,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Posúvať"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pozastaviť"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Pozícia"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Balík <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> bol vložený do kontajnera OBMEDZENÉ"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"odoslal(a) obrázok"</string> @@ -2483,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"3. pracovný"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Spoločné"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Pracovný profil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Súkromný priestor"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index c0d18ed0a067..07cb71c1b317 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1967,8 +1967,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Pred odpenjanjem vprašaj za vzorec za odklepanje"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Pred odpenjanjem vprašaj za geslo"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Namestil skrbnik.\nV nastavitvah si oglejte odobrena dovoljenja."</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Posodobil skrbnik.\nV nastavitvah si oglejte odobrena dovoljenja"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Izbrisal skrbnik"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"V redu"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Funkcija varčevanja z energijo baterije vklopi temno temo ter omeji ali izklopi dejavnost v ozadju, nekatere vizualne učinke, določene funkcije in nekatere omrežne povezave."</string> @@ -2276,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Drsenje"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Začasna zaustavitev"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Položaj"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Paket <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> je bil dodan v segment OMEJENO"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"je poslal(-a) sliko"</string> @@ -2483,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Delo 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Preizkus"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Skupno"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Delovni profil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Zasebni prostor"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index ddccedeaa36c..1b3feedaeccb 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Lëviz"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Vendos në pauzë"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Pozicioni"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> është vendosur në grupin E KUFIZUAR"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"dërgoi një imazh"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Puna 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"I përbashkët"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Profili i punës"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Hapësira private"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 397a39458580..24624f7e479f 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -2275,6 +2275,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Скролујте"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Паузирај"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Позиција"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Пакет <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> је додат у сегмент ОГРАНИЧЕНО"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"је послао/ла слику"</string> @@ -2482,6 +2494,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Посао 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Тест"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Заједничко"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Пословни профил"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Приватан простор"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клонирано"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 71062addb40f..c471f065b377 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Be om upplåsningsmönster innan skärmen slutar fästas"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Be om lösenord innan skärmen slutar fästas"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Har installerats av administratören.\nÖppna inställningarna för att se behörigheter som beviljats"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Har uppdaterats av administratören.\nÖppna inställningarna för att se behörigheter som beviljats"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Administratören raderade paketet"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"I batterisparläget aktiveras mörkt tema medan bakgrundsaktivitet, vissa visuella effekter och funktioner samt vissa nätverksanslutningar begränsas eller inaktiveras."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Scrolla"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pausa"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Position"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> har placerats i hinken RESTRICTED"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"har skickat en bild"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Arbete 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Allmän"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Jobbprofil"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privat utrymme"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klona"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index e74ac1858d76..2a920b235335 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Sogeza"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Sitisha"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Nafasi"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> kimewekwa katika kikundi KILICHODHIBITIWA"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"alituma picha"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Wa 3 wa Kazini"</string> <string name="profile_label_test" msgid="9168641926186071947">"Jaribio"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Unaoshirikiwa"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Wasifu wa kazini"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Sehemu ya faragha"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Nakala"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 7737d8f6da45..1fade556f421 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"நகர்த்தும்"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"இடைநிறுத்து"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"நிலை"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> என்பதை வரம்பிடப்பட்ட பக்கெட்திற்குள் சேர்க்கப்பட்டது"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"படம் அனுப்பப்பட்டது"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"பணி 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"பரிசோதனை"</string> <string name="profile_label_communal" msgid="8743921499944800427">"பொது"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"பணிக் கணக்கு"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"ரகசிய இடம்"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"குளோன்"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 265fb8c9b382..4f6eaf3b2307 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"అన్పిన్ చేయడానికి ముందు అన్లాక్ ఆకృతి కోసం అడుగు"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"అన్పిన్ చేయడానికి ముందు పాస్వర్డ్ కోసం అడుగు"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"మీ అడ్మిన్ ఇన్స్టాల్ చేశారు.\nసెట్టింగ్లకు వెళ్లి, మంజూరు చేసిన అనుమతులు చూడండి"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"మీ అడ్మిన్ అప్డేట్ చేశారు.\nసెట్టింగ్లకు వెళ్లి, మంజూరు చేసిన అనుమతులను చూడండి"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"మీ నిర్వాహకులు తొలగించారు"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"సరే"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"బ్యాటరీ సేవర్ ముదురు రంగు రూపాన్ని ఆన్ చేసి, బ్యాక్గ్రౌండ్ యాక్టివిటీ, కొన్ని విజువల్ ఎఫెక్ట్లు, నిర్దిష్ట ఫీచర్లు, ఇంకా కొన్ని నెట్వర్క్ కనెక్షన్లను పరిమితం చేస్తుంది లేదా ఆఫ్ చేస్తుంది."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"స్క్రోల్ చేయండి"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"పాజ్ చేయండి"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"స్థానం"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> పరిమితం చేయబడిన బకెట్లో ఉంచబడింది"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ఇమేజ్ను పంపారు"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"ఆఫీస్ 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"పరీక్ష"</string> <string name="profile_label_communal" msgid="8743921499944800427">"కమ్యూనల్"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"వర్క్ ప్రొఫైల్"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"ప్రైవేట్ స్పేస్"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"క్లోన్"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index a922943f54c7..b67f3828ab72 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"ขอรูปแบบการปลดล็อกก่อนเลิกปักหมุด"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"ขอรหัสผ่านก่อนเลิกปักหมุด"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"ติดตั้งโดยผู้ดูแลระบบของคุณ\nไปที่การตั้งค่าเพื่อดูสิทธิ์ที่ได้รับอนุญาต"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"อัปเดตโดยผู้ดูแลระบบของคุณ\nไปที่การตั้งค่าเพื่อดูสิทธิ์ที่ได้รับอนุญาต"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"ลบโดยผู้ดูแลระบบ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ตกลง"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"โหมดประหยัดแบตเตอรี่จะเปิดธีมมืดและจำกัดหรือปิดกิจกรรมในเบื้องหลัง เอฟเฟกต์ภาพบางอย่าง ฟีเจอร์บางส่วน และการเชื่อมต่อบางเครือข่าย"</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"เลื่อน"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"หยุดชั่วคราว"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"วางตำแหน่ง"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"ใส่ <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ในที่เก็บข้อมูลที่ถูกจำกัดแล้ว"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ส่งรูปภาพ"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"งาน 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"ทดสอบ"</string> <string name="profile_label_communal" msgid="8743921499944800427">"ส่วนกลาง"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"โปรไฟล์งาน"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"พื้นที่ส่วนตัว"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"โคลน"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 5e3e1e86c713..3c380884ceea 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"Humingi ng pattern sa pag-unlock bago mag-unpin"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"Humingi ng password bago mag-unpin"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"Na-install ng iyong admin.\nPumunta sa mga setting para makita ang mga ibinigay na pahintulot"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"Na-update ng iyong admin.\nPumunta sa mga setting para makita ang mga ibinigay na pahintulot"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Na-delete ng iyong admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Ino-on ng Pantipid ng Baterya ang Madilim na tema at nililimitahan o ino-off nito ang aktibidad sa background, ilang visual effect, ilang partikular na feature, at ilang koneksyon sa network."</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Mag-scroll"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"I-pause"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Posisyon"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Inilagay ang <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> sa PINAGHIHIGPITANG bucket"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"nagpadala ng larawan"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Trabaho 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Communal"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Profile sa trabaho"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Pribadong space"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 72d62d5b2499..dfaa061ba093 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Kaydırma"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Duraklatma"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Konum"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> KISITLANMIŞ gruba yerleştirildi"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"bir resim gönderildi"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"İş 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Paylaşılan"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"İş profili"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Özel alan"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index e4e1e99be263..34dda976f1bc 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -2276,6 +2276,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Прокрутити"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Призупинити"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Змінити позицію"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Пакет \"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>\" додано в сегмент з обмеженнями"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"надіслано зображення"</string> @@ -2483,6 +2495,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Робочий профіль 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Тестовий профіль"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Спільний профіль"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Робочий профіль"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Приватний простір"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Копія профілю"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index a98179a3064b..31b5999b6f15 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -1965,8 +1965,7 @@ <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"پن ہٹانے سے پہلے غیر مقفل کرنے کا پیٹرن طلب کریں"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"پن ہٹانے سے پہلے پاس ورڈ طلب کریں"</string> <string name="package_installed_device_owner" msgid="8684974629306529138">"آپ کے منتظم نے انسٹال کیا ہے۔\nدی گئی اجازتیں دیکھنے کیلئے ترتیبات پر جائیں"</string> - <!-- no translation found for package_updated_device_owner (7770195449213776218) --> - <skip /> + <string name="package_updated_device_owner" msgid="7770195449213776218">"آپ کے منتظم نے اپ ڈیٹ کیا ہے۔\nدی گئی اجازتیں دیکھنے کیلئے ترتیبات پر جائیں"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"آپ کے منتظم کے ذریعے حذف کیا گیا"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ٹھیک ہے"</string> <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"بیٹری سیور گہری تھیم کو آن کرتی ہے اور پس منظر کی سرگرمی، کچھ بصری اثرات، مخصوص خصوصیات اور کچھ نیٹ ورک کنکشنز کو محدود یا آف کرتی ہے۔"</string> @@ -2274,6 +2273,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"اسکرول کریں"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"موقوف کریں"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"پوزیشن"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> کو پابند کردہ بکٹ میں رکھ دیا گیا ہے"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"ایک تصویر بھیجی"</string> @@ -2481,6 +2492,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"تیسری دفتری پروفائل"</string> <string name="profile_label_test" msgid="9168641926186071947">"ٹیسٹ"</string> <string name="profile_label_communal" msgid="8743921499944800427">"کمیونل"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"دفتری پروفائل"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"پرائیویٹ اسپیس"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"کلون"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 81ebe5fa7c2b..35c35ac6d90b 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Aylantirish"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Pauza"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Joylashuvi"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> cheklangan turkumga joylandi"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"rasm yuborildi"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Ish 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Test"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Umumiy"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Ish profili"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Maxfiy makon"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Nusxalash"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 4dda8cc0c8c1..626625f85d40 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Cuộn"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Tạm dừng"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Vị trí"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"Đã đưa <xliff:g id="PACKAGE_NAME">%1$s</xliff:g> vào bộ chứa BỊ HẠN CHẾ"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"đã gửi hình ảnh"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Công việc 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Kiểm thử"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Dùng chung"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Hồ sơ công việc"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Không gian riêng tư"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Nhân bản"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 851195acf204..921a464c434e 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"滚动"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"暂停"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"位置"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> 已被放入受限存储分区"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>："</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"发送了一张图片"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"工作 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"测试"</string> <string name="profile_label_communal" msgid="8743921499944800427">"共用"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"工作资料"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"私密空间"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"克隆"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 87b403d39207..8681d036948a 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"捲動"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"暫停"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"位置"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> 已納入受限制的儲存區"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>："</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"已傳送圖片"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"工作 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"測試"</string> <string name="profile_label_communal" msgid="8743921499944800427">"共用"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"工作設定檔"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"私人空間"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"複製"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 72d2e7ce3cc1..21e9113bc9a0 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"捲動"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"暫停"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"位置"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"已將「<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>」移入受限制的值區"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>："</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"傳送了一張圖片"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"工作 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"測試"</string> <string name="profile_label_communal" msgid="8743921499944800427">"通用"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"工作資料夾"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"私人空間"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"複製"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 13356cbcd356..695f3198c90b 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -2274,6 +2274,18 @@ <string name="accessibility_autoclick_scroll" msgid="3499385943728726933">"Skrola"</string> <string name="accessibility_autoclick_pause" msgid="3272200156172573568">"Misa"</string> <string name="accessibility_autoclick_position" msgid="2933660969907663545">"Indawo"</string> + <!-- no translation found for accessibility_autoclick_scroll_up (2044948780797117443) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_down (3733401063292018116) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_left (8564421367992824198) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_right (8932417330753984265) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_exit (3788610039146769696) --> + <skip /> + <!-- no translation found for accessibility_autoclick_scroll_panel_title (7120598166296447036) --> + <skip /> <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"I-<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ifakwe kubhakede LOKUKHAWULELWE"</string> <string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string> <string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"uthumele isithombe"</string> @@ -2481,6 +2493,8 @@ <string name="profile_label_work_3" msgid="4834572253956798917">"Umsebenzi 3"</string> <string name="profile_label_test" msgid="9168641926186071947">"Hlola"</string> <string name="profile_label_communal" msgid="8743921499944800427">"Okomphakathi"</string> + <!-- no translation found for profile_label_supervising (5649312778545745371) --> + <skip /> <string name="accessibility_label_managed_profile" msgid="3366526886209832641">"Iphrofayela yomsebenzi"</string> <string name="accessibility_label_private_profile" msgid="1436459319135548969">"Indawo engasese"</string> <string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Yenza i-Clone"</string> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 465e318511c6..6e540833bc46 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -277,12 +277,24 @@ <!-- The margin on the end of the top-line content views (accommodates the expander) --> <dimen name="notification_heading_margin_end">56dp</dimen> + <!-- The vertical spacing for the smart reply/smart action container. + Note that the button background itself also has an inset of 6dp (making the height of the + tappable area 48dp total, 32dp for the visible button plus 6dp top and bottom), so the visible + space between the button and the other content is going to be 16dp. --> + <dimen name="notification_2025_smart_reply_container_margin">10dp</dimen> + <!-- The total height of the notification action list --> <dimen name="notification_action_list_height">60dp</dimen> + <!-- The total height of the notification action list (2025 redesign version) --> + <dimen name="notification_2025_action_list_height">48dp</dimen> + <!-- The margin of the notification action list at the top --> <dimen name="notification_action_list_margin_top">0dp</dimen> + <!-- The margin of the notification action list at the bottom in the 2025 redesign --> + <dimen name="notification_2025_action_list_margin_bottom">6dp</dimen> + <!-- The overall height of the emphasized notification action --> <dimen name="notification_action_emphasized_height">48dp</dimen> @@ -304,6 +316,9 @@ <!-- The size of icons for visual actions in the notification_material_action_list --> <dimen name="notification_actions_icon_size">56dp</dimen> + <!-- The size of icon actions in notification_material_action_list (2025 redesign version) --> + <dimen name="notification_2025_actions_icon_size">48dp</dimen> + <!-- The size of icons for visual actions in the notification_material_action_list --> <dimen name="notification_actions_icon_drawable_size">20dp</dimen> @@ -1235,4 +1250,7 @@ <!-- The maximum width for a context menu icon --> <dimen name="list_menu_item_icon_max_width">24dp</dimen> + + <!-- Default height of desktop view header for freeform tasks on launch. --> + <dimen name="desktop_view_default_header_height">40dp</dimen> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 46d18e3d3302..922d59dfcfe0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3271,6 +3271,8 @@ <java-symbol type="dimen" name="notification_2025_expand_button_reduced_end_padding" /> <java-symbol type="dimen" name="notification_2025_expand_button_right_icon_spacing" /> <java-symbol type="dimen" name="notification_2025_right_icon_expanded_margin_end" /> + <java-symbol type="dimen" name="notification_2025_action_list_margin_bottom" /> + <java-symbol type="dimen" name="notification_2025_smart_reply_container_margin" /> <java-symbol type="dimen" name="notification_progress_margin_horizontal" /> <java-symbol type="dimen" name="notification_header_background_height" /> <java-symbol type="dimen" name="notification_header_touchable_height" /> @@ -3497,6 +3499,7 @@ <java-symbol type="dimen" name="input_extract_action_button_height" /> <java-symbol type="dimen" name="notification_action_list_height" /> + <java-symbol type="dimen" name="notification_2025_action_list_height" /> <java-symbol type="dimen" name="notification_action_emphasized_height" /> <!-- TV Remote Service package --> @@ -5975,4 +5978,6 @@ <!-- Enable OEMs to support scale up anim across tasks.--> <java-symbol type="bool" name="config_enableCrossTaskScaleUpAnimation" /> + <!-- Default height of desktop view header for freeform tasks on launch. --> + <java-symbol type="dimen" name="desktop_view_default_header_height" /> </resources> diff --git a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/StartProgramListUpdatesFanoutTest.java b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/StartProgramListUpdatesFanoutTest.java index fa0744775f6d..5af837fce612 100644 --- a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/StartProgramListUpdatesFanoutTest.java +++ b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/StartProgramListUpdatesFanoutTest.java @@ -18,7 +18,7 @@ package com.android.server.broadcastradio.hal2; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static org.junit.Assert.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.timeout; diff --git a/core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java b/core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java index 46f22cec4213..504786111efe 100644 --- a/core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java +++ b/core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java @@ -20,8 +20,8 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertSame; import static junit.framework.Assert.fail; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import android.Manifest.permission; import android.content.Context; diff --git a/core/tests/coretests/src/android/provider/FontsContractTest.java b/core/tests/coretests/src/android/provider/FontsContractTest.java index 21a22057d7c8..f5209952508c 100644 --- a/core/tests/coretests/src/android/provider/FontsContractTest.java +++ b/core/tests/coretests/src/android/provider/FontsContractTest.java @@ -21,8 +21,8 @@ import static android.provider.FontsContract.Columns.RESULT_CODE_FONT_UNAVAILABL import static android.provider.FontsContract.Columns.RESULT_CODE_MALFORMED_QUERY; import static android.provider.FontsContract.Columns.RESULT_CODE_OK; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java index e5ad5613af2d..341947c900c5 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java @@ -29,8 +29,8 @@ import static junit.framework.Assert.assertNull; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -79,7 +79,7 @@ public class AccessibilityCacheTest { @Before public void setUp() { mAccessibilityNodeRefresher = mock(AccessibilityCache.AccessibilityNodeRefresher.class); - when(mAccessibilityNodeRefresher.refreshNode(anyObject(), anyBoolean())).thenReturn(true); + when(mAccessibilityNodeRefresher.refreshNode(any(), anyBoolean())).thenReturn(true); mAccessibilityCache = new AccessibilityCache(mAccessibilityNodeRefresher); } @@ -854,7 +854,7 @@ public class AccessibilityCacheTest { try { assertEventTypeClearsNode(eventType, false); verify(mAccessibilityNodeRefresher, never()) - .refreshNode(anyObject(), anyBoolean()); + .refreshNode(any(), anyBoolean()); } catch (Throwable e) { throw new AssertionError( "Failed for eventType: " + AccessibilityEvent.eventTypeToString( diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java index 82e34275c66c..551357c6ba7a 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java @@ -34,8 +34,8 @@ import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/core/tests/coretests/src/android/widget/TextViewActivityTest.java b/core/tests/coretests/src/android/widget/TextViewActivityTest.java index 3eb7d9aa738a..34ccc8bb5179 100644 --- a/core/tests/coretests/src/android/widget/TextViewActivityTest.java +++ b/core/tests/coretests/src/android/widget/TextViewActivityTest.java @@ -51,7 +51,7 @@ import static junit.framework.Assert.assertTrue; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.is; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java b/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java index 74b4de1833ea..890074552284 100644 --- a/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java +++ b/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHO import static android.provider.Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN; import static android.provider.Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE; import static android.provider.Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES; +import static android.provider.Settings.Secure.USER_SETUP_COMPLETE; import static com.android.internal.accessibility.AccessibilityShortcutController.ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME; import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME; @@ -34,10 +35,9 @@ import static org.junit.Assert.fail; import static org.mockito.AdditionalMatchers.aryEq; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -165,7 +165,7 @@ public class AccessibilityShortcutControllerTest { .thenReturn(accessibilityManager); when(mFrameworkObjectProvider.getAlertDialogBuilder(mContext)) .thenReturn(mAlertDialogBuilder); - when(mFrameworkObjectProvider.makeToastFromText(eq(mContext), anyObject(), anyInt())) + when(mFrameworkObjectProvider.makeToastFromText(eq(mContext), any(), anyInt())) .thenReturn(mToast); when(mFrameworkObjectProvider.getSystemUiContext()).thenReturn(mContext); when(mFrameworkObjectProvider.getTextToSpeech(eq(mContext), any())) @@ -179,20 +179,20 @@ public class AccessibilityShortcutControllerTest { ResolveInfo resolveInfo = mock(ResolveInfo.class); resolveInfo.serviceInfo = mock(ServiceInfo.class); resolveInfo.serviceInfo.applicationInfo = mApplicationInfo; - when(resolveInfo.loadLabel(anyObject())).thenReturn(PACKAGE_NAME_STRING); + when(resolveInfo.loadLabel(any())).thenReturn(PACKAGE_NAME_STRING); when(mServiceInfo.getResolveInfo()).thenReturn(resolveInfo); when(mServiceInfo.getComponentName()) .thenReturn(ComponentName.unflattenFromString(SERVICE_NAME_STRING)); when(mServiceInfo.loadSummary(any())).thenReturn(SERVICE_NAME_SUMMARY); - when(mAlertDialogBuilder.setTitle(anyObject())).thenReturn(mAlertDialogBuilder); + when(mAlertDialogBuilder.setTitle(any())).thenReturn(mAlertDialogBuilder); when(mAlertDialogBuilder.setCancelable(anyBoolean())).thenReturn(mAlertDialogBuilder); - when(mAlertDialogBuilder.setMessage(anyObject())).thenReturn(mAlertDialogBuilder); - when(mAlertDialogBuilder.setPositiveButton(anyInt(), anyObject())) + when(mAlertDialogBuilder.setMessage(any())).thenReturn(mAlertDialogBuilder); + when(mAlertDialogBuilder.setPositiveButton(anyInt(), any())) .thenReturn(mAlertDialogBuilder); - when(mAlertDialogBuilder.setNegativeButton(anyInt(), anyObject())) + when(mAlertDialogBuilder.setNegativeButton(anyInt(), any())) .thenReturn(mAlertDialogBuilder); - when(mAlertDialogBuilder.setOnCancelListener(anyObject())).thenReturn(mAlertDialogBuilder); + when(mAlertDialogBuilder.setOnCancelListener(any())).thenReturn(mAlertDialogBuilder); when(mAlertDialogBuilder.create()).thenReturn(mAlertDialog); mLayoutParams.privateFlags = 0; @@ -348,7 +348,7 @@ public class AccessibilityShortcutControllerTest { configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN); AccessibilityShortcutController accessibilityShortcutController = getController(); accessibilityShortcutController.performAccessibilityShortcut(); - verify(mVibrator).vibrate(aryEq(VIBRATOR_PATTERN_LONG), eq(-1), anyObject()); + verify(mVibrator).vibrate(aryEq(VIBRATOR_PATTERN_LONG), eq(-1), any()); } @Test @@ -715,6 +715,25 @@ public class AccessibilityShortcutControllerTest { verify(mRingtone, times(0)).play(); } + @Test + public void onUserSetupComplete_noEnabledServices_blankHardwareSetting() throws Exception { + AccessibilityShortcutController controller = getController(); + configureValidShortcutService(); + // Shortcut setting should be cleared on user setup + Settings.Secure.putStringForUser( + mContentResolver, ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, null, 0); + when(mAccessibilityManagerService + .getEnabledAccessibilityServiceList(anyInt(), eq(0))) + .thenReturn(Collections.emptyList()); + Settings.Secure.putInt(mContentResolver, USER_SETUP_COMPLETE, 1); + + controller.mUserSetupCompleteObserver.onChange(true); + + final String shortcut = Settings.Secure.getStringForUser( + mContentResolver, ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, 0); + assertThat(shortcut).isEqualTo(""); + } + private void configureNoShortcutService() throws Exception { when(mAccessibilityManagerService .getAccessibilityShortcutTargets(HARDWARE)) 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 d21ab44d251d..15e746cb13b6 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java @@ -87,6 +87,10 @@ public class ResolverActivityTest { private static final UserHandle PERSONAL_USER_HANDLE = InstrumentationRegistry .getInstrumentation().getTargetContext().getUser(); + private static final int WORK_USER_ID = PERSONAL_USER_HANDLE.getIdentifier() + 1; + private static final int CLONE_USER_ID = PERSONAL_USER_HANDLE.getIdentifier() + 2; + private static final int PRIVATE_USER_ID = PERSONAL_USER_HANDLE.getIdentifier() + 3; + @Rule public ActivityTestRule<ResolverWrapperActivity> mActivityRule = new ActivityTestRule<>(ResolverWrapperActivity.class, false, @@ -247,7 +251,7 @@ public class ResolverActivityTest { // enable the work tab feature flag ResolverActivity.ENABLE_TABBED_VIEW = true; List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(2, /* userId */ 10, + createResolvedComponentsForTestWithOtherProfile(2, WORK_USER_ID, PERSONAL_USER_HANDLE); markWorkProfileUserAvailable(); List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(4, @@ -270,7 +274,7 @@ public class ResolverActivityTest { }; // Make a stable copy of the components as the original list may be modified List<ResolvedComponentInfo> stableCopy = - createResolvedComponentsForTestWithOtherProfile(2, /* userId= */ 10, + createResolvedComponentsForTestWithOtherProfile(2, WORK_USER_ID, PERSONAL_USER_HANDLE); // We pick the first one as there is another one in the work profile side onView(first(withText(stableCopy.get(1).getResolveInfoAt(0).activityInfo.name))) @@ -444,7 +448,7 @@ public class ResolverActivityTest { // enable the work tab feature flag ResolverActivity.ENABLE_TABBED_VIEW = true; List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(3, /* userId = */ 10, + createResolvedComponentsForTestWithOtherProfile(3, WORK_USER_ID, PERSONAL_USER_HANDLE); markWorkProfileUserAvailable(); List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(4, @@ -456,7 +460,7 @@ public class ResolverActivityTest { final ResolverWrapperActivity activity = mActivityRule.launchActivity(sendIntent); waitForIdle(); - assertThat(activity.getCurrentUserHandle().getIdentifier(), is(0)); + assertThat(activity.getCurrentUserHandle(), is(PERSONAL_USER_HANDLE)); // The work list adapter must be populated in advance before tapping the other tab assertThat(activity.getWorkListAdapter().getCount(), is(4)); } @@ -466,7 +470,7 @@ public class ResolverActivityTest { // enable the work tab feature flag ResolverActivity.ENABLE_TABBED_VIEW = true; List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(3, /* userId */ 10, + createResolvedComponentsForTestWithOtherProfile(3, WORK_USER_ID, PERSONAL_USER_HANDLE); markWorkProfileUserAvailable(); List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(4, @@ -478,7 +482,7 @@ public class ResolverActivityTest { waitForIdle(); onView(withText(R.string.resolver_work_tab)).perform(click()); - assertThat(activity.getCurrentUserHandle().getIdentifier(), is(10)); + assertThat(activity.getCurrentUserHandle().getIdentifier(), is(WORK_USER_ID)); assertThat(activity.getWorkListAdapter().getCount(), is(4)); } @@ -498,7 +502,7 @@ public class ResolverActivityTest { waitForIdle(); onView(withText(R.string.resolver_work_tab)).perform(click()); - assertThat(activity.getCurrentUserHandle().getIdentifier(), is(10)); + assertThat(activity.getCurrentUserHandle().getIdentifier(), is(WORK_USER_ID)); assertThat(activity.getPersonalListAdapter().getCount(), is(2)); } @@ -508,7 +512,7 @@ public class ResolverActivityTest { ResolverActivity.ENABLE_TABBED_VIEW = true; markWorkProfileUserAvailable(); List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(3, /* userId */ 10, + createResolvedComponentsForTestWithOtherProfile(3, WORK_USER_ID, PERSONAL_USER_HANDLE); List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(4, sOverrides.workProfileUserHandle); @@ -530,7 +534,7 @@ public class ResolverActivityTest { ResolverActivity.ENABLE_TABBED_VIEW = true; markWorkProfileUserAvailable(); List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(3, /* userId */ 10, + createResolvedComponentsForTestWithOtherProfile(3, WORK_USER_ID, PERSONAL_USER_HANDLE); List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(4, sOverrides.workProfileUserHandle); @@ -633,7 +637,7 @@ public class ResolverActivityTest { ResolverActivity.ENABLE_TABBED_VIEW = true; markWorkProfileUserAvailable(); List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(3, /* userId= */ 10, + createResolvedComponentsForTestWithOtherProfile(3, WORK_USER_ID, PERSONAL_USER_HANDLE); List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(4, sOverrides.workProfileUserHandle); @@ -669,7 +673,7 @@ public class ResolverActivityTest { markWorkProfileUserAvailable(); int workProfileTargets = 4; List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(3, /* userId */ 10, + createResolvedComponentsForTestWithOtherProfile(3, WORK_USER_ID, PERSONAL_USER_HANDLE); List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(workProfileTargets, @@ -697,7 +701,7 @@ public class ResolverActivityTest { markWorkProfileUserAvailable(); int workProfileTargets = 4; List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(3, /* userId */ 10, + createResolvedComponentsForTestWithOtherProfile(3, WORK_USER_ID, PERSONAL_USER_HANDLE); List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(workProfileTargets, @@ -844,7 +848,7 @@ public class ResolverActivityTest { public void testAutolaunch_singleTarget_withWorkProfileAndTabbedViewOff_noAutolaunch() { ResolverActivity.ENABLE_TABBED_VIEW = false; List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(2, /* userId */ 10, + createResolvedComponentsForTestWithOtherProfile(2, WORK_USER_ID, PERSONAL_USER_HANDLE); when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), Mockito.anyBoolean(), @@ -898,7 +902,7 @@ public class ResolverActivityTest { markWorkProfileUserAvailable(); int workProfileTargets = 4; List<ResolvedComponentInfo> personalResolvedComponentInfos = - createResolvedComponentsForTestWithOtherProfile(2, /* userId */ 10, + createResolvedComponentsForTestWithOtherProfile(2, WORK_USER_ID, PERSONAL_USER_HANDLE); List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(workProfileTargets, @@ -1376,15 +1380,16 @@ public class ResolverActivityTest { } private void markWorkProfileUserAvailable() { - ResolverWrapperActivity.sOverrides.workProfileUserHandle = UserHandle.of(10); + ResolverWrapperActivity.sOverrides.workProfileUserHandle = UserHandle.of(WORK_USER_ID); } private void markCloneProfileUserAvailable() { - ResolverWrapperActivity.sOverrides.cloneProfileUserHandle = UserHandle.of(11); + ResolverWrapperActivity.sOverrides.cloneProfileUserHandle = UserHandle.of(CLONE_USER_ID); } private void markPrivateProfileUserAvailable() { - ResolverWrapperActivity.sOverrides.privateProfileUserHandle = UserHandle.of(12); + ResolverWrapperActivity.sOverrides.privateProfileUserHandle = + UserHandle.of(PRIVATE_USER_ID); } private void setTabOwnerUserHandleForLaunch(UserHandle tabOwnerUserHandleForLaunch) { 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 90f5c24e13a1..cdf506c941e9 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java @@ -22,10 +22,10 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java b/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java index 4604b01d1bd2..050a68a89d6f 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java @@ -112,8 +112,8 @@ public class ResolverWrapperActivity extends ResolverActivity { @Override protected ResolverListController createListController(UserHandle userHandle) { - if (userHandle == UserHandle.SYSTEM) { - when(sOverrides.resolverListController.getUserHandle()).thenReturn(UserHandle.SYSTEM); + if (userHandle == getUser()) { + when(sOverrides.resolverListController.getUserHandle()).thenReturn(getUser()); return sOverrides.resolverListController; } if (isLaunchedInSingleUserMode()) { diff --git a/core/tests/mockingcoretests/src/android/util/TimingsTraceLogTest.java b/core/tests/mockingcoretests/src/android/util/TimingsTraceLogTest.java index 8de919681006..7c6046223698 100644 --- a/core/tests/mockingcoretests/src/android/util/TimingsTraceLogTest.java +++ b/core/tests/mockingcoretests/src/android/util/TimingsTraceLogTest.java @@ -22,10 +22,10 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.contains; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.matches; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.contains; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.matches; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/libs/WindowManager/Shell/aconfig/OWNERS b/libs/WindowManager/Shell/aconfig/OWNERS index 9eba0f2dea7b..eacadeacab36 100644 --- a/libs/WindowManager/Shell/aconfig/OWNERS +++ b/libs/WindowManager/Shell/aconfig/OWNERS @@ -1,3 +1,4 @@ # Owners for flag changes madym@google.com -hwwang@google.com
\ No newline at end of file +hwwang@google.com +sqsun@google.com
\ No newline at end of file diff --git a/libs/WindowManager/Shell/aconfig/multitasking.aconfig b/libs/WindowManager/Shell/aconfig/multitasking.aconfig index ab2804626361..b6a1501831c0 100644 --- a/libs/WindowManager/Shell/aconfig/multitasking.aconfig +++ b/libs/WindowManager/Shell/aconfig/multitasking.aconfig @@ -114,7 +114,7 @@ flag { name: "enable_shell_top_task_tracking" namespace: "multitasking" description: "Enables tracking top tasks from the shell" - bug: "342627272" + bug: "346588978" metadata { purpose: PURPOSE_BUGFIX } @@ -203,4 +203,11 @@ flag { metadata { purpose: PURPOSE_BUGFIX } -}
\ No newline at end of file +} + +flag { + name: "enable_magnetic_split_divider" + namespace: "multitasking" + description: "Makes the split divider snap 'magnetically' to available snap points during drag" + bug: "383631946" +} diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/UiEventSubject.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/UiEventSubject.kt index 2d6df43f67e0..3597ce0041d4 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/UiEventSubject.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/UiEventSubject.kt @@ -22,14 +22,14 @@ import com.google.common.truth.Subject import com.google.common.truth.Truth /** Subclass of [Subject] to simplify verifying [FakeUiEvent] data */ -class UiEventSubject(metadata: FailureMetadata, private val actual: FakeUiEvent) : +class UiEventSubject(metadata: FailureMetadata, private val actual: FakeUiEvent?) : Subject(metadata, actual) { /** Check that [FakeUiEvent] contains the expected data from the [bubble] passed id */ fun hasBubbleInfo(bubble: Bubble) { - check("uid").that(actual.uid).isEqualTo(bubble.appUid) - check("packageName").that(actual.packageName).isEqualTo(bubble.packageName) - check("instanceId").that(actual.instanceId).isEqualTo(bubble.instanceId) + check("uid").that(actual?.uid).isEqualTo(bubble.appUid) + check("packageName").that(actual?.packageName).isEqualTo(bubble.packageName) + check("instanceId").that(actual?.instanceId).isEqualTo(bubble.instanceId) } companion object { diff --git a/libs/WindowManager/Shell/res/drawable/desktop_mode_header_ic_minimize.xml b/libs/WindowManager/Shell/res/drawable/desktop_mode_header_ic_minimize.xml index b35dc022e210..56e5dc717a7b 100644 --- a/libs/WindowManager/Shell/res/drawable/desktop_mode_header_ic_minimize.xml +++ b/libs/WindowManager/Shell/res/drawable/desktop_mode_header_ic_minimize.xml @@ -18,9 +18,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" - android:viewportHeight="24" - android:viewportWidth="24"> + android:viewportWidth="960" + android:viewportHeight="960"> <path android:fillColor="#FF000000" - android:pathData="M6,21V19H18V21Z"/> + android:pathData="M160,800L160,720L800,720L800,800L160,800Z"/> </vector> diff --git a/libs/WindowManager/Shell/res/layout/desktop_mode_window_decor_handle_menu.xml b/libs/WindowManager/Shell/res/layout/desktop_mode_window_decor_handle_menu.xml index 16e098b39004..ed8b54397076 100644 --- a/libs/WindowManager/Shell/res/layout/desktop_mode_window_decor_handle_menu.xml +++ b/libs/WindowManager/Shell/res/layout/desktop_mode_window_decor_handle_menu.xml @@ -22,8 +22,8 @@ android:layout_height="wrap_content" android:clipChildren="false" android:clipToPadding="false" - android:paddingBottom="@dimen/desktop_mode_handle_menu_pill_elevation" - android:paddingEnd="@dimen/desktop_mode_handle_menu_pill_elevation" + android:paddingBottom="@dimen/desktop_mode_handle_menu_pill_elevation_padding" + android:paddingEnd="@dimen/desktop_mode_handle_menu_pill_elevation_padding" android:orientation="vertical"> <LinearLayout @@ -39,8 +39,8 @@ <ImageView android:id="@+id/application_icon" - android:layout_width="@dimen/desktop_mode_caption_icon_radius" - android:layout_height="@dimen/desktop_mode_caption_icon_radius" + android:layout_width="@dimen/desktop_mode_handle_menu_icon_radius" + android:layout_height="@dimen/desktop_mode_handle_menu_icon_radius" android:layout_marginStart="10dp" android:layout_marginEnd="12dp" android:contentDescription="@string/app_icon_text" diff --git a/libs/WindowManager/Shell/res/values-af/strings.xml b/libs/WindowManager/Shell/res/values-af/strings.xml index 61dbb69761ad..1491c70023e7 100644 --- a/libs/WindowManager/Shell/res/values-af/strings.xml +++ b/libs/WindowManager/Shell/res/values-af/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Die appkieslys kan hier gevind word"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Maak rekenaaraansig oop om veelvuldige apps saam oop te maak"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Keer enige tyd terug na volskerm vanaf die appkieslys"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Sien en doen meer"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Sleep ’n ander app in vir verdeelde skerm"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Apphandvatsel"</string> <string name="app_icon_text" msgid="2823268023931811747">"Appikoon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Volskerm"</string> - <string name="desktop_text" msgid="1582173066857454541">"Rekenaaraansig"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Verdeelde skerm"</string> <string name="more_button_text" msgid="3655388105592893530">"Meer"</string> <string name="float_button_text" msgid="9221657008391364581">"Sweef"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Verander aspekverhouding"</string> <string name="close_text" msgid="4986518933445178928">"Maak toe"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Maak kieslys toe"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Rekenaaraansig)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimeer skerm"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Verander grootte"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"App kan nie hierheen geskuif word nie"</string> diff --git a/libs/WindowManager/Shell/res/values-am/strings.xml b/libs/WindowManager/Shell/res/values-am/strings.xml index 52008a6ff952..8bd602c08508 100644 --- a/libs/WindowManager/Shell/res/values-am/strings.xml +++ b/libs/WindowManager/Shell/res/values-am/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"አልተስተካከለም?\nለማህደር መታ ያድርጉ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ምንም የካሜራ ችግሮች የሉም? ለማሰናበት መታ ያድርጉ።"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"የመተግበሪያ ምናሌው እዚህ መገኘት ይችላል"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"በርካታ መተግበሪያዎችን በአንድ ላይ ለመክፈት ወደ የዴስክቶፕ እይታ ይግቡ"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"በማንኛውም ጊዜ ከመተግበሪያ ምናሌው ላይ ወደ ሙሉ ገጽ እይታ ይመለሱ"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ተጨማሪ ይመልከቱ እና ያድርጉ"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ለተከፈለ ማያ ገፅ ሌላ መተግበሪያ ይጎትቱ"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"የመተግበሪያ መያዣ"</string> <string name="app_icon_text" msgid="2823268023931811747">"የመተግበሪያ አዶ"</string> <string name="fullscreen_text" msgid="1162316685217676079">"ሙሉ ማያ"</string> - <string name="desktop_text" msgid="1582173066857454541">"የዴስክቶፕ ዕይታ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"የተከፈለ ማያ ገፅ"</string> <string name="more_button_text" msgid="3655388105592893530">"ተጨማሪ"</string> <string name="float_button_text" msgid="9221657008391364581">"ተንሳፋፊ"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"ምጥጥነ ገፅታ ለውጥ"</string> <string name="close_text" msgid="4986518933445178928">"ዝጋ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ምናሌ ዝጋ"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> የዴስክቶፕ ዕይታ"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"የማያ ገጹ መጠን አሳድግ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"መጠን ቀይር"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"መተግበሪያ ወደዚህ መንቀሳቀስ አይችልም"</string> diff --git a/libs/WindowManager/Shell/res/values-ar/strings.xml b/libs/WindowManager/Shell/res/values-ar/strings.xml index 65dd965afbf1..70a23b73b6f5 100644 --- a/libs/WindowManager/Shell/res/values-ar/strings.xml +++ b/libs/WindowManager/Shell/res/values-ar/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ألم يتم حل المشكلة؟\nانقر للعودة"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"أليس هناك مشاكل في الكاميرا؟ انقر للإغلاق."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"يمكن العثور على قائمة التطبيقات هنا"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"يمكنك الدخول إلى وضع العرض المخصّص للكمبيوتر المكتبي لفتح عدة تطبيقات معًا"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"يمكنك الرجوع إلى وضع ملء الشاشة في أي وقت من قائمة التطبيقات"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"استخدام تطبيقات متعدّدة في وقت واحد"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"اسحب تطبيقًا آخر لاستخدام وضع تقسيم الشاشة."</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"مقبض التطبيق"</string> <string name="app_icon_text" msgid="2823268023931811747">"رمز التطبيق"</string> <string name="fullscreen_text" msgid="1162316685217676079">"ملء الشاشة"</string> - <string name="desktop_text" msgid="1582173066857454541">"العرض المخصّص للكمبيوتر المكتبي"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"تقسيم الشاشة"</string> <string name="more_button_text" msgid="3655388105592893530">"المزيد"</string> <string name="float_button_text" msgid="9221657008391364581">"نافذة عائمة"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"تغيير نسبة العرض إلى الارتفاع"</string> <string name="close_text" msgid="4986518933445178928">"إغلاق"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"إغلاق القائمة"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (العرض المخصّص للكمبيوتر المكتبي)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"تكبير الشاشة إلى أقصى حدّ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"تغيير الحجم"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"لا يمكن نقل التطبيق إلى هنا"</string> diff --git a/libs/WindowManager/Shell/res/values-as/strings.xml b/libs/WindowManager/Shell/res/values-as/strings.xml index 919447e125a1..6872df6acbc9 100644 --- a/libs/WindowManager/Shell/res/values-as/strings.xml +++ b/libs/WindowManager/Shell/res/values-as/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"এইটো সমাধান কৰা নাই নেকি?\nপূৰ্বাৱস্থালৈ নিবলৈ টিপক"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"কেমেৰাৰ কোনো সমস্যা নাই নেকি? অগ্ৰাহ্য কৰিবলৈ টিপক।"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"এপৰ মেনু ইয়াত বিচাৰি পোৱা যাব"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"একেলগে একাধিক এপ্ খুলিবলৈ ডেস্কটপ ভিউলৈ যাওক"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"এপৰ মেনুৰ পৰা যিকোনো সময়তে পূৰ্ণ স্ক্ৰীনলৈ উভতি যাওক"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"চাওক আৰু অধিক কৰক"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"বিভাজিত স্ক্ৰীনৰ বাবে অন্য এটা এপ্ টানি আনি এৰক"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"এপৰ হেণ্ডেল"</string> <string name="app_icon_text" msgid="2823268023931811747">"এপৰ চিহ্ন"</string> <string name="fullscreen_text" msgid="1162316685217676079">"সম্পূৰ্ণ স্ক্ৰীন"</string> - <string name="desktop_text" msgid="1582173066857454541">"ডেস্কটপ ভিউ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"বিভাজিত স্ক্ৰীন"</string> <string name="more_button_text" msgid="3655388105592893530">"অধিক"</string> <string name="float_button_text" msgid="9221657008391364581">"ওপঙা"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"আকাৰৰ অনুপাত সলনি কৰক"</string> <string name="close_text" msgid="4986518933445178928">"বন্ধ কৰক"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"মেনু বন্ধ কৰক"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ডেস্কটপ ভিউ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"স্ক্ৰীন মেক্সিমাইজ কৰক"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"আকাৰ সলনি কৰক"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ইয়ালৈ এপ্টো আনিব নোৱাৰি"</string> diff --git a/libs/WindowManager/Shell/res/values-az/strings.xml b/libs/WindowManager/Shell/res/values-az/strings.xml index 846240f80037..46309411d0c9 100644 --- a/libs/WindowManager/Shell/res/values-az/strings.xml +++ b/libs/WindowManager/Shell/res/values-az/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Tətbiq menyusunu burada tapa bilərsiniz"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Bir neçə tətbiqi birlikdə açmaq üçün masaüstü görünüşə daxil olun"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"İstənilən vaxt tətbiq menyusundan tam ekrana qayıdın"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Ardını görün və edin"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Bölünmüş ekran üçün başqa tətbiq sürüşdürün"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Tətbiq ləqəbi"</string> <string name="app_icon_text" msgid="2823268023931811747">"Tətbiq ikonası"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Tam Ekran"</string> - <string name="desktop_text" msgid="1582173066857454541">"Masaüstü Görünüş"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Bölünmüş Ekran"</string> <string name="more_button_text" msgid="3655388105592893530">"Ardı"</string> <string name="float_button_text" msgid="9221657008391364581">"Üzən pəncərə"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Tərəflər nisbətini dəyişin"</string> <string name="close_text" msgid="4986518933445178928">"Bağlayın"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menyunu bağlayın"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Masaüstü Görünüş)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ekranı maksimum böyüdün"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Ölçüsünü dəyişin"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Tətbiqi bura köçürmək mümkün deyil"</string> diff --git a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml index 4ee7d7ee92bb..4af564833ba1 100644 --- a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml +++ b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Problem nije rešen?\nDodirnite da biste vratili"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nemate problema sa kamerom? Dodirnite da biste odbacili."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Meni aplikacije možete da pronađete ovde"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Uđite u prikaz za računare da biste istovremeno otvorili više aplikacija"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Vratite se na ceo ekran bilo kada iz menija aplikacije"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Vidite i uradite više"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Prevucite drugu aplikaciju da biste koristili podeljeni ekran"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Identifikator aplikacije"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikona aplikacije"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Preko celog ekrana"</string> - <string name="desktop_text" msgid="1582173066857454541">"Prikaz za računare"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Podeljeni ekran"</string> <string name="more_button_text" msgid="3655388105592893530">"Još"</string> <string name="float_button_text" msgid="9221657008391364581">"Plutajuće"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Promeni razmeru"</string> <string name="close_text" msgid="4986518933445178928">"Zatvorite"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvorite meni"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (prikaz za računare)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Povećaj ekran"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Prilagodi"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikacija ne može da se premesti ovde"</string> diff --git a/libs/WindowManager/Shell/res/values-be/strings.xml b/libs/WindowManager/Shell/res/values-be/strings.xml index d686da96d3d8..7719396b01d1 100644 --- a/libs/WindowManager/Shell/res/values-be/strings.xml +++ b/libs/WindowManager/Shell/res/values-be/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Не ўдалося выправіць?\nНацісніце, каб аднавіць"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Ніякіх праблем з камерай? Націсніце, каб адхіліць."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Меню праграмы шукайце тут"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Каб адкрыць некалькі праграм адначасова, увайдзіце ў версію для камп’ютараў"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Вы можаце вярнуцца ў поўнаэкранны рэжым у любы час з меню праграмы"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Адначасова выконвайце розныя задачы"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Перацягніце іншую праграму, каб выкарыстоўваць падзелены экран"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Маркер праграмы"</string> <string name="app_icon_text" msgid="2823268023931811747">"Значок праграмы"</string> <string name="fullscreen_text" msgid="1162316685217676079">"На ўвесь экран"</string> - <string name="desktop_text" msgid="1582173066857454541">"Версія для камп’ютараў"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Падзяліць экран"</string> <string name="more_button_text" msgid="3655388105592893530">"Яшчэ"</string> <string name="float_button_text" msgid="9221657008391364581">"Зрабіць рухомым акном"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Змяніць суадносіны бакоў"</string> <string name="close_text" msgid="4986518933445178928">"Закрыць"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрыць меню"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (версія для камп’ютараў)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Разгарнуць на ўвесь экран"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Змяніць памер"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Нельга перамясціць сюды праграму"</string> diff --git a/libs/WindowManager/Shell/res/values-bg/strings.xml b/libs/WindowManager/Shell/res/values-bg/strings.xml index 984c20ff5dba..514556e30fe0 100644 --- a/libs/WindowManager/Shell/res/values-bg/strings.xml +++ b/libs/WindowManager/Shell/res/values-bg/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Проблемът не се отстрани?\nДокоснете за връщане в предишното състояние"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Нямате проблеми с камерата? Докоснете, за да отхвърлите."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Можете да намерите менюто на приложението тук"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Активирайте изгледа за настолни компютри, за да отворите няколко приложения едновременно"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Преминете към цял екран по всяко време от менюто на приложението"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Преглеждайте и правете повече неща"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Преместете друго приложение с плъзгане, за да преминете в режим за разделен екран"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Манипулатор за приложението"</string> <string name="app_icon_text" msgid="2823268023931811747">"Икона на приложението"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Цял екран"</string> - <string name="desktop_text" msgid="1582173066857454541">"Изглед за настолни компютри"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Разделяне на екрана"</string> <string name="more_button_text" msgid="3655388105592893530">"Още"</string> <string name="float_button_text" msgid="9221657008391364581">"Плаващо"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Промяна на съотношението"</string> <string name="close_text" msgid="4986518933445178928">"Затваряне"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затваряне на менюто"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (изглед за настолни компютри)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Увеличаване на екрана"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Нов размер"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Приложението не може да бъде преместено тук"</string> diff --git a/libs/WindowManager/Shell/res/values-bn/strings.xml b/libs/WindowManager/Shell/res/values-bn/strings.xml index dd5653c48464..d4488a220ac7 100644 --- a/libs/WindowManager/Shell/res/values-bn/strings.xml +++ b/libs/WindowManager/Shell/res/values-bn/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"এখনও সমাধান হয়নি?\nরিভার্ট করার জন্য ট্যাপ করুন"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ক্যামেরা সংক্রান্ত সমস্যা নেই? বাতিল করতে ট্যাপ করুন।"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"অ্যাপ মেনু এখানে খুঁজে পাওয়া যাবে"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"একসাথে একাধিক অ্যাপ খোলার জন্য ডেস্কটপ ভিউতে যান"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"অ্যাপ মেনু থেকে ফুল-স্ক্রিন মোডে যেকোনও সময়ে ফিরে আসুন"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"দেখুন ও আরও অনেক কিছু করুন"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"স্প্লিট স্ক্রিনের ক্ষেত্রে অন্য কোনও অ্যাপ টেনে আনুন"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"অ্যাপের হ্যান্ডেল"</string> <string name="app_icon_text" msgid="2823268023931811747">"অ্যাপ আইকন"</string> <string name="fullscreen_text" msgid="1162316685217676079">"ফুলস্ক্রিন"</string> - <string name="desktop_text" msgid="1582173066857454541">"ডেস্কটপ ভিউ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"স্প্লিট স্ক্রিন"</string> <string name="more_button_text" msgid="3655388105592893530">"আরও"</string> <string name="float_button_text" msgid="9221657008391364581">"ফ্লোট"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"অ্যাস্পেক্ট রেশিও পরিবর্তন করুন"</string> <string name="close_text" msgid="4986518933445178928">"বন্ধ করুন"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"\'মেনু\' বন্ধ করুন"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ডেস্কটপ ভিউ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"স্ক্রিন বড় করুন"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"ছোট বড় করুন"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"অ্যাপটি এখানে সরানো যাবে না"</string> diff --git a/libs/WindowManager/Shell/res/values-bs/strings.xml b/libs/WindowManager/Shell/res/values-bs/strings.xml index 01e0515dfa16..23c467c0b4ba 100644 --- a/libs/WindowManager/Shell/res/values-bs/strings.xml +++ b/libs/WindowManager/Shell/res/values-bs/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Ovdje možete pronaći meni aplikacije"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Ulazak u prikaz na računaru radi istovremenog otvaranja više aplikacija"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Povratak na prikaz preko cijelog ekrana bilo kada putem menija aplikacije"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Pogledajte i učinite više"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Prevucite još jednu aplikaciju za podijeljeni ekran"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Ručica aplikacije"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikona aplikacije"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Cijeli ekran"</string> - <string name="desktop_text" msgid="1582173066857454541">"Prikaz na računaru"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Podijeljeni ekran"</string> <string name="more_button_text" msgid="3655388105592893530">"Više"</string> <string name="float_button_text" msgid="9221657008391364581">"Lebdeći"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Promjena formata slike"</string> <string name="close_text" msgid="4986518933445178928">"Zatvaranje"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvaranje menija"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (prikaz na računaru)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimiziraj ekran"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Promijeni veličinu"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Ne možete premjestiti aplikaciju ovdje"</string> diff --git a/libs/WindowManager/Shell/res/values-ca/strings.xml b/libs/WindowManager/Shell/res/values-ca/strings.xml index 77cf94b84450..893d16e6155e 100644 --- a/libs/WindowManager/Shell/res/values-ca/strings.xml +++ b/libs/WindowManager/Shell/res/values-ca/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Pots trobar el menú de l\'aplicació aquí"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Accedeix a la visualització per a ordinadors per obrir diverses aplicacions alhora"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Torna a la pantalla completa en qualsevol moment des del menú de l\'aplicació"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Consulta i fes més coses"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arrossega una altra aplicació per utilitzar la pantalla dividida"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Identificador de l\'aplicació"</string> <string name="app_icon_text" msgid="2823268023931811747">"Icona de l\'aplicació"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Pantalla completa"</string> - <string name="desktop_text" msgid="1582173066857454541">"Visualització per a ordinadors"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Pantalla dividida"</string> <string name="more_button_text" msgid="3655388105592893530">"Més"</string> <string name="float_button_text" msgid="9221657008391364581">"Flotant"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Canvia la relació d\'aspecte"</string> <string name="close_text" msgid="4986518933445178928">"Tanca"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tanca el menú"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (visualització per a ordinadors)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximitza la pantalla"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Canvia la mida"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"L\'aplicació no es pot moure aquí"</string> diff --git a/libs/WindowManager/Shell/res/values-cs/strings.xml b/libs/WindowManager/Shell/res/values-cs/strings.xml index 1a414ba89fdc..a96344a0a365 100644 --- a/libs/WindowManager/Shell/res/values-cs/strings.xml +++ b/libs/WindowManager/Shell/res/values-cs/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Najdete tu nabídku aplikace"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Pokud chcete otevřít několik aplikací současně, přejděte na zobrazení na počítači"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Na celou obrazovku se můžete kdykoli vrátit z nabídky aplikace"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Lepší zobrazení a více možností"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Přetáhnutím druhé aplikace použijete rozdělenou obrazovku"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Popisovač aplikace"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikona aplikace"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Celá obrazovka"</string> - <string name="desktop_text" msgid="1582173066857454541">"Zobrazení na počítači"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Rozdělená obrazovka"</string> <string name="more_button_text" msgid="3655388105592893530">"Více"</string> <string name="float_button_text" msgid="9221657008391364581">"Plovoucí"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Změnit poměr stran"</string> <string name="close_text" msgid="4986518933445178928">"Zavřít"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zavřít nabídku"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (zobrazení na počítači)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximalizovat obrazovku"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Změnit velikost"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikaci sem nelze přesunout"</string> diff --git a/libs/WindowManager/Shell/res/values-da/strings.xml b/libs/WindowManager/Shell/res/values-da/strings.xml index 07f1969ec9c6..7d28fc842e59 100644 --- a/libs/WindowManager/Shell/res/values-da/strings.xml +++ b/libs/WindowManager/Shell/res/values-da/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Appmenuen kan findes her"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Gå til computervenlig visning for at åbne flere apps på én gang"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Gå tilbage til fuld skærm når som helst via appmenuen"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Se og gør mere"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Træk en anden app hertil for at bruge opdelt skærm"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Apphåndtag"</string> <string name="app_icon_text" msgid="2823268023931811747">"Appikon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Fuld skærm"</string> - <string name="desktop_text" msgid="1582173066857454541">"Computervenlig visning"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Opdelt skærm"</string> <string name="more_button_text" msgid="3655388105592893530">"Mere"</string> <string name="float_button_text" msgid="9221657008391364581">"Svævende"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Skift billedformat"</string> <string name="close_text" msgid="4986518933445178928">"Luk"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Luk menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (computervenlig visning)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimér skærm"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Tilpas størrelse"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Apps kan ikke flyttes hertil"</string> diff --git a/libs/WindowManager/Shell/res/values-de/strings.xml b/libs/WindowManager/Shell/res/values-de/strings.xml index 7a8f2d984457..4cc11243b8bd 100644 --- a/libs/WindowManager/Shell/res/values-de/strings.xml +++ b/libs/WindowManager/Shell/res/values-de/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Das App-Menü findest du hier"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Über die Desktop-Ansicht kannst du mehrere Apps gleichzeitig öffnen"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Über das App-Menü kannst du jederzeit zum Vollbildmodus zurückkehren"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Mehr sehen und erledigen"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Für Splitscreen-Modus weitere App hineinziehen"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"App-Ziehpunkt"</string> <string name="app_icon_text" msgid="2823268023931811747">"App-Symbol"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Vollbild"</string> - <string name="desktop_text" msgid="1582173066857454541">"Desktop-Ansicht"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Splitscreen"</string> <string name="more_button_text" msgid="3655388105592893530">"Mehr"</string> <string name="float_button_text" msgid="9221657008391364581">"Frei schwebend"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Seitenverhältnis ändern"</string> <string name="close_text" msgid="4986518933445178928">"Schließen"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menü schließen"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Desktop-Ansicht)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Bildschirm maximieren"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Größe ändern"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Die App kann nicht hierher verschoben werden"</string> diff --git a/libs/WindowManager/Shell/res/values-el/strings.xml b/libs/WindowManager/Shell/res/values-el/strings.xml index e2477d35881c..0fb17ecdb278 100644 --- a/libs/WindowManager/Shell/res/values-el/strings.xml +++ b/libs/WindowManager/Shell/res/values-el/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Δεν διορθώθηκε;\nΠατήστε για επαναφορά."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Δεν αντιμετωπίζετε προβλήματα με την κάμερα; Πατήστε για παράβλεψη."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Μπορείτε να βρείτε το μενού εφαρμογών εδώ"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Μεταβείτε στην προβολή για υπολογιστές, για να ανοίξετε πολλές εφαρμογές μαζί"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Επιστρέψτε στην πλήρη οθόνη ανά πάσα στιγμή από το μενού της εφαρμογής"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Δείτε και κάντε περισσότερα"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Σύρετε σε μια άλλη εφαρμογή για διαχωρισμό οθόνης."</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Λαβή εφαρμογής"</string> <string name="app_icon_text" msgid="2823268023931811747">"Εικονίδιο εφαρμογής"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Πλήρης οθόνη"</string> - <string name="desktop_text" msgid="1582173066857454541">"Προβολή για υπολογιστές"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Διαχωρισμός οθόνης"</string> <string name="more_button_text" msgid="3655388105592893530">"Περισσότερα"</string> <string name="float_button_text" msgid="9221657008391364581">"Κινούμενο"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Αλλαγή λόγου διαστάσεων"</string> <string name="close_text" msgid="4986518933445178928">"Κλείσιμο"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Κλείσιμο μενού"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Προβολή για υπολογιστές)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Μεγιστοποίηση οθόνης"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Αλλαγή μεγέθους"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Δεν είναι δυνατή η μετακίνηση της εφαρμογής εδώ"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml index bed6e5058a9f..2087bb4ad579 100644 --- a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Didn’t fix it?\nTap to revert"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"No camera issues? Tap to dismiss."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"The app menu can be found here"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Enter desktop view to open multiple apps together"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Return to full screen at any time from the app menu"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"See and do more"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Drag in another app for split screen"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"App handle"</string> <string name="app_icon_text" msgid="2823268023931811747">"App icon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Full screen"</string> - <string name="desktop_text" msgid="1582173066857454541">"Desktop view"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Split screen"</string> <string name="more_button_text" msgid="3655388105592893530">"More"</string> <string name="float_button_text" msgid="9221657008391364581">"Float"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Change aspect ratio"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (desktop view)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximise screen"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Resize"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"App can\'t be moved here"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml index 9b9294dbeba8..8abb9dffec67 100644 --- a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Didn’t fix it?\nTap to revert"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"No camera issues? Tap to dismiss."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"The app menu can be found here"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Enter desktop view to open multiple apps together"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Return to full screen anytime from the app menu"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"See and do more"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Drag in another app for split screen"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"App handle"</string> <string name="app_icon_text" msgid="2823268023931811747">"App Icon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Fullscreen"</string> - <string name="desktop_text" msgid="1582173066857454541">"Desktop View"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Split Screen"</string> <string name="more_button_text" msgid="3655388105592893530">"More"</string> <string name="float_button_text" msgid="9221657008391364581">"Float"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Change aspect ratio"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close Menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Desktop View)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximize Screen"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Resize"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"App can\'t be moved here"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml index bed6e5058a9f..2087bb4ad579 100644 --- a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Didn’t fix it?\nTap to revert"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"No camera issues? Tap to dismiss."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"The app menu can be found here"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Enter desktop view to open multiple apps together"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Return to full screen at any time from the app menu"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"See and do more"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Drag in another app for split screen"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"App handle"</string> <string name="app_icon_text" msgid="2823268023931811747">"App icon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Full screen"</string> - <string name="desktop_text" msgid="1582173066857454541">"Desktop view"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Split screen"</string> <string name="more_button_text" msgid="3655388105592893530">"More"</string> <string name="float_button_text" msgid="9221657008391364581">"Float"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Change aspect ratio"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (desktop view)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximise screen"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Resize"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"App can\'t be moved here"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml index bed6e5058a9f..2087bb4ad579 100644 --- a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Didn’t fix it?\nTap to revert"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"No camera issues? Tap to dismiss."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"The app menu can be found here"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Enter desktop view to open multiple apps together"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Return to full screen at any time from the app menu"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"See and do more"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Drag in another app for split screen"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"App handle"</string> <string name="app_icon_text" msgid="2823268023931811747">"App icon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Full screen"</string> - <string name="desktop_text" msgid="1582173066857454541">"Desktop view"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Split screen"</string> <string name="more_button_text" msgid="3655388105592893530">"More"</string> <string name="float_button_text" msgid="9221657008391364581">"Float"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Change aspect ratio"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (desktop view)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximise screen"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Resize"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"App can\'t be moved here"</string> diff --git a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml index 2b7769d19168..bb70f6e419a5 100644 --- a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml +++ b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"¿No se resolvió?\nPresiona para revertir los cambios"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"¿No tienes problemas con la cámara? Presionar para descartar."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"El menú de la app se encuentra aquí"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Entra a la vista de escritorio para abrir varias apps a la vez"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Regresa a pantalla completa en cualquier momento desde el menú de la app"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Aprovecha más"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arrastra otra app para el modo de pantalla dividida"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Controlador de la app"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ícono de la app"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Pantalla completa"</string> - <string name="desktop_text" msgid="1582173066857454541">"Vista para computadoras de escritorio"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Pantalla dividida"</string> <string name="more_button_text" msgid="3655388105592893530">"Más"</string> <string name="float_button_text" msgid="9221657008391364581">"Flotante"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Cambiar relación de aspecto"</string> <string name="close_text" msgid="4986518933445178928">"Cerrar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Cerrar menú"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (vista para computadoras de escritorio)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximizar pantalla"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Dividir pantalla"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"No se puede mover la app aquí"</string> diff --git a/libs/WindowManager/Shell/res/values-es/strings.xml b/libs/WindowManager/Shell/res/values-es/strings.xml index afb1034551b3..a6595aa9292d 100644 --- a/libs/WindowManager/Shell/res/values-es/strings.xml +++ b/libs/WindowManager/Shell/res/values-es/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"El menú de la aplicación se encuentra aquí"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Entra en la vista para ordenador si quieres abrir varias aplicaciones a la vez"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Vuelve a la pantalla completa en cualquier momento desde el menú de aplicaciones"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Consulta más información y haz más"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arrastra otra aplicación para activar la pantalla dividida"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Controlador de la aplicación"</string> <string name="app_icon_text" msgid="2823268023931811747">"Icono de la aplicación"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Pantalla completa"</string> - <string name="desktop_text" msgid="1582173066857454541">"Vista para ordenadores"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Pantalla dividida"</string> <string name="more_button_text" msgid="3655388105592893530">"Más"</string> <string name="float_button_text" msgid="9221657008391364581">"Flotante"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Cambiar relación de aspecto"</string> <string name="close_text" msgid="4986518933445178928">"Cerrar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Cerrar menú"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (vista para ordenadores)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximizar pantalla"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Dividir pantalla"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"La aplicación no se puede mover aquí"</string> diff --git a/libs/WindowManager/Shell/res/values-et/strings.xml b/libs/WindowManager/Shell/res/values-et/strings.xml index 61ca3e0db920..36086578dd4d 100644 --- a/libs/WindowManager/Shell/res/values-et/strings.xml +++ b/libs/WindowManager/Shell/res/values-et/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Rakenduse menüü leiate siit"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Mitme rakenduse koos avamiseks avage arvutivaade"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Saate rakenduse menüüst igal ajal täisekraanile naasta"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Vaadake ja tehke rohkem"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Lohistage muusse rakendusse, et jagatud ekraanikuva kasutada"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Rakenduse element"</string> <string name="app_icon_text" msgid="2823268023931811747">"Rakenduse ikoon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Täisekraan"</string> - <string name="desktop_text" msgid="1582173066857454541">"Arvutivaade"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Jagatud ekraanikuva"</string> <string name="more_button_text" msgid="3655388105592893530">"Rohkem"</string> <string name="float_button_text" msgid="9221657008391364581">"Hõljuv"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Kuvasuhte muutmine"</string> <string name="close_text" msgid="4986518933445178928">"Sule"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Sule menüü"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (arvutivaade)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Kuva täisekraanil"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Suuruse muutmine"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Rakendust ei saa siia teisaldada"</string> diff --git a/libs/WindowManager/Shell/res/values-eu/strings.xml b/libs/WindowManager/Shell/res/values-eu/strings.xml index af175bc9d08e..446839a8eb06 100644 --- a/libs/WindowManager/Shell/res/values-eu/strings.xml +++ b/libs/WindowManager/Shell/res/values-eu/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Aplikazioaren menua dago hemen"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Sartu ordenagailuetarako ikuspegian aplikazio bat baino gehiago batera irekitzeko"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Pantaila osoko modura itzultzeko, erabili aplikazioaren menua"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Ikusi eta egin gauza gehiago"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Pantaila zatitua ikusteko, arrastatu beste aplikazio bat"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Aplikazioaren kontrol-puntua"</string> <string name="app_icon_text" msgid="2823268023931811747">"Aplikazioaren ikonoa"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Pantaila osoa"</string> - <string name="desktop_text" msgid="1582173066857454541">"Ordenagailuetarako ikuspegia"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Pantaila zatitzea"</string> <string name="more_button_text" msgid="3655388105592893530">"Gehiago"</string> <string name="float_button_text" msgid="9221657008391364581">"Leiho gainerakorra"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Aldatu aspektu-erlazioa"</string> <string name="close_text" msgid="4986518933445178928">"Itxi"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Itxi menua"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ordenagailuetarako ikuspegia)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Handitu pantaila"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Aldatu tamaina"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikazioa ezin da hona ekarri"</string> diff --git a/libs/WindowManager/Shell/res/values-fa/strings.xml b/libs/WindowManager/Shell/res/values-fa/strings.xml index 4df47c1dd2cf..bf5c8f95cfb3 100644 --- a/libs/WindowManager/Shell/res/values-fa/strings.xml +++ b/libs/WindowManager/Shell/res/values-fa/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"مشکل برطرف نشد؟\nبرای برگرداندن تکضرب بزنید"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"دوربین مشکلی ندارد؟ برای بستن تکضرب بزنید."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"منو برنامه را میتوانید اینجا ببینید"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"برای باز کردن همزمان چند برنامه، وارد نمای ویژه رایانه شوید"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"هروقت خواستید از منو برنامه به حالت تمامصفحه برگردید"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"از چندین برنامه بهطور همزمان استفاده کنید"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"برای حالت صفحهٔ دونیمه، در برنامهای دیگر بکشید"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"دستگیره برنامه"</string> <string name="app_icon_text" msgid="2823268023931811747">"نماد برنامه"</string> <string name="fullscreen_text" msgid="1162316685217676079">"تمامصفحه"</string> - <string name="desktop_text" msgid="1582173066857454541">"نمای ویژه رایانه رومیزی"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"صفحهٔ دونیمه"</string> <string name="more_button_text" msgid="3655388105592893530">"بیشتر"</string> <string name="float_button_text" msgid="9221657008391364581">"شناور"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"تغییر نسبت ابعادی"</string> <string name="close_text" msgid="4986518933445178928">"بستن"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"بستن منو"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (نمای ویژه رایانه رومیزی)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"بزرگ کردن صفحه"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"تغییر اندازه"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"برنامه را نمیتوان به اینجا منتقل کرد"</string> diff --git a/libs/WindowManager/Shell/res/values-fi/strings.xml b/libs/WindowManager/Shell/res/values-fi/strings.xml index 7da06bd50378..a32e4fab9d81 100644 --- a/libs/WindowManager/Shell/res/values-fi/strings.xml +++ b/libs/WindowManager/Shell/res/values-fi/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Sovellusvalikko löytyy täältä"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Siirry työpöytänäkymään, niin voit avata useita sovelluksia kerralla"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Voit palata koko näytön tilaan milloin tahansa sovellusvalikosta"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Näe ja tee enemmän"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Käytä jaettua näyttöä vetämällä tähän toinen sovellus"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Sovelluksen tunnus"</string> <string name="app_icon_text" msgid="2823268023931811747">"Sovelluskuvake"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Koko näyttö"</string> - <string name="desktop_text" msgid="1582173066857454541">"Tietokonenäkymä"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Jaettu näyttö"</string> <string name="more_button_text" msgid="3655388105592893530">"Lisää"</string> <string name="float_button_text" msgid="9221657008391364581">"Kelluva ikkuna"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Vaihda kuvasuhdetta"</string> <string name="close_text" msgid="4986518933445178928">"Sulje"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Sulje valikko"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (tietokonenäkymä)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Suurenna näyttö"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Muuta kokoa"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Sovellusta ei voi siirtää tänne"</string> diff --git a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml index d0fac37dc8ed..7037377156c6 100644 --- a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Le menu de l\'appli se trouve ici"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Accéder à l\'affichage sur un ordinateur de bureau pour ouvrir plusieurs applis simultanément"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Revenir au mode Plein écran à tout moment à partir du menu de l\'appli"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Voir et en faire plus"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Faites glisser une autre appli pour utiliser l\'écran partagé"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Poignée de l\'appli"</string> <string name="app_icon_text" msgid="2823268023931811747">"Icône de l\'appli"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Plein écran"</string> - <string name="desktop_text" msgid="1582173066857454541">"Affichage sur un ordinateur de bureau"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Écran divisé"</string> <string name="more_button_text" msgid="3655388105592893530">"Plus"</string> <string name="float_button_text" msgid="9221657008391364581">"Flottant"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Modifier les proportions"</string> <string name="close_text" msgid="4986518933445178928">"Fermer"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fermer le menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (affichage sur un ordinateur de bureau)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Agrandir l\'écran"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Redimensionner"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Impossible de déplacer l\'appli ici"</string> diff --git a/libs/WindowManager/Shell/res/values-fr/strings.xml b/libs/WindowManager/Shell/res/values-fr/strings.xml index 91dc6de3a27f..fb2ebfd55583 100644 --- a/libs/WindowManager/Shell/res/values-fr/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Le menu de l\'application se trouve ici"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Passer à l\'affichage sur ordinateur pour ouvrir plusieurs applications simultanément"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Revenir en plein écran à tout moment depuis le menu de l\'application"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Voir et interagir plus"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Faites glisser une autre appli pour utiliser l\'écran partagé"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Poignée de l\'appli"</string> <string name="app_icon_text" msgid="2823268023931811747">"Icône d\'application"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Plein écran"</string> - <string name="desktop_text" msgid="1582173066857454541">"Affichage sur ordinateur"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Écran partagé"</string> <string name="more_button_text" msgid="3655388105592893530">"Plus"</string> <string name="float_button_text" msgid="9221657008391364581">"Flottante"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Modifier le format"</string> <string name="close_text" msgid="4986518933445178928">"Fermer"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fermer le menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (affichage sur ordinateur)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Mettre en plein écran"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Redimensionner"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Impossible de déplacer l\'appli ici"</string> diff --git a/libs/WindowManager/Shell/res/values-gl/strings.xml b/libs/WindowManager/Shell/res/values-gl/strings.xml index e315648c598d..895cf47e3d53 100644 --- a/libs/WindowManager/Shell/res/values-gl/strings.xml +++ b/libs/WindowManager/Shell/res/values-gl/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Aquí podes ver o menú da aplicación"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Vai á vista para ordenadores se queres abrir varias aplicacións á vez"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Volve á pantalla completa en calquera momento desde o menú da aplicación"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Ver e facer máis"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arrastra outra aplicación para usar a pantalla dividida"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Controlador da aplicación"</string> <string name="app_icon_text" msgid="2823268023931811747">"Icona de aplicación"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Pantalla completa"</string> - <string name="desktop_text" msgid="1582173066857454541">"Vista para ordenadores"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Pantalla dividida"</string> <string name="more_button_text" msgid="3655388105592893530">"Máis"</string> <string name="float_button_text" msgid="9221657008391364581">"Flotante"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Cambiar a proporción"</string> <string name="close_text" msgid="4986518933445178928">"Pechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Pechar o menú"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (vista para ordenadores)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximizar pantalla"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Cambiar tamaño"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Non se pode mover aquí a aplicación"</string> diff --git a/libs/WindowManager/Shell/res/values-gu/strings.xml b/libs/WindowManager/Shell/res/values-gu/strings.xml index cd7550893dca..9c8cf96be294 100644 --- a/libs/WindowManager/Shell/res/values-gu/strings.xml +++ b/libs/WindowManager/Shell/res/values-gu/strings.xml @@ -102,7 +102,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"સુધારો નથી થયો?\nપહેલાંના પર પાછું ફેરવવા માટે ટૅપ કરો"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"કૅમેરામાં કોઈ સમસ્યા નથી? છોડી દેવા માટે ટૅપ કરો."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ઍપ મેનૂ અહીં જોવા મળી શકે છે"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"એકથી વધુ ઍપ એકસાથે ખોલવા માટે ડેસ્કટૉપ વ્યૂ દાખલ કરો"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ઍપ મેનૂમાંથી કોઈપણ સમયે પૂર્ણ સ્ક્રીન પર પાછા ફરો"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"જુઓ અને બીજું ઘણું કરો"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"વિભાજિત સ્ક્રીન માટે કોઈ અન્ય ઍપમાં ખેંચો"</string> @@ -127,7 +128,8 @@ <string name="handle_text" msgid="4419667835599523257">"ઍપનું હૅન્ડલ"</string> <string name="app_icon_text" msgid="2823268023931811747">"ઍપનું આઇકન"</string> <string name="fullscreen_text" msgid="1162316685217676079">"પૂર્ણસ્ક્રીન"</string> - <string name="desktop_text" msgid="1582173066857454541">"ડેસ્કટૉપ વ્યૂ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"સ્ક્રીનને વિભાજિત કરો"</string> <string name="more_button_text" msgid="3655388105592893530">"વધુ"</string> <string name="float_button_text" msgid="9221657008391364581">"ફ્લોટિંગ વિન્ડો"</string> @@ -140,7 +142,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"સાપેક્ષ ગુણોત્તર બદલો"</string> <string name="close_text" msgid="4986518933445178928">"બંધ કરો"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"મેનૂ બંધ કરો"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ડેસ્કટૉપ વ્યૂ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"સ્ક્રીન કરો મોટી કરો"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"કદ બદલો"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ઍપ અહીં ખસેડી શકાતી નથી"</string> diff --git a/libs/WindowManager/Shell/res/values-hi/strings.xml b/libs/WindowManager/Shell/res/values-hi/strings.xml index cbcb2674c6b4..985dafffa68a 100644 --- a/libs/WindowManager/Shell/res/values-hi/strings.xml +++ b/libs/WindowManager/Shell/res/values-hi/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"क्या समस्या ठीक नहीं हुई?\nपहले जैसा करने के लिए टैप करें"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"क्या कैमरे से जुड़ी कोई समस्या नहीं है? खारिज करने के लिए टैप करें."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ऐप्लिकेशन मेन्यू यहां पाया जा सकता है"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"एक साथ कई ऐप्लिकेशन खोलने के लिए, डेस्कटॉप व्यू में जाएं"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ऐप्लिकेशन मेन्यू से फ़ुल स्क्रीन मोड पर किसी भी समय वापस जाएं"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"पूरी जानकारी लेकर, बेहतर तरीके से काम करें"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"स्प्लिट स्क्रीन का इस्तेमाल करने के लिए, किसी अन्य ऐप्लिकेशन को खींचें और छोड़ें"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"ऐप्लिकेशन का हैंडल"</string> <string name="app_icon_text" msgid="2823268023931811747">"ऐप्लिकेशन आइकॉन"</string> <string name="fullscreen_text" msgid="1162316685217676079">"फ़ुलस्क्रीन"</string> - <string name="desktop_text" msgid="1582173066857454541">"डेस्कटॉप व्यू"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"स्प्लिट स्क्रीन मोड"</string> <string name="more_button_text" msgid="3655388105592893530">"ज़्यादा देखें"</string> <string name="float_button_text" msgid="9221657008391364581">"फ़्लोट"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"आसपेक्ट रेशियो (लंबाई-चौड़ाई का अनुपात) बदलें"</string> <string name="close_text" msgid="4986518933445178928">"बंद करें"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेन्यू बंद करें"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (डेस्कटॉप व्यू)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"स्क्रीन को बड़ा करें"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"साइज़ बदलें"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ऐप्लिकेशन को यहां मूव नहीं किया जा सकता"</string> diff --git a/libs/WindowManager/Shell/res/values-hr/strings.xml b/libs/WindowManager/Shell/res/values-hr/strings.xml index 0eed0a422cf1..4640bf3b8293 100644 --- a/libs/WindowManager/Shell/res/values-hr/strings.xml +++ b/libs/WindowManager/Shell/res/values-hr/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Izbornik aplikacije možete pronaći ovdje"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Otvorite prikaz na računalu da biste otvorili više aplikacija zajedno"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Vratite se na cijeli zaslon bilo kad iz izbornika aplikacije"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Gledajte i učinite više"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Povucite drugu aplikaciju unutra da biste podijelili zaslon"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Pokazivač aplikacije"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikona aplikacije"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Puni zaslon"</string> - <string name="desktop_text" msgid="1582173066857454541">"Prikaz na računalu"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Razdvojeni zaslon"</string> <string name="more_button_text" msgid="3655388105592893530">"Više"</string> <string name="float_button_text" msgid="9221657008391364581">"Plutajući"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Promijeni omjer slike"</string> <string name="close_text" msgid="4986518933445178928">"Zatvorite"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvorite izbornik"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (prikaz na računalu)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimalno povećaj zaslon"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Promijeni veličinu"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikacija se ne može premjestiti ovdje"</string> diff --git a/libs/WindowManager/Shell/res/values-hu/strings.xml b/libs/WindowManager/Shell/res/values-hu/strings.xml index 48d5afd778c3..711e2f0bfbbe 100644 --- a/libs/WindowManager/Shell/res/values-hu/strings.xml +++ b/libs/WindowManager/Shell/res/values-hu/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Az alkalmazásmenü itt található"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Asztali nézetbe lépve több alkalmazást nyithat meg egyidejűleg"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Az alkalmazásmenüből bármikor visszatérhet a teljes képernyőre"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Több mindent láthat és tehet"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Húzzon ide egy másik alkalmazást az osztott képernyő használatához"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"App fogópontja"</string> <string name="app_icon_text" msgid="2823268023931811747">"Alkalmazásikon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Teljes képernyő"</string> - <string name="desktop_text" msgid="1582173066857454541">"Asztali nézet"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Osztott képernyő"</string> <string name="more_button_text" msgid="3655388105592893530">"Továbbiak"</string> <string name="float_button_text" msgid="9221657008391364581">"Lebegő"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Méretarány módosítása"</string> <string name="close_text" msgid="4986518933445178928">"Bezárás"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menü bezárása"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Asztali nézet)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Képernyő méretének maximalizálása"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Átméretezés"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Az alkalmazás nem helyezhető át ide"</string> diff --git a/libs/WindowManager/Shell/res/values-hy/strings.xml b/libs/WindowManager/Shell/res/values-hy/strings.xml index bf1e840179d5..d7b1b07b6917 100644 --- a/libs/WindowManager/Shell/res/values-hy/strings.xml +++ b/libs/WindowManager/Shell/res/values-hy/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Չհաջողվե՞ց շտկել։\nՀպեք՝ փոփոխությունները չեղարկելու համար։"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Տեսախցիկի հետ կապված խնդիրներ չկա՞ն։ Փակելու համար հպեք։"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Հավելվածի ընտրացանկն այստեղ է"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Անցեք համակարգչային տարբերակին՝ միաժամանակ մի քանի հավելված բացելու համար"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Ցանկացած ժամանակ հավելվածի ընտրացանկից վերադարձեք լիաէկրան ռեժիմ"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Միաժամանակ կատարեք մի քանի առաջադրանք"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Քաշեք մյուս հավելվածի մեջ՝ էկրանի տրոհումն օգտագործելու համար"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Հավելվածի կեղծանուն"</string> <string name="app_icon_text" msgid="2823268023931811747">"Հավելվածի պատկերակ"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Լիաէկրան"</string> - <string name="desktop_text" msgid="1582173066857454541">"Համակարգչային տարբերակ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Տրոհված էկրան"</string> <string name="more_button_text" msgid="3655388105592893530">"Ավելին"</string> <string name="float_button_text" msgid="9221657008391364581">"Լողացող պատուհան"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Փոխել կողմերի հարաբերակցությունը"</string> <string name="close_text" msgid="4986518933445178928">"Փակել"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Փակել ընտրացանկը"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (համակարգչային տարբերակ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ծավալել էկրանը"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Փոխել չափը"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Հավելվածը հնարավոր չէ տեղափոխել այստեղ"</string> diff --git a/libs/WindowManager/Shell/res/values-in/strings.xml b/libs/WindowManager/Shell/res/values-in/strings.xml index d658f59ec9e3..1d1927f9dfbc 100644 --- a/libs/WindowManager/Shell/res/values-in/strings.xml +++ b/libs/WindowManager/Shell/res/values-in/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Menu aplikasi dapat ditemukan di sini"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Buka tampilan desktop untuk membuka beberapa aplikasi secara bersamaan"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Kembali ke layar penuh kapan saja dari menu aplikasi"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Lihat dan lakukan lebih banyak hal"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Tarik aplikasi lain untuk menggunakan layar terpisah"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Penanganan aplikasi"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikon Aplikasi"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Layar Penuh"</string> - <string name="desktop_text" msgid="1582173066857454541">"Tampilan Desktop"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Layar Terpisah"</string> <string name="more_button_text" msgid="3655388105592893530">"Lainnya"</string> <string name="float_button_text" msgid="9221657008391364581">"Mengambang"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Ubah rasio aspek"</string> <string name="close_text" msgid="4986518933445178928">"Tutup"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tutup Menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Tampilan Desktop)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Perbesar Layar"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Ubah ukuran"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikasi tidak dapat dipindahkan ke sini"</string> diff --git a/libs/WindowManager/Shell/res/values-is/strings.xml b/libs/WindowManager/Shell/res/values-is/strings.xml index f7b78d2222f5..e94a4c8a08ea 100644 --- a/libs/WindowManager/Shell/res/values-is/strings.xml +++ b/libs/WindowManager/Shell/res/values-is/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Hér finnurðu forritavalmyndina"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Veldu tölvuútgáfu til að opna mörg forrit samtímis"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Þú getur skipt aftur í allan skjáinn hvenær sem er af forritavalmyndinni"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Sjáðu og gerðu meira"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Dragðu annað forrit inn til að nota skjáskiptingu"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Handfang forrits"</string> <string name="app_icon_text" msgid="2823268023931811747">"Tákn forrits"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Allur skjárinn"</string> - <string name="desktop_text" msgid="1582173066857454541">"Tölvuútgáfa"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Skjáskipting"</string> <string name="more_button_text" msgid="3655388105592893530">"Meira"</string> <string name="float_button_text" msgid="9221657008391364581">"Reikult"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Breyta myndhlutfalli"</string> <string name="close_text" msgid="4986518933445178928">"Loka"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Loka valmynd"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (tölvuútgáfa)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Stækka skjá"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Breyta stærð"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Ekki er hægt að færa forritið hingað"</string> diff --git a/libs/WindowManager/Shell/res/values-it/strings.xml b/libs/WindowManager/Shell/res/values-it/strings.xml index a2787a7e7b91..5f8334fa011c 100644 --- a/libs/WindowManager/Shell/res/values-it/strings.xml +++ b/libs/WindowManager/Shell/res/values-it/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Il problema non si è risolto?\nTocca per ripristinare"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nessun problema con la fotocamera? Tocca per ignorare."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Il menu dell\'app si trova qui"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Entra nella visualizzazione desktop per aprire più app contemporaneamente"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Torna allo schermo intero in qualsiasi momento dal menu dell\'app"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Visualizza più contenuti e fai di più"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Trascina in un\'altra app per usare lo schermo diviso"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Punto di manipolazione app"</string> <string name="app_icon_text" msgid="2823268023931811747">"Icona dell\'app"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Schermo intero"</string> - <string name="desktop_text" msgid="1582173066857454541">"Visualizzazione desktop"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Schermo diviso"</string> <string name="more_button_text" msgid="3655388105592893530">"Altro"</string> <string name="float_button_text" msgid="9221657008391364581">"Mobile"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Cambia proporzioni"</string> <string name="close_text" msgid="4986518933445178928">"Chiudi"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Chiudi il menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (visualizzazione desktop)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Massimizza schermo"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Ridimensiona"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Impossibile spostare l\'app qui"</string> diff --git a/libs/WindowManager/Shell/res/values-iw/strings.xml b/libs/WindowManager/Shell/res/values-iw/strings.xml index 36ac62091e43..c3e85230c319 100644 --- a/libs/WindowManager/Shell/res/values-iw/strings.xml +++ b/libs/WindowManager/Shell/res/values-iw/strings.xml @@ -43,10 +43,8 @@ <string name="accessibility_action_divider_left_50" msgid="3488317024557521561">"שמאלה 50%"</string> <string name="accessibility_action_divider_left_30" msgid="6023611335723838727">"שמאלה 30%"</string> <string name="accessibility_action_divider_right_full" msgid="3408505054325944903">"מסך ימני מלא"</string> - <!-- no translation found for accessibility_action_divider_swap_vertical (3644891227133372072) --> - <skip /> - <!-- no translation found for accessibility_action_divider_swap_horizontal (2722197605446631628) --> - <skip /> + <string name="accessibility_action_divider_swap_vertical" msgid="3644891227133372072">"החלפה בין האפליקציה העליונה לבין האפליקציה התחתונה"</string> + <string name="accessibility_action_divider_swap_horizontal" msgid="2722197605446631628">"החלפה בין האפליקציה השמאלית לבין האפליקציה הימנית"</string> <string name="accessibility_action_divider_top_full" msgid="3495871951082107594">"מסך עליון מלא"</string> <string name="accessibility_action_divider_top_70" msgid="1779164068887875474">"עליון 70%"</string> <string name="accessibility_action_divider_top_50" msgid="8649582798829048946">"עליון 50%"</string> @@ -102,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"הבעיה לא נפתרה?\nאפשר ללחוץ כדי לחזור לגרסה הקודמת"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"אין בעיות במצלמה? אפשר ללחוץ כדי לסגור."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"תפריט האפליקציה נמצא כאן"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"כדי לפתוח כמה אפליקציות יחד, צריך לעבור למצב תצוגה למחשב"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"אפשר לחזור למסך מלא בכל שלב מתפריט האפליקציה"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"רוצה לראות ולעשות יותר?"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"צריך לגרור אפליקציה אחרת כדי להשתמש במסך המפוצל"</string> @@ -115,19 +114,16 @@ <string name="letterbox_restart_restart" msgid="8529976234412442973">"הפעלה מחדש"</string> <string name="letterbox_restart_dialog_checkbox_title" msgid="5252918008140768386">"לא להציג שוב"</string> <string name="letterbox_reachability_reposition_text" msgid="3522042240665748268">"אפשר ללחוץ לחיצה כפולה כדי\nלהעביר את האפליקציה למקום אחר"</string> - <!-- no translation found for maximize_button_text (8106849394538234709) --> - <skip /> - <!-- no translation found for restore_button_text (5377571986086775288) --> - <skip /> - <!-- no translation found for minimize_button_text (5213953162664451152) --> - <skip /> - <!-- no translation found for close_button_text (4544839489310949894) --> - <skip /> + <string name="maximize_button_text" msgid="8106849394538234709">"הגדלה של <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="restore_button_text" msgid="5377571986086775288">"שחזור של <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="minimize_button_text" msgid="5213953162664451152">"מזעור של <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="close_button_text" msgid="4544839489310949894">"סגירה של <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="back_button_text" msgid="1469718707134137085">"חזרה"</string> <string name="handle_text" msgid="4419667835599523257">"נקודת אחיזה לאפליקציה"</string> <string name="app_icon_text" msgid="2823268023931811747">"סמל האפליקציה"</string> <string name="fullscreen_text" msgid="1162316685217676079">"מסך מלא"</string> - <string name="desktop_text" msgid="1582173066857454541">"תצוגה למחשב"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"מסך מפוצל"</string> <string name="more_button_text" msgid="3655388105592893530">"עוד"</string> <string name="float_button_text" msgid="9221657008391364581">"בלונים"</string> @@ -140,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"שינוי יחס הגובה-רוחב"</string> <string name="close_text" msgid="4986518933445178928">"סגירה"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"סגירת התפריט"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (תצוגה למחשב)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"הגדלת המסך"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"שינוי הגודל"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"לא ניתן להעביר את האפליקציה לכאן"</string> @@ -158,14 +155,10 @@ <string name="maximize_menu_talkback_action_snap_left_text" msgid="500309467459084564">"שינוי גודל החלון שמשמאל"</string> <string name="maximize_menu_talkback_action_snap_right_text" msgid="7010831426654467163">"שינוי גודל החלון שמימין"</string> <string name="maximize_menu_talkback_action_maximize_restore_text" msgid="4942610897847934859">"שחזור של גודל החלון או הגדלת החלון"</string> - <!-- no translation found for app_header_talkback_action_maximize_button_text (8776156791095878638) --> - <skip /> - <!-- no translation found for app_header_talkback_action_restore_button_text (2153022340772980863) --> - <skip /> - <!-- no translation found for app_header_talkback_action_minimize_button_text (7491054416186901764) --> - <skip /> - <!-- no translation found for app_header_talkback_action_close_button_text (5159612596378268926) --> - <skip /> + <string name="app_header_talkback_action_maximize_button_text" msgid="8776156791095878638">"הגדלת החלון של האפליקציה"</string> + <string name="app_header_talkback_action_restore_button_text" msgid="2153022340772980863">"שחזור הגודל של החלון"</string> + <string name="app_header_talkback_action_minimize_button_text" msgid="7491054416186901764">"מזעור החלון של האפליקציה"</string> + <string name="app_header_talkback_action_close_button_text" msgid="5159612596378268926">"סגירת החלון של האפליקציה"</string> <string name="open_by_default_settings_text" msgid="2526548548598185500">"הגדרות לפתיחה כברירת מחדל"</string> <string name="open_by_default_dialog_subheader_text" msgid="1729599730664063881">"כאן בוחרים איך לפתוח באפליקציה הזו קישורים לדפי אינטרנט"</string> <string name="open_by_default_dialog_in_app_text" msgid="6978022419634199806">"באפליקציה"</string> diff --git a/libs/WindowManager/Shell/res/values-ja/strings.xml b/libs/WindowManager/Shell/res/values-ja/strings.xml index d68581bda1ff..1a73dd3b7715 100644 --- a/libs/WindowManager/Shell/res/values-ja/strings.xml +++ b/libs/WindowManager/Shell/res/values-ja/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"修正されなかった場合は、\nタップすると元に戻ります"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"カメラに関する問題でない場合は、タップすると閉じます。"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"アプリメニューはここにあります"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"デスクトップ ビューに切り替えて複数のアプリを同時に開けます"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"アプリメニューからいつでも全画面表示に戻れます"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"表示を拡大して機能を強化"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"分割画面にするにはもう 1 つのアプリをドラッグしてください"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"アプリハンドル"</string> <string name="app_icon_text" msgid="2823268023931811747">"アプリのアイコン"</string> <string name="fullscreen_text" msgid="1162316685217676079">"全画面表示"</string> - <string name="desktop_text" msgid="1582173066857454541">"デスクトップ ビュー"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"分割画面"</string> <string name="more_button_text" msgid="3655388105592893530">"その他"</string> <string name="float_button_text" msgid="9221657008391364581">"フローティング"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"アスペクト比を変更"</string> <string name="close_text" msgid="4986518933445178928">"閉じる"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"メニューを閉じる"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g>（デスクトップ ビュー）"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"画面の最大化"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"サイズ変更"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"アプリはここに移動できません"</string> diff --git a/libs/WindowManager/Shell/res/values-ka/strings.xml b/libs/WindowManager/Shell/res/values-ka/strings.xml index 369c019726c7..4bbfaefb36a2 100644 --- a/libs/WindowManager/Shell/res/values-ka/strings.xml +++ b/libs/WindowManager/Shell/res/values-ka/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"არ გამოსწორდა?\nშეეხეთ წინა ვერსიის დასაბრუნებლად"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"კამერას პრობლემები არ აქვს? შეეხეთ უარყოფისთვის."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"აპის მენიუ შეგიძლიათ იხილოთ აქ"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"რამდენიმე აპის ერთდროულად გასახსნელად შედით დესკტოპის ხედში"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"სრულ ეკრანზე ნებისმიერ დროს შეგიძლიათ დაბრუნდეთ აპის მენიუდან"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"მეტის ნახვა და გაკეთება"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ეკრანის გასაყოფად ჩავლებით გადაიტანეთ სხვა აპში"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"აპის იდენტიფიკატორი"</string> <string name="app_icon_text" msgid="2823268023931811747">"აპის ხატულა"</string> <string name="fullscreen_text" msgid="1162316685217676079">"სრულ ეკრანზე"</string> - <string name="desktop_text" msgid="1582173066857454541">"დესკტოპის ხედი"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"ეკრანის გაყოფა"</string> <string name="more_button_text" msgid="3655388105592893530">"სხვა"</string> <string name="float_button_text" msgid="9221657008391364581">"ფარფატი"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"თანაფარდობის შეცვლა"</string> <string name="close_text" msgid="4986518933445178928">"დახურვა"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"მენიუს დახურვა"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (დესკტოპის ხედი)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"აპლიკაციის გაშლა სრულ ეკრანზე"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"ზომის შეცვლა"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"აპის აქ გადატანა შეუძლებელია"</string> diff --git a/libs/WindowManager/Shell/res/values-kk/strings.xml b/libs/WindowManager/Shell/res/values-kk/strings.xml index 1de32d4ae834..2f6404d4680d 100644 --- a/libs/WindowManager/Shell/res/values-kk/strings.xml +++ b/libs/WindowManager/Shell/res/values-kk/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Жөнделмеді ме?\nҚайтару үшін түртіңіз."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Камерада қателер шықпады ма? Жабу үшін түртіңіз."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Қолданба мәзірін осы жерден табуға болады."</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Бірнеше қолданбаны бірге ашу үшін компьютерлік нұсқаны қосыңыз."</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Қолданба мәзірінен кез келген уақытта толық экранға оралыңыз."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Қосымша ақпаратты қарап, әрекеттер жасау"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Экранды бөлу үшін басқа қолданбаға өтіңіз."</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Қолданба идентификаторы"</string> <string name="app_icon_text" msgid="2823268023931811747">"Қолданба белгішесі"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Толық экран"</string> - <string name="desktop_text" msgid="1582173066857454541">"Компьютерлік нұсқа"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Экранды бөлу"</string> <string name="more_button_text" msgid="3655388105592893530">"Қосымша"</string> <string name="float_button_text" msgid="9221657008391364581">"Қалқыма"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Арақатынасты өзгерту"</string> <string name="close_text" msgid="4986518933445178928">"Жабу"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Мәзірді жабу"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (компьютерлік нұсқа)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Экранды ұлғайту"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Өлшемін өзгерту"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Қолданба бұл жерге қойылмайды."</string> diff --git a/libs/WindowManager/Shell/res/values-km/strings.xml b/libs/WindowManager/Shell/res/values-km/strings.xml index 6c7faf1469eb..d3942fdc1e6c 100644 --- a/libs/WindowManager/Shell/res/values-km/strings.xml +++ b/libs/WindowManager/Shell/res/values-km/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"មិនបានដោះស្រាយបញ្ហានេះទេឬ?\nចុចដើម្បីត្រឡប់"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"មិនមានបញ្ហាពាក់ព័ន្ធនឹងកាមេរ៉ាទេឬ? ចុចដើម្បីច្រានចោល។"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"អាចរកឃើញម៉ឺនុយកម្មវិធីនៅទីនេះ"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"ចូលទិដ្ឋភាពលើកុំព្យូទ័រ ដើម្បីបើកកម្មវិធីច្រើនជាមួយគ្នា"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ត្រឡប់ទៅអេក្រង់ពេញវិញនៅពេលណាក៏បានពីម៉ឺនុយកម្មវិធី"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"មើលឃើញ និងធ្វើបានកាន់តែច្រើន"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"អូសកម្មវិធីមួយទៀតចូល ដើម្បីប្រើមុខងារបំបែកអេក្រង់"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"ឈ្មោះអ្នកប្រើប្រាស់កម្មវិធី"</string> <string name="app_icon_text" msgid="2823268023931811747">"រូបកម្មវិធី"</string> <string name="fullscreen_text" msgid="1162316685217676079">"អេក្រង់ពេញ"</string> - <string name="desktop_text" msgid="1582173066857454541">"ទិដ្ឋភាពលើកុំព្យូទ័រ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"មុខងារបំបែកអេក្រង់"</string> <string name="more_button_text" msgid="3655388105592893530">"ច្រើនទៀត"</string> <string name="float_button_text" msgid="9221657008391364581">"អណ្ដែត"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"ប្ដូរសមាមាត្រ"</string> <string name="close_text" msgid="4986518933445178928">"បិទ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"បិទម៉ឺនុយ"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ទិដ្ឋភាពលើកុំព្យូទ័រ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"ពង្រីកអេក្រង់"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"ប្ដូរទំហំ"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"មិនអាចផ្លាស់ទីកម្មវិធីមកទីនេះបានទេ"</string> diff --git a/libs/WindowManager/Shell/res/values-kn/strings.xml b/libs/WindowManager/Shell/res/values-kn/strings.xml index 6a9e07f91d08..fb15e34d934b 100644 --- a/libs/WindowManager/Shell/res/values-kn/strings.xml +++ b/libs/WindowManager/Shell/res/values-kn/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ಅದನ್ನು ಸರಿಪಡಿಸಲಿಲ್ಲವೇ?\nಹಿಂತಿರುಗಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ಕ್ಯಾಮರಾ ಸಮಸ್ಯೆಗಳಿಲ್ಲವೇ? ವಜಾಗೊಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ಆ್ಯಪ್ ಮೆನುವನ್ನು ಇಲ್ಲಿ ಕಾಣಬಹುದು"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"ಹಲವು ಆ್ಯಪ್ಗಳನ್ನು ಒಟ್ಟಿಗೆ ತೆರೆಯಲು ಡೆಸ್ಕ್ಟಾಪ್ ವೀಕ್ಷಣೆಯನ್ನು ನಮೂದಿಸಿ"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ಆ್ಯಪ್ ಮೆನುವಿನಿಂದ ಯಾವಾಗ ಬೇಕಾದರೂ ಫುಲ್ಸ್ಕ್ರೀನ್ಗೆ ಹಿಂತಿರುಗಿ"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ನೋಡಿ ಮತ್ತು ಹೆಚ್ಚಿನದನ್ನು ಮಾಡಿ"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ಗಾಗಿ ಮತ್ತೊಂದು ಆ್ಯಪ್ನಲ್ಲಿ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"ಆ್ಯಪ್ ಹ್ಯಾಂಡಲ್"</string> <string name="app_icon_text" msgid="2823268023931811747">"ಆ್ಯಪ್ ಐಕಾನ್"</string> <string name="fullscreen_text" msgid="1162316685217676079">"ಫುಲ್ಸ್ಕ್ರೀನ್"</string> - <string name="desktop_text" msgid="1582173066857454541">"ಡೆಸ್ಕ್ಟಾಪ್ ವೀಕ್ಷಣೆ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್"</string> <string name="more_button_text" msgid="3655388105592893530">"ಇನ್ನಷ್ಟು"</string> <string name="float_button_text" msgid="9221657008391364581">"ಫ್ಲೋಟ್"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"ದೃಶ್ಯಾನುಪಾತವನ್ನು ಬದಲಾಯಿಸಿ"</string> <string name="close_text" msgid="4986518933445178928">"ಮುಚ್ಚಿ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ಮೆನು ಮುಚ್ಚಿ"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ಡೆಸ್ಕ್ಟಾಪ್ ವೀಕ್ಷಣೆ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಮ್ಯಾಕ್ಸಿಮೈಸ್ ಮಾಡಿ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"ಮರುಗಾತ್ರಗೊಳಿಸಿ"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ಆ್ಯಪ್ ಅನ್ನು ಇಲ್ಲಿಗೆ ಸರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string> diff --git a/libs/WindowManager/Shell/res/values-ko/strings.xml b/libs/WindowManager/Shell/res/values-ko/strings.xml index e94d8893010f..dbfd32a7dcb1 100644 --- a/libs/WindowManager/Shell/res/values-ko/strings.xml +++ b/libs/WindowManager/Shell/res/values-ko/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"해결되지 않았나요?\n되돌리려면 탭하세요."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"카메라에 문제가 없나요? 닫으려면 탭하세요."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"앱 메뉴는 여기에서 찾을 수 있습니다."</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"데스크톱 뷰를 실행하여 여러 앱을 함께 열 수 있습니다."</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"언제든지 앱 메뉴에서 전체 화면으로 돌아갈 수 있습니다."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"더 많은 정보를 보고 더 많은 작업을 처리하세요"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"화면 분할을 사용하려면 다른 앱을 드래그해 가져옵니다."</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"앱 핸들"</string> <string name="app_icon_text" msgid="2823268023931811747">"앱 아이콘"</string> <string name="fullscreen_text" msgid="1162316685217676079">"전체 화면"</string> - <string name="desktop_text" msgid="1582173066857454541">"데스크톱 뷰"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"화면 분할"</string> <string name="more_button_text" msgid="3655388105592893530">"더보기"</string> <string name="float_button_text" msgid="9221657008391364581">"플로팅"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"가로세로 비율 변경"</string> <string name="close_text" msgid="4986518933445178928">"닫기"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"메뉴 닫기"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g>(데스크톱 뷰)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"화면 최대화"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"크기 조절"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"앱을 여기로 이동할 수 없음"</string> diff --git a/libs/WindowManager/Shell/res/values-ky/strings.xml b/libs/WindowManager/Shell/res/values-ky/strings.xml index 73e743686b77..36194cdaaa47 100644 --- a/libs/WindowManager/Shell/res/values-ky/strings.xml +++ b/libs/WindowManager/Shell/res/values-ky/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Оңдолгон жокпу?\nАртка кайтаруу үчүн таптаңыз"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Камерада маселе жокпу? Этибарга албоо үчүн таптаңыз."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Колдонмонун менюсун ушул жерден таба аласыз"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Бир убакта бир нече колдонмону ачуу үчүн компьютердик версияга өтүңүз"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Каалаган убакта колдонмонун менюсунан толук экранга кайта аласыз"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Көрүп, көбүрөөк нерселерди жасаңыз"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Экранды бөлүү үчүн башка колдонмону сүйрөңүз"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Колдонмонун маркери"</string> <string name="app_icon_text" msgid="2823268023931811747">"Колдонмонун сүрөтчөсү"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Толук экран"</string> - <string name="desktop_text" msgid="1582173066857454541">"Компьютердик версия"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Экранды бөлүү"</string> <string name="more_button_text" msgid="3655388105592893530">"Дагы"</string> <string name="float_button_text" msgid="9221657008391364581">"Калкыма"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Тараптардын катнашын өзгөртүү"</string> <string name="close_text" msgid="4986518933445178928">"Жабуу"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Менюну жабуу"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (компьютердик версия)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Экранды чоңойтуу"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Өлчөмүн өзгөртүү"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Колдонмону бул жерге жылдырууга болбойт"</string> diff --git a/libs/WindowManager/Shell/res/values-lo/strings.xml b/libs/WindowManager/Shell/res/values-lo/strings.xml index fd47465de5da..671f92447204 100644 --- a/libs/WindowManager/Shell/res/values-lo/strings.xml +++ b/libs/WindowManager/Shell/res/values-lo/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ບໍ່ໄດ້ແກ້ໄຂມັນບໍ?\nແຕະເພື່ອແປງກັບຄືນ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ບໍ່ມີບັນຫາກ້ອງຖ່າຍຮູບບໍ? ແຕະເພື່ອປິດໄວ້."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ສາມາດເບິ່ງເມນູແອັບໄດ້ບ່ອນນີ້"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"ເຂົ້າສູ່ມຸມມອງເດັສທັອບເພື່ອເປີດຫຼາຍແອັບພ້ອມກັນ"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ກັບຄືນໄປຫາໂໝດເຕັມຈໍໄດ້ທຸກເວລາຈາກເມນູແອັບ"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ເບິ່ງ ແລະ ເຮັດຫຼາຍຂຶ້ນ"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ລາກໄປໄວ້ໃນແອັບອື່ນເພື່ອແບ່ງໜ້າຈໍ"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"ຊື່ຜູ້ໃຊ້ແອັບ"</string> <string name="app_icon_text" msgid="2823268023931811747">"ໄອຄອນແອັບ"</string> <string name="fullscreen_text" msgid="1162316685217676079">"ເຕັມຈໍ"</string> - <string name="desktop_text" msgid="1582173066857454541">"ມຸມມອງຢູ່ເດັສທັອບ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"ແບ່ງໜ້າຈໍ"</string> <string name="more_button_text" msgid="3655388105592893530">"ເພີ່ມເຕີມ"</string> <string name="float_button_text" msgid="9221657008391364581">"ລອຍ"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"ປ່ຽນອັດຕາສ່ວນຮູບ"</string> <string name="close_text" msgid="4986518933445178928">"ປິດ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ປິດເມນູ"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ມຸມມອງຢູ່ເດັສທັອບ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"ປັບຈໍໃຫຍ່ສຸດ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"ປັບຂະໜາດ"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ບໍ່ສາມາດຍ້າຍແອັບມາບ່ອນນີ້ໄດ້"</string> diff --git a/libs/WindowManager/Shell/res/values-lt/strings.xml b/libs/WindowManager/Shell/res/values-lt/strings.xml index 902ef048b11e..794c5ab02c19 100644 --- a/libs/WindowManager/Shell/res/values-lt/strings.xml +++ b/libs/WindowManager/Shell/res/values-lt/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Programos meniu rasite čia"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Įjunkite rodinio versiją staliniams kompiuteriams, kad vienu metu atidarytumėte kelias programas"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Bet kada iš programos meniu grįžkite į viso ekrano režimą"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Daugiau turinio ir funkcijų"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Vilkite kitoje programoje, kad galėtumėte naudoti išskaidyto ekrano režimą"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Programos kreipinys"</string> <string name="app_icon_text" msgid="2823268023931811747">"Programos piktograma"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Visas ekranas"</string> - <string name="desktop_text" msgid="1582173066857454541">"Rodinio versija staliniams kompiuteriams"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Išskaidyto ekrano režimas"</string> <string name="more_button_text" msgid="3655388105592893530">"Daugiau"</string> <string name="float_button_text" msgid="9221657008391364581">"Slankusis langas"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Keisti kraštinių santykį"</string> <string name="close_text" msgid="4986518933445178928">"Uždaryti"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Uždaryti meniu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ (rodinio versija staliniams kompiuteriams)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Išskleisti ekraną"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Pakeisti dydį"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Programos negalima perkelti čia"</string> diff --git a/libs/WindowManager/Shell/res/values-lv/strings.xml b/libs/WindowManager/Shell/res/values-lv/strings.xml index b4095dfd6f1e..5b44112c76d5 100644 --- a/libs/WindowManager/Shell/res/values-lv/strings.xml +++ b/libs/WindowManager/Shell/res/values-lv/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Šeit ir pieejama lietotņu izvēlne"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Lai atvērtu vairākas lietotnes vienlaikus, pārejiet uz skatu datorā"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"No lietotnes izvēlnes varat jebkurā brīdī atgriezties pilnekrāna režīmā."</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Uzziniet un paveiciet vairāk"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Lai izmantotu sadalītu ekrānu, ievelciet vēl vienu lietotni"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Lietotnes turis"</string> <string name="app_icon_text" msgid="2823268023931811747">"Lietotnes ikona"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Pilnekrāna režīms"</string> - <string name="desktop_text" msgid="1582173066857454541">"Skats datorā"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Sadalīt ekrānu"</string> <string name="more_button_text" msgid="3655388105592893530">"Vairāk"</string> <string name="float_button_text" msgid="9221657008391364581">"Peldošs"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Mainīt malu attiecību"</string> <string name="close_text" msgid="4986518933445178928">"Aizvērt"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Aizvērt izvēlni"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (skats datorā)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimizēt ekrānu"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Mainīt lielumu"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Lietotni nevar pārvietot šeit."</string> diff --git a/libs/WindowManager/Shell/res/values-mk/strings.xml b/libs/WindowManager/Shell/res/values-mk/strings.xml index be97489d6159..96bf9b67144e 100644 --- a/libs/WindowManager/Shell/res/values-mk/strings.xml +++ b/libs/WindowManager/Shell/res/values-mk/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Не се поправи?\nДопрете за враќање"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Нема проблеми со камерата? Допрете за отфрлање."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Менито со апликации може да го најдете овде"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Влезете во приказот на компјутер за да отворите повеќе апликации заедно"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Вратете се на цел екран од менито со апликации кога сакате"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Погледнете и направете повеќе"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Повлечете друга апликација за поделен екран"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Прекар на апликацијата"</string> <string name="app_icon_text" msgid="2823268023931811747">"Икона на апликацијата"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Цел екран"</string> - <string name="desktop_text" msgid="1582173066857454541">"Приказ на компјутер"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Поделен екран"</string> <string name="more_button_text" msgid="3655388105592893530">"Повеќе"</string> <string name="float_button_text" msgid="9221657008391364581">"Лебдечко"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Промени го соодносот"</string> <string name="close_text" msgid="4986518933445178928">"Затворете"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затворете го менито"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (приказ на компјутер)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Максимизирај го екранот"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Смени големина"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Апликацијата не може да се премести овде"</string> diff --git a/libs/WindowManager/Shell/res/values-ml/strings.xml b/libs/WindowManager/Shell/res/values-ml/strings.xml index cb84dec8a254..8085601076ef 100644 --- a/libs/WindowManager/Shell/res/values-ml/strings.xml +++ b/libs/WindowManager/Shell/res/values-ml/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"അത് പരിഹരിച്ചില്ലേ?\nപുനഃസ്ഥാപിക്കാൻ ടാപ്പ് ചെയ്യുക"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ക്യാമറാ പ്രശ്നങ്ങളൊന്നുമില്ലേ? നിരസിക്കാൻ ടാപ്പ് ചെയ്യുക."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ആപ്പ് മെനു ഇവിടെ കണ്ടെത്താനാകും"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"ഒന്നിലധികം ആപ്പുകൾ ഒരുമിച്ച് തുറക്കാൻ ഡെസ്ക്ടോപ്പ് വ്യൂവിൽ പ്രവേശിക്കുക"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ആപ്പ് മെനുവിൽ നിന്ന് ഏതുസമയത്തും പൂർണ്ണ സ്ക്രീനിലേക്ക് മടങ്ങുക"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"കൂടുതൽ കാണുക, ചെയ്യുക"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"സ്ക്രീൻ വിഭജന മോഡിന്, മറ്റൊരു ആപ്പ് വലിച്ചിടുക"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"ആപ്പ് ഹാൻഡിൽ"</string> <string name="app_icon_text" msgid="2823268023931811747">"ആപ്പ് ഐക്കൺ"</string> <string name="fullscreen_text" msgid="1162316685217676079">"പൂർണ്ണസ്ക്രീൻ"</string> - <string name="desktop_text" msgid="1582173066857454541">"ഡെസ്ക്ടോപ്പ് വ്യൂ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"സ്ക്രീൻ വിഭജനം"</string> <string name="more_button_text" msgid="3655388105592893530">"കൂടുതൽ"</string> <string name="float_button_text" msgid="9221657008391364581">"ഫ്ലോട്ട്"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"വീക്ഷണ അനുപാതം മാറ്റുക"</string> <string name="close_text" msgid="4986518933445178928">"അടയ്ക്കുക"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"മെനു അടയ്ക്കുക"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ഡെസ്ക്ടോപ്പ് വ്യൂ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"സ്ക്രീൻ വലുതാക്കുക"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"വലുപ്പം മാറ്റുക"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ആപ്പ് ഇവിടേക്ക് നീക്കാനാകില്ല"</string> diff --git a/libs/WindowManager/Shell/res/values-mn/strings.xml b/libs/WindowManager/Shell/res/values-mn/strings.xml index d8efd8b2a103..5efe62d7d837 100644 --- a/libs/WindowManager/Shell/res/values-mn/strings.xml +++ b/libs/WindowManager/Shell/res/values-mn/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Үүнийг засаагүй юу?\nБуцаахын тулд товшино уу"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Камерын асуудал байхгүй юу? Хаахын тулд товшино уу."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Аппын цэсийг эндээс олох боломжтой"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Олон аппыг хамтад нь нээхийн тулд дэлгэц дээр харагдах байдалд орно уу"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Аппын цэсээс бүтэн дэлгэц рүү хүссэн үедээ буцна уу"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Харж илүү ихийг хий"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Дэлгэц хуваах горимд ашиглахын тулд өөр аппыг чирнэ үү"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Аппын бариул"</string> <string name="app_icon_text" msgid="2823268023931811747">"Aппын дүрс тэмдэг"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Бүтэн дэлгэц"</string> - <string name="desktop_text" msgid="1582173066857454541">"Дэлгэц дээр харагдах байдал"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Дэлгэцийг хуваах"</string> <string name="more_button_text" msgid="3655388105592893530">"Бусад"</string> <string name="float_button_text" msgid="9221657008391364581">"Хөвөгч"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Аспектын харьцааг өөрчлөх"</string> <string name="close_text" msgid="4986518933445178928">"Хаах"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Цэсийг хаах"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (дэлгэц дээр харагдах байдал)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Дэлгэцийг томруулах"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Хэмжээг өөрчлөх"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Аппыг ийш зөөх боломжгүй"</string> diff --git a/libs/WindowManager/Shell/res/values-mr/strings.xml b/libs/WindowManager/Shell/res/values-mr/strings.xml index d09a78426669..e10c8d82440d 100644 --- a/libs/WindowManager/Shell/res/values-mr/strings.xml +++ b/libs/WindowManager/Shell/res/values-mr/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"निराकरण झाले नाही?\nरिव्हर्ट करण्यासाठी कृपया टॅप करा"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"कॅमेराशी संबंधित कोणत्याही समस्या नाहीत का? डिसमिस करण्यासाठी टॅप करा."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ॲप मेनू इथे आढळू शकतो"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"एकाहून अधिक ॲप्स एकत्र उघडण्यासाठी डेस्कटॉप दृश्यात एंटर करा"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ॲप मेनूमधून कधीही फुल स्क्रीनवर परत या"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"पहा आणि आणखी बरेच काही करा"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"स्प्लिट स्क्रीन वापरण्यासाठी दुसरे ॲप ड्रॅग करा"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"अॅपचे हँडल"</string> <string name="app_icon_text" msgid="2823268023931811747">"अॅप आयकन"</string> <string name="fullscreen_text" msgid="1162316685217676079">"फुलस्क्रीन"</string> - <string name="desktop_text" msgid="1582173066857454541">"डेस्कटॉप दृश्य"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"स्प्लिट स्क्रीन"</string> <string name="more_button_text" msgid="3655388105592893530">"आणखी"</string> <string name="float_button_text" msgid="9221657008391364581">"फ्लोट"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"आस्पेक्ट रेशो बदला"</string> <string name="close_text" msgid="4986518933445178928">"बंद करा"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेनू बंद करा"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (डेस्कटॉप दृश्य)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"स्क्रीन मोठी करा"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"आकार बदला"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"अॅप इथे हलवू शकत नाही"</string> diff --git a/libs/WindowManager/Shell/res/values-ms/strings.xml b/libs/WindowManager/Shell/res/values-ms/strings.xml index e954b0f8937e..e18e7ec68640 100644 --- a/libs/WindowManager/Shell/res/values-ms/strings.xml +++ b/libs/WindowManager/Shell/res/values-ms/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Menu apl boleh ditemukan di sini"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Masuki paparan desktop untuk membuka berbilang apl serentak"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Kembali kepada skrin penuh pada bila-bila masa daripada menu apl"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Lihat dan lakukan lebih"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Seret masuk apl lain untuk menggunakan skrin pisah"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Pengendalian apl"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikon Apl"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Skrin penuh"</string> - <string name="desktop_text" msgid="1582173066857454541">"Paparan Desktop"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Skrin Pisah"</string> <string name="more_button_text" msgid="3655388105592893530">"Lagi"</string> <string name="float_button_text" msgid="9221657008391364581">"Terapung"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Tukar nisbah bidang"</string> <string name="close_text" msgid="4986518933445178928">"Tutup"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tutup Menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Paparan Desktop)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimumkan Skrin"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Ubah saiz"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Apl tidak boleh dialihkan ke sini"</string> diff --git a/libs/WindowManager/Shell/res/values-my/strings.xml b/libs/WindowManager/Shell/res/values-my/strings.xml index 2342564930b4..334a79799d53 100644 --- a/libs/WindowManager/Shell/res/values-my/strings.xml +++ b/libs/WindowManager/Shell/res/values-my/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ကောင်းမသွားဘူးလား။\nပြန်ပြောင်းရန် တို့ပါ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ကင်မရာပြဿနာ မရှိဘူးလား။ ပယ်ရန် တို့ပါ။"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"အက်ပ်မီနူးကို ဤနေရာတွင် တွေ့နိုင်သည်"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"အက်ပ်များစွာကို အတူတကွဖွင့်ရန်အတွက် ဒက်စ်တော့မြင်ကွင်းသို့ ဝင်ရောက်နိုင်သည်"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"အက်ပ်မီနူးမှ ဖန်သားပြင်အပြည့်သို့ အချိန်မရွေး ပြန်သွားနိုင်သည်"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ကြည့်ပြီး ပိုမိုလုပ်ဆောင်ပါ"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"မျက်နှာပြင် ခွဲ၍ပြသခြင်းအတွက် အက်ပ်နောက်တစ်ခုကို ဖိဆွဲပါ"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"အက်ပ်သုံးသူအမည်"</string> <string name="app_icon_text" msgid="2823268023931811747">"အက်ပ်သင်္ကေတ"</string> <string name="fullscreen_text" msgid="1162316685217676079">"ဖန်သားပြင်အပြည့်"</string> - <string name="desktop_text" msgid="1582173066857454541">"ဒက်စ်တော့ မြင်ကွင်း"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"မျက်နှာပြင် ခွဲ၍ပြသရန်"</string> <string name="more_button_text" msgid="3655388105592893530">"ပိုပြပါ"</string> <string name="float_button_text" msgid="9221657008391364581">"မျှောရန်"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"အချိုးအစား ပြောင်းရန်"</string> <string name="close_text" msgid="4986518933445178928">"ပိတ်ရန်"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"မီနူး ပိတ်ရန်"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ဒက်စ်တော့ မြင်ကွင်း)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"စခရင်ကို ချဲ့မည်"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"အရွယ်ပြင်ရန်"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"အက်ပ်ကို ဤနေရာသို့ ရွှေ့၍မရပါ"</string> diff --git a/libs/WindowManager/Shell/res/values-nb/strings.xml b/libs/WindowManager/Shell/res/values-nb/strings.xml index fb61a105eaaa..7e21b475b2fa 100644 --- a/libs/WindowManager/Shell/res/values-nb/strings.xml +++ b/libs/WindowManager/Shell/res/values-nb/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Her finner du appmenyen"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Gå til skrivebordsvisningen for å åpne flere apper samtidig"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Du kan gå tilbake til fullskjermmodusen når som helst fra appmenyen"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Se og gjør mer"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Dra inn en annen app for å bruke delt skjerm"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Apphåndtak"</string> <string name="app_icon_text" msgid="2823268023931811747">"Appikon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Fullskjerm"</string> - <string name="desktop_text" msgid="1582173066857454541">"Datamaskinvisning"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Delt skjerm"</string> <string name="more_button_text" msgid="3655388105592893530">"Mer"</string> <string name="float_button_text" msgid="9221657008391364581">"Svevende"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Endre høyde/bredde-forholdet"</string> <string name="close_text" msgid="4986518933445178928">"Lukk"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Lukk menyen"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (datamaskinvisning)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimer skjermen"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Endre størrelse"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Appen kan ikke flyttes hit"</string> diff --git a/libs/WindowManager/Shell/res/values-ne/strings.xml b/libs/WindowManager/Shell/res/values-ne/strings.xml index fdfa227b8080..976f8378606a 100644 --- a/libs/WindowManager/Shell/res/values-ne/strings.xml +++ b/libs/WindowManager/Shell/res/values-ne/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"समस्या हल भएन?\nपहिलेको जस्तै बनाउन ट्याप गर्नुहोस्"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"क्यामेरासम्बन्धी कुनै पनि समस्या छैन? खारेज गर्न ट्याप गर्नुहोस्।"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"एपको मेनु यहाँ भेट्टाउन सकिन्छ"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"एकभन्दा बढी एपहरू सँगै देखाउन डेस्कटप भ्यू हाल्नुहोस्"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"जुनसुकै बेला एपको मेनुबाट फुल स्क्रिनमा फर्कनुहोस्"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"थप कुरा हेर्नुहोस् र गर्नुहोस्"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"स्प्लिट स्क्रिन मोड प्रयोग गर्न अर्को एप ड्रयाग एन्ड ड्रप गर्नुहोस्"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"एपको ह्यान्डल"</string> <string name="app_icon_text" msgid="2823268023931811747">"एपको आइकन"</string> <string name="fullscreen_text" msgid="1162316685217676079">"फुल स्क्रिन"</string> - <string name="desktop_text" msgid="1582173066857454541">"डेस्कटप भ्यू"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"स्प्लिट स्क्रिन"</string> <string name="more_button_text" msgid="3655388105592893530">"थप"</string> <string name="float_button_text" msgid="9221657008391364581">"फ्लोट"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"एस्पेक्ट रेसियो परिवर्तन गर्नुहोस्"</string> <string name="close_text" msgid="4986518933445178928">"बन्द गर्नुहोस्"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेनु बन्द गर्नुहोस्"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (डेस्कटप भ्यू)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"स्क्रिन ठुलो बनाउनुहोस्"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"आकार बदल्नुहोस्"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"एप सारेर यहाँ ल्याउन सकिएन"</string> diff --git a/libs/WindowManager/Shell/res/values-nl/strings.xml b/libs/WindowManager/Shell/res/values-nl/strings.xml index 578877c65dd1..7178e418a5aa 100644 --- a/libs/WindowManager/Shell/res/values-nl/strings.xml +++ b/libs/WindowManager/Shell/res/values-nl/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Het app-menu vind je hier"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Ga naar de desktopweergave om meerdere apps tegelijk te openen"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Ga wanneer je wilt terug naar volledig scherm vanuit het app-menu"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Zie en doe meer"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Sleep een andere app hier naartoe om het scherm te splitsen"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"App-handgreep"</string> <string name="app_icon_text" msgid="2823268023931811747">"App-icoon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Volledig scherm"</string> - <string name="desktop_text" msgid="1582173066857454541">"Desktopweergave"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Gesplitst scherm"</string> <string name="more_button_text" msgid="3655388105592893530">"Meer"</string> <string name="float_button_text" msgid="9221657008391364581">"Zwevend"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Beeldverhouding wijzigen"</string> <string name="close_text" msgid="4986518933445178928">"Sluiten"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menu sluiten"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (desktopweergave)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Scherm maximaliseren"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Formaat aanpassen"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Kan de app niet hierheen verplaatsen"</string> diff --git a/libs/WindowManager/Shell/res/values-or/strings.xml b/libs/WindowManager/Shell/res/values-or/strings.xml index 62ee4a049a1d..19cc8ced6517 100644 --- a/libs/WindowManager/Shell/res/values-or/strings.xml +++ b/libs/WindowManager/Shell/res/values-or/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ଏହାର ସମାଧାନ ହୋଇନାହିଁ?\nଫେରିଯିବା ପାଇଁ ଟାପ କରନ୍ତୁ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"କ୍ୟାମେରାରେ କିଛି ସମସ୍ୟା ନାହିଁ? ଖାରଜ କରିବାକୁ ଟାପ କରନ୍ତୁ।"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ଆପ ମେନୁ ଏଠାରେ ମିଳିପାରିବ"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"ଏକାଠି ଏକାଧିକ ଆପ୍ସ ଖୋଲିବାକୁ ଡେସ୍କଟପ ଭ୍ୟୁରେ ପ୍ରବେଶ କରନ୍ତୁ"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ଆପ ମେନୁରୁ ଯେ କୌଣସି ସମୟରେ ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନକୁ ଫେରନ୍ତୁ"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ଦେଖନ୍ତୁ ଏବଂ ଆହୁରି ଅନେକ କିଛି କରନ୍ତୁ"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ପାଇଁ ଅନ୍ୟ ଏକ ଆପକୁ ଡ୍ରାଗ କରନ୍ତୁ"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"ଆପର ହେଣ୍ଡେଲ"</string> <string name="app_icon_text" msgid="2823268023931811747">"ଆପ ଆଇକନ"</string> <string name="fullscreen_text" msgid="1162316685217676079">"ପୂର୍ଣ୍ଣସ୍କ୍ରିନ"</string> - <string name="desktop_text" msgid="1582173066857454541">"ଡେସ୍କଟପ ଭ୍ୟୁ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ"</string> <string name="more_button_text" msgid="3655388105592893530">"ଅଧିକ"</string> <string name="float_button_text" msgid="9221657008391364581">"ଫ୍ଲୋଟ"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"ଚଉଡ଼ା ଓ ଉଚ୍ଚତାର ଅନୁପାତ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string> <string name="close_text" msgid="4986518933445178928">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ମେନୁ ବନ୍ଦ କରନ୍ତୁ"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ଡେସ୍କଟପ ଭ୍ୟୁ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"ସ୍କ୍ରିନକୁ ବଡ଼ କରନ୍ତୁ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"ରିସାଇଜ କରନ୍ତୁ"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ଆପକୁ ଏଠାକୁ ମୁଭ କରାଯାଇପାରିବ ନାହିଁ"</string> diff --git a/libs/WindowManager/Shell/res/values-pa/strings.xml b/libs/WindowManager/Shell/res/values-pa/strings.xml index 4dde6d292148..7e8929003017 100644 --- a/libs/WindowManager/Shell/res/values-pa/strings.xml +++ b/libs/WindowManager/Shell/res/values-pa/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"ਕੀ ਇਹ ਠੀਕ ਨਹੀਂ ਹੋਈ?\nਵਾਪਸ ਉਹੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"ਕੀ ਕੈਮਰੇ ਸੰਬੰਧੀ ਕੋਈ ਸਮੱਸਿਆ ਨਹੀਂ ਹੈ? ਖਾਰਜ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ਐਪ ਮੀਨੂ ਇੱਥੇ ਮਿਲ ਸਕਦਾ ਹੈ"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"ਕਈ ਐਪਾਂ ਨੂੰ ਇਕੱਠੇ ਖੋਲ੍ਹਣ ਲਈ ਡੈਸਕਟਾਪ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਦਾਖਲ ਹੋਵੋ"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ਐਪ ਮੀਨੂ ਤੋਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਪੂਰੀ ਸਕ੍ਰੀਨ \'ਤੇ ਵਾਪਸ ਜਾਓ"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"ਦੇਖੋ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ ਕਰੋ"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੇ ਲਈ ਕਿਸੇ ਹੋਰ ਐਪ ਵਿੱਚ ਘਸੀਟੋ"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"ਐਪ ਹੈਂਡਲ"</string> <string name="app_icon_text" msgid="2823268023931811747">"ਐਪ ਪ੍ਰਤੀਕ"</string> <string name="fullscreen_text" msgid="1162316685217676079">"ਪੂਰੀ-ਸਕ੍ਰੀਨ"</string> - <string name="desktop_text" msgid="1582173066857454541">"ਡੈਸਕਟਾਪ ਦ੍ਰਿਸ਼"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ"</string> <string name="more_button_text" msgid="3655388105592893530">"ਹੋਰ"</string> <string name="float_button_text" msgid="9221657008391364581">"ਫ਼ਲੋਟ"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"ਆਕਾਰ ਅਨੁਪਾਤ ਬਦਲੋ"</string> <string name="close_text" msgid="4986518933445178928">"ਬੰਦ ਕਰੋ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ਮੀਨੂ ਬੰਦ ਕਰੋ"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ਡੈਸਕਟਾਪ ਦ੍ਰਿਸ਼)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"ਸਕ੍ਰੀਨ ਦਾ ਆਕਾਰ ਵਧਾਓ"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"ਆਕਾਰ ਬਦਲੋ"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ਐਪ ਨੂੰ ਇੱਥੇ ਨਹੀਂ ਲਿਜਾਇਆ ਜਾ ਸਕਦਾ"</string> diff --git a/libs/WindowManager/Shell/res/values-pl/strings.xml b/libs/WindowManager/Shell/res/values-pl/strings.xml index 50861bac617b..58a691f83cca 100644 --- a/libs/WindowManager/Shell/res/values-pl/strings.xml +++ b/libs/WindowManager/Shell/res/values-pl/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Tu znajdziesz menu aplikacji"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Aby otworzyć kilka aplikacji jednocześnie, przejdź do widoku pulpitu"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Z menu aplikacji w każdej chwili możesz wrócić do pełnego ekranu"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Zobacz i zrób więcej"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Aby podzielić ekran, przeciągnij drugą aplikację"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Uchwyt aplikacji"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikona aplikacji"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Pełny ekran"</string> - <string name="desktop_text" msgid="1582173066857454541">"Wersja na komputery"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Podzielony ekran"</string> <string name="more_button_text" msgid="3655388105592893530">"Więcej"</string> <string name="float_button_text" msgid="9221657008391364581">"Pływające"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Zmień format obrazu"</string> <string name="close_text" msgid="4986518933445178928">"Zamknij"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zamknij menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (wersja na komputery)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksymalizuj ekran"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Zmień rozmiar"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Nie można przenieść aplikacji tutaj"</string> diff --git a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml index a8f7403a94db..2d9bc2bc5b80 100644 --- a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"O menu do app está aqui"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Acesse a versão para computadores para abrir vários apps ao mesmo tempo"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Volte para a tela cheia a qualquer momento no menu do app"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Veja e faça mais"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arraste outro app para dividir a tela"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Identificador do app"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ícone do app"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Tela cheia"</string> - <string name="desktop_text" msgid="1582173066857454541">"Versão para computadores"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Tela dividida"</string> <string name="more_button_text" msgid="3655388105592893530">"Mais"</string> <string name="float_button_text" msgid="9221657008391364581">"Ponto flutuante"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Mudar a proporção"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (versão para computadores)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ampliar tela"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Redimensionar"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Não é possível mover o app para cá"</string> diff --git a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml index 04d404287327..765a2071a037 100644 --- a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Não foi corrigido?\nToque para reverter"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nenhum problema com a câmara? Toque para ignorar."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"O menu da app pode ser encontrado aqui"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Entre na vista de computador para abrir várias apps em conjunto"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Regresse ao ecrã inteiro em qualquer altura a partir do menu da app"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Veja e faça mais"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arraste outra app para usar o ecrã dividido"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Indicador da app"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ícone da app"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Ecrã inteiro"</string> - <string name="desktop_text" msgid="1582173066857454541">"Vista de computador"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Ecrã dividido"</string> <string name="more_button_text" msgid="3655388105592893530">"Mais"</string> <string name="float_button_text" msgid="9221657008391364581">"Flutuar"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Alterar formato"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (vista de computador)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximizar ecrã"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Redimensionar"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Não é possível mover a app para aqui"</string> diff --git a/libs/WindowManager/Shell/res/values-pt/strings.xml b/libs/WindowManager/Shell/res/values-pt/strings.xml index a8f7403a94db..2d9bc2bc5b80 100644 --- a/libs/WindowManager/Shell/res/values-pt/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"O menu do app está aqui"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Acesse a versão para computadores para abrir vários apps ao mesmo tempo"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Volte para a tela cheia a qualquer momento no menu do app"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Veja e faça mais"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Arraste outro app para dividir a tela"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Identificador do app"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ícone do app"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Tela cheia"</string> - <string name="desktop_text" msgid="1582173066857454541">"Versão para computadores"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Tela dividida"</string> <string name="more_button_text" msgid="3655388105592893530">"Mais"</string> <string name="float_button_text" msgid="9221657008391364581">"Ponto flutuante"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Mudar a proporção"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (versão para computadores)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ampliar tela"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Redimensionar"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Não é possível mover o app para cá"</string> diff --git a/libs/WindowManager/Shell/res/values-ro/strings.xml b/libs/WindowManager/Shell/res/values-ro/strings.xml index d781d0893fa6..68d045fdbe29 100644 --- a/libs/WindowManager/Shell/res/values-ro/strings.xml +++ b/libs/WindowManager/Shell/res/values-ro/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Nu ai remediat problema?\nAtinge pentru a reveni"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Nu ai probleme cu camera foto? Atinge pentru a închide."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Meniul aplicației poate fi găsit aici"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Accesează afișarea pe desktop pentru a deschide mai multe aplicații simultan"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Revino oricând la ecranul complet din meniul aplicației"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Vezi și fă mai multe"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Trage în altă aplicație pentru a folosi ecranul împărțit"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Handle de aplicație"</string> <string name="app_icon_text" msgid="2823268023931811747">"Pictograma aplicației"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Ecran complet"</string> - <string name="desktop_text" msgid="1582173066857454541">"Afișare pe desktop"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Ecran împărțit"</string> <string name="more_button_text" msgid="3655388105592893530">"Mai multe"</string> <string name="float_button_text" msgid="9221657008391364581">"Flotantă"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Schimbă raportul de dimensiuni"</string> <string name="close_text" msgid="4986518933445178928">"Închide"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Închide meniul"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (afișare pe desktop)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximizează fereastra"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Redimensionează"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplicația nu poate fi mutată aici"</string> diff --git a/libs/WindowManager/Shell/res/values-ru/strings.xml b/libs/WindowManager/Shell/res/values-ru/strings.xml index 1837c31cbeef..8e683b8afb79 100644 --- a/libs/WindowManager/Shell/res/values-ru/strings.xml +++ b/libs/WindowManager/Shell/res/values-ru/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Не помогло?\nНажмите, чтобы отменить изменения."</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Нет проблем с камерой? Нажмите, чтобы закрыть."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Здесь вы найдете меню приложения"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Чтобы открыть сразу несколько приложений, перейдите в режим компьютера"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Вернуться в полноэкранный режим можно из меню приложения"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Выполняйте несколько задач одновременно"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Перетащите сюда другое приложение, чтобы использовать разделение экрана."</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Обозначение приложения"</string> <string name="app_icon_text" msgid="2823268023931811747">"Значок приложения"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Полноэкранный режим"</string> - <string name="desktop_text" msgid="1582173066857454541">"Версия для ПК"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Разделить экран"</string> <string name="more_button_text" msgid="3655388105592893530">"Ещё"</string> <string name="float_button_text" msgid="9221657008391364581">"Плавающее окно"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Изменить соотношение сторон"</string> <string name="close_text" msgid="4986518933445178928">"Закрыть"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрыть меню"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" (версия для ПК)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Развернуть на весь экран"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Изменить размер"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Приложение нельзя сюда переместить"</string> diff --git a/libs/WindowManager/Shell/res/values-si/strings.xml b/libs/WindowManager/Shell/res/values-si/strings.xml index d2fc08229793..6d548395bfac 100644 --- a/libs/WindowManager/Shell/res/values-si/strings.xml +++ b/libs/WindowManager/Shell/res/values-si/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"එය විසඳුවේ නැතිද?\nප්රතිවර්තනය කිරීමට තට්ටු කරන්න"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"කැමරා ගැටලු නොමැතිද? ඉවත දැමීමට තට්ටු කරන්න"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"යෙදුම් මෙනුව මෙතැනින් සොයා ගත හැක"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"යෙදුම් කිහිපයක් එකට විවෘත කිරීමට ඩෙස්ක්ටොප් දසුනට ඇතුළු වන්න"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"යෙදුම් මෙනුවෙන් ඕනෑම වේලාවක පූර්ණ තිරය වෙත ආපසු යන්න"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"බලන්න සහ තවත් දේ කරන්න"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"බෙදුම් තිරය සඳහා වෙනත් යෙදුමකට අදින්න"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"යෙදුම් හසුරුව"</string> <string name="app_icon_text" msgid="2823268023931811747">"යෙදුම් නිරූපකය"</string> <string name="fullscreen_text" msgid="1162316685217676079">"පූර්ණ තිරය"</string> - <string name="desktop_text" msgid="1582173066857454541">"ඩෙස්ක්ටොප් දසුන"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"බෙදුම් තිරය"</string> <string name="more_button_text" msgid="3655388105592893530">"තව"</string> <string name="float_button_text" msgid="9221657008391364581">"පාවෙන"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"දර්ශන අනුපාතය වෙනස් කරන්න"</string> <string name="close_text" msgid="4986518933445178928">"වසන්න"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"මෙනුව වසන්න"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ඩෙස්ක්ටොප් දසුන)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"තිරය උපරිම කරන්න"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"ප්රතිප්රමාණය කරන්න"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"යෙදුම මෙතැනට ගෙන යා නොහැක"</string> diff --git a/libs/WindowManager/Shell/res/values-sk/strings.xml b/libs/WindowManager/Shell/res/values-sk/strings.xml index a9c81a2e59ad..c04b03873dc7 100644 --- a/libs/WindowManager/Shell/res/values-sk/strings.xml +++ b/libs/WindowManager/Shell/res/values-sk/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Ponuku aplikácie nájdete tu"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Prejdite do zobrazenia v počítači a otvorte viac aplikácií naraz"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Z ponuky aplikácie sa môžete kedykoľvek vrátiť na celú obrazovku"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Zobrazte si a zvládnite toho viac"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Rozdelenú obrazovku môžete použiť presunutím do inej aplikácie"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Rukoväť aplikácie"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikona aplikácie"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Celá obrazovka"</string> - <string name="desktop_text" msgid="1582173066857454541">"Zobrazenie v počítači"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Rozdelená obrazovka"</string> <string name="more_button_text" msgid="3655388105592893530">"Viac"</string> <string name="float_button_text" msgid="9221657008391364581">"Plávajúce"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Zmeniť pomer strán"</string> <string name="close_text" msgid="4986518933445178928">"Zavrieť"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zavrieť ponuku"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (zobrazenie v počítači)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximalizovať obrazovku"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Zmeniť veľkosť"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikácia sa sem nedá presunúť"</string> diff --git a/libs/WindowManager/Shell/res/values-sl/strings.xml b/libs/WindowManager/Shell/res/values-sl/strings.xml index 8dcca185e374..22d7bfe978cc 100644 --- a/libs/WindowManager/Shell/res/values-sl/strings.xml +++ b/libs/WindowManager/Shell/res/values-sl/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Meni aplikacije najdete tukaj"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Preklopite v pogled za namizni računalnik, če želite odpreti več aplikacij hkrati"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"V meniju aplikacije se lahko kadar koli vrnete v celozaslonski način"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Oglejte si in naredite več"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Za razdeljeni zaslon povlecite sem še eno aplikacijo."</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Identifikator aplikacije"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikona aplikacije"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Celozaslonsko"</string> - <string name="desktop_text" msgid="1582173066857454541">"Pogled za namizni računalnik"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Razdeljen zaslon"</string> <string name="more_button_text" msgid="3655388105592893530">"Več"</string> <string name="float_button_text" msgid="9221657008391364581">"Lebdeče"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Sprememba razmerja stranic"</string> <string name="close_text" msgid="4986518933445178928">"Zapri"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zapri meni"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (pogled za namizni računalnik)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimiraj zaslon"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Spremeni velikost"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikacije ni mogoče premakniti sem"</string> diff --git a/libs/WindowManager/Shell/res/values-sq/strings.xml b/libs/WindowManager/Shell/res/values-sq/strings.xml index 6f8bdef18dfe..9330ec3edde5 100644 --- a/libs/WindowManager/Shell/res/values-sq/strings.xml +++ b/libs/WindowManager/Shell/res/values-sq/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Menyja e aplikacioneve mund të gjendet këtu"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Kalo te pamja e desktopit për të hapur disa aplikacione së bashku"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Kthehu tek ekrani i plotë në çdo kohë nga menyja e aplikacioneve"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Shiko dhe bëj më shumë"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Zvarrite në një aplikacion tjetër për ekranin e ndarë"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Emërtimi i aplikacionit"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ikona e aplikacionit"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Ekrani i plotë"</string> - <string name="desktop_text" msgid="1582173066857454541">"Pamja e desktopit"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Ekrani i ndarë"</string> <string name="more_button_text" msgid="3655388105592893530">"Më shumë"</string> <string name="float_button_text" msgid="9221657008391364581">"Pluskuese"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Ndrysho raportin e pamjes"</string> <string name="close_text" msgid="4986518933445178928">"Mbyll"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Mbyll menynë"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Pamja e desktopit)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maksimizo ekranin"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Ndrysho përmasat"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Aplikacioni nuk mund të zhvendoset këtu"</string> diff --git a/libs/WindowManager/Shell/res/values-sr/strings.xml b/libs/WindowManager/Shell/res/values-sr/strings.xml index 287d34fc1de8..5bdad159b146 100644 --- a/libs/WindowManager/Shell/res/values-sr/strings.xml +++ b/libs/WindowManager/Shell/res/values-sr/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Проблем није решен?\nДодирните да бисте вратили"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Немате проблема са камером? Додирните да бисте одбацили."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Мени апликације можете да пронађете овде"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Уђите у приказ за рачунаре да бисте истовремено отворили више апликација"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Вратите се на цео екран било када из менија апликације"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Видите и урадите више"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Превуците другу апликацију да бисте користили подељени екран"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Идентификатор апликације"</string> <string name="app_icon_text" msgid="2823268023931811747">"Икона апликације"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Преко целог екрана"</string> - <string name="desktop_text" msgid="1582173066857454541">"Приказ за рачунаре"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Подељени екран"</string> <string name="more_button_text" msgid="3655388105592893530">"Још"</string> <string name="float_button_text" msgid="9221657008391364581">"Плутајуће"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Промени размеру"</string> <string name="close_text" msgid="4986518933445178928">"Затворите"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затворите мени"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (приказ за рачунаре)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Повећај екран"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Прилагоди"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Апликација не може да се премести овде"</string> diff --git a/libs/WindowManager/Shell/res/values-sv/strings.xml b/libs/WindowManager/Shell/res/values-sv/strings.xml index d8893dfab5f1..40a0a5aa6288 100644 --- a/libs/WindowManager/Shell/res/values-sv/strings.xml +++ b/libs/WindowManager/Shell/res/values-sv/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Appmenyn finns här"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Starta datorvyn för att öppna flera appar samtidigt"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Återgå till helskärm när som helst från appmenyn"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Se och gör mer"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Dra till en annan app för att dela upp skärmen"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Apphandtag"</string> <string name="app_icon_text" msgid="2823268023931811747">"Appikon"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Helskärm"</string> - <string name="desktop_text" msgid="1582173066857454541">"Datorvy"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Delad skärm"</string> <string name="more_button_text" msgid="3655388105592893530">"Mer"</string> <string name="float_button_text" msgid="9221657008391364581">"Svävande"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Ändra bildformat"</string> <string name="close_text" msgid="4986518933445178928">"Stäng"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Stäng menyn"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (datorvy)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Maximera skärmen"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Ändra storlek"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Det går inte att flytta appen hit"</string> diff --git a/libs/WindowManager/Shell/res/values-sw/strings.xml b/libs/WindowManager/Shell/res/values-sw/strings.xml index 3ee43f3a69a8..20429e17d0d6 100644 --- a/libs/WindowManager/Shell/res/values-sw/strings.xml +++ b/libs/WindowManager/Shell/res/values-sw/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Unaweza kupata menyu ya programu hapa"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Tumia mwonekano wa kompyuta ili ufungue programu nyingi pamoja"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Rudi kwenye skrini nzima wakati wowote ukitumia menyu ya programu"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Angalia na ufanye zaidi"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Buruta katika programu nyingine ili utumie skrini iliyogawanywa"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Utambulisho wa programu"</string> <string name="app_icon_text" msgid="2823268023931811747">"Aikoni ya Programu"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Skrini nzima"</string> - <string name="desktop_text" msgid="1582173066857454541">"Mwonekano wa Kompyuta"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Gawa Skrini"</string> <string name="more_button_text" msgid="3655388105592893530">"Zaidi"</string> <string name="float_button_text" msgid="9221657008391364581">"Inayoelea"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Badilisha uwiano"</string> <string name="close_text" msgid="4986518933445178928">"Funga"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Funga Menyu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Mwonekano wa Kompyuta)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Panua Dirisha kwenye Skrini"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Badilisha ukubwa"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Imeshindwa kuhamishia programu hapa"</string> diff --git a/libs/WindowManager/Shell/res/values-ta/strings.xml b/libs/WindowManager/Shell/res/values-ta/strings.xml index a0e7c6acfb05..74ecfdcf73a9 100644 --- a/libs/WindowManager/Shell/res/values-ta/strings.xml +++ b/libs/WindowManager/Shell/res/values-ta/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"சிக்கல்கள் சரிசெய்யப்படவில்லையா?\nமாற்றியமைக்க தட்டவும்"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"கேமரா தொடர்பான சிக்கல்கள் எதுவும் இல்லையா? நிராகரிக்க தட்டவும்."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ஆப்ஸ் மெனுவை இங்கே பார்க்கலாம்"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"பல ஆப்ஸை ஒன்றாகத் திறக்க டெஸ்க்டாப் காட்சிக்குச் செல்லலாம்"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ஆப்ஸ் மெனுவிலிருந்து எப்போது வேண்டுமானாலும் முழுத்திரைக்குத் திரும்பலாம்"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"பலவற்றைப் பார்த்தல் மற்றும் செய்தல்"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"திரைப் பிரிப்புக்கு மற்றொரு ஆப்ஸை இழுக்கலாம்"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"ஆப்ஸ் ஹேண்டில்"</string> <string name="app_icon_text" msgid="2823268023931811747">"ஆப்ஸ் ஐகான்"</string> <string name="fullscreen_text" msgid="1162316685217676079">"முழுத்திரை"</string> - <string name="desktop_text" msgid="1582173066857454541">"டெஸ்க்டாப் காட்சி"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"திரையைப் பிரிக்கும்"</string> <string name="more_button_text" msgid="3655388105592893530">"கூடுதல் விருப்பத்தேர்வுகள்"</string> <string name="float_button_text" msgid="9221657008391364581">"மிதக்கும் சாளரம்"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"தோற்ற விகிதத்தை மாற்று"</string> <string name="close_text" msgid="4986518933445178928">"மூடும்"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"மெனுவை மூடும்"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (டெஸ்க்டாப் காட்சி)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"திரையைப் பெரிதாக்கு"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"அளவை மாற்று"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ஆப்ஸை இங்கே நகர்த்த முடியாது"</string> diff --git a/libs/WindowManager/Shell/res/values-te/strings.xml b/libs/WindowManager/Shell/res/values-te/strings.xml index e0930132e6f3..f46c9b628d1a 100644 --- a/libs/WindowManager/Shell/res/values-te/strings.xml +++ b/libs/WindowManager/Shell/res/values-te/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"దాని సమస్యను పరిష్కరించలేదా?\nపూర్వస్థితికి మార్చడానికి ట్యాప్ చేయండి"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"కెమెరా సమస్యలు లేవా? తీసివేయడానికి ట్యాప్ చేయండి."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"యాప్ మెనూను ఇక్కడ పొందవచ్చు"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"పలు యాప్లను ఒకేసారి తెరవడానికి డెస్క్టాప్ వీక్షణకు ఎంటర్ అవ్వండి"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"యాప్ మెనూ నుండి ఏ సమయంలోనైనా ఫుల్ స్క్రీన్కు తిరిగి రండి"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"చూసి, మరిన్ని చేయండి"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"స్ప్లిట్ స్క్రీన్ కోసం మరొక యాప్లోకి లాగండి"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"యాప్ హ్యాండిల్"</string> <string name="app_icon_text" msgid="2823268023931811747">"యాప్ చిహ్నం"</string> <string name="fullscreen_text" msgid="1162316685217676079">"ఫుల్-స్క్రీన్"</string> - <string name="desktop_text" msgid="1582173066857454541">"డెస్క్టాప్ వీక్షణ"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"స్ప్లిట్ స్క్రీన్"</string> <string name="more_button_text" msgid="3655388105592893530">"మరిన్ని"</string> <string name="float_button_text" msgid="9221657008391364581">"ఫ్లోట్"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"ఆకార నిష్పత్తిని మార్చండి"</string> <string name="close_text" msgid="4986518933445178928">"మూసివేయండి"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"మెనూను మూసివేయండి"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (డెస్క్టాప్ వీక్షణ)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"స్క్రీన్ సైజ్ను పెంచండి"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"సైజ్ మార్చండి"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"యాప్ను ఇక్కడకి తరలించడం సాధ్యం కాదు"</string> diff --git a/libs/WindowManager/Shell/res/values-th/strings.xml b/libs/WindowManager/Shell/res/values-th/strings.xml index 594ee6c97689..60632ada32bb 100644 --- a/libs/WindowManager/Shell/res/values-th/strings.xml +++ b/libs/WindowManager/Shell/res/values-th/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"หากไม่ได้แก้ไข\nแตะเพื่อเปลี่ยนกลับ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"หากไม่พบปัญหากับกล้อง แตะเพื่อปิด"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ดูเมนูแอปที่นี่ได้"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"เข้าสู่มุมมองบนเดสก์ท็อปเพื่อเปิดหลายแอปพร้อมกัน"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"กลับไปที่โหมดเต็มหน้าจอได้ทุกเมื่อจากเมนูแอป"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"รับชมและทำสิ่งต่างๆ ได้มากขึ้น"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"ลากไปไว้ในแอปอื่นเพื่อแยกหน้าจอ"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"แฮนเดิลแอป"</string> <string name="app_icon_text" msgid="2823268023931811747">"ไอคอนแอป"</string> <string name="fullscreen_text" msgid="1162316685217676079">"เต็มหน้าจอ"</string> - <string name="desktop_text" msgid="1582173066857454541">"มุมมองบนเดสก์ท็อป"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"แยกหน้าจอ"</string> <string name="more_button_text" msgid="3655388105592893530">"เพิ่มเติม"</string> <string name="float_button_text" msgid="9221657008391364581">"ล่องลอย"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"เปลี่ยนสัดส่วนการแสดงผล"</string> <string name="close_text" msgid="4986518933445178928">"ปิด"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ปิดเมนู"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (มุมมองบนเดสก์ท็อป)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"ขยายหน้าจอให้ใหญ่สุด"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"ปรับขนาด"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ย้ายแอปมาที่นี่ไม่ได้"</string> diff --git a/libs/WindowManager/Shell/res/values-tl/strings.xml b/libs/WindowManager/Shell/res/values-tl/strings.xml index f13de5b7846b..ae6df04c255c 100644 --- a/libs/WindowManager/Shell/res/values-tl/strings.xml +++ b/libs/WindowManager/Shell/res/values-tl/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Hindi ito naayos?\nI-tap para i-revert"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Walang isyu sa camera? I-tap para i-dismiss."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Makikita rito ang menu ng app"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Pumasok sa desktop view para magbukas ng maraming app nang sabay-sabay"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Bumalik sa full screen anumang oras mula sa menu ng app"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Tumingin at gumawa ng higit pa"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Mag-drag ng isa pang app para sa split screen"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Handle ng app"</string> <string name="app_icon_text" msgid="2823268023931811747">"Icon ng App"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Fullscreen"</string> - <string name="desktop_text" msgid="1582173066857454541">"Desktop View"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Split Screen"</string> <string name="more_button_text" msgid="3655388105592893530">"Higit pa"</string> <string name="float_button_text" msgid="9221657008391364581">"Float"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Baguhin ang aspect ratio"</string> <string name="close_text" msgid="4986518933445178928">"Isara"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Isara ang Menu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Desktop View)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"I-maximize ang Screen"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"I-resize"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Hindi mailipat dito ang app"</string> diff --git a/libs/WindowManager/Shell/res/values-tr/strings.xml b/libs/WindowManager/Shell/res/values-tr/strings.xml index 61fae05cc71c..116740ef93f7 100644 --- a/libs/WindowManager/Shell/res/values-tr/strings.xml +++ b/libs/WindowManager/Shell/res/values-tr/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Uygulama menüsünü burada bulabilirsiniz"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Birden fazla uygulamayı birlikte açmak için masaüstü görünümüne geçin"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Uygulama menüsünden dilediğiniz zaman tam ekrana dönebilirsiniz"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Daha fazlasını görün ve yapın"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Bölünmüş ekran için başka bir uygulamayı sürükleyin"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Uygulama tanıtıcısı"</string> <string name="app_icon_text" msgid="2823268023931811747">"Uygulama Simgesi"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Tam Ekran"</string> - <string name="desktop_text" msgid="1582173066857454541">"Masaüstü görünümü"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Bölünmüş Ekran"</string> <string name="more_button_text" msgid="3655388105592893530">"Daha Fazla"</string> <string name="float_button_text" msgid="9221657008391364581">"Havada Süzülen"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"En boy oranını değiştir"</string> <string name="close_text" msgid="4986518933445178928">"Kapat"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menüyü kapat"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (masaüstü görünümü)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ekranı Büyüt"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Yeniden boyutlandır"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Uygulama buraya taşınamıyor"</string> diff --git a/libs/WindowManager/Shell/res/values-uk/strings.xml b/libs/WindowManager/Shell/res/values-uk/strings.xml index ada82dfdc126..54af06762029 100644 --- a/libs/WindowManager/Shell/res/values-uk/strings.xml +++ b/libs/WindowManager/Shell/res/values-uk/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Проблему не вирішено?\nНатисніть, щоб скасувати зміни"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Немає проблем із камерою? Торкніться, щоб закрити."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Тут ви знайдете меню додатка"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Щоб відкрити кілька додатків одночасно, перейдіть у режим робочого стола"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"З меню додатка можна будь-коли повернутися в повноекранний режим"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Більше простору та можливостей"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Щоб перейти в режим розділення екрана, перетягніть сюди інший додаток"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Дескриптор додатка"</string> <string name="app_icon_text" msgid="2823268023931811747">"Значок додатка"</string> <string name="fullscreen_text" msgid="1162316685217676079">"На весь екран"</string> - <string name="desktop_text" msgid="1582173066857454541">"Версія для ПК"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Розділити екран"</string> <string name="more_button_text" msgid="3655388105592893530">"Більше"</string> <string name="float_button_text" msgid="9221657008391364581">"Плаваюче вікно"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Змінити формат"</string> <string name="close_text" msgid="4986518933445178928">"Закрити"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрити меню"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (версія для ПК)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Розгорнути екран"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Змінити розмір"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Сюди не можна перемістити додаток"</string> diff --git a/libs/WindowManager/Shell/res/values-ur/strings.xml b/libs/WindowManager/Shell/res/values-ur/strings.xml index ded104cfd718..635bc4086c0d 100644 --- a/libs/WindowManager/Shell/res/values-ur/strings.xml +++ b/libs/WindowManager/Shell/res/values-ur/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"یہ حل نہیں ہوا؟\nلوٹانے کیلئے تھپتھپائیں"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"کوئی کیمرے کا مسئلہ نہیں ہے؟ برخاست کرنے کیلئے تھپتھپائیں۔"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"ایپ کا مینو یہاں پایا جا سکتا ہے"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"متعدد ایپس کو ایک ساتھ کھولنے کے لیے ڈیسک ٹاپ منظر میں داخل ہوں"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"ایپ مینو سے کسی بھی وقت فُل اسکرین پر واپس جائیں"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"دیکھیں اور بہت کچھ کریں"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"اسپلٹ اسکرین کے ليے دوسری ایپ میں گھسیٹیں"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"ایپ ہینڈل"</string> <string name="app_icon_text" msgid="2823268023931811747">"ایپ کا آئیکن"</string> <string name="fullscreen_text" msgid="1162316685217676079">"مکمل اسکرین"</string> - <string name="desktop_text" msgid="1582173066857454541">"ڈیسک ٹاپ منظر"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"اسپلٹ اسکرین"</string> <string name="more_button_text" msgid="3655388105592893530">"مزید"</string> <string name="float_button_text" msgid="9221657008391364581">"فلوٹ"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"تناسبی شرح کو تبدیل کریں"</string> <string name="close_text" msgid="4986518933445178928">"بند کریں"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"مینیو بند کریں"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (ڈیسک ٹاپ منظر)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"اسکرین کو بڑا کریں"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"سائز تبدیل کریں"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"ایپ کو یہاں منتقل نہیں کیا جا سکتا"</string> @@ -154,7 +157,7 @@ <string name="maximize_menu_talkback_action_maximize_restore_text" msgid="4942610897847934859">"ونڈو کا سائز زیادہ سے زیادہ یا بحال کریں"</string> <string name="app_header_talkback_action_maximize_button_text" msgid="8776156791095878638">"ایپ ونڈو سائز بڑا کریں"</string> <string name="app_header_talkback_action_restore_button_text" msgid="2153022340772980863">"ونڈو سائز بحال کریں"</string> - <string name="app_header_talkback_action_minimize_button_text" msgid="7491054416186901764">"ایپ ونڈو چھوٹا کریں"</string> + <string name="app_header_talkback_action_minimize_button_text" msgid="7491054416186901764">"ایپ ونڈو چھوٹی کریں"</string> <string name="app_header_talkback_action_close_button_text" msgid="5159612596378268926">"ایپ ونڈو بند کریں"</string> <string name="open_by_default_settings_text" msgid="2526548548598185500">"بطور ڈیفالٹ ترتیبات کھولیں"</string> <string name="open_by_default_dialog_subheader_text" msgid="1729599730664063881">"اس ایپ کے لیے ویب لنکس کھولنے کا طریقہ منتخب کریں"</string> diff --git a/libs/WindowManager/Shell/res/values-uz/strings.xml b/libs/WindowManager/Shell/res/values-uz/strings.xml index 8a9dad029276..6ce2bd859bea 100644 --- a/libs/WindowManager/Shell/res/values-uz/strings.xml +++ b/libs/WindowManager/Shell/res/values-uz/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Ilova menyusi shu yerda chiqadi"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Bir nechta ilovani birga ochish uchun kompyuter versiyasiga kiring"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Ilova menyusi orqali istalganda butun ekranga qaytish mumkin"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Yana boshqa amallar"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Ekranni ikkiga ajratish uchun boshqa ilovani bu yerga torting"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Ilova identifikatori"</string> <string name="app_icon_text" msgid="2823268023931811747">"Ilova belgisi"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Butun ekran"</string> - <string name="desktop_text" msgid="1582173066857454541">"Desktop versiya"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Ekranni ikkiga ajratish"</string> <string name="more_button_text" msgid="3655388105592893530">"Yana"</string> <string name="float_button_text" msgid="9221657008391364581">"Pufakli"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Tomonlar nisbatini oʻzgartirish"</string> <string name="close_text" msgid="4986518933445178928">"Yopish"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menyuni yopish"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (desktop versiya)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Ekranni yoyish"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Oʻlchamini oʻzgartirish"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Ilova bu yerga surilmaydi"</string> diff --git a/libs/WindowManager/Shell/res/values-vi/strings.xml b/libs/WindowManager/Shell/res/values-vi/strings.xml index d6c8bc6173fb..67f80c142ea3 100644 --- a/libs/WindowManager/Shell/res/values-vi/strings.xml +++ b/libs/WindowManager/Shell/res/values-vi/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Bạn chưa khắc phục vấn đề?\nHãy nhấn để hủy bỏ"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Không có vấn đề với máy ảnh? Hãy nhấn để đóng."</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Bạn có thể tìm thấy trình đơn ứng dụng tại đây"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Chuyển sang chế độ xem trên máy tính để bàn để mở nhiều ứng dụng cùng lúc"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Trở về chế độ toàn màn hình bất cứ lúc nào từ trình đơn ứng dụng"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Xem và làm được nhiều việc hơn"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Kéo một ứng dụng khác vào để chia đôi màn hình"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Ô điều khiển ứng dụng"</string> <string name="app_icon_text" msgid="2823268023931811747">"Biểu tượng ứng dụng"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Toàn màn hình"</string> - <string name="desktop_text" msgid="1582173066857454541">"Chế độ xem trên máy tính để bàn"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Chia đôi màn hình"</string> <string name="more_button_text" msgid="3655388105592893530">"Tuỳ chọn khác"</string> <string name="float_button_text" msgid="9221657008391364581">"Nổi"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Thay đổi tỷ lệ khung hình"</string> <string name="close_text" msgid="4986518933445178928">"Đóng"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Đóng trình đơn"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Chế độ xem trên máy tính để bàn)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Mở rộng màn hình"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Đổi kích thước"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"Không di chuyển được ứng dụng đến đây"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml index 1009afc62f55..b29711df14b9 100644 --- a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"没有解决此问题？\n点按即可恢复"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"相机没有问题？点按即可忽略。"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"您可以在此处找到应用菜单"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"进入桌面版视图可同时打开多个应用"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"随时从应用菜单返回全屏模式"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"查看和处理更多任务"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"拖入另一个应用，即可使用分屏模式"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"应用手柄"</string> <string name="app_icon_text" msgid="2823268023931811747">"应用图标"</string> <string name="fullscreen_text" msgid="1162316685217676079">"全屏"</string> - <string name="desktop_text" msgid="1582173066857454541">"桌面版视图"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"分屏"</string> <string name="more_button_text" msgid="3655388105592893530">"更多"</string> <string name="float_button_text" msgid="9221657008391364581">"悬浮"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"更改宽高比"</string> <string name="close_text" msgid="4986518933445178928">"关闭"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"关闭菜单"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g>（桌面版视图）"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"最大化屏幕"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"调整大小"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"无法将应用移至此处"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml index edd67c17fcf4..74e6b5c1e491 100644 --- a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"未能修正問題？\n輕按即可還原"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"相機冇問題？㩒一下就可以即可閂咗佢。"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"你可在這裡找到應用程式選單"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"進入桌面電腦檢視模式以同時開啟多個應用程式"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"你可隨時從應用程式選單返回全螢幕"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"瀏覽更多內容及執行更多操作"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"拖入另一個應用程式即可分割螢幕"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"應用程式控點"</string> <string name="app_icon_text" msgid="2823268023931811747">"應用程式圖示"</string> <string name="fullscreen_text" msgid="1162316685217676079">"全螢幕"</string> - <string name="desktop_text" msgid="1582173066857454541">"桌面電腦檢視模式"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"分割螢幕"</string> <string name="more_button_text" msgid="3655388105592893530">"更多"</string> <string name="float_button_text" msgid="9221657008391364581">"浮動"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"變更長寬比"</string> <string name="close_text" msgid="4986518933445178928">"關閉"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"關閉選單"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (桌面電腦檢視模式)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"畫面最大化"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"調整大小"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"應用程式無法移至這裡"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml index 32d87f3f8ce6..575b217229bd 100644 --- a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml @@ -100,7 +100,8 @@ <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"未修正問題嗎？\n輕觸即可還原"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"相機沒問題嗎？輕觸即可關閉。"</string> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"你可以在這裡查看應用程式選單"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"進入電腦檢視畫面可以同時開啟多個應用程式"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"你隨時可以從應用程式選單返回全螢幕模式"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"瀏覽更多內容及執行更多操作"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"拖進另一個應用程式即可使用分割畫面模式"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"應用程式控制代碼"</string> <string name="app_icon_text" msgid="2823268023931811747">"應用程式圖示"</string> <string name="fullscreen_text" msgid="1162316685217676079">"全螢幕"</string> - <string name="desktop_text" msgid="1582173066857454541">"電腦檢視畫面"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"分割畫面"</string> <string name="more_button_text" msgid="3655388105592893530">"更多"</string> <string name="float_button_text" msgid="9221657008391364581">"浮動"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"變更顯示比例"</string> <string name="close_text" msgid="4986518933445178928">"關閉"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"關閉選單"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (電腦檢視畫面)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"畫面最大化"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"調整大小"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"應用程式無法移至此處"</string> diff --git a/libs/WindowManager/Shell/res/values-zu/strings.xml b/libs/WindowManager/Shell/res/values-zu/strings.xml index 94f0d3476c5e..30403cd21862 100644 --- a/libs/WindowManager/Shell/res/values-zu/strings.xml +++ b/libs/WindowManager/Shell/res/values-zu/strings.xml @@ -100,7 +100,8 @@ <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> <string name="windowing_app_handle_education_tooltip" msgid="2929643449849791854">"Imenyu ye-app ingatholakala lapha"</string> - <string name="windowing_desktop_mode_image_button_education_tooltip" msgid="2523468503353474095">"Faka ukubuka kwedeskithophu ukuze uvule ama-app amaningi ndawonye"</string> + <!-- no translation found for windowing_desktop_mode_image_button_education_tooltip (7171915734817051666) --> + <skip /> <string name="windowing_desktop_mode_exit_education_tooltip" msgid="5225660258192054132">"Buyela esikrinini esigcwele noma nini ukusuka kumenyu ye-app"</string> <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Bona futhi wenze okuningi"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Hudula kwenye i-app mayelana nokuhlukanisa isikrini"</string> @@ -121,7 +122,8 @@ <string name="handle_text" msgid="4419667835599523257">"Inkomba ye-App"</string> <string name="app_icon_text" msgid="2823268023931811747">"Isithonjana Se-app"</string> <string name="fullscreen_text" msgid="1162316685217676079">"Isikrini esigcwele"</string> - <string name="desktop_text" msgid="1582173066857454541">"Ukubuka Kwedeskithophu"</string> + <!-- no translation found for desktop_text (9058641752519570266) --> + <skip /> <string name="split_screen_text" msgid="1396336058129570886">"Hlukanisa isikrini"</string> <string name="more_button_text" msgid="3655388105592893530">"Okwengeziwe"</string> <string name="float_button_text" msgid="9221657008391364581">"Iflowuthi"</string> @@ -134,7 +136,8 @@ <string name="change_aspect_ratio_text" msgid="9104456064548212806">"Shintsha ukubukeka kwesilinganiselo"</string> <string name="close_text" msgid="4986518933445178928">"Vala"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Vala Imenyu"</string> - <string name="desktop_mode_app_header_chip_text" msgid="8300164817452574565">"<xliff:g id="APP_NAME">%1$s</xliff:g> (Ukubuka Kwedeskithophu)"</string> + <!-- no translation found for desktop_mode_app_header_chip_text (7617377295944971651) --> + <skip /> <string name="desktop_mode_maximize_menu_maximize_text" msgid="3275717276171114411">"Khulisa Isikrini Sifike Ekugcineni"</string> <string name="desktop_mode_maximize_menu_snap_text" msgid="5673738963174074006">"Shintsha usayizi"</string> <string name="desktop_mode_non_resizable_snap_text" msgid="3771776422751387878">"I-app ayikwazi ukuhanjiswa lapha"</string> diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 60044ad51d83..2a8c88ed3a40 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -437,9 +437,6 @@ <!-- Height of button (32dp) + 2 * margin (5dp each). --> <dimen name="freeform_decor_caption_height">42dp</dimen> - <!-- Height of desktop mode caption for freeform tasks. --> - <dimen name="desktop_mode_freeform_decor_caption_height">40dp</dimen> - <!-- Height of desktop mode caption for fullscreen tasks. --> <dimen name="desktop_mode_fullscreen_decor_caption_height">36dp</dimen> @@ -528,17 +525,21 @@ <!-- The radius of the Maximize menu shadow. --> <dimen name="desktop_mode_maximize_menu_shadow_radius">8dp</dimen> - <!-- The width of the handle menu in desktop mode. --> - <dimen name="desktop_mode_handle_menu_width">216dp</dimen> + <!-- The width of the handle menu in desktop mode plus the 2dp added for padding to account for + pill elevation. --> + <dimen name="desktop_mode_handle_menu_width">218dp</dimen> - <!-- The maximum height of the handle menu in desktop mode. Three pills at 52dp each, - additional actions pill 208dp, plus 2dp spacing between them plus 4dp top padding. - 52*3 + 52*4 + (4-1)*2 + 4 = 374 --> - <dimen name="desktop_mode_handle_menu_height">374dp</dimen> + <!-- The maximum height of the handle menu in desktop mode. Three pills at 52dp each plus + additional actions pill 208dp plus 2dp spacing between them plus 4dp top padding + plus 2dp bottom padding: 52*3 + 52*4 + (4-1)*2 + 4 + 2 = 376 --> + <dimen name="desktop_mode_handle_menu_height">376dp</dimen> <!-- The elevation set on the handle menu pills. --> <dimen name="desktop_mode_handle_menu_pill_elevation">1dp</dimen> + <!-- The padding added to account for the handle menu's pills' elevation. --> + <dimen name="desktop_mode_handle_menu_pill_elevation_padding">2dp</dimen> + <!-- The height of the handle menu's "App Info" pill in desktop mode. --> <dimen name="desktop_mode_handle_menu_app_info_pill_height">52dp</dimen> @@ -573,7 +574,10 @@ <dimen name="desktop_mode_handle_menu_corner_radius">26dp</dimen> <!-- The radius of the caption menu icon. --> - <dimen name="desktop_mode_caption_icon_radius">32dp</dimen> + <dimen name="desktop_mode_caption_icon_radius">24dp</dimen> + + <!-- The radius of the icon in the header menu's app info pill. --> + <dimen name="desktop_mode_handle_menu_icon_radius">32dp</dimen> <!-- The radius of the caption menu shadow. --> <dimen name="desktop_mode_handle_menu_shadow_radius">2dp</dimen> diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/bubbles/DropTargetManager.kt b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/bubbles/DropTargetManager.kt index 2dbbeaebd3c0..651e776891db 100644 --- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/bubbles/DropTargetManager.kt +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/bubbles/DropTargetManager.kt @@ -73,7 +73,11 @@ class DropTargetManager( val newDragZone = state.getMatchingDragZone(x = x, y = y) state.currentDragZone = newDragZone if (oldDragZone != newDragZone) { - dragZoneChangedListener.onDragZoneChanged(from = oldDragZone, to = newDragZone) + dragZoneChangedListener.onDragZoneChanged( + draggedObject = state.draggedObject, + from = oldDragZone, + to = newDragZone + ) updateDropTarget() } } @@ -136,7 +140,7 @@ class DropTargetManager( /** Stores the current drag state. */ private inner class DragState( private val dragZones: List<DragZone>, - draggedObject: DraggedObject + val draggedObject: DraggedObject ) { val initialDragZone = if (draggedObject.initialLocation.isOnLeft(isLayoutRtl)) { @@ -157,7 +161,7 @@ class DropTargetManager( fun onInitialDragZoneSet(dragZone: DragZone) /** Called when the object was dragged to a different drag zone. */ - fun onDragZoneChanged(from: DragZone, to: DragZone) + fun onDragZoneChanged(draggedObject: DraggedObject, from: DragZone, to: DragZone) /** Called when the drag has ended with the zone it ended in. */ fun onDragEnded(zone: DragZone) diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeCompatPolicy.kt b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeCompatPolicy.kt index 9ea0532f9450..b87c2054bea6 100644 --- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeCompatPolicy.kt +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeCompatPolicy.kt @@ -19,13 +19,10 @@ package com.android.wm.shell.shared.desktopmode import android.Manifest.permission.SYSTEM_ALERT_WINDOW import android.app.TaskInfo import android.content.Context -import android.content.pm.ActivityInfo -import android.content.pm.ActivityInfo.INSETS_DECOUPLED_CONFIGURATION_ENFORCED -import android.content.pm.ActivityInfo.OVERRIDE_ENABLE_INSETS_DECOUPLED_CONFIGURATION -import android.content.pm.ActivityInfo.OVERRIDE_EXCLUDE_CAPTION_INSETS_FROM_APP_BOUNDS import android.content.pm.PackageManager import android.window.DesktopModeFlags import com.android.internal.R +import com.android.internal.policy.DesktopModeCompatUtils /** * Class to decide whether to apply app compat policies in desktop mode. @@ -60,22 +57,11 @@ class DesktopModeCompatPolicy(private val context: Context) { hasFullscreenTransparentPermission(packageName))) && !isTopActivityNoDisplay) - /** - * Whether the caption insets should be excluded from configuration for system to handle. - * - * The treatment is enabled when all the of the following is true: - * * Any flags to forcibly consume caption insets are enabled. - * * Top activity have configuration coupled with insets. - * * Task is not resizeable or [ActivityInfo.OVERRIDE_EXCLUDE_CAPTION_INSETS_FROM_APP_BOUNDS] - * is enabled. - */ + /** @see DesktopModeCompatUtils.shouldExcludeCaptionFromAppBounds */ fun shouldExcludeCaptionFromAppBounds(taskInfo: TaskInfo): Boolean = - DesktopModeFlags.EXCLUDE_CAPTION_FROM_APP_BOUNDS.isTrue - && isAnyForceConsumptionFlagsEnabled() - && taskInfo.topActivityInfo?.let { - isInsetsCoupledWithConfiguration(it) && (!taskInfo.isResizeable || it.isChangeEnabled( - OVERRIDE_EXCLUDE_CAPTION_INSETS_FROM_APP_BOUNDS - )) + taskInfo.topActivityInfo?.let { + DesktopModeCompatUtils.shouldExcludeCaptionFromAppBounds(it, taskInfo.isResizeable, + taskInfo.appCompatTaskInfo.hasOptOutEdgeToEdge()) } ?: false /** @@ -118,12 +104,4 @@ class DesktopModeCompatPolicy(private val context: Context) { */ private fun isPartOfDefaultHomePackageOrNoHomeAvailable(packageName: String?) = defaultHomePackage == null || (packageName != null && packageName == defaultHomePackage) - - private fun isAnyForceConsumptionFlagsEnabled(): Boolean = - DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS.isTrue - || DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION.isTrue - - private fun isInsetsCoupledWithConfiguration(info: ActivityInfo): Boolean = - !(info.isChangeEnabled(OVERRIDE_ENABLE_INSETS_DECOUPLED_CONFIGURATION) - || info.isChangeEnabled(INSETS_DECOUPLED_CONFIGURATION_ENFORCED)) } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index 3e95a0b1100f..912de813cf59 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -2645,11 +2645,7 @@ public class BubbleController implements ConfigurationChangeListener, private void moveBubbleToFullscreen(String key) { Bubble b = mBubbleData.getBubbleInStackWithKey(key); - if (b == null) { - Log.w(TAG, "can't find bubble with key " + key + " to move to fullscreen"); - return; - } - b.getTaskView().moveToFullscreen(); + mBubbleTransitions.startDraggedBubbleIconToFullscreen(b); } private boolean isDeviceLocked() { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTransitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTransitions.java index 51a5b12edb84..8cd6ce020408 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTransitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTransitions.java @@ -113,6 +113,11 @@ public class BubbleTransitions { return convert; } + /** Starts a transition that converts a dragged bubble icon to a full screen task. */ + public BubbleTransition startDraggedBubbleIconToFullscreen(Bubble bubble) { + return new DraggedBubbleIconToFullscreen(bubble); + } + /** * Plucks the task-surface out of an ancestor view while making the view invisible. This helper * attempts to do this seamlessly (ie. view becomes invisible in sync with task reparent). @@ -645,4 +650,115 @@ public class BubbleTransitions { t.apply(); } } + + /** + * A transition that converts a dragged bubble icon to a full screen window. + * + * <p>This transition assumes that the bubble is invisible so it is simply sent to front. + */ + class DraggedBubbleIconToFullscreen implements Transitions.TransitionHandler, BubbleTransition { + + IBinder mTransition; + final Bubble mBubble; + + DraggedBubbleIconToFullscreen(Bubble bubble) { + mBubble = bubble; + bubble.setPreparingTransition(this); + WindowContainerToken token = bubble.getTaskView().getTaskInfo().getToken(); + WindowContainerTransaction wct = new WindowContainerTransaction(); + wct.setAlwaysOnTop(token, false); + wct.setWindowingMode(token, WINDOWING_MODE_UNDEFINED); + wct.reorder(token, /* onTop= */ true); + wct.setHidden(token, false); + mTaskOrganizer.setInterceptBackPressedOnTaskRoot(token, false); + mTaskViewTransitions.enqueueExternal(bubble.getTaskView().getController(), () -> { + mTransition = mTransitions.startTransition(TRANSIT_TO_FRONT, wct, this); + return mTransition; + }); + } + + @Override + public void skip() { + mBubble.setPreparingTransition(null); + } + + @Override + public boolean startAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + if (mTransition != transition) { + return false; + } + + final TaskViewTaskController taskViewTaskController = + mBubble.getTaskView().getController(); + if (taskViewTaskController == null) { + mTaskViewTransitions.onExternalDone(transition); + finishCallback.onTransitionFinished(null); + return true; + } + + TransitionInfo.Change change = findTransitionChange(info); + if (change == null) { + Slog.w(TAG, "Expected a TaskView transition to front but didn't find " + + "one, cleaning up the task view"); + taskViewTaskController.setTaskNotFound(); + mTaskViewTransitions.onExternalDone(transition); + finishCallback.onTransitionFinished(null); + return true; + } + mRepository.remove(taskViewTaskController); + + startTransaction.apply(); + finishCallback.onTransitionFinished(null); + taskViewTaskController.notifyTaskRemovalStarted(mBubble.getTaskView().getTaskInfo()); + mTaskViewTransitions.onExternalDone(transition); + return true; + } + + private TransitionInfo.Change findTransitionChange(TransitionInfo info) { + TransitionInfo.Change result = null; + WindowContainerToken token = mBubble.getTaskView().getTaskInfo().getToken(); + for (int i = 0; i < info.getChanges().size(); ++i) { + final TransitionInfo.Change change = info.getChanges().get(i); + if (change.getTaskInfo() == null) { + continue; + } + if (change.getMode() != TRANSIT_TO_FRONT) { + continue; + } + if (!token.equals(change.getTaskInfo().token)) { + continue; + } + result = change; + break; + } + return result; + } + + @Override + public void mergeAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction startTransaction, + @NonNull SurfaceControl.Transaction finishTransaction, + @NonNull IBinder mergeTarget, + @NonNull Transitions.TransitionFinishCallback finishCallback) { + } + + @Override + public WindowContainerTransaction handleRequest(@NonNull IBinder transition, + @NonNull TransitionRequestInfo request) { + return null; + } + + @Override + public void onTransitionConsumed(@NonNull IBinder transition, boolean aborted, + @Nullable SurfaceControl.Transaction finishTransaction) { + if (!aborted) { + return; + } + mTransition = null; + mTaskViewTransitions.onExternalDone(transition); + } + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java index bdb21f246359..3997412ab459 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java @@ -55,6 +55,7 @@ import com.android.wm.shell.shared.bubbles.DeviceConfig; import com.android.wm.shell.shared.bubbles.DismissView; import com.android.wm.shell.shared.bubbles.DragZone; import com.android.wm.shell.shared.bubbles.DragZoneFactory; +import com.android.wm.shell.shared.bubbles.DraggedObject; import com.android.wm.shell.shared.bubbles.DropTargetManager; import kotlin.Unit; @@ -168,8 +169,8 @@ public class BubbleBarLayerView extends FrameLayout } @Override - public void onDragZoneChanged(@NonNull DragZone from, - @NonNull DragZone to) { + public void onDragZoneChanged(@NonNull DraggedObject draggedObject, + @NonNull DragZone from, @NonNull DragZone to) { final boolean isBubbleLeft = to instanceof DragZone.Bubble.Left; final boolean isBubbleRight = to instanceof DragZone.Bubble.Right; if ((isBubbleLeft || isBubbleRight) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDesktopState.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDesktopState.java index 453ca167557a..1128fb2259b2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDesktopState.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDesktopState.java @@ -86,8 +86,7 @@ public class PipDesktopState { return false; } final int displayId = mPipDisplayLayoutState.getDisplayId(); - return mDesktopUserRepositoriesOptional.get().getCurrent().isAnyDeskActive(displayId) - || isDisplayInFreeform(); + return mDesktopUserRepositoriesOptional.get().getCurrent().isAnyDeskActive(displayId); } /** diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDoubleTapHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDoubleTapHelper.java index 4cbb78f2dae2..d36201a4ac9e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDoubleTapHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDoubleTapHelper.java @@ -52,24 +52,15 @@ public class PipDoubleTapHelper { public static final int SIZE_SPEC_MAX = 1; public static final int SIZE_SPEC_CUSTOM = 2; - /** - * Returns MAX or DEFAULT {@link PipSizeSpec} to toggle to/from. - * - * <p>Each double tap toggles back and forth between {@code PipSizeSpec.CUSTOM} and - * either {@code PipSizeSpec.MAX} or {@code PipSizeSpec.DEFAULT}. The choice between - * the latter two sizes is determined based on the current state of the pip screen.</p> - * - * @param mPipBoundsState current state of the pip screen - */ @PipSizeSpec - private static int getMaxOrDefaultPipSizeSpec(@NonNull PipBoundsState mPipBoundsState) { + private static int getMaxOrDefaultPipSizeSpec(@NonNull PipBoundsState pipBoundsState) { // determine the average pip screen width - int averageWidth = (mPipBoundsState.getMaxSize().x - + mPipBoundsState.getMinSize().x) / 2; + int averageWidth = (pipBoundsState.getMaxSize().x + + pipBoundsState.getMinSize().x) / 2; // If pip screen width is above average, DEFAULT is the size spec we need to // toggle to. Otherwise, we choose MAX. - return (mPipBoundsState.getBounds().width() > averageWidth) + return (pipBoundsState.getBounds().width() > averageWidth) ? SIZE_SPEC_DEFAULT : SIZE_SPEC_MAX; } @@ -77,35 +68,33 @@ public class PipDoubleTapHelper { /** * Determines the {@link PipSizeSpec} to toggle to on double tap. * - * @param mPipBoundsState current state of the pip screen + * @param pipBoundsState current state of the pip bounds * @param userResizeBounds latest user resized bounds (by pinching in/out) - * @return pip screen size to switch to */ @PipSizeSpec - public static int nextSizeSpec(@NonNull PipBoundsState mPipBoundsState, + public static int nextSizeSpec(@NonNull PipBoundsState pipBoundsState, @NonNull Rect userResizeBounds) { - // is pip screen at its maximum - boolean isScreenMax = mPipBoundsState.getBounds().width() - == mPipBoundsState.getMaxSize().x; - - // is pip screen at its normal default size - boolean isScreenDefault = (mPipBoundsState.getBounds().width() - == mPipBoundsState.getNormalBounds().width()) - && (mPipBoundsState.getBounds().height() - == mPipBoundsState.getNormalBounds().height()); + boolean isScreenMax = pipBoundsState.getBounds().width() == pipBoundsState.getMaxSize().x + && pipBoundsState.getBounds().height() == pipBoundsState.getMaxSize().y; + boolean isScreenDefault = (pipBoundsState.getBounds().width() + == pipBoundsState.getNormalBounds().width()) + && (pipBoundsState.getBounds().height() + == pipBoundsState.getNormalBounds().height()); // edge case 1 // if user hasn't resized screen yet, i.e. CUSTOM size does not exist yet // or if user has resized exactly to DEFAULT, then we just want to maximize if (isScreenDefault - && userResizeBounds.width() == mPipBoundsState.getNormalBounds().width()) { + && userResizeBounds.width() == pipBoundsState.getNormalBounds().width() + && userResizeBounds.height() == pipBoundsState.getNormalBounds().height()) { return SIZE_SPEC_MAX; } // edge case 2 - // if user has maximized, then we want to toggle to DEFAULT + // if user has resized to max, then we want to toggle to DEFAULT if (isScreenMax - && userResizeBounds.width() == mPipBoundsState.getMaxSize().x) { + && userResizeBounds.width() == pipBoundsState.getMaxSize().x + && userResizeBounds.height() == pipBoundsState.getMaxSize().y) { return SIZE_SPEC_DEFAULT; } @@ -113,9 +102,6 @@ public class PipDoubleTapHelper { if (isScreenDefault || isScreenMax) { return SIZE_SPEC_CUSTOM; } - - // if we are currently in user resized CUSTOM size state - // then we toggle either to MAX or DEFAULT depending on the current pip screen state - return getMaxOrDefaultPipSizeSpec(mPipBoundsState); + return getMaxOrDefaultPipSizeSpec(pipBoundsState); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeUtils.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeUtils.kt index fa98d0339a65..a8b0bafee724 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeUtils.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeUtils.kt @@ -18,10 +18,8 @@ package com.android.wm.shell.desktopmode -import android.annotation.DimenRes import android.app.ActivityManager.RunningTaskInfo import android.app.TaskInfo -import android.content.Context import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK import android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK import android.content.Intent.FLAG_ACTIVITY_NEW_TASK @@ -38,7 +36,6 @@ import android.graphics.Rect import android.os.SystemProperties import android.util.Size import android.window.DesktopModeFlags -import com.android.wm.shell.R import com.android.wm.shell.ShellTaskOrganizer import com.android.wm.shell.common.DisplayController import com.android.wm.shell.common.DisplayLayout @@ -265,13 +262,6 @@ fun isTaskBoundsEqual(taskBounds: Rect, stableBounds: Rect): Boolean { return taskBounds == stableBounds } -/** Returns the app header height in desktop mode in pixels. */ -fun getAppHeaderHeight(context: Context): Int = - context.resources.getDimensionPixelSize(getAppHeaderHeightId()) - -/** Returns the resource id of the app header height in desktop mode. */ -@DimenRes fun getAppHeaderHeightId(): Int = R.dimen.desktop_mode_freeform_decor_caption_height - /** * Returns the task bounds a launching task should inherit from an existing running instance. * Returns null if there are no bounds to inherit. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java index b3b4d59090e8..1938e76cad49 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java @@ -19,6 +19,7 @@ package com.android.wm.shell.desktopmode; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; +import static com.android.internal.policy.SystemBarUtils.getDesktopViewAppHeaderHeightPx; import static com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.IndicatorType.NO_INDICATOR; import static com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.IndicatorType.TO_DESKTOP_INDICATOR; import static com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.IndicatorType.TO_FULLSCREEN_INDICATOR; @@ -212,8 +213,7 @@ public class DesktopModeVisualIndicator { com.android.wm.shell.R.dimen.desktop_mode_transition_region_thickness); // Because drags in freeform use task position for indicator calculation, we need to // account for the possibility of the task going off the top of the screen by captionHeight - final int captionHeight = mContext.getResources().getDimensionPixelSize( - com.android.wm.shell.R.dimen.desktop_mode_freeform_decor_caption_height); + final int captionHeight = getDesktopViewAppHeaderHeightPx(mContext); final Region fullscreenRegion = calculateFullscreenRegion(layout, captionHeight); final Region splitLeftRegion = calculateSplitLeftRegion(layout, transitionAreaWidth, captionHeight); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopRepository.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopRepository.kt index 8636bc1f56c2..a4e9c52ac9d9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopRepository.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopRepository.kt @@ -339,7 +339,7 @@ class DesktopRepository( val affectedDisplays = mutableSetOf<Int>() desktopData .desksSequence() - .filter { desk -> desk.displayId != excludedDeskId } + .filter { desk -> desk.deskId != excludedDeskId } .forEach { desk -> val removed = removeActiveTaskFromDesk(desk.deskId, taskId, notifyListeners = false) if (removed) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index d0356d55035d..7d83a8e5060c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -32,8 +32,6 @@ import android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED import android.app.WindowConfiguration.WindowingMode import android.content.Context import android.content.Intent -import android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK -import android.content.Intent.FLAG_ACTIVITY_NEW_TASK import android.graphics.Point import android.graphics.PointF import android.graphics.Rect @@ -76,6 +74,7 @@ import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_SNAP_RESIZE import com.android.internal.jank.InteractionJankMonitor +import com.android.internal.policy.SystemBarUtils.getDesktopViewAppHeaderHeightPx import com.android.internal.protolog.ProtoLog import com.android.internal.util.LatencyTracker import com.android.window.flags.Flags @@ -652,6 +651,7 @@ class DesktopTasksController( taskInfo: RunningTaskInfo, dragToDesktopValueAnimator: MoveToDesktopAnimator, taskSurface: SurfaceControl, + dragInterruptedCallback: Runnable, ) { logV("startDragToDesktop taskId=%d", taskInfo.taskId) val jankConfigBuilder = @@ -667,6 +667,7 @@ class DesktopTasksController( taskInfo, dragToDesktopValueAnimator, visualIndicator, + dragInterruptedCallback, ) } @@ -1255,8 +1256,7 @@ class DesktopTasksController( wct.reparent(task.token, displayAreaInfo.token, /* onTop= */ true) } - // TODO: b/391485148 - pass in the moving-to-desk |task| here to apply task-limit policy. - val activationRunnable = addDeskActivationChanges(destinationDeskId, wct) + val activationRunnable = addDeskActivationChanges(destinationDeskId, wct, task) if (Flags.enableDisplayFocusInShellTransitions()) { // Bring the destination display to top with includingParents=true, so that the @@ -2631,7 +2631,7 @@ class DesktopTasksController( // Caption insets stay fixed and don't scale with bounds. val captionInsets = if (desktopModeCompatPolicy.shouldExcludeCaptionFromAppBounds(taskInfo)) { - getAppHeaderHeight(context) + getDesktopViewAppHeaderHeightPx(context) } else { 0 } @@ -2943,6 +2943,11 @@ class DesktopTasksController( removeDesk(displayId = displayId, deskId = deskId) } + /** Removes all the available desks on all displays. */ + fun removeAllDesks() { + taskRepository.getAllDeskIds().forEach { deskId -> removeDesk(deskId) } + } + private fun removeDesk(displayId: Int, deskId: Int) { if (!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue()) return logV("removeDesk deskId=%d from displayId=%d", deskId, displayId) @@ -3709,6 +3714,18 @@ class DesktopTasksController( } } + override fun removeDesk(deskId: Int) { + executeRemoteCallWithTaskPermission(controller, "removeDesk") { c -> + c.removeDesk(deskId) + } + } + + override fun removeAllDesks() { + executeRemoteCallWithTaskPermission(controller, "removeAllDesks") { c -> + c.removeAllDesks() + } + } + override fun activateDesk(deskId: Int, remoteTransition: RemoteTransition?) { executeRemoteCallWithTaskPermission(controller, "activateDesk") { c -> c.activateDesk(deskId, remoteTransition) @@ -3772,8 +3789,8 @@ class DesktopTasksController( } } - override fun removeDesktop(displayId: Int) { - executeRemoteCallWithTaskPermission(controller, "removeDesktop") { c -> + override fun removeDefaultDeskInDisplay(displayId: Int) { + executeRemoteCallWithTaskPermission(controller, "removeDefaultDeskInDisplay") { c -> c.removeDefaultDeskInDisplay(displayId) } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt index 24b2e4879546..c6f74728fd81 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt @@ -2,6 +2,7 @@ package com.android.wm.shell.desktopmode import android.animation.Animator import android.animation.AnimatorListenerAdapter +import android.animation.AnimatorSet import android.animation.RectEvaluator import android.animation.ValueAnimator import android.app.ActivityManager.RunningTaskInfo @@ -23,6 +24,7 @@ import android.os.IBinder import android.os.SystemClock import android.os.SystemProperties import android.os.UserHandle +import android.view.Choreographer import android.view.SurfaceControl import android.view.SurfaceControl.Transaction import android.view.WindowManager.TRANSIT_CLOSE @@ -48,6 +50,7 @@ import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKT import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE import com.android.wm.shell.shared.TransitionUtil +import com.android.wm.shell.shared.animation.Interpolators import com.android.wm.shell.shared.animation.PhysicsAnimator import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT import com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT @@ -122,6 +125,7 @@ sealed class DragToDesktopTransitionHandler( taskInfo: RunningTaskInfo, dragToDesktopAnimator: MoveToDesktopAnimator, visualIndicator: DesktopModeVisualIndicator?, + dragCancelCallback: Runnable, ) { if (inProgress) { logV("Drag to desktop transition already in progress.") @@ -168,6 +172,7 @@ sealed class DragToDesktopTransitionHandler( startTransitionToken = startTransitionToken, otherSplitTask = otherTask, visualIndicator = visualIndicator, + dragCancelCallback = dragCancelCallback, ) } else { TransitionState.FromFullscreen( @@ -175,6 +180,7 @@ sealed class DragToDesktopTransitionHandler( dragAnimator = dragToDesktopAnimator, startTransitionToken = startTransitionToken, visualIndicator = visualIndicator, + dragCancelCallback = dragCancelCallback, ) } } @@ -203,8 +209,9 @@ sealed class DragToDesktopTransitionHandler( } if (state.startInterrupted) { logV("finishDragToDesktop: start was interrupted, returning") - // We should only have interrupted the start transition after receiving a cancel/end - // request, let that existing request play out and just return here. + // If start was interrupted we've either already requested a cancel/end transition - so + // we should let that request play out, or we're cancelling the drag-to-desktop + // transition altogether, so just return here. return null } state.endTransitionToken = @@ -221,6 +228,7 @@ sealed class DragToDesktopTransitionHandler( */ fun cancelDragToDesktopTransition(cancelState: CancelState) { if (!inProgress) { + logV("cancelDragToDesktop: not in progress, returning") // Don't attempt to cancel a drag to desktop transition since there is no transition in // progress which means that the drag to desktop transition was never successfully // started. @@ -228,14 +236,17 @@ sealed class DragToDesktopTransitionHandler( } val state = requireTransitionState() if (state.startAborted) { + logV("cancelDragToDesktop: start was aborted, clearing state") // Don't attempt to cancel the drag-to-desktop since the start transition didn't // succeed as expected. Just reset the state as if nothing happened. clearState() return } if (state.startInterrupted) { - // We should only have interrupted the start transition after receiving a cancel/end - // request, let that existing request play out and just return here. + logV("cancelDragToDesktop: start was interrupted, returning") + // If start was interrupted we've either already requested a cancel/end transition - so + // we should let that request play out, or we're cancelling the drag-to-desktop + // transition altogether, so just return here. return } state.cancelState = cancelState @@ -706,11 +717,7 @@ sealed class DragToDesktopTransitionHandler( // end-transition, or if the end-transition is running on its own, then just wait until that // finishes instead. If we've merged the cancel-transition we've finished the // start-transition and won't reach this code. - if ( - mergeTarget == state.startTransitionToken && - isCancelOrEndTransitionRequested(state) && - !state.mergedEndTransition - ) { + if (mergeTarget == state.startTransitionToken && !state.mergedEndTransition) { interruptStartTransition(state) } } @@ -722,9 +729,23 @@ sealed class DragToDesktopTransitionHandler( if (!ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX.isTrue) { return } - logV("interruptStartTransition") - state.startTransitionFinishCb?.onTransitionFinished(/* wct= */ null) - state.dragAnimator.cancelAnimator() + if (isCancelOrEndTransitionRequested(state)) { + logV("interruptStartTransition, bookend requested -> finish start transition") + // Finish the start-drag transition, we will finish the overall transition properly when + // receiving #startAnimation for Cancel/End. + state.startTransitionFinishCb?.onTransitionFinished(/* wct= */ null) + state.dragAnimator.cancelAnimator() + } else { + logV("interruptStartTransition, bookend not requested -> animate to Home") + // Animate to Home, and then finish the start-drag transition. Since there is no other + // (end/cancel) transition requested that will be the end of the overall transition. + state.dragAnimator.cancelAnimator() + state.dragCancelCallback?.run() + createInterruptToHomeAnimator(transactionSupplier.get(), state) { + state.startTransitionFinishCb?.onTransitionFinished(/* wct= */ null) + clearState() + } + } state.activeCancelAnimation?.removeAllListeners() state.activeCancelAnimation?.cancel() state.activeCancelAnimation = null @@ -738,6 +759,46 @@ sealed class DragToDesktopTransitionHandler( .onActionCancel(LatencyTracker.ACTION_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG) } + private fun createInterruptToHomeAnimator( + transaction: Transaction, + state: TransitionState, + endCallback: Runnable, + ) { + val homeLeash = state.homeChange?.leash ?: error("Expected home leash to be non-null") + val draggedTaskLeash = + state.draggedTaskChange?.leash ?: error("Expected dragged leash to be non-null") + val homeAnimator = createInterruptAlphaAnimator(transaction, homeLeash, toShow = true) + val draggedTaskAnimator = + createInterruptAlphaAnimator(transaction, draggedTaskLeash, toShow = false) + val animatorSet = AnimatorSet() + animatorSet.playTogether(homeAnimator, draggedTaskAnimator) + animatorSet.addListener( + object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + endCallback.run() + } + } + ) + animatorSet.start() + } + + private fun createInterruptAlphaAnimator( + transaction: Transaction, + leash: SurfaceControl, + toShow: Boolean, + ) = + ValueAnimator.ofFloat(if (toShow) 0f else 1f, if (toShow) 1f else 0f).apply { + transaction.show(leash) + duration = DRAG_TO_DESKTOP_FINISH_ANIM_DURATION_MS + interpolator = Interpolators.LINEAR + addUpdateListener { animation -> + transaction + .setAlpha(leash, animation.animatedValue as Float) + .setFrameTimeline(Choreographer.getInstance().vsyncId) + .apply() + } + } + protected open fun setupEndDragToDesktop( info: TransitionInfo, startTransaction: SurfaceControl.Transaction, @@ -1060,6 +1121,7 @@ sealed class DragToDesktopTransitionHandler( abstract var endTransitionToken: IBinder? abstract var mergedEndTransition: Boolean abstract var activeCancelAnimation: Animator? + abstract var dragCancelCallback: Runnable? data class FromFullscreen( override val draggedTaskId: Int, @@ -1079,6 +1141,7 @@ sealed class DragToDesktopTransitionHandler( override var endTransitionToken: IBinder? = null, override var mergedEndTransition: Boolean = false, override var activeCancelAnimation: Animator? = null, + override var dragCancelCallback: Runnable? = null, var otherRootChanges: MutableList<Change> = mutableListOf(), ) : TransitionState() @@ -1100,6 +1163,7 @@ sealed class DragToDesktopTransitionHandler( override var endTransitionToken: IBinder? = null, override var mergedEndTransition: Boolean = false, override var activeCancelAnimation: Animator? = null, + override var dragCancelCallback: Runnable? = null, var splitRootChange: Change? = null, var otherSplitTask: Int, ) : TransitionState() diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl index 44f7e16e98c3..5f7fbd9843d4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl @@ -35,6 +35,12 @@ interface IDesktopMode { /** Activates the desk whose ID is `deskId` on whatever display it currently exists on. */ oneway void activateDesk(int deskId, in RemoteTransition remoteTransition); + /** Removes the desk with the given `deskId`. */ + oneway void removeDesk(int deskId); + + /** Removes all the available desks on all displays. */ + oneway void removeAllDesks(); + /** Show apps on the desktop on the given display */ void showDesktopApps(int displayId, in RemoteTransition remoteTransition); @@ -64,8 +70,11 @@ interface IDesktopMode { in @nullable RemoteTransition remoteTransition, in @nullable IMoveToDesktopCallback callback); - /** Remove desktop on the given display */ - oneway void removeDesktop(int displayId); + /** + * Removes the default desktop on the given display. + * @deprecated with multi-desks, we should use `removeDesk()`. + */ + oneway void removeDefaultDeskInDisplay(int displayId); /** Move a task with given `taskId` to external display */ void moveToExternalDisplay(int taskId); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java index f81f330e50c4..a02a51f92b1b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java @@ -180,10 +180,17 @@ public class PipScheduler implements PipTransitionState.PipTransitionStateChange return; } WindowContainerTransaction wct = new WindowContainerTransaction(); - wct.setBounds(pipTaskToken, toBounds); if (configAtEnd) { wct.deferConfigToTransitionEnd(pipTaskToken); + + if (mPipBoundsState.getBounds().width() == toBounds.width() + && mPipBoundsState.getBounds().height() == toBounds.height()) { + // TODO (b/393159816): Config-at-End causes a flicker without size change. + // If PiP size isn't changing enforce a minimal one-pixel change as a workaround. + --toBounds.bottom; + } } + wct.setBounds(pipTaskToken, toBounds); mPipTransitionController.startResizeTransition(wct, duration); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java index 6fdfecaf15d5..d1bc450c3c4d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java @@ -934,6 +934,7 @@ public class PipTouchHandler implements PipTransitionState.PipTransitionStateCha } // the size to toggle to after a double tap + mPipBoundsState.setNormalBounds(getAdjustedNormalBounds()); int nextSize = PipDoubleTapHelper .nextSizeSpec(mPipBoundsState, getUserResizeBounds()); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java index 34d1011bac0e..f652e3149d9e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java @@ -85,8 +85,8 @@ class WindowlessSnapshotWindowCreator { final ActivityManager.TaskDescription taskDescription = SnapshotDrawerUtils.getOrCreateTaskDescription(runningTaskInfo); - final SnapshotWindowRecord record = new SnapshotWindowRecord(mViewHost, wlw.mChildSurface, - taskDescription.getBackgroundColor(), snapshot.hasImeSurface(), + final SnapshotWindowRecord record = new SnapshotWindowRecord(mViewHost, rootSurface, + wlw.mChildSurface, taskDescription.getBackgroundColor(), snapshot.hasImeSurface(), runningTaskInfo.topActivityType, removeExecutor, taskId, mStartingWindowRecordManager); mStartingWindowRecordManager.addRecord(taskId, record); @@ -96,14 +96,16 @@ class WindowlessSnapshotWindowCreator { private class SnapshotWindowRecord extends StartingSurfaceDrawer.SnapshotRecord { private SurfaceControlViewHost mViewHost; private SurfaceControl mChildSurface; + private SurfaceControl mRootSurface; private final boolean mHasImeSurface; - SnapshotWindowRecord(SurfaceControlViewHost viewHost, SurfaceControl childSurface, - int bgColor, boolean hasImeSurface, int activityType, + SnapshotWindowRecord(SurfaceControlViewHost viewHost, SurfaceControl rootSurface, + SurfaceControl childSurface, int bgColor, boolean hasImeSurface, int activityType, ShellExecutor removeExecutor, int id, StartingSurfaceDrawer.StartingWindowRecordManager recordManager) { super(activityType, removeExecutor, id, recordManager); mViewHost = viewHost; + mRootSurface = rootSurface; mChildSurface = childSurface; mBGColor = bgColor; mHasImeSurface = hasImeSurface; @@ -145,6 +147,10 @@ class WindowlessSnapshotWindowCreator { mTransactionPool.release(t); mChildSurface = null; } + if (mRootSurface != null && mRootSurface.isValid()) { + mRootSurface.release(); + } + mRootSurface = null; if (mViewHost != null) { mViewHost.release(); mViewHost = null; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java index f5aaaad93229..ce98b03b77a6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java @@ -137,8 +137,7 @@ public class DefaultSurfaceAnimator { if (mClipRect != null) { boolean needCrop = false; mAnimClipRect.set(mClipRect); - if (transformation.hasClipRect() - && com.android.window.flags.Flags.respectAnimationClip()) { + if (transformation.hasClipRect()) { mAnimClipRect.intersectUnchecked(transformation.getClipRect()); needCrop = true; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java index 938885cc1684..23dfb41d52c1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java @@ -18,6 +18,7 @@ package com.android.wm.shell.transition; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.view.Display.DEFAULT_DISPLAY; +import static android.window.DesktopModeFlags.ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX; import static android.window.TransitionInfo.FLAG_BACK_GESTURE_ANIMATED; import static com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP; @@ -50,6 +51,7 @@ public class HomeTransitionObserver implements TransitionObserver, private @NonNull final Context mContext; private @NonNull final ShellExecutor mMainExecutor; + private IBinder mPendingStartDragTransition; private Boolean mPendingHomeVisibilityUpdate; public HomeTransitionObserver(@NonNull Context context, @@ -63,31 +65,42 @@ public class HomeTransitionObserver implements TransitionObserver, @NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction startTransaction, @NonNull SurfaceControl.Transaction finishTransaction) { - if (BubbleAnythingFlagHelper.enableBubbleToFullscreen()) { - handleTransitionReadyWithBubbleAnything(info); - } else { - handleTransitionReady(info); + Boolean homeVisibilityUpdate = getHomeVisibilityUpdate(info); + + if (info.getType() == TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP) { + // Do not apply at the start of desktop drag as that updates launcher UI visibility. + // Store the value and apply with a next transition or when cancelling the + // desktop-drag transition. + storePendingHomeVisibilityUpdate(transition, homeVisibilityUpdate); + return; + } + + if (BubbleAnythingFlagHelper.enableBubbleToFullscreen() + && info.getType() == TRANSIT_CONVERT_TO_BUBBLE + && homeVisibilityUpdate == null) { + // We are converting to bubble and we did not get a change to home visibility in this + // transition. Apply the value from start of drag. + homeVisibilityUpdate = mPendingHomeVisibilityUpdate; + } + + if (homeVisibilityUpdate != null) { + mPendingHomeVisibilityUpdate = null; + mPendingStartDragTransition = null; + notifyHomeVisibilityChanged(homeVisibilityUpdate); } } - private void handleTransitionReady(@NonNull TransitionInfo info) { - for (TransitionInfo.Change change : info.getChanges()) { - final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo(); - if (taskInfo == null - || info.getType() == TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP - || taskInfo.displayId != DEFAULT_DISPLAY - || taskInfo.taskId == -1 - || !taskInfo.isRunning) { - continue; - } - Boolean homeVisibilityUpdate = getHomeVisibilityUpdate(info, change, taskInfo); - if (homeVisibilityUpdate != null) { - notifyHomeVisibilityChanged(homeVisibilityUpdate); - } + private void storePendingHomeVisibilityUpdate( + IBinder transition, Boolean homeVisibilityUpdate) { + if (!BubbleAnythingFlagHelper.enableBubbleToFullscreen() + && !ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX.isTrue()) { + return; } + mPendingHomeVisibilityUpdate = homeVisibilityUpdate; + mPendingStartDragTransition = transition; } - private void handleTransitionReadyWithBubbleAnything(@NonNull TransitionInfo info) { + private Boolean getHomeVisibilityUpdate(TransitionInfo info) { Boolean homeVisibilityUpdate = null; for (TransitionInfo.Change change : info.getChanges()) { final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo(); @@ -97,29 +110,12 @@ public class HomeTransitionObserver implements TransitionObserver, || !taskInfo.isRunning) { continue; } - Boolean update = getHomeVisibilityUpdate(info, change, taskInfo); if (update != null) { homeVisibilityUpdate = update; } } - - if (info.getType() == TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP) { - // Do not apply at the start of desktop drag as that updates launcher UI visibility. - // Store the value and apply with a next transition if needed. - mPendingHomeVisibilityUpdate = homeVisibilityUpdate; - return; - } - - if (info.getType() == TRANSIT_CONVERT_TO_BUBBLE && homeVisibilityUpdate == null) { - // We are converting to bubble and we did not get a change to home visibility in this - // transition. Apply the value from start of drag. - homeVisibilityUpdate = mPendingHomeVisibilityUpdate; - } - if (homeVisibilityUpdate != null) { - mPendingHomeVisibilityUpdate = null; - notifyHomeVisibilityChanged(homeVisibilityUpdate); - } + return homeVisibilityUpdate; } private Boolean getHomeVisibilityUpdate(TransitionInfo info, @@ -146,7 +142,24 @@ public class HomeTransitionObserver implements TransitionObserver, @Override public void onTransitionFinished(@NonNull IBinder transition, - boolean aborted) {} + boolean aborted) { + if (!ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX.isTrue()) { + return; + } + // Handle the case where the DragToDesktop START transition is interrupted and we never + // receive a CANCEL/END transition. + if (mPendingStartDragTransition == null + || mPendingStartDragTransition != transition) { + return; + } + mPendingStartDragTransition = null; + if (aborted) return; + + if (mPendingHomeVisibilityUpdate != null) { + notifyHomeVisibilityChanged(mPendingHomeVisibilityUpdate); + mPendingHomeVisibilityUpdate = null; + } + } /** * Sets the home transition listener that receives any transitions resulting in a change of diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index a1d2774ee428..febb8850183d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -979,6 +979,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, private boolean mIsCustomHeaderGesture; private boolean mIsResizeGesture; private boolean mIsDragging; + private boolean mDragInterrupted; private boolean mLongClickDisabled; private int mDragPointerId = -1; private MotionEvent mMotionEvent; @@ -1216,7 +1217,12 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, View v, MotionEvent e) { final int id = v.getId(); if (id == R.id.caption_handle) { - handleCaptionThroughStatusBar(e, decoration); + handleCaptionThroughStatusBar(e, decoration, + /* interruptDragCallback= */ + () -> { + mDragInterrupted = true; + setIsDragging(decoration, /* isDragging= */ false); + }); final boolean wasDragging = mIsDragging; updateDragStatus(decoration, e); final boolean upOrCancel = e.getActionMasked() == ACTION_UP @@ -1333,11 +1339,14 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: { + mDragInterrupted = false; setIsDragging(decor, false /* isDragging */); break; } case MotionEvent.ACTION_MOVE: { - setIsDragging(decor, true /* isDragging */); + if (!mDragInterrupted) { + setIsDragging(decor, true /* isDragging */); + } break; } } @@ -1458,7 +1467,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, if (!mInImmersiveMode && (relevantDecor == null || relevantDecor.mTaskInfo.getWindowingMode() != WINDOWING_MODE_FREEFORM || mTransitionDragActive)) { - handleCaptionThroughStatusBar(ev, relevantDecor); + handleCaptionThroughStatusBar(ev, relevantDecor, + /* interruptDragCallback= */ () -> {}); } } handleEventOutsideCaption(ev, relevantDecor); @@ -1498,7 +1508,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, * Turn on desktop mode if handle is dragged below status bar. */ private void handleCaptionThroughStatusBar(MotionEvent ev, - DesktopModeWindowDecoration relevantDecor) { + DesktopModeWindowDecoration relevantDecor, Runnable interruptDragCallback) { if (relevantDecor == null) { if (ev.getActionMasked() == ACTION_UP) { mMoveToDesktopAnimator = null; @@ -1599,7 +1609,16 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, mContext, mDragToDesktopAnimationStartBounds, relevantDecor.mTaskInfo, relevantDecor.mTaskSurface); mDesktopTasksController.startDragToDesktop(relevantDecor.mTaskInfo, - mMoveToDesktopAnimator, relevantDecor.mTaskSurface); + mMoveToDesktopAnimator, relevantDecor.mTaskSurface, + /* dragInterruptedCallback= */ () -> { + // Don't call into DesktopTasksController to cancel the + // transition here - the transition handler already handles + // that (including removing the visual indicator). + mTransitionDragActive = false; + mMoveToDesktopAnimator = null; + relevantDecor.handleDragInterrupted(); + interruptDragCallback.run(); + }); } } if (mMoveToDesktopAnimator != null) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index 3f0d931af7c0..5432f6f65afb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -27,6 +27,7 @@ import static android.view.MotionEvent.ACTION_UP; import static android.window.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION; import static android.window.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS; +import static com.android.internal.policy.SystemBarUtils.getDesktopViewAppHeaderHeightId; import static com.android.wm.shell.shared.desktopmode.DesktopModeStatus.canEnterDesktopMode; import static com.android.wm.shell.shared.desktopmode.DesktopModeStatus.canEnterDesktopModeOrShowAppHandle; import static com.android.wm.shell.shared.desktopmode.DesktopModeStatus.isDesktopModeSupportedOnDisplay; @@ -1682,6 +1683,17 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } } + /** + * Indicates that an app handle drag has been interrupted, this can happen e.g. if we receive an + * unknown transition during the drag-to-desktop transition. + */ + void handleDragInterrupted() { + if (mResult.mRootView == null) return; + final View handle = mResult.mRootView.findViewById(R.id.caption_handle); + handle.setHovered(false); + handle.setPressed(false); + } + private boolean pointInView(View v, float x, float y) { return v != null && v.getLeft() <= x && v.getRight() >= x && v.getTop() <= y && v.getBottom() >= y; @@ -1768,7 +1780,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin private static int getCaptionHeightIdStatic(@WindowingMode int windowingMode) { return windowingMode == WINDOWING_MODE_FULLSCREEN ? com.android.internal.R.dimen.status_bar_height_default - : DesktopModeUtils.getAppHeaderHeightId(); + : getDesktopViewAppHeaderHeightId(); } private int getCaptionHeight(@WindowingMode int windowingMode) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.kt index c544468f5191..a8a7032d0b86 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/HandleMenu.kt @@ -108,12 +108,9 @@ class HandleMenu( private val isViewAboveStatusBar: Boolean get() = (DesktopModeFlags.ENABLE_HANDLE_INPUT_FIX.isTrue() && !taskInfo.isFreeform) - private val pillElevation: Int = loadDimensionPixelSize( - R.dimen.desktop_mode_handle_menu_pill_elevation) private val pillTopMargin: Int = loadDimensionPixelSize( R.dimen.desktop_mode_handle_menu_pill_spacing_margin) - private val menuWidth = loadDimensionPixelSize( - R.dimen.desktop_mode_handle_menu_width) + pillElevation + private val menuWidth = loadDimensionPixelSize(R.dimen.desktop_mode_handle_menu_width) private val menuHeight = getHandleMenuHeight() private val marginMenuTop = loadDimensionPixelSize(R.dimen.desktop_mode_handle_menu_margin_top) private val marginMenuStart = loadDimensionPixelSize( @@ -398,8 +395,7 @@ class HandleMenu( * Determines handle menu height based the max size and the visibility of pills. */ private fun getHandleMenuHeight(): Int { - var menuHeight = loadDimensionPixelSize( - R.dimen.desktop_mode_handle_menu_height) + pillElevation + var menuHeight = loadDimensionPixelSize(R.dimen.desktop_mode_handle_menu_height) if (!shouldShowWindowingPill) { menuHeight -= loadDimensionPixelSize( R.dimen.desktop_mode_handle_menu_windowing_pill_height) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleTransitionsTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleTransitionsTest.java index 925ca0f1638d..25f17fe8a3c2 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleTransitionsTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleTransitionsTest.java @@ -16,6 +16,7 @@ package com.android.wm.shell.bubbles; import static android.view.WindowManager.TRANSIT_CHANGE; +import static android.view.WindowManager.TRANSIT_TO_FRONT; import static com.android.wm.shell.transition.Transitions.TRANSIT_CONVERT_TO_BUBBLE; @@ -52,6 +53,7 @@ import com.android.launcher3.icons.BubbleIconFactory; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.TestSyncExecutor; +import com.android.wm.shell.bubbles.BubbleTransitions.DraggedBubbleIconToFullscreen; import com.android.wm.shell.bubbles.bar.BubbleBarExpandedView; import com.android.wm.shell.bubbles.bar.BubbleBarLayerView; import com.android.wm.shell.common.ShellExecutor; @@ -136,6 +138,7 @@ public class BubbleTransitionsTest extends ShellTestCase { when(tvtc.getTaskInfo()).thenReturn(taskInfo); when(tv.getController()).thenReturn(tvtc); when(mBubble.getTaskView()).thenReturn(tv); + when(tv.getTaskInfo()).thenReturn(taskInfo); mRepository.add(tvtc); return taskInfo; } @@ -285,4 +288,27 @@ public class BubbleTransitionsTest extends ShellTestCase { // directly tested. assertFalse(mTaskViewTransitions.hasPending()); } + + @Test + public void convertDraggedBubbleToFullscreen() { + ActivityManager.RunningTaskInfo taskInfo = setupBubble(); + final DraggedBubbleIconToFullscreen bt = + (DraggedBubbleIconToFullscreen) mBubbleTransitions + .startDraggedBubbleIconToFullscreen(mBubble); + verify(mTransitions).startTransition(anyInt(), any(), eq(bt)); + + final TransitionInfo info = new TransitionInfo(TRANSIT_TO_FRONT, 0); + final TransitionInfo.Change chg = new TransitionInfo.Change(taskInfo.token, + mock(SurfaceControl.class)); + chg.setMode(TRANSIT_TO_FRONT); + chg.setTaskInfo(taskInfo); + info.addChange(chg); + info.addRoot(new TransitionInfo.Root(0, mock(SurfaceControl.class), 0, 0)); + SurfaceControl.Transaction startT = mock(SurfaceControl.Transaction.class); + SurfaceControl.Transaction finishT = mock(SurfaceControl.Transaction.class); + Transitions.TransitionFinishCallback finishCb = wct -> {}; + bt.startAnimation(bt.mTransition, info, startT, finishT, finishCb); + verify(startT).apply(); + assertFalse(mTaskViewTransitions.hasPending()); + } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDesktopStateTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDesktopStateTest.java index 4cdb1e5b5d10..25dbc64f83de 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDesktopStateTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDesktopStateTest.java @@ -22,6 +22,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static com.android.window.flags.Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_PIP; import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP; +import static com.android.wm.shell.Flags.FLAG_ENABLE_PIP2; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; @@ -119,12 +120,28 @@ public class PipDesktopStateTest { } @Test - @EnableFlags(FLAG_ENABLE_CONNECTED_DISPLAYS_PIP) + @EnableFlags({ + FLAG_ENABLE_CONNECTED_DISPLAYS_PIP, FLAG_ENABLE_PIP2 + }) public void isConnectedDisplaysPipEnabled_returnsTrue() { assertTrue(mPipDesktopState.isConnectedDisplaysPipEnabled()); } @Test + public void isPipInDesktopMode_anyDeskActive_returnsTrue() { + when(mMockDesktopRepository.isAnyDeskActive(DISPLAY_ID)).thenReturn(true); + + assertTrue(mPipDesktopState.isPipInDesktopMode()); + } + + @Test + public void isPipInDesktopMode_noDeskActive_returnsFalse() { + when(mMockDesktopRepository.isAnyDeskActive(DISPLAY_ID)).thenReturn(false); + + assertFalse(mPipDesktopState.isPipInDesktopMode()); + } + + @Test public void getOutPipWindowingMode_exitToDesktop_displayFreeform_returnsUndefined() { when(mMockDesktopRepository.isAnyDeskActive(DISPLAY_ID)).thenReturn(true); setDisplayWindowingMode(WINDOWING_MODE_FREEFORM); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDoubleTapHelperTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDoubleTapHelperTest.java index 1756aad8fc9b..cc23d9a75fcd 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDoubleTapHelperTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDoubleTapHelperTest.java @@ -21,7 +21,6 @@ import static com.android.wm.shell.common.pip.PipDoubleTapHelper.SIZE_SPEC_DEFAU import static com.android.wm.shell.common.pip.PipDoubleTapHelper.SIZE_SPEC_MAX; import static com.android.wm.shell.common.pip.PipDoubleTapHelper.nextSizeSpec; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.graphics.Point; @@ -41,131 +40,75 @@ import org.mockito.Mock; */ @RunWith(AndroidTestingRunner.class) public class PipDoubleTapHelperTest extends ShellTestCase { - // represents the current pip window state and has information on current - // max, min, and normal sizes - @Mock private PipBoundsState mBoundStateMock; - // tied to boundsStateMock.getBounds() in setUp() - @Mock private Rect mBoundsMock; - - // represents the most recent manually resized bounds - // i.e. dimensions from the most recent pinch in/out - @Mock private Rect mUserResizeBoundsMock; - - // actual dimensions of the pip screen bounds - private static final int MAX_WIDTH = 100; - private static final int DEFAULT_WIDTH = 40; - private static final int MIN_WIDTH = 10; - - private static final int AVERAGE_WIDTH = (MAX_WIDTH + MIN_WIDTH) / 2; - - /** - * Initializes mocks and assigns values for different pip screen bounds. - */ + @Mock private PipBoundsState mMockPipBoundsState; + + // Actual dimension guidelines of the PiP bounds. + private static final int MAX_EDGE_SIZE = 100; + private static final int DEFAULT_EDGE_SIZE = 60; + private static final int MIN_EDGE_SIZE = 50; + private static final int AVERAGE_EDGE_SIZE = (MAX_EDGE_SIZE + MIN_EDGE_SIZE) / 2; + @Before public void setUp() { // define pip bounds - when(mBoundStateMock.getMaxSize()).thenReturn(new Point(MAX_WIDTH, 20)); - when(mBoundStateMock.getMinSize()).thenReturn(new Point(MIN_WIDTH, 2)); + when(mMockPipBoundsState.getMaxSize()).thenReturn(new Point(MAX_EDGE_SIZE, MAX_EDGE_SIZE)); + when(mMockPipBoundsState.getMinSize()).thenReturn(new Point(MIN_EDGE_SIZE, MIN_EDGE_SIZE)); - Rect rectMock = mock(Rect.class); - when(rectMock.width()).thenReturn(DEFAULT_WIDTH); - when(mBoundStateMock.getNormalBounds()).thenReturn(rectMock); + final Rect normalBounds = new Rect(0, 0, DEFAULT_EDGE_SIZE, DEFAULT_EDGE_SIZE); + when(mMockPipBoundsState.getNormalBounds()).thenReturn(normalBounds); + } - when(mBoundsMock.width()).thenReturn(DEFAULT_WIDTH); - when(mBoundStateMock.getBounds()).thenReturn(mBoundsMock); + @Test + public void nextSizeSpec_resizedWiderThanAverage_returnDefaultThenCustom() { + final int resizeEdgeSize = (MAX_EDGE_SIZE + AVERAGE_EDGE_SIZE) / 2; + final Rect userResizeBounds = new Rect(0, 0, resizeEdgeSize, resizeEdgeSize); + when(mMockPipBoundsState.getBounds()).thenReturn(userResizeBounds); + Assert.assertEquals(nextSizeSpec(mMockPipBoundsState, userResizeBounds), SIZE_SPEC_DEFAULT); + + // once we toggle to DEFAULT only PiP bounds state gets updated - not the user resize bounds + when(mMockPipBoundsState.getBounds()).thenReturn( + new Rect(0, 0, DEFAULT_EDGE_SIZE, DEFAULT_EDGE_SIZE)); + Assert.assertEquals(nextSizeSpec(mMockPipBoundsState, userResizeBounds), SIZE_SPEC_CUSTOM); + } + + @Test + public void nextSizeSpec_resizedSmallerThanAverage_returnMaxThenCustom() { + final int resizeEdgeSize = (AVERAGE_EDGE_SIZE + MIN_EDGE_SIZE) / 2; + final Rect userResizeBounds = new Rect(0, 0, resizeEdgeSize, resizeEdgeSize); + when(mMockPipBoundsState.getBounds()).thenReturn(userResizeBounds); + Assert.assertEquals(nextSizeSpec(mMockPipBoundsState, userResizeBounds), SIZE_SPEC_MAX); + + // Once we toggle to MAX our screen size gets updated but not the user resize bounds + when(mMockPipBoundsState.getBounds()).thenReturn( + new Rect(0, 0, MAX_EDGE_SIZE, MAX_EDGE_SIZE)); + Assert.assertEquals(nextSizeSpec(mMockPipBoundsState, userResizeBounds), SIZE_SPEC_CUSTOM); } - /** - * Tests {@link PipDoubleTapHelper#nextSizeSpec(PipBoundsState, Rect)}. - * - * <p>when the user resizes the screen to a larger than the average but not the maximum width, - * then we toggle between {@code PipSizeSpec.CUSTOM} and {@code PipSizeSpec.DEFAULT} - */ @Test - public void testNextScreenSize_resizedWiderThanAverage_returnDefaultThenCustom() { - // make the user resize width in between MAX and average - when(mUserResizeBoundsMock.width()).thenReturn((MAX_WIDTH + AVERAGE_WIDTH) / 2); - // make current bounds same as resized bound since no double tap yet - when(mBoundsMock.width()).thenReturn((MAX_WIDTH + AVERAGE_WIDTH) / 2); - - // then nextScreenSize() i.e. double tapping should - // toggle to DEFAULT state - Assert.assertSame(nextSizeSpec(mBoundStateMock, mUserResizeBoundsMock), - SIZE_SPEC_DEFAULT); - - // once we toggle to DEFAULT our screen size gets updated - // but not the user resize bounds - when(mBoundsMock.width()).thenReturn(DEFAULT_WIDTH); - - // then nextScreenSize() i.e. double tapping should - // toggle to CUSTOM state - Assert.assertSame(nextSizeSpec(mBoundStateMock, mUserResizeBoundsMock), - SIZE_SPEC_CUSTOM); + public void nextSizeSpec_resizedToMax_returnDefault() { + final Rect userResizeBounds = new Rect(0, 0, MAX_EDGE_SIZE, MAX_EDGE_SIZE); + when(mMockPipBoundsState.getBounds()).thenReturn(userResizeBounds); + Assert.assertEquals(nextSizeSpec(mMockPipBoundsState, userResizeBounds), SIZE_SPEC_DEFAULT); } - /** - * Tests {@link PipDoubleTapHelper#nextSizeSpec(PipBoundsState, Rect)}. - * - * <p>when the user resizes the screen to a smaller than the average but not the default width, - * then we toggle between {@code PipSizeSpec.CUSTOM} and {@code PipSizeSpec.MAX} - */ @Test - public void testNextScreenSize_resizedNarrowerThanAverage_returnMaxThenCustom() { - // make the user resize width in between MIN and average - when(mUserResizeBoundsMock.width()).thenReturn((MIN_WIDTH + AVERAGE_WIDTH) / 2); - // make current bounds same as resized bound since no double tap yet - when(mBoundsMock.width()).thenReturn((MIN_WIDTH + AVERAGE_WIDTH) / 2); - - // then nextScreenSize() i.e. double tapping should - // toggle to MAX state - Assert.assertSame(nextSizeSpec(mBoundStateMock, mUserResizeBoundsMock), - SIZE_SPEC_MAX); - - // once we toggle to MAX our screen size gets updated - // but not the user resize bounds - when(mBoundsMock.width()).thenReturn(MAX_WIDTH); - - // then nextScreenSize() i.e. double tapping should - // toggle to CUSTOM state - Assert.assertSame(nextSizeSpec(mBoundStateMock, mUserResizeBoundsMock), - SIZE_SPEC_CUSTOM); + public void nextSizeSpec_resizedToDefault_returnMax() { + final Rect userResizeBounds = new Rect(0, 0, DEFAULT_EDGE_SIZE, DEFAULT_EDGE_SIZE); + when(mMockPipBoundsState.getBounds()).thenReturn(userResizeBounds); + Assert.assertEquals(nextSizeSpec(mMockPipBoundsState, userResizeBounds), SIZE_SPEC_MAX); } - /** - * Tests {@link PipDoubleTapHelper#nextSizeSpec(PipBoundsState, Rect)}. - * - * <p>when the user resizes the screen to exactly the maximum width - * then we toggle to {@code PipSizeSpec.DEFAULT} - */ @Test - public void testNextScreenSize_resizedToMax_returnDefault() { - // the resized width is the same as MAX_WIDTH - when(mUserResizeBoundsMock.width()).thenReturn(MAX_WIDTH); - // the current bounds are also at MAX_WIDTH - when(mBoundsMock.width()).thenReturn(MAX_WIDTH); - - // then nextScreenSize() i.e. double tapping should - // toggle to DEFAULT state - Assert.assertSame(nextSizeSpec(mBoundStateMock, mUserResizeBoundsMock), - SIZE_SPEC_DEFAULT); + public void nextSizeSpec_resizedToAlmostMax_returnDefault() { + final Rect userResizeBounds = new Rect(0, 0, MAX_EDGE_SIZE, MAX_EDGE_SIZE - 1); + when(mMockPipBoundsState.getBounds()).thenReturn(userResizeBounds); + Assert.assertEquals(nextSizeSpec(mMockPipBoundsState, userResizeBounds), SIZE_SPEC_DEFAULT); } - /** - * Tests {@link PipDoubleTapHelper#nextSizeSpec(PipBoundsState, Rect)}. - * - * <p>when the user resizes the screen to exactly the default width - * then we toggle to {@code PipSizeSpec.MAX} - */ @Test - public void testNextScreenSize_resizedToDefault_returnMax() { - // the resized width is the same as DEFAULT_WIDTH - when(mUserResizeBoundsMock.width()).thenReturn(DEFAULT_WIDTH); - // the current bounds are also at DEFAULT_WIDTH - when(mBoundsMock.width()).thenReturn(DEFAULT_WIDTH); - - // then nextScreenSize() i.e. double tapping should - // toggle to MAX state - Assert.assertSame(nextSizeSpec(mBoundStateMock, mUserResizeBoundsMock), - SIZE_SPEC_MAX); + public void nextSizeSpec_resizedToAlmostMin_returnMax() { + final Rect userResizeBounds = new Rect(0, 0, MIN_EDGE_SIZE, MIN_EDGE_SIZE + 1); + when(mMockPipBoundsState.getBounds()).thenReturn(userResizeBounds); + Assert.assertEquals(nextSizeSpec(mMockPipBoundsState, userResizeBounds), SIZE_SPEC_MAX); } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopDisplayEventHandlerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopDisplayEventHandlerTest.kt index 275d7b73a112..2aebcdcc3bf5 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopDisplayEventHandlerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopDisplayEventHandlerTest.kt @@ -61,10 +61,10 @@ class DesktopDisplayEventHandlerTest : ShellTestCase() { @Mock lateinit var testExecutor: ShellExecutor @Mock lateinit var displayController: DisplayController @Mock private lateinit var mockDesktopUserRepositories: DesktopUserRepositories - @Mock private lateinit var mockDesktopRepositoryInitializer: DesktopRepositoryInitializer @Mock private lateinit var mockDesktopRepository: DesktopRepository @Mock private lateinit var mockDesktopTasksController: DesktopTasksController @Mock private lateinit var desktopDisplayModeController: DesktopDisplayModeController + private val desktopRepositoryInitializer = FakeDesktopRepositoryInitializer() private val testScope = TestScope() private lateinit var mockitoSession: StaticMockitoSession @@ -90,7 +90,7 @@ class DesktopDisplayEventHandlerTest : ShellTestCase() { shellInit, testScope.backgroundScope, displayController, - mockDesktopRepositoryInitializer, + desktopRepositoryInitializer, mockDesktopUserRepositories, mockDesktopTasksController, desktopDisplayModeController, @@ -109,12 +109,10 @@ class DesktopDisplayEventHandlerTest : ShellTestCase() { @Test fun testDisplayAdded_supportsDesks_desktopRepositoryInitialized_createsDesk() = testScope.runTest { - val stateFlow = MutableStateFlow(false) - whenever(mockDesktopRepositoryInitializer.isInitialized).thenReturn(stateFlow) whenever(DesktopModeStatus.canEnterDesktopMode(context)).thenReturn(true) onDisplaysChangedListenerCaptor.lastValue.onDisplayAdded(DEFAULT_DISPLAY) - stateFlow.emit(true) + desktopRepositoryInitializer.initialize(mockDesktopUserRepositories) runCurrent() verify(mockDesktopTasksController).createDesk(DEFAULT_DISPLAY) @@ -123,8 +121,6 @@ class DesktopDisplayEventHandlerTest : ShellTestCase() { @Test fun testDisplayAdded_supportsDesks_desktopRepositoryNotInitialized_doesNotCreateDesk() = testScope.runTest { - val stateFlow = MutableStateFlow(false) - whenever(mockDesktopRepositoryInitializer.isInitialized).thenReturn(stateFlow) whenever(DesktopModeStatus.canEnterDesktopMode(context)).thenReturn(true) onDisplaysChangedListenerCaptor.lastValue.onDisplayAdded(DEFAULT_DISPLAY) @@ -136,13 +132,11 @@ class DesktopDisplayEventHandlerTest : ShellTestCase() { @Test fun testDisplayAdded_supportsDesks_desktopRepositoryInitializedTwice_createsDeskOnce() = testScope.runTest { - val stateFlow = MutableStateFlow(false) - whenever(mockDesktopRepositoryInitializer.isInitialized).thenReturn(stateFlow) whenever(DesktopModeStatus.canEnterDesktopMode(context)).thenReturn(true) onDisplaysChangedListenerCaptor.lastValue.onDisplayAdded(DEFAULT_DISPLAY) - stateFlow.emit(true) - stateFlow.emit(true) + desktopRepositoryInitializer.initialize(mockDesktopUserRepositories) + desktopRepositoryInitializer.initialize(mockDesktopUserRepositories) runCurrent() verify(mockDesktopTasksController, times(1)).createDesk(DEFAULT_DISPLAY) @@ -151,13 +145,11 @@ class DesktopDisplayEventHandlerTest : ShellTestCase() { @Test fun testDisplayAdded_supportsDesks_desktopRepositoryInitialized_deskExists_doesNotCreateDesk() = testScope.runTest { - val stateFlow = MutableStateFlow(false) - whenever(mockDesktopRepositoryInitializer.isInitialized).thenReturn(stateFlow) whenever(DesktopModeStatus.canEnterDesktopMode(context)).thenReturn(true) whenever(mockDesktopRepository.getNumberOfDesks(DEFAULT_DISPLAY)).thenReturn(1) onDisplaysChangedListenerCaptor.lastValue.onDisplayAdded(DEFAULT_DISPLAY) - stateFlow.emit(true) + desktopRepositoryInitializer.initialize(mockDesktopUserRepositories) runCurrent() verify(mockDesktopTasksController, never()).createDesk(DEFAULT_DISPLAY) @@ -203,4 +195,15 @@ class DesktopDisplayEventHandlerTest : ShellTestCase() { onDisplaysChangedListenerCaptor.lastValue.onDisplayRemoved(externalDisplayId) verify(desktopDisplayModeController).refreshDisplayWindowingMode() } + + private class FakeDesktopRepositoryInitializer : DesktopRepositoryInitializer { + override var deskRecreationFactory: DesktopRepositoryInitializer.DeskRecreationFactory = + DesktopRepositoryInitializer.DeskRecreationFactory { _, _, deskId -> deskId } + + override val isInitialized: MutableStateFlow<Boolean> = MutableStateFlow(false) + + override fun initialize(userRepositories: DesktopUserRepositories) { + isInitialized.value = true + } + } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopRepositoryTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopRepositoryTest.kt index f84a1a38bdfc..c455205f6411 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopRepositoryTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopRepositoryTest.kt @@ -275,6 +275,18 @@ class DesktopRepositoryTest(flags: FlagsParameterization) : ShellTestCase() { } @Test + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun removeActiveTask_excludingDesk_leavesTaskInDesk() { + repo.addDesk(displayId = 2, deskId = 11) + repo.addDesk(displayId = 3, deskId = 12) + repo.addTaskToDesk(displayId = 3, deskId = 12, taskId = 100, isVisible = true) + + repo.removeActiveTask(taskId = 100, excludedDeskId = 12) + + assertThat(repo.getActiveTaskIdsInDesk(12)).contains(100) + } + + @Test fun isActiveTask_nonExistingTask_returnsFalse() { assertThat(repo.isActiveTask(99)).isFalse() } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt index 34c5ebd6d94d..3835c02678e7 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt @@ -87,6 +87,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession import com.android.dx.mockito.inline.extended.ExtendedMockito.never import com.android.dx.mockito.inline.extended.StaticMockitoSession import com.android.internal.jank.InteractionJankMonitor +import com.android.internal.policy.SystemBarUtils.getDesktopViewAppHeaderHeightPx import com.android.window.flags.Flags import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE import com.android.window.flags.Flags.FLAG_ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS @@ -1464,7 +1465,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() controller.addMoveToDeskTaskChanges(wct, task, deskId = 0) val finalBounds = findBoundsChange(wct, task) - val captionInsets = getAppHeaderHeight(context) + val captionInsets = getDesktopViewAppHeaderHeightPx(context) finalBounds!!.top += captionInsets val finalAspectRatio = maxOf(finalBounds.height(), finalBounds.width()) / @@ -1486,7 +1487,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() controller.addMoveToDeskTaskChanges(wct, task, deskId = 0) val finalBounds = findBoundsChange(wct, task) - val captionInsets = getAppHeaderHeight(context) + val captionInsets = getDesktopViewAppHeaderHeightPx(context) finalBounds!!.top += captionInsets val finalAspectRatio = maxOf(finalBounds.height(), finalBounds.width()) / @@ -3122,6 +3123,36 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() } @Test + @EnableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + fun moveToNextDisplay_toDesktopInOtherDisplay_appliesTaskLimit() { + val transition = Binder() + val sourceDeskId = 0 + val targetDeskId = 2 + taskRepository.addDesk(displayId = SECOND_DISPLAY, deskId = targetDeskId) + taskRepository.setDeskInactive(deskId = targetDeskId) + val targetDeskTasks = + (1..MAX_TASK_LIMIT + 1).map { _ -> + setUpFreeformTask(displayId = SECOND_DISPLAY, deskId = targetDeskId) + } + // Set up two display ids + whenever(rootTaskDisplayAreaOrganizer.displayIds) + .thenReturn(intArrayOf(DEFAULT_DISPLAY, SECOND_DISPLAY)) + // Create a mock for the target display area: second display + val secondDisplayArea = DisplayAreaInfo(MockToken().token(), SECOND_DISPLAY, 0) + whenever(rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(SECOND_DISPLAY)) + .thenReturn(secondDisplayArea) + whenever(transitions.startTransition(eq(TRANSIT_CHANGE), any(), anyOrNull())) + .thenReturn(transition) + val task = setUpFreeformTask(displayId = DEFAULT_DISPLAY, deskId = sourceDeskId) + + controller.moveToNextDisplay(task.taskId) + + val wct = getLatestTransition() + assertNotNull(wct) + verify(desksOrganizer).minimizeTask(wct, targetDeskId, targetDeskTasks[0]) + } + + @Test @EnableFlags( Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, Flags.FLAG_ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY, @@ -3190,10 +3221,11 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() verify(desksOrganizer).activateDesk(any(), eq(targetDeskId)) verify(desksTransitionsObserver) .addPendingTransition( - DeskTransition.ActivateDesk( + DeskTransition.ActiveDeskWithTask( token = transition, displayId = SECOND_DISPLAY, deskId = targetDeskId, + enterTaskId = task.taskId, ) ) } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt index 6e7adf368155..dc96694b814d 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt @@ -54,7 +54,9 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.any +import org.mockito.ArgumentMatchers.anyFloat import org.mockito.ArgumentMatchers.anyInt +import org.mockito.ArgumentMatchers.anyLong import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.MockitoSession @@ -85,8 +87,17 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { @Mock private lateinit var desktopUserRepositories: DesktopUserRepositories @Mock private lateinit var bubbleController: BubbleController @Mock private lateinit var visualIndicator: DesktopModeVisualIndicator - - private val transactionSupplier = Supplier { mock<SurfaceControl.Transaction>() } + @Mock private lateinit var dragCancelCallback: Runnable + @Mock + private lateinit var dragToDesktopStateListener: + DragToDesktopTransitionHandler.DragToDesktopStateListener + + private val transactionSupplier = Supplier { + val transaction = mock<SurfaceControl.Transaction>() + whenever(transaction.setAlpha(any(), anyFloat())).thenReturn(transaction) + whenever(transaction.setFrameTimeline(anyLong())).thenReturn(transaction) + transaction + } private lateinit var defaultHandler: DragToDesktopTransitionHandler private lateinit var springHandler: SpringDragToDesktopTransitionHandler @@ -104,7 +115,11 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { Optional.of(bubbleController), transactionSupplier, ) - .apply { setSplitScreenController(splitScreenController) } + .apply { + setSplitScreenController(splitScreenController) + dragToDesktopStateListener = + this@DragToDesktopTransitionHandlerTest.dragToDesktopStateListener + } springHandler = SpringDragToDesktopTransitionHandler( context, @@ -115,7 +130,11 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { Optional.of(bubbleController), transactionSupplier, ) - .apply { setSplitScreenController(splitScreenController) } + .apply { + setSplitScreenController(splitScreenController) + dragToDesktopStateListener = + this@DragToDesktopTransitionHandlerTest.dragToDesktopStateListener + } mockitoSession = ExtendedMockito.mockitoSession() .strictness(Strictness.LENIENT) @@ -706,8 +725,8 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { } @Test - @EnableFlags(FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX) - fun mergeOtherTransition_cancelAndEndNotYetRequested_doesntInterruptsStartDrag() { + @DisableFlags(FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX) + fun mergeOtherTransition_flagDisabled_cancelAndEndNotYetRequested_doesNotInterruptStartDrag() { val finishCallback = mock<Transitions.TransitionFinishCallback>() val task = createTask() defaultHandler.onTaskResizeAnimationListener = mock() @@ -721,6 +740,39 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { @Test @EnableFlags(FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX) + fun mergeOtherTransition_cancelAndEndNotYetRequested_interruptsStartDrag() { + val finishCallback = mock<Transitions.TransitionFinishCallback>() + val task = createTask() + defaultHandler.onTaskResizeAnimationListener = mock() + val startTransition = startDrag(defaultHandler, task, finishCallback = finishCallback) + + mergeInterruptingTransition(mergeTarget = startTransition) + + verify(dragAnimator).cancelAnimator() + verify(dragCancelCallback).run() + verify(dragToDesktopStateListener).onTransitionInterrupted() + assertThat(defaultHandler.inProgress).isTrue() + // Doesn't finish start transition yet + verify(finishCallback, never()).onTransitionFinished(/* wct= */ anyOrNull()) + } + + @Test + @EnableFlags(FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX) + fun mergeOtherTransition_cancelAndEndNotYetRequested_finishesStartAfterAnimation() { + val finishCallback = mock<Transitions.TransitionFinishCallback>() + val task = createTask() + defaultHandler.onTaskResizeAnimationListener = mock() + val startTransition = startDrag(defaultHandler, task, finishCallback = finishCallback) + + mergeInterruptingTransition(mergeTarget = startTransition) + mAnimatorTestRule.advanceTimeBy(DRAG_TO_DESKTOP_FINISH_ANIM_DURATION_MS) + + verify(finishCallback).onTransitionFinished(/* wct= */ anyOrNull()) + assertThat(defaultHandler.inProgress).isFalse() + } + + @Test + @EnableFlags(FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX) fun mergeOtherTransition_endDragAlreadyMerged_doesNotInterruptStartDrag() { val startDragFinishCallback = mock<Transitions.TransitionFinishCallback>() val task = createTask() @@ -795,6 +847,35 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { verify(dragAnimator, times(2)).startAnimation() } + @Test + @EnableFlags(FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX) + fun startCancelAnimation_otherTransitionInterruptingAfterCancelRequest_finishImmediately() { + val task1 = createTask() + val startTransition = startDrag(defaultHandler, task1) + val cancelTransition = + cancelDragToDesktopTransition(defaultHandler, CancelState.STANDARD_CANCEL) + mergeInterruptingTransition(mergeTarget = startTransition) + val cancelFinishCallback = mock<Transitions.TransitionFinishCallback>() + val startTransaction = mock<SurfaceControl.Transaction>() + + val didAnimate = + defaultHandler.startAnimation( + transition = requireNotNull(cancelTransition), + info = + createTransitionInfo( + type = TRANSIT_DESKTOP_MODE_CANCEL_DRAG_TO_DESKTOP, + draggedTask = task1, + ), + startTransaction = startTransaction, + finishTransaction = mock(), + finishCallback = cancelFinishCallback, + ) + + assertThat(didAnimate).isTrue() + verify(startTransaction).apply() + verify(cancelFinishCallback).onTransitionFinished(/* wct= */ anyOrNull()) + } + private fun mergeInterruptingTransition(mergeTarget: IBinder) { defaultHandler.mergeAnimation( transition = mock<IBinder>(), @@ -942,7 +1023,12 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { ) ) .thenReturn(token) - handler.startDragToDesktopTransition(task, dragAnimator, visualIndicator) + handler.startDragToDesktopTransition( + task, + dragAnimator, + visualIndicator, + dragCancelCallback, + ) return token } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/shared/bubbles/DropTargetManagerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/shared/bubbles/DropTargetManagerTest.kt index 95498cbbe53c..3b21e365e911 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/shared/bubbles/DropTargetManagerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/shared/bubbles/DropTargetManagerTest.kt @@ -352,7 +352,7 @@ class DropTargetManagerTest { initialDragZone = dragZone } - override fun onDragZoneChanged(from: DragZone, to: DragZone) { + override fun onDragZoneChanged(draggedObject: DraggedObject, from: DragZone, to: DragZone) { fromDragZone = from toDragZone = to } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java index e246329446dc..5dff21860ef4 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java @@ -211,11 +211,19 @@ public class StageCoordinatorTests extends ShellTestCase { when(mSplitLayout.getDividerLeash()).thenReturn(dividerLeash); mRootTask = new TestRunningTaskInfoBuilder().build(); - SurfaceControl rootLeash = new SurfaceControl.Builder().setName("test").build(); + SurfaceControl rootLeash = new SurfaceControl.Builder().setName("splitRoot").build(); mStageCoordinator.onTaskAppeared(mRootTask, rootLeash); mSideStage.mRootTaskInfo = new TestRunningTaskInfoBuilder().build(); mMainStage.mRootTaskInfo = new TestRunningTaskInfoBuilder().build(); + SurfaceControl mainRootLeash = new SurfaceControl.Builder().setName("mainRoot").build(); + SurfaceControl sideRootLeash = new SurfaceControl.Builder().setName("sideRoot").build(); + mMainStage.mRootLeash = mainRootLeash; + mSideStage.mRootLeash = sideRootLeash; + SurfaceControl mainDimLayer = new SurfaceControl.Builder().setName("mainDim").build(); + SurfaceControl sideDimLayer = new SurfaceControl.Builder().setName("sideDim").build(); + mMainStage.mDimLayer = mainDimLayer; + mSideStage.mDimLayer = sideDimLayer; doReturn(mock(SplitDecorManager.class)).when(mMainStage).getSplitDecorManager(); doReturn(mock(SplitDecorManager.class)).when(mSideStage).getSplitDecorManager(); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/HomeTransitionObserverTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/HomeTransitionObserverTest.java index 3099b0f5cf66..a122c3820dcb 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/HomeTransitionObserverTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/HomeTransitionObserverTest.java @@ -27,6 +27,7 @@ import static android.view.WindowManager.TRANSIT_TO_FRONT; import static android.window.TransitionInfo.FLAG_BACK_GESTURE_ANIMATED; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; +import static com.android.window.flags.Flags.FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX; import static com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP; import static com.android.wm.shell.transition.Transitions.TRANSIT_CONVERT_TO_BUBBLE; @@ -44,6 +45,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; +import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.EnableFlags; import android.view.SurfaceControl; import android.window.TransitionInfo; @@ -196,6 +198,73 @@ public class HomeTransitionObserverTest extends ShellTestCase { } @Test + @DisableFlags({FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX}) + public void startDragToDesktopFinished_flagDisabled_doesNotTriggerCallback() + throws RemoteException { + TransitionInfo info = mock(TransitionInfo.class); + TransitionInfo.Change change = mock(TransitionInfo.Change.class); + ActivityManager.RunningTaskInfo taskInfo = mock(ActivityManager.RunningTaskInfo.class); + when(change.getTaskInfo()).thenReturn(taskInfo); + when(info.getChanges()).thenReturn(new ArrayList<>(List.of(change))); + when(info.getType()).thenReturn(TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP); + setupTransitionInfo(taskInfo, change, ACTIVITY_TYPE_HOME, TRANSIT_OPEN, true); + IBinder transition = mock(IBinder.class); + mHomeTransitionObserver.onTransitionReady( + transition, + info, + mock(SurfaceControl.Transaction.class), + mock(SurfaceControl.Transaction.class)); + + mHomeTransitionObserver.onTransitionFinished(transition, /* aborted= */ false); + + verify(mListener, never()).onHomeVisibilityChanged(/* isVisible= */ anyBoolean()); + } + + @Test + @EnableFlags({FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX}) + public void startDragToDesktopAborted_doesNotTriggerCallback() throws RemoteException { + TransitionInfo info = mock(TransitionInfo.class); + TransitionInfo.Change change = mock(TransitionInfo.Change.class); + ActivityManager.RunningTaskInfo taskInfo = mock(ActivityManager.RunningTaskInfo.class); + when(change.getTaskInfo()).thenReturn(taskInfo); + when(info.getChanges()).thenReturn(new ArrayList<>(List.of(change))); + when(info.getType()).thenReturn(TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP); + setupTransitionInfo(taskInfo, change, ACTIVITY_TYPE_HOME, TRANSIT_OPEN, true); + IBinder transition = mock(IBinder.class); + mHomeTransitionObserver.onTransitionReady( + transition, + info, + mock(SurfaceControl.Transaction.class), + mock(SurfaceControl.Transaction.class)); + + mHomeTransitionObserver.onTransitionFinished(transition, /* aborted= */ true); + + verify(mListener, never()).onHomeVisibilityChanged(/* isVisible= */ anyBoolean()); + } + + @Test + @EnableFlags({FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX}) + public void startDragToDesktopFinished_triggersCallback() throws RemoteException { + TransitionInfo info = mock(TransitionInfo.class); + TransitionInfo.Change change = mock(TransitionInfo.Change.class); + ActivityManager.RunningTaskInfo taskInfo = mock(ActivityManager.RunningTaskInfo.class); + when(change.getTaskInfo()).thenReturn(taskInfo); + when(info.getChanges()).thenReturn(new ArrayList<>(List.of(change))); + when(info.getType()).thenReturn(TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP); + setupTransitionInfo(taskInfo, change, ACTIVITY_TYPE_HOME, TRANSIT_OPEN, true); + IBinder transition = mock(IBinder.class); + mHomeTransitionObserver.onTransitionReady( + transition, + info, + mock(SurfaceControl.Transaction.class), + mock(SurfaceControl.Transaction.class)); + + mHomeTransitionObserver.onTransitionFinished(transition, /* aborted= */ false); + + verify(mListener).onHomeVisibilityChanged(/* isVisible= */ true); + } + + @Test @EnableFlags({Flags.FLAG_ENABLE_BUBBLE_TO_FULLSCREEN, Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE}) public void testDragTaskToBubbleOverHome_notifiesHomeIsVisible() throws RemoteException { ActivityManager.RunningTaskInfo homeTask = createTaskInfo(1, ACTIVITY_TYPE_HOME); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/HandleMenuTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/HandleMenuTest.kt index f984f6db13fc..2e46f6312d03 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/HandleMenuTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/HandleMenuTest.kt @@ -98,8 +98,6 @@ class HandleMenuTest : ShellTestCase() { private lateinit var handleMenu: HandleMenu - private val menuWidthWithElevation = MENU_WIDTH + MENU_PILL_ELEVATION - @Before fun setUp() { val mockAdditionalViewHostViewContainer = AdditionalViewHostViewContainer( @@ -126,7 +124,6 @@ class HandleMenuTest : ShellTestCase() { addOverride(R.dimen.desktop_mode_handle_menu_height, MENU_HEIGHT) addOverride(R.dimen.desktop_mode_handle_menu_margin_top, MENU_TOP_MARGIN) addOverride(R.dimen.desktop_mode_handle_menu_margin_start, MENU_START_MARGIN) - addOverride(R.dimen.desktop_mode_handle_menu_pill_elevation, MENU_PILL_ELEVATION) addOverride( R.dimen.desktop_mode_handle_menu_pill_spacing_margin, MENU_PILL_SPACING_MARGIN) } @@ -141,7 +138,7 @@ class HandleMenuTest : ShellTestCase() { assertTrue(handleMenu.handleMenuViewContainer is AdditionalSystemViewContainer) // Verify menu is created at coordinates that, when added to WindowManager, // show at the top-center of display. - val expected = Point(DISPLAY_BOUNDS.centerX() - menuWidthWithElevation / 2, MENU_TOP_MARGIN) + val expected = Point(DISPLAY_BOUNDS.centerX() - MENU_WIDTH / 2, MENU_TOP_MARGIN) assertEquals(expected.toPointF(), handleMenu.handleMenuPosition) } @@ -165,7 +162,7 @@ class HandleMenuTest : ShellTestCase() { // Verify menu is created at coordinates that, when added to WindowManager, // show at the top-center of split left task. val expected = Point( - SPLIT_LEFT_BOUNDS.centerX() - menuWidthWithElevation / 2, + SPLIT_LEFT_BOUNDS.centerX() - MENU_WIDTH / 2, MENU_TOP_MARGIN ) assertEquals(expected.toPointF(), handleMenu.handleMenuPosition) @@ -180,7 +177,7 @@ class HandleMenuTest : ShellTestCase() { // Verify menu is created at coordinates that, when added to WindowManager, // show at the top-center of split right task. val expected = Point( - SPLIT_RIGHT_BOUNDS.centerX() - menuWidthWithElevation / 2, + SPLIT_RIGHT_BOUNDS.centerX() - MENU_WIDTH / 2, MENU_TOP_MARGIN ) assertEquals(expected.toPointF(), handleMenu.handleMenuPosition) @@ -323,7 +320,6 @@ class HandleMenuTest : ShellTestCase() { private const val MENU_HEIGHT = 400 private const val MENU_TOP_MARGIN = 10 private const val MENU_START_MARGIN = 20 - private const val MENU_PILL_ELEVATION = 2 private const val MENU_PILL_SPACING_MARGIN = 4 private const val HANDLE_WIDTH = 80 private const val APP_NAME = "Test App" diff --git a/location/java/android/location/GnssClock.java b/location/java/android/location/GnssClock.java index 62f50b57520c..6930f365adc1 100644 --- a/location/java/android/location/GnssClock.java +++ b/location/java/android/location/GnssClock.java @@ -349,7 +349,7 @@ public final class GnssClock implements Parcelable { * Gets the clock's Drift in nanoseconds per second. * * <p>This value is the instantaneous time-derivative of the value provided by - * {@link #getBiasNanos()}. + * the sum of {@link #getFullBiasNanos()} and {@link #getBiasNanos()}. * * <p>A positive value indicates that the frequency is higher than the nominal (e.g. GPS master * clock) frequency. The error estimate for this reported drift is diff --git a/media/java/android/media/flags/media_better_together.aconfig b/media/java/android/media/flags/media_better_together.aconfig index e39a0aa8717e..48e2f4e15238 100644 --- a/media/java/android/media/flags/media_better_together.aconfig +++ b/media/java/android/media/flags/media_better_together.aconfig @@ -242,3 +242,13 @@ flag { description: "Fallbacks to the default handling for volume adjustment when media session has fixed volume handling and its app is in the foreground and setting a media controller." bug: "293743975" } + +flag { + name: "fix_output_media_item_list_index_out_of_bounds_exception" + namespace: "media_better_together" + description: "Fixes a bug of causing IndexOutOfBoundsException when building media item list." + bug: "398246089" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/media/java/android/media/quality/Android.bp b/media/java/android/media/quality/Android.bp index 080d5266ccb7..f620144e2880 100644 --- a/media/java/android/media/quality/Android.bp +++ b/media/java/android/media/quality/Android.bp @@ -15,6 +15,30 @@ filegroup { path: "aidl", } +cc_library_headers { + name: "media_quality_headers", + export_include_dirs: ["include"], +} + +cc_library_shared { + name: "libmedia_quality_include", + + export_include_dirs: ["include"], + cflags: [ + "-Wno-unused-variable", + "-Wunused-parameter", + ], + + shared_libs: [ + "libbinder", + "libutils", + ], + + srcs: [ + ":framework-media-quality-sources-aidl", + ], +} + aidl_interface { name: "media_quality_aidl_interface", unstable: true, @@ -24,7 +48,8 @@ aidl_interface { enabled: true, }, cpp: { - enabled: false, + additional_shared_libraries: ["libmedia_quality_include"], + enabled: true, }, ndk: { enabled: false, diff --git a/media/java/android/media/quality/aidl/android/media/quality/ActiveProcessingPicture.aidl b/media/java/android/media/quality/aidl/android/media/quality/ActiveProcessingPicture.aidl index 2851306f6e4d..d2cf140632ab 100644 --- a/media/java/android/media/quality/aidl/android/media/quality/ActiveProcessingPicture.aidl +++ b/media/java/android/media/quality/aidl/android/media/quality/ActiveProcessingPicture.aidl @@ -16,4 +16,4 @@ package android.media.quality; -parcelable ActiveProcessingPicture;
\ No newline at end of file +parcelable ActiveProcessingPicture cpp_header "quality/MediaQualityManager.h";
\ No newline at end of file diff --git a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightEvent.aidl b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightEvent.aidl index 174cd461e846..d53860fdf9ad 100644 --- a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightEvent.aidl +++ b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightEvent.aidl @@ -16,4 +16,4 @@ package android.media.quality; -parcelable AmbientBacklightEvent; +parcelable AmbientBacklightEvent cpp_header "quality/MediaQualityManager.h"; diff --git a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightMetadata.aidl b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightMetadata.aidl index b95a474fbf90..a935b49b5d23 100644 --- a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightMetadata.aidl +++ b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightMetadata.aidl @@ -16,4 +16,4 @@ package android.media.quality; -parcelable AmbientBacklightMetadata;
\ No newline at end of file +parcelable AmbientBacklightMetadata cpp_header "quality/MediaQualityManager.h";
\ No newline at end of file diff --git a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightSettings.aidl b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightSettings.aidl index e2cdd03194cd..051aef80b948 100644 --- a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightSettings.aidl +++ b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightSettings.aidl @@ -16,4 +16,4 @@ package android.media.quality; -parcelable AmbientBacklightSettings; +parcelable AmbientBacklightSettings cpp_header "quality/MediaQualityManager.h"; diff --git a/media/java/android/media/quality/aidl/android/media/quality/ParameterCapability.aidl b/media/java/android/media/quality/aidl/android/media/quality/ParameterCapability.aidl index eb2ac97916f3..ea848576e026 100644 --- a/media/java/android/media/quality/aidl/android/media/quality/ParameterCapability.aidl +++ b/media/java/android/media/quality/aidl/android/media/quality/ParameterCapability.aidl @@ -16,4 +16,4 @@ package android.media.quality; -parcelable ParameterCapability; +parcelable ParameterCapability cpp_header "quality/MediaQualityManager.h"; diff --git a/media/java/android/media/quality/aidl/android/media/quality/PictureProfile.aidl b/media/java/android/media/quality/aidl/android/media/quality/PictureProfile.aidl index 41d018b12f33..b0fe3f5538f4 100644 --- a/media/java/android/media/quality/aidl/android/media/quality/PictureProfile.aidl +++ b/media/java/android/media/quality/aidl/android/media/quality/PictureProfile.aidl @@ -16,4 +16,4 @@ package android.media.quality; -parcelable PictureProfile; +parcelable PictureProfile cpp_header "quality/MediaQualityManager.h"; diff --git a/media/java/android/media/quality/aidl/android/media/quality/PictureProfileHandle.aidl b/media/java/android/media/quality/aidl/android/media/quality/PictureProfileHandle.aidl index 5d14631dbb73..0582938b6ea7 100644 --- a/media/java/android/media/quality/aidl/android/media/quality/PictureProfileHandle.aidl +++ b/media/java/android/media/quality/aidl/android/media/quality/PictureProfileHandle.aidl @@ -16,4 +16,4 @@ package android.media.quality; -parcelable PictureProfileHandle; +parcelable PictureProfileHandle cpp_header "quality/MediaQualityManager.h"; diff --git a/media/java/android/media/quality/aidl/android/media/quality/SoundProfile.aidl b/media/java/android/media/quality/aidl/android/media/quality/SoundProfile.aidl index e79fcaac97be..d93231fbf7e0 100644 --- a/media/java/android/media/quality/aidl/android/media/quality/SoundProfile.aidl +++ b/media/java/android/media/quality/aidl/android/media/quality/SoundProfile.aidl @@ -16,4 +16,4 @@ package android.media.quality; -parcelable SoundProfile; +parcelable SoundProfile cpp_header "quality/MediaQualityManager.h"; diff --git a/media/java/android/media/quality/include/quality/MediaQualityManager.h b/media/java/android/media/quality/include/quality/MediaQualityManager.h new file mode 100644 index 000000000000..8c31667077c3 --- /dev/null +++ b/media/java/android/media/quality/include/quality/MediaQualityManager.h @@ -0,0 +1,127 @@ +#ifndef ANDROID_MEDIA_QUALITY_MANAGER_H +#define ANDROID_MEDIA_QUALITY_MANAGER_H + + +namespace android { +namespace media { +namespace quality { + +// TODO: implement writeToParcel and readFromParcel + +class PictureProfileHandle : public Parcelable { + public: + PictureProfileHandle() {} + status_t writeToParcel(android::Parcel*) const override { + return 0; + } + status_t readFromParcel(const android::Parcel*) override { + return 0; + } + std::string toString() const { + return ""; + } +}; + +class SoundProfile : public Parcelable { + public: + SoundProfile() {} + status_t writeToParcel(android::Parcel*) const override { + return 0; + } + status_t readFromParcel(const android::Parcel*) override { + return 0; + } + std::string toString() const { + return ""; + } +}; + +class PictureProfile : public Parcelable { + public: + PictureProfile() {} + status_t writeToParcel(android::Parcel*) const override { + return 0; + } + status_t readFromParcel(const android::Parcel*) override { + return 0; + } + std::string toString() const { + return ""; + } +}; + +class ActiveProcessingPicture : public Parcelable { + public: + ActiveProcessingPicture() {} + status_t writeToParcel(android::Parcel*) const override { + return 0; + } + status_t readFromParcel(const android::Parcel*) override { + return 0; + } + std::string toString() const { + return ""; + } +}; + +class AmbientBacklightEvent : public Parcelable { + public: + AmbientBacklightEvent() {} + status_t writeToParcel(android::Parcel*) const override { + return 0; + } + status_t readFromParcel(const android::Parcel*) override { + return 0; + } + std::string toString() const { + return ""; + } +}; + +class AmbientBacklightMetadata : public Parcelable { + public: + AmbientBacklightMetadata() {} + status_t writeToParcel(android::Parcel*) const override { + return 0; + } + status_t readFromParcel(const android::Parcel*) override { + return 0; + } + std::string toString() const { + return ""; + } +}; + +class AmbientBacklightSettings : public Parcelable { + public: + AmbientBacklightSettings() {} + status_t writeToParcel(android::Parcel*) const override { + return 0; + } + status_t readFromParcel(const android::Parcel*) override { + return 0; + } + std::string toString() const { + return ""; + } +}; + +class ParameterCapability : public Parcelable { + public: + ParameterCapability() {} + status_t writeToParcel(android::Parcel*) const override { + return 0; + } + status_t readFromParcel(const android::Parcel*) override { + return 0; + } + std::string toString() const { + return ""; + } +}; + +} // namespace quality +} // namespace media +} // namespace android + +#endif diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java index 65264d30f04f..006b86a63f60 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java @@ -16,9 +16,9 @@ package com.android.mediaframeworktest.unit; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/CarrierDefaultReceiverTest.java b/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/CarrierDefaultReceiverTest.java index 6229434d1d86..7c54ad2f231c 100644 --- a/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/CarrierDefaultReceiverTest.java +++ b/packages/CarrierDefaultApp/tests/unit/src/com/android/carrierdefaultapp/CarrierDefaultReceiverTest.java @@ -16,7 +16,7 @@ package com.android.carrierdefaultapp; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/packages/CompanionDeviceManager/res/values-fr/strings.xml b/packages/CompanionDeviceManager/res/values-fr/strings.xml index 394efae9da0e..87148207575b 100644 --- a/packages/CompanionDeviceManager/res/values-fr/strings.xml +++ b/packages/CompanionDeviceManager/res/values-fr/strings.xml @@ -26,7 +26,7 @@ <string name="profile_name_watch" msgid="576290739483672360">"montre"</string> <string name="chooser_title_non_profile" msgid="6035023914517087400">"Sélectionner l\'appareil qui sera géré par <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong>"</string> <string name="chooser_title" msgid="2235819929238267637">"Sélectionner votre <xliff:g id="PROFILE_NAME">%1$s</xliff:g> à configurer"</string> - <string name="single_device_title" msgid="4199861437545438606">"Recherche de l\'appareil suivant : <xliff:g id="PROFILE_NAME">%1$s</xliff:g>"</string> + <string name="single_device_title" msgid="4199861437545438606">"Recherche de votre <xliff:g id="PROFILE_NAME">%1$s</xliff:g>"</string> <string name="summary_watch" msgid="8134580124808507407">"Cette appli sera autorisée à synchroniser des infos (comme le nom de l\'appelant) et disposera de ces autorisations sur votre <xliff:g id="DEVICE_TYPE">%1$s</xliff:g>"</string> <string name="confirmation_title_glasses" msgid="8288346850537727333">"Autoriser <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> à gérer <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> ?"</string> <string name="profile_name_glasses" msgid="3506504967216601277">"appareil"</string> diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java index b2c1e604db7e..964268e4ad14 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java @@ -65,6 +65,7 @@ import android.graphics.drawable.Icon; import android.net.MacAddress; import android.os.Bundle; import android.os.Handler; +import android.os.Looper; import android.os.RemoteException; import android.os.ResultReceiver; import android.text.Spanned; @@ -621,8 +622,10 @@ public class CompanionAssociationActivity extends FragmentActivity implements Slog.w(TAG, "Already selected."); return; } - // Notify the adapter to highlight the selected item. - mDeviceAdapter.setSelectedPosition(position); + // Delay highlighting the selected item by posting to the main thread. + // This helps avoid flicker in the user consent dialog after device selection. + new Handler( + Looper.getMainLooper()).post(() -> mDeviceAdapter.setSelectedPosition(position)); mSelectedDevice = requireNonNull(selectedDevice); diff --git a/packages/ExternalStorageProvider/res/values-fa/strings.xml b/packages/ExternalStorageProvider/res/values-fa/strings.xml index 9eabfd027da2..28781f123ada 100644 --- a/packages/ExternalStorageProvider/res/values-fa/strings.xml +++ b/packages/ExternalStorageProvider/res/values-fa/strings.xml @@ -18,6 +18,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="748293919008814871">"حافظه خارجی"</string> <string name="storage_description" msgid="9176081505553938524">"فضای ذخیرهسازی محلی"</string> - <string name="root_internal_storage" msgid="4980477711224234931">"حافظهٔ داخلی"</string> + <string name="root_internal_storage" msgid="4980477711224234931">"فضای ذخیرهسازی داخلی"</string> <string name="root_documents" msgid="5695037589229175941">"اسناد"</string> </resources> diff --git a/packages/PackageInstaller/res/values-ne/strings.xml b/packages/PackageInstaller/res/values-ne/strings.xml index 0bc4be3e53d6..f7998309f2c1 100644 --- a/packages/PackageInstaller/res/values-ne/strings.xml +++ b/packages/PackageInstaller/res/values-ne/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name" msgid="7488448184431507488">"प्याकेज स्थापनाकर्ता"</string> - <string name="install" msgid="711829760615509273">"स्थापना गर्नु…"</string> + <string name="install" msgid="711829760615509273">"इन्स्टल"</string> <string name="update" msgid="3932142540719227615">"अपडेट गर्नुहोस्"</string> <string name="done" msgid="6632441120016885253">"सम्पन्न भयो"</string> <string name="cancel" msgid="1018267193425558088">"रद्द गर्नुहोस्"</string> diff --git a/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt b/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt index 13541b1ebc9a..009d265833b4 100644 --- a/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt +++ b/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt @@ -58,6 +58,7 @@ import com.android.settingslib.metadata.PreferenceTitleProvider import com.android.settingslib.metadata.ReadWritePermit import com.android.settingslib.metadata.SensitivityLevel.Companion.HIGH_SENSITIVITY import com.android.settingslib.metadata.SensitivityLevel.Companion.UNKNOWN_SENSITIVITY +import com.android.settingslib.metadata.getPreferenceIcon import com.android.settingslib.preference.PreferenceScreenFactory import com.android.settingslib.preference.PreferenceScreenProvider import java.util.Locale diff --git a/packages/SettingsLib/IllustrationPreference/res/values/strings.xml b/packages/SettingsLib/IllustrationPreference/res/values/strings.xml index 3a8aaf8b5092..03da0dc41d47 100644 --- a/packages/SettingsLib/IllustrationPreference/res/values/strings.xml +++ b/packages/SettingsLib/IllustrationPreference/res/values/strings.xml @@ -20,8 +20,6 @@ <string name="settingslib_action_label_resume">resume</string> <!-- Label for an accessibility action that stops an animation [CHAR LIMIT=30] --> <string name="settingslib_action_label_pause">pause</string> - <!-- Label for an accessibility action that stops an animation [CHAR LIMIT=50] --> - <string name="settingslib_state_animation_playing">Animation playing</string> - <!-- Label for an accessibility action that stops an animation [CHAR LIMIT=50] --> - <string name="settingslib_state_animation_paused">Animation paused</string> + <!-- Default content description attached to the illustration if there is no content description. [CHAR LIMIT=NONE] --> + <string name="settingslib_illustration_content_description">Animation</string> </resources> diff --git a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java index bf739620bc99..777607010b3a 100644 --- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java +++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java @@ -474,6 +474,10 @@ public class IllustrationPreference extends Preference implements GroupSectionDi if (mIsAnimatable) { // TODO(b/397340540): list out pages having illustration without a content description. if (TextUtils.isEmpty(mContentDescription)) { + // Default content description will be attached if there's no content description. + illustrationView.setContentDescription( + getContext().getString( + R.string.settingslib_illustration_content_description)); Log.w(TAG, "Illustration should have a content description. preference key = " + getKey()); } @@ -493,8 +497,6 @@ public class IllustrationPreference extends Preference implements GroupSectionDi } private void updateAccessibilityAction(ViewGroup container) { - // Setting the state of animation - container.setStateDescription(getStateDescriptionForAnimation()); container.setAccessibilityDelegate(new View.AccessibilityDelegate() { @Override public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) { @@ -515,14 +517,6 @@ public class IllustrationPreference extends Preference implements GroupSectionDi } } - private String getStateDescriptionForAnimation() { - if (mIsAnimationPaused) { - return getContext().getString(R.string.settingslib_state_animation_paused); - } else { - return getContext().getString(R.string.settingslib_state_animation_playing); - } - } - private static void startLottieAnimationWith(LottieAnimationView illustrationView, Uri imageUri) { final InputStream inputStream = diff --git a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt index 7f2a61081fbb..fcca82330d10 100644 --- a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt +++ b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt @@ -137,44 +137,6 @@ interface PreferenceMetadata { /** Returns preference intent. */ fun intent(context: Context): Intent? = null - - /** - * Returns the preference title. - * - * Implement [PreferenceTitleProvider] interface if title content is generated dynamically. - */ - fun getPreferenceTitle(context: Context): CharSequence? = - when { - title != 0 -> context.getText(title) - this is PreferenceTitleProvider -> getTitle(context) - else -> null - } - - /** - * Returns the preference summary. - * - * Implement [PreferenceSummaryProvider] interface if summary content is generated dynamically - * (e.g. summary is provided per preference value). - */ - fun getPreferenceSummary(context: Context): CharSequence? = - when { - summary != 0 -> context.getText(summary) - this is PreferenceSummaryProvider -> getSummary(context) - else -> null - } - - /** - * Returns the preference icon. - * - * Implement [PreferenceIconProvider] interface if icon is provided dynamically (e.g. icon is - * provided based on flag value). - */ - fun getPreferenceIcon(context: Context): Int = - when { - icon != 0 -> icon - this is PreferenceIconProvider -> getIcon(context) - else -> 0 - } } /** Metadata of preference group. */ diff --git a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt new file mode 100644 index 000000000000..6d580fb47160 --- /dev/null +++ b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2025 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.settingslib.metadata + +import android.content.Context + +/** Returns the preference screen title. */ +fun PreferenceScreenMetadata.getPreferenceScreenTitle(context: Context): CharSequence? = + when { + screenTitle != 0 -> context.getString(screenTitle) + else -> getScreenTitle(context) ?: (this as? PreferenceTitleProvider)?.getTitle(context) + } + +/** Returns the preference title. */ +fun PreferenceMetadata.getPreferenceTitle(context: Context): CharSequence? = + when { + title != 0 -> context.getText(title) + this is PreferenceTitleProvider -> getTitle(context) + else -> null + } + +/** Returns the preference summary. */ +fun PreferenceMetadata.getPreferenceSummary(context: Context): CharSequence? = + when { + summary != 0 -> context.getText(summary) + this is PreferenceSummaryProvider -> getSummary(context) + else -> null + } + +/** Returns the preference icon. */ +fun PreferenceMetadata.getPreferenceIcon(context: Context): Int = + when { + icon != 0 -> icon + this is PreferenceIconProvider -> getIcon(context) + else -> 0 + } diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt index 59141c99e587..8896af47a1c2 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt @@ -25,10 +25,16 @@ import androidx.preference.PreferenceScreen import androidx.preference.SeekBarPreference import com.android.settingslib.metadata.DiscreteIntValue import com.android.settingslib.metadata.DiscreteValue +import com.android.settingslib.metadata.EXTRA_BINDING_SCREEN_ARGS +import com.android.settingslib.metadata.EXTRA_BINDING_SCREEN_KEY import com.android.settingslib.metadata.IntRangeValuePreference import com.android.settingslib.metadata.PreferenceAvailabilityProvider import com.android.settingslib.metadata.PreferenceMetadata import com.android.settingslib.metadata.PreferenceScreenMetadata +import com.android.settingslib.metadata.getPreferenceIcon +import com.android.settingslib.metadata.getPreferenceScreenTitle +import com.android.settingslib.metadata.getPreferenceSummary +import com.android.settingslib.metadata.getPreferenceTitle /** Binding of preference widget and preference metadata. */ interface PreferenceBinding { @@ -72,9 +78,22 @@ interface PreferenceBinding { preference.icon = null } val isPreferenceScreen = preference is PreferenceScreen + val screenMetadata = this as? PreferenceScreenMetadata + // extras preference.peekExtras()?.clear() extras(context)?.let { preference.extras.putAll(it) } - preference.title = getPreferenceTitle(context) + if (!isPreferenceScreen && screenMetadata != null) { + val extras = preference.extras + // Pass the preference key to fragment, so that the fragment could find associated + // preference screen registered in PreferenceScreenRegistry + extras.putString(EXTRA_BINDING_SCREEN_KEY, preference.key) + screenMetadata.arguments?.let { extras.putBundle(EXTRA_BINDING_SCREEN_ARGS, it) } + } + preference.title = + when { + isPreferenceScreen -> screenMetadata?.getPreferenceScreenTitle(context) + else -> getPreferenceTitle(context) + } if (!isPreferenceScreen) { preference.summary = getPreferenceSummary(context) } @@ -82,12 +101,12 @@ interface PreferenceBinding { preference.isVisible = (this as? PreferenceAvailabilityProvider)?.isAvailable(context) != false preference.isPersistent = isPersistent(context) - // PreferenceRegistry will notify dependency change, so we do not need to set + // PreferenceScreenBindingHelper will notify dependency change, so we do not need to set // dependency here. This simplifies dependency management and avoid the // IllegalStateException when call Preference.setDependency preference.dependency = null if (!isPreferenceScreen) { // avoid recursive loop when build graph - preference.fragment = (this as? PreferenceScreenCreator)?.fragmentClass()?.name + preference.fragment = screenMetadata?.fragmentClass()?.name preference.intent = intent(context) } if (preference is DialogPreference) { diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt index 6287fda86a73..33b614e19bbe 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt @@ -60,7 +60,6 @@ open class DefaultPreferenceBindingFactory : PreferenceBindingFactory { ?: when (metadata) { is SwitchPreference -> SwitchPreferenceBinding.INSTANCE is PreferenceCategory -> PreferenceCategoryBinding.INSTANCE - is PreferenceScreenCreator -> PreferenceScreenBinding.INSTANCE is MainSwitchPreference -> MainSwitchPreferenceBinding.INSTANCE else -> DefaultPreferenceBinding } diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindings.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindings.kt index 44c93c77e33b..71c46fa76aed 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindings.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindings.kt @@ -19,45 +19,11 @@ package com.android.settingslib.preference import android.content.Context import androidx.preference.Preference import androidx.preference.PreferenceCategory -import androidx.preference.PreferenceScreen import androidx.preference.SwitchPreferenceCompat import androidx.preference.TwoStatePreference -import com.android.settingslib.metadata.EXTRA_BINDING_SCREEN_ARGS -import com.android.settingslib.metadata.EXTRA_BINDING_SCREEN_KEY import com.android.settingslib.metadata.PreferenceMetadata -import com.android.settingslib.metadata.PreferenceScreenMetadata -import com.android.settingslib.metadata.PreferenceTitleProvider import com.android.settingslib.widget.MainSwitchPreference -/** Binding of preference group associated with [PreferenceCategory]. */ -interface PreferenceScreenBinding : PreferenceBinding { - - override fun bind(preference: Preference, metadata: PreferenceMetadata) { - super.bind(preference, metadata) - val context = preference.context - val screenMetadata = metadata as PreferenceScreenMetadata - val extras = preference.extras - // Pass the preference key to fragment, so that the fragment could find associated - // preference screen registered in PreferenceScreenRegistry - extras.putString(EXTRA_BINDING_SCREEN_KEY, preference.key) - screenMetadata.arguments?.let { extras.putBundle(EXTRA_BINDING_SCREEN_ARGS, it) } - if (preference is PreferenceScreen) { - val screenTitle = screenMetadata.screenTitle - preference.title = - if (screenTitle != 0) { - context.getString(screenTitle) - } else { - screenMetadata.getScreenTitle(context) - ?: (screenMetadata as? PreferenceTitleProvider)?.getTitle(context) - } - } - } - - companion object { - @JvmStatic val INSTANCE = object : PreferenceScreenBinding {} - } -} - /** Binding of preference category associated with [PreferenceCategory]. */ interface PreferenceCategoryBinding : PreferenceBinding { diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-af/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-af/strings.xml index b41ec957f12d..9d3092d39d03 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-af/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-af/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Geaktiveer deur administrateur"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Gedeaktiveer deur administrateur"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Geaktiveer deur Gevorderde Beskerming"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Gedeaktiveer deur Gevorderde Beskerming"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-am/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-am/strings.xml index 8e9488453032..9617acaa0c14 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-am/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-am/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"በአስተዳዳሪ ነቅቷል"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"በአስተዳዳሪ ተሰናክሏል"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"በላቀ ጥበቃ የነቃ"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"በላቀ ጥበቃ የተሰናከለ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ar/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ar/strings.xml index 8b2ccdfbb0e8..581b91458c1c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ar/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ar/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"يفعِّل المشرف هذا الإعداد."</string> <string name="disabled_by_admin" msgid="4023569940620832713">"أوقف المشرف هذا الإعداد"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"تم التفعيل من خلال ميزة \"الحماية المتقدّمة\""</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"تم الإيقاف من خلال ميزة \"الحماية المتقدّمة\""</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-as/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-as/strings.xml index 03e9e828534a..5824abdf921c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-as/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-as/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"প্ৰশাসকে সক্ষম কৰিছে"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"প্ৰশাসকে অক্ষম কৰিছে"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"সুৰক্ষা সম্পৰ্কীয় উন্নত সুবিধাটোৱে সক্ষম কৰিছে"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"সুৰক্ষা সম্পৰ্কীয় উন্নত সুবিধাটোৱে অক্ষম কৰিছে"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-az/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-az/strings.xml index 98447166a156..f07e05403afb 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-az/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-az/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Admin tərəfindən aktiv edildi"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Admin tərəfindən deaktiv edildi"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Qabaqcıl Qoruma tərəfindən aktiv edilib"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Qabaqcıl Qoruma tərəfindən deaktiv edilib"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-b+sr+Latn/strings.xml index c7b9be28fb1e..e09afbfbbd63 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-b+sr+Latn/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Administrator je omogućio"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Administrator je onemogućio"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Omogućila je Napredna zaštita"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Onemogućila je Napredna zaštita"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-be/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-be/strings.xml index 92ed11157dfc..a64734bde002 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-be/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-be/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Уключана адміністратарам"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Адключана адміністратарам"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Уключана Палепшанай абаронай"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Адключана Палепшанай абаронай"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-bg/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-bg/strings.xml index 57b50c5c580c..ccaa6563cbe9 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-bg/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-bg/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Активирано от администратора"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Деактивирано от администратора"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Активирано от „Разширена защита“"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Деактивирано от „Разширена защита“"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-bn/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-bn/strings.xml index 939ceb82ab40..0a48aa21a36b 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-bn/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-bn/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"অ্যাডমিন চালু করেছেন"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"অ্যাডমিন বন্ধ করেছেন"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"উন্নত সুরক্ষা চালু করেছে"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"উন্নত সুরক্ষা বন্ধ করেছে"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-bs/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-bs/strings.xml index 87cd3b8905c7..eebcebffe2a1 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-bs/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-bs/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Omogućio administrator"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Onemogućio administrator"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Omogućeno je Naprednom zaštitom"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Onemogućeno je Naprednom zaštitom"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ca/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ca/strings.xml index 34099b6f3f08..51e3fa9c8a41 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ca/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ca/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Activat per l\'administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Desactivat per l\'administrador"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Activat per la Protecció avançada"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Desactivat per la Protecció avançada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-cs/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-cs/strings.xml index 82cd56f39059..a5db6099c8cb 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-cs/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-cs/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Zapnuto administrátorem"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Vypnuto administrátorem"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktivováno pokročilou ochranou"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Deaktivováno pokročilou ochranou"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-da/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-da/strings.xml index 7f7ae8b3d5e0..7f10edf158b6 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-da/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-da/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aktiveret af administratoren"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Deaktiveret af administrator"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktiveret af Avanceret beskyttelse"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Deaktiveret af Avanceret beskyttelse"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-de/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-de/strings.xml index efaa50efacf4..604593bf0966 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-de/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-de/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Vom Administrator aktiviert"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Vom Administrator deaktiviert"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Vom erweiterten Sicherheitsprogramm aktiviert"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Vom erweiterten Sicherheitsprogramm deaktiviert"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-el/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-el/strings.xml index ddde3ece472a..79b401607a94 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-el/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-el/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Ενεργοποιήθηκε από τον διαχειριστή"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Απενεργοποιήθηκε από τον διαχειριστή"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Ενεργοποιήθηκε από την Ενισχυμένη προστασία"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Απενεργοποιήθηκε από την Ενισχυμένη προστασία"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rAU/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rAU/strings.xml index 6a07741d8e4c..14b92720487e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rAU/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rAU/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Enabled by admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Disabled by admin"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Enabled by Advanced Protection"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disabled by Advanced Protection"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rCA/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rCA/strings.xml index 6a07741d8e4c..14b92720487e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rCA/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rCA/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Enabled by admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Disabled by admin"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Enabled by Advanced Protection"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disabled by Advanced Protection"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rGB/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rGB/strings.xml index 6a07741d8e4c..14b92720487e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rGB/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Enabled by admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Disabled by admin"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Enabled by Advanced Protection"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disabled by Advanced Protection"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rIN/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rIN/strings.xml index 6a07741d8e4c..14b92720487e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rIN/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rIN/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Enabled by admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Disabled by admin"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Enabled by Advanced Protection"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disabled by Advanced Protection"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-es-rUS/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-es-rUS/strings.xml index 8dc15f77f6e0..616b568d58fe 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-es-rUS/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-es-rUS/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"El administrador habilitó la opción"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"El administrador inhabilitó la opción"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Habilitado por la Protección avanzada"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Inhabilitado por la Protección avanzada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-es/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-es/strings.xml index 7c9864d7e81e..351f16cb1a24 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-es/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-es/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Habilitado por el administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Inhabilitado por el administrador"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Habilitado por Protección Avanzada"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Inhabilitado por Protección Avanzada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-et/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-et/strings.xml index 5939b584a0f2..c59d6459789e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-et/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-et/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Administraatori lubatud"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Administraatori keelatud"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Lubatud täiustatud kaitsega"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Keelatud täiustatud kaitsega"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-eu/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-eu/strings.xml index 27bef6e92073..2a881247c3af 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-eu/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-eu/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Administratzaileak gaitu egin du"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Administratzaileak desgaitu du"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Babes aurreratua programak gaitu du"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Babes aurreratua programak desgaitu du"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-fa/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-fa/strings.xml index 8fb2646821dc..9c39f98aab17 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-fa/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-fa/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"توسط سرپرست فعال شده"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"توسط سرپرست غیرفعال شده"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"فعالشده با «محافظت پیشرفته»"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"غیرفعالشده با «محافظت پیشرفته»"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-fi/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-fi/strings.xml index cd7cbd3d83ca..41fef5af7033 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-fi/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-fi/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Järjestelmänvalvojan sallima"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Järjestelmänvalvojan estämä"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Lisäsuojaus on ottanut asetuksen käyttöön"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Lisäsuojaus on poistanut asetuksen käytöstä"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-fr-rCA/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-fr-rCA/strings.xml index da74cf6a3ab9..9ff117427555 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-fr-rCA/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-fr-rCA/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Activé par l\'administrateur"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Désactivé par l\'administrateur"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Activée par la protection avancée"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Désactivée par la protection avancée"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-fr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-fr/strings.xml index 2215af24664c..9ff117427555 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-fr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-fr/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Activé par l\'administrateur"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Désactivé par l\'administrateur"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Activé par la Protection Avancée"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Désactivé par la Protection Avancée"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-gl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-gl/strings.xml index 92f33bbf2533..dbf8f7d83b6c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-gl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-gl/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Opción activada polo administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Opción desactivada polo administrador"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Opción activada por Protección avanzada"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Opción desactivada por Protección avanzada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-gu/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-gu/strings.xml index 026bdb1127d3..4fc4ab48059d 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-gu/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-gu/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"વ્યવસ્થાપકે ચાલુ કરેલ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ઍડમિને બંધ કરેલું"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"અદ્યતન સુરક્ષા દ્વારા ચાલુ કરવામાં આવી છે"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"અદ્યતન સુરક્ષા દ્વારા બંધ કરવામાં આવી છે"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-hi/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-hi/strings.xml index 8fc8fd04ad93..6de84388bbe4 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-hi/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-hi/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"एडमिन की ओर से चालू किया गया"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"एडमिन ने यह सुविधा बंद की हुई है"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"\'ऐडवांस सुरक्षा\' सेटिंग ने चालू किया है"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"\'ऐडवांस सुरक्षा\' सेटिंग ने बंद किया है"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-hr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-hr/strings.xml index 40605a3b83fb..eebcebffe2a1 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-hr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-hr/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Omogućio administrator"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Onemogućio administrator"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Omogućila je napredna zaštita"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Onemogućila je napredna zaštita"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-hu/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-hu/strings.xml index 59135a42fd2a..ecfa2c794e28 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-hu/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-hu/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"A rendszergazda bekapcsolta"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"A rendszergazda letiltotta"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Engedélyezte a Speciális védelem"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Letiltotta a Speciális védelem"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-hy/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-hy/strings.xml index 0221f9333249..23a2a6b125eb 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-hy/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-hy/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Միացված է ադմինիստրատորի կողմից"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Անջատվել է ադմինիստրատորի կողմից"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Միացվել է Լրացուցիչ պաշտպանության կողմից"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Անջատվել է Լրացուցիչ պաշտպանության կողմից"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-in/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-in/strings.xml index 6beb4c9b2c26..ae8ec8251b7d 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-in/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-in/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Diaktifkan oleh admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Dinonaktifkan oleh admin"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Diaktifkan oleh Perlindungan Lanjutan"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Dinonaktifkan oleh Perlindungan Lanjutan"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-is/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-is/strings.xml index feb325bf2210..55380b333edd 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-is/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-is/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Gert virkt af kerfisstjóra"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Gert óvirkt af kerfisstjóra"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Virkjað af ítarlegri vernd"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Gert óvirkt af ítarlegri vernd"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-it/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-it/strings.xml index 616392026b55..bddf43ce6917 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-it/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-it/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Attivata dall\'amministratore"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Opzione disattivata dall\'amministratore"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Attivata dalla protezione avanzata"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disattivata dalla protezione avanzata"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-iw/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-iw/strings.xml index c342041f6c6e..007de061fbe9 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-iw/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-iw/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"מופעל על ידי מנהל המכשיר"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"האפשרות הושבתה על ידי האדמין"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ההעדפה הופעלה על ידי ההגנה המתקדמת"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ההעדפה הושבתה על ידי ההגנה המתקדמת"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ja/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ja/strings.xml index bd386f5858a9..490efd099569 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ja/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ja/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"管理者によって有効にされています"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"管理者により無効にされています"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"高度な保護機能により有効になっています"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"高度な保護機能により無効になっています"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ka/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ka/strings.xml index a6fde9022a21..5c394b832af9 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ka/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ka/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ჩართულია ადმინისტრატორის მიერ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"გათიშულია ადმინისტრატორის მიერ"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ჩართულია დამატებითი დაცვის საშუალებით"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"გათიშულია დამატებითი დაცვის საშუალებით"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-kk/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-kk/strings.xml index ed0f95c200f6..eff7e44c6a39 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-kk/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-kk/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Әкімші қосқан"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Әкімші өшірген"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Күшейтілген қорғаныс параметрі қосып қойды."</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Күшейтілген қорғаныс параметрі өшіріп тастады."</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-km/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-km/strings.xml index f2f5ab8e1dbf..5a4f0748c796 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-km/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-km/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"បើកដោយអ្នកគ្រប់គ្រង"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"បានបិទដោយអ្នកគ្រប់គ្រង"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"បានបើកដោយការការពារកម្រិតខ្ពស់"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"បានបិទដោយការការពារកម្រិតខ្ពស់"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-kn/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-kn/strings.xml index ebc41a52b4df..9b7a0d8b97bd 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-kn/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-kn/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ನಿರ್ವಾಹಕರು ಸಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ಸುಧಾರಿತ ಸಂರಕ್ಷಣೆ ಮೂಲಕ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ಸುಧಾರಿತ ಸಂರಕ್ಷಣೆ ಮೂಲಕ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ko/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ko/strings.xml index 552662b4be95..d4f134cf3adb 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ko/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ko/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"관리자가 사용 설정함"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"관리자가 사용 중지함"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"고급 보호 기능으로 사용 설정됨"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"고급 보호 기능으로 사용 중지됨"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ky/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ky/strings.xml index 375ea19ff66e..a934b51f6a98 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ky/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ky/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Администратор иштетип койгон"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Администратор өчүрүп койгон"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Өркүндөтүлгөн коргоо тарабынан иштетилди"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Өркүндөтүлгөн коргоо тарабынан өчүрүлдү"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-lo/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-lo/strings.xml index 4b311c0ce38d..c2d80f28130e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-lo/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-lo/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ເປີດນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ຖືກຜູ້ເບິ່ງແຍງລະບົບປິດໄວ້"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ໄດ້ເປີດການນຳໃຊ້ໂດຍການປົກປ້ອງຂັ້ນສູງ"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ໄດ້ປິດການນຳໃຊ້ໂດຍການປົກປ້ອງຂັ້ນສູງ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-lt/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-lt/strings.xml index cbbe92374854..2e96a0ad7dae 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-lt/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-lt/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Įgalino administratorius"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Išjungė administratorius"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Įgalino Papildoma apsauga"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Išjungė Papildoma apsauga"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-lv/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-lv/strings.xml index a5189aa70ff8..1d2bcb0d484b 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-lv/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-lv/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Iespējoja administrators"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Atspējoja administrators"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Iespējota iestatījuma “Papildu aizsardzība” dēļ"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Atspējota iestatījuma “Papildu aizsardzība” dēļ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-mk/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-mk/strings.xml index 993b4aea8b13..1c8f1d1a0c43 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-mk/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-mk/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Овозможено од администраторот"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Оневозможено од администраторот"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Овозможено од „Напредна заштита“"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Оневозможено од „Напредна заштита“"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ml/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ml/strings.xml index 9deeb6aa2cfd..c4ee22491659 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ml/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ml/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"അഡ്മിൻ പ്രവർത്തനക്ഷമമാക്കി"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"അഡ്മിൻ പ്രവർത്തനരഹിതമാക്കി"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"വിപുലമായ പരിരക്ഷ പ്രവർത്തനക്ഷമമാക്കി"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"വിപുലമായ പരിരക്ഷ പ്രവർത്തനരഹിതമാക്കി"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-mn/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-mn/strings.xml index c9a91de26591..472c50ac36a3 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-mn/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-mn/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Админ идэвхжүүлсэн"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Админ цуцалсан"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Дэвшилтэт хамгаалалтаар идэвхжүүлсэн"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Дэвшилтэт хамгаалалтаар идэвхгүй болгосон"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-mr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-mr/strings.xml index ede12424de04..d01bfc4dea81 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-mr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-mr/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"अॅडमिनने सुरू केलेले"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"अॅडमिनने बंद केलेले"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"प्रगत संरक्षणाद्वारे सुरू केले आहे"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"प्रगत संरक्षणाद्वारे बंद केले आहे"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ms/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ms/strings.xml index e8f710a7c909..618ea8c13c37 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ms/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ms/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Didayakan oleh pentadbir"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Dilumpuhkan oleh pentadbir"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Didayakan oleh Perlindungan Lanjutan"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Dilumpuhkan oleh Perlindungan Lanjutan"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-my/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-my/strings.xml index 97be99f43291..e4626000476e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-my/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-my/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"စီမံခန့်ခွဲသူက ဖွင့်ထားသည်"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"စီမံခန့်ခွဲသူက ပိတ်ထားသည်"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"အဆင့်မြင့်ကာကွယ်ရေးက ဖွင့်ထားသည်"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"အဆင့်မြင့်ကာကွယ်ရေးက ပိတ်ထားသည်"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-nb/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-nb/strings.xml index 971d1ccd190a..509e70b31645 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-nb/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-nb/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aktivert av administratoren"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Deaktivert av administratoren"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktivert av Avansert beskyttelse"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Deaktivert av Avansert beskyttelse"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ne/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ne/strings.xml index 3d2a74e3b270..15bb85c7b174 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ne/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ne/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"प्रशासकद्वारा सक्षम पारिएको"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"एडमिनले अफ गरेको"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"सुरक्षासम्बन्धी उन्नत सुविधाले अन गरेको छ"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"सुरक्षासम्बन्धी उन्नत सुविधाले अफ गरेको छ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-nl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-nl/strings.xml index 9830363c7f65..a73deafbc70f 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-nl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-nl/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aangezet door beheerder"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Uitgezet door beheerder"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aangezet door Geavanceerde beveiliging"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Uitgezet door Geavanceerde beveiliging"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-or/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-or/strings.xml index 2dab1592c296..4ce6460f8b89 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-or/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-or/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ଆଡମିନଙ୍କ ଦ୍ୱାରା ସକ୍ଷମ କରାଯାଇଛି"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ଆଡମିନଙ୍କ ଦ୍ଵାରା ଅକ୍ଷମ କରାଯାଇଛି"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ଆଡଭାନ୍ସଡ ପ୍ରୋଟେକସନ ଦ୍ୱାରା ସକ୍ଷମ କରାଯାଇଛି"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ଆଡଭାନ୍ସଡ ପ୍ରୋଟେକସନ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pa/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pa/strings.xml index 12f296a46b2d..1a3a133e6c41 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pa/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pa/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ਅਡਵਾਂਸ ਸੁਰੱਖਿਆ ਵੱਲੋਂ ਚਾਲੂ ਕੀਤੀ ਗਈ"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ਅਡਵਾਂਸ ਸੁਰੱਖਿਆ ਵੱਲੋਂ ਬੰਦ ਕੀਤੀ ਗਈ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pl/strings.xml index df7394766339..0523e2b23ed3 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pl/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Włączone przez administratora"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Wyłączone przez administratora"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Włączone przez Ochronę zaawansowaną"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Wyłączone przez Ochronę zaawansowaną"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rBR/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rBR/strings.xml index a705ba421910..908e2fbbff5b 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rBR/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rBR/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Ativado pelo administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Desativado pelo administrador"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Preferência ativada pela Proteção Avançada"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Preferência desativada pela Proteção Avançada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rPT/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rPT/strings.xml index b01118381478..908e2fbbff5b 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rPT/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rPT/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Ativado pelo administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Desativado pelo administrador"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Ativado pela Proteção avançada"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Desativado pela Proteção avançada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pt/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pt/strings.xml index a705ba421910..908e2fbbff5b 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pt/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pt/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Ativado pelo administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Desativado pelo administrador"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Preferência ativada pela Proteção Avançada"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Preferência desativada pela Proteção Avançada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ro/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ro/strings.xml index 3eb347abbc1b..ad41605c636f 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ro/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ro/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Activat de administrator"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Dezactivat de administrator"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Activată de Protecția avansată"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Dezactivată de Protecția avansată"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ru/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ru/strings.xml index a004a1fe60da..59006449133d 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ru/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ru/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Включено администратором"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Отключено администратором"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Включено Дополнительной защитой"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Отключено Дополнительной защитой"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-si/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-si/strings.xml index addc8b3ae15c..de89710d7acd 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-si/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-si/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"පරිපාලක විසින් සබල කර ඇත"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ඔබගේ පරිපාලක විසින් අබල කර ඇත"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"උසස් ආරක්ෂණය මගින් සබල කර ඇත"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"උසස් ආරක්ෂණය මගින් අබල කර ඇත"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sk/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sk/strings.xml index 0277696560b9..b8bb91942799 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sk/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sk/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Povolené správcom"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Zakázané správcom"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktivované rozšírenou ochranou"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Deaktivované rozšírenou ochranou"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sl/strings.xml index eb886bcf1232..1d8ee573e233 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sl/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Omogočil skrbnik"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Onemogočil skrbnik"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Omogočila dodatna zaščita"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Onemogočila dodatna zaščita"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sq/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sq/strings.xml index 2de5ffe47c1c..4ee40bf39b59 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sq/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sq/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aktivizuar nga administratori"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Çaktivizuar nga administratori"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktivizuar nga \"Mbrojtja e përparuar\""</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Çaktivizuar nga \"Mbrojtja e përparuar\""</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sr/strings.xml index 94f52a0b95a2..9d006a7ef4ef 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sr/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Администратор је омогућио"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Администратор је онемогућио"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Омогућила је Напредна заштита"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Онемогућила је Напредна заштита"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sv/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sv/strings.xml index b41c4d8a8275..faea0703468e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sv/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sv/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aktiverad av administratör"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Inaktiverad av administratören"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktiverades av Avancerat skydd"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Inaktiverades av Avancerat skydd"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sw/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sw/strings.xml index 4d2e0d994972..59f511aea6fc 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sw/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sw/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Imewashwa na msimamizi"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Imezimwa na msimamizi"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Imewashwa kwa kutumia Ulinzi wa Hali ya Juu"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Imezimwa kwa kutumia Ulinzi wa Hali ya Juu"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ta/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ta/strings.xml index 55b300657eaf..3ef5f77e96dc 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ta/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ta/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"நிர்வாகி இயக்கியுள்ளார்"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"நிர்வாகி முடக்கியுள்ளார்"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"மேம்பட்ட பாதுகாப்பு அமைப்பால் இயக்கப்பட்டது"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"மேம்பட்ட பாதுகாப்பு அமைப்பால் முடக்கப்பட்டது"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-te/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-te/strings.xml index fc6d00b22d34..8f17dc5ec1e8 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-te/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-te/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"అడ్మిన్ ఎనేబుల్ చేశారు"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"అడ్మిన్ డిజేబుల్ చేశారు"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"అడ్వాన్స్డ్ ప్రొటెక్షన్ ద్వారా ఎనేబుల్ చేయబడింది"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"అడ్వాన్స్డ్ ప్రొటెక్షన్ ద్వారా డిజేబుల్ చేయబడింది"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-th/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-th/strings.xml index 51da8dec6443..80fd0c04cb2f 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-th/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-th/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"เปิดใช้โดยผู้ดูแลระบบ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ปิดใช้โดยผู้ดูแลระบบ"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"เปิดใช้โดยการปกป้องขั้นสูง"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ปิดใช้โดยการปกป้องขั้นสูง"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-tl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-tl/strings.xml index 7fbf0e7ace73..a4a538dc84ba 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-tl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-tl/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Na-enable ng admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Na-disable ng admin"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Na-enable ng Advanced na Proteksyon"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Na-disable ng Advanced na Proteksyon"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-tr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-tr/strings.xml index a529ca557ba1..ac5ed6a152b7 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-tr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-tr/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Yönetici tarafından etkinleştirildi"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Yönetici tarafından devre dışı bırakıldı"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Gelişmiş Koruma tarafından etkinleştirildi"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Gelişmiş Koruma tarafından devre dışı bırakıldı"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-uk/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-uk/strings.xml index fdf4160b1bb0..32f02a45608e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-uk/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-uk/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Увімкнено адміністратором"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Вимкнено адміністратором"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Увімкнено Додатковим захистом"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Вимкнено Додатковим захистом"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ur/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ur/strings.xml index b40cb6827523..f3752d90497c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ur/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ur/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"منتظم کی طرف سے فعال کردہ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"منتظم کی طرف سے غیر فعال کردہ"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"اعلی تحفظ نے فعال کیا ہے"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"اعلی تحفظ نے غیر فعال کیا ہے"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-uz/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-uz/strings.xml index 9a27735407e2..e2e9f423f501 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-uz/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-uz/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Administrator tomonidan yoqilgan"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Administrator tomonidan faolsizlantirilgan"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Kuchaytirilgan himoya tomonidan yoqilgan"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Kuchaytirilgan himoya tomonidan faolsizlantirilgan"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-vi/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-vi/strings.xml index 3436762f8355..dd654b290977 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-vi/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-vi/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Do quản trị viên bật"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Quản trị viên đã vô hiệu hóa chế độ này"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Được bật bởi chế độ Bảo vệ nâng cao"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Bị tắt bởi chế độ Bảo vệ nâng cao"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rCN/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rCN/strings.xml index 5c9e302f274c..8fa969ea5112 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rCN/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rCN/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"已被管理员启用"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"已被管理员停用"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"已被“高级保护”功能启用"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"已被“高级保护”功能停用"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rHK/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rHK/strings.xml index d4b883355cf3..501f86084340 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rHK/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"已由管理員啟用"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"已由管理員停用"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"已由進階保護功能啟用"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"已由進階保護功能停用"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rTW/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rTW/strings.xml index d4b883355cf3..501f86084340 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rTW/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rTW/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"已由管理員啟用"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"已由管理員停用"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"已由進階保護功能啟用"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"已由進階保護功能停用"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-zu/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-zu/strings.xml index 2a93d00d687f..86a6acb92df4 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-zu/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-zu/strings.xml @@ -19,6 +19,4 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Kunikwe amandla umlawuli"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Kukhutshazwe umlawuli"</string> - <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Kunikwe Amandla Ukuvikela Okuthuthukile"</string> - <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Kukhutshazwe Ukuvikela Okuthuthukile"</string> </resources> diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml index dcad7356508d..58ddc723b77a 100644 --- a/packages/SettingsLib/res/values-af/strings.xml +++ b/packages/SettingsLib/res/values-af/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Beheer deur Beperkte Instellings"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Onbeskikbaar tydens oproepe"</string> <string name="disabled" msgid="8017887509554714950">"Gedeaktiveer"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Toegelaat"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nie toegelaat nie"</string> <string name="install_other_apps" msgid="3232595082023199454">"Installeer onbekende apps"</string> diff --git a/packages/SettingsLib/res/values-am/strings.xml b/packages/SettingsLib/res/values-am/strings.xml index dc6bd0fb06c8..3844a4b69d86 100644 --- a/packages/SettingsLib/res/values-am/strings.xml +++ b/packages/SettingsLib/res/values-am/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"በተገደበ ቅንብር ቁጥጥር የሚደረግበት"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"በጥሪዎች ጊዜ አይገኝም"</string> <string name="disabled" msgid="8017887509554714950">"ቦዝኗል"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"ይፈቀዳል"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"አይፈቀድም"</string> <string name="install_other_apps" msgid="3232595082023199454">"ያልታወቁ መተግበሪያዎችን ይጫኑ"</string> diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml index 5fbab96a6a01..0d31c2eb0b96 100644 --- a/packages/SettingsLib/res/values-ar/strings.xml +++ b/packages/SettingsLib/res/values-ar/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"يتحكّم فيه إعداد محظور"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"غير متاح أثناء المكالمات"</string> <string name="disabled" msgid="8017887509554714950">"غير مفعّل"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"تطبيق مسموح به"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"تطبيق غير مسموح به"</string> <string name="install_other_apps" msgid="3232595082023199454">"تثبيت التطبيقات غير المعروفة"</string> diff --git a/packages/SettingsLib/res/values-as/strings.xml b/packages/SettingsLib/res/values-as/strings.xml index f95a66befec1..56f73df512a1 100644 --- a/packages/SettingsLib/res/values-as/strings.xml +++ b/packages/SettingsLib/res/values-as/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"প্ৰতিবন্ধিত ছেটিঙৰ দ্বাৰা নিয়ন্ত্ৰিত"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"কল চলি থকাৰ সময়ত উপলব্ধ নহয়"</string> <string name="disabled" msgid="8017887509554714950">"নিষ্ক্ৰিয়"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"অনুমতি দিয়া হৈছে"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"অনুমতি দিয়া হোৱা নাই"</string> <string name="install_other_apps" msgid="3232595082023199454">"অজ্ঞাত এপ্ ইনষ্টল কৰক"</string> diff --git a/packages/SettingsLib/res/values-az/strings.xml b/packages/SettingsLib/res/values-az/strings.xml index 5e47ff955125..b7dcfb857902 100644 --- a/packages/SettingsLib/res/values-az/strings.xml +++ b/packages/SettingsLib/res/values-az/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Məhdudlaşdırılmış Ayar ilə nəzarət edilir"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Zənglər zamanı əlçatan deyil"</string> <string name="disabled" msgid="8017887509554714950">"Deaktiv"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"İcazə verilib"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"İcazə verilməyib"</string> <string name="install_other_apps" msgid="3232595082023199454">"Tanınmayan tətbiqlərin quraşdırılması"</string> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml index cb623991538d..97873e5a2d2a 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Kontrolišu ograničena podešavanja"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Nedostupno tokom poziva"</string> <string name="disabled" msgid="8017887509554714950">"Onemogućeno"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Dozvoljeno"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nije dozvoljeno"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instaliranje nepoznatih aplikacija"</string> diff --git a/packages/SettingsLib/res/values-be/strings.xml b/packages/SettingsLib/res/values-be/strings.xml index ef66fb32d844..78a5eaf388f0 100644 --- a/packages/SettingsLib/res/values-be/strings.xml +++ b/packages/SettingsLib/res/values-be/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Пад кіраваннем Абмежаванага наладжвання"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Недаступна падчас выклікаў"</string> <string name="disabled" msgid="8017887509554714950">"Адключанае"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Дазволена"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Забаронена"</string> <string name="install_other_apps" msgid="3232595082023199454">"Усталёўка невядомых праграм"</string> diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml index 69d68662b8c5..9fc0dea9abea 100644 --- a/packages/SettingsLib/res/values-bg/strings.xml +++ b/packages/SettingsLib/res/values-bg/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Управлява се чрез ограничена настройка"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Заето по време на обаждания"</string> <string name="disabled" msgid="8017887509554714950">"Деактивирано"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Има разрешение"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Няма разрешение"</string> <string name="install_other_apps" msgid="3232595082023199454">"Инст. на неизвестни прилож."</string> diff --git a/packages/SettingsLib/res/values-bn/strings.xml b/packages/SettingsLib/res/values-bn/strings.xml index 7e8e3fe3de70..79e4ed9600aa 100644 --- a/packages/SettingsLib/res/values-bn/strings.xml +++ b/packages/SettingsLib/res/values-bn/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"এটি বিধিনিষেধ সেটিং থেকে নিয়ন্ত্রণ করা হয়"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"কল চলাকালীন উপলভ্য হবে না"</string> <string name="disabled" msgid="8017887509554714950">"অক্ষম হয়েছে"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"অনুমোদিত"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"অনুমোদিত নয়"</string> <string name="install_other_apps" msgid="3232595082023199454">"অজানা অ্যাপ ইনস্টল করা"</string> diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml index d0b15d9e6768..d06ce341fa99 100644 --- a/packages/SettingsLib/res/values-bs/strings.xml +++ b/packages/SettingsLib/res/values-bs/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Kontrolira ograničena postavka"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Nije dostupno tokom poziva"</string> <string name="disabled" msgid="8017887509554714950">"Onemogućeno"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Dozvoljeno"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nije dozvoljeno"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instaliranje nepoznatih aplikacija"</string> diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml index 283182c7219d..776caae3b828 100644 --- a/packages/SettingsLib/res/values-ca/strings.xml +++ b/packages/SettingsLib/res/values-ca/strings.xml @@ -507,7 +507,7 @@ <string name="power_discharge_by_only_enhanced" msgid="3268796172652988877">"Hauria de durar aproximadament fins a les <xliff:g id="TIME">%1$s</xliff:g> segons l\'ús que en facis"</string> <string name="power_discharge_by" msgid="4113180890060388350">"Hauria de durar aproximadament fins a les <xliff:g id="TIME">%1$s</xliff:g> (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string> <string name="power_discharge_by_only" msgid="92545648425937000">"Hauria de durar aproximadament fins a les <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_discharge_by_only_short" msgid="5883041507426914446">"fins a les <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_discharge_by_only_short" msgid="5883041507426914446">"Fins a les <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_suggestion_battery_run_out" msgid="6332089307827787087">"És possible que la bateria s\'esgoti a les <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_less_than_duration_only" msgid="8956656616031395152">"Temps restant inferior a <xliff:g id="THRESHOLD">%1$s</xliff:g>"</string> <string name="power_remaining_less_than_duration" msgid="318215464914990578">"Temps restant inferior a <xliff:g id="THRESHOLD">%1$s</xliff:g> (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string> @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlat per l\'opció de configuració restringida"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"No està disponible durant les trucades"</string> <string name="disabled" msgid="8017887509554714950">"Desactivat"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Amb permís"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Sense permís"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instal·la aplicacions desconegudes"</string> diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml index bc00d47af14f..02722fd98959 100644 --- a/packages/SettingsLib/res/values-cs/strings.xml +++ b/packages/SettingsLib/res/values-cs/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Spravováno omezeným nastavením"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Při volání nedostupné"</string> <string name="disabled" msgid="8017887509554714950">"Deaktivováno"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Povoleno"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Není povoleno"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalace neznámých aplikací"</string> diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml index ef1448316f26..4d37578c68b9 100644 --- a/packages/SettingsLib/res/values-da/strings.xml +++ b/packages/SettingsLib/res/values-da/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Styres af en begrænset indstilling"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Kan ikke bruges under opkald"</string> <string name="disabled" msgid="8017887509554714950">"Deaktiveret"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Tilladt"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Ikke tilladt"</string> <string name="install_other_apps" msgid="3232595082023199454">"Installer ukendte apps"</string> diff --git a/packages/SettingsLib/res/values-de/strings.xml b/packages/SettingsLib/res/values-de/strings.xml index e7ffaa4f6048..3e57002a7a59 100644 --- a/packages/SettingsLib/res/values-de/strings.xml +++ b/packages/SettingsLib/res/values-de/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Gesteuert durch eingeschränkte Einstellung"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Während Anrufen nicht verfügbar"</string> <string name="disabled" msgid="8017887509554714950">"Deaktiviert"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Zugelassen"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nicht zugelassen"</string> <string name="install_other_apps" msgid="3232595082023199454">"Installieren unbekannter Apps"</string> diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml index 2fc0ff2fc1db..be1135690e62 100644 --- a/packages/SettingsLib/res/values-el/strings.xml +++ b/packages/SettingsLib/res/values-el/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Ελέγχεται από τη Ρύθμιση με περιορισμό"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Μη διαθέσιμη κατά τη διάρκεια κλήσεων"</string> <string name="disabled" msgid="8017887509554714950">"Απενεργοποιημένη"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Επιτρέπεται"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Δεν επιτρέπεται"</string> <string name="install_other_apps" msgid="3232595082023199454">"Εγκατ. άγνωστων εφ."</string> diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml index 34d6bf7299f2..8c819ac742a1 100644 --- a/packages/SettingsLib/res/values-en-rAU/strings.xml +++ b/packages/SettingsLib/res/values-en-rAU/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlled by restricted setting"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Unavailable during calls"</string> <string name="disabled" msgid="8017887509554714950">"Disabled"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Allowed"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Not allowed"</string> <string name="install_other_apps" msgid="3232595082023199454">"Install unknown apps"</string> diff --git a/packages/SettingsLib/res/values-en-rCA/strings.xml b/packages/SettingsLib/res/values-en-rCA/strings.xml index 120343727593..2faf2feed627 100644 --- a/packages/SettingsLib/res/values-en-rCA/strings.xml +++ b/packages/SettingsLib/res/values-en-rCA/strings.xml @@ -539,6 +539,7 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlled by Restricted Setting"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Unavailable during calls"</string> <string name="disabled" msgid="8017887509554714950">"Disabled"</string> + <string name="enabled" msgid="3997122818554810678">"Enabled"</string> <string name="external_source_trusted" msgid="1146522036773132905">"Allowed"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Not allowed"</string> <string name="install_other_apps" msgid="3232595082023199454">"Install unknown apps"</string> diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml index 34d6bf7299f2..8c819ac742a1 100644 --- a/packages/SettingsLib/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/res/values-en-rGB/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlled by restricted setting"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Unavailable during calls"</string> <string name="disabled" msgid="8017887509554714950">"Disabled"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Allowed"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Not allowed"</string> <string name="install_other_apps" msgid="3232595082023199454">"Install unknown apps"</string> diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml index 34d6bf7299f2..8c819ac742a1 100644 --- a/packages/SettingsLib/res/values-en-rIN/strings.xml +++ b/packages/SettingsLib/res/values-en-rIN/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlled by restricted setting"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Unavailable during calls"</string> <string name="disabled" msgid="8017887509554714950">"Disabled"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Allowed"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Not allowed"</string> <string name="install_other_apps" msgid="3232595082023199454">"Install unknown apps"</string> diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml index ca17178b0db0..224ad41a5ad2 100644 --- a/packages/SettingsLib/res/values-es-rUS/strings.xml +++ b/packages/SettingsLib/res/values-es-rUS/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Función controlada por configuración restringida"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"No disponible durante llamadas"</string> <string name="disabled" msgid="8017887509554714950">"Inhabilitada"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Con permiso"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"No permitida"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalar apps desconocidas"</string> diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml index 22e8b114f875..66d81d27a807 100644 --- a/packages/SettingsLib/res/values-es/strings.xml +++ b/packages/SettingsLib/res/values-es/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlado por ajustes restringidos"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"No disponible durante las llamadas"</string> <string name="disabled" msgid="8017887509554714950">"Inhabilitada"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Autorizadas"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"No autorizadas"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalar aplicaciones desconocidas"</string> diff --git a/packages/SettingsLib/res/values-et/strings.xml b/packages/SettingsLib/res/values-et/strings.xml index 0de019794528..59e1e4b4bc95 100644 --- a/packages/SettingsLib/res/values-et/strings.xml +++ b/packages/SettingsLib/res/values-et/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Haldavad piiranguga seaded"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Pole kõnede ajal saadaval"</string> <string name="disabled" msgid="8017887509554714950">"Keelatud"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Lubatud"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Pole lubatud"</string> <string name="install_other_apps" msgid="3232595082023199454">"Tundmatute rakenduste installimine"</string> diff --git a/packages/SettingsLib/res/values-eu/strings.xml b/packages/SettingsLib/res/values-eu/strings.xml index 7a8bf56841b6..6fd7e24b8c8b 100644 --- a/packages/SettingsLib/res/values-eu/strings.xml +++ b/packages/SettingsLib/res/values-eu/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Ezarpen mugatuak kontrolatzen du"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Ez dago erabilgarri deiak egin bitartean"</string> <string name="disabled" msgid="8017887509554714950">"Desgaituta"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Baimenduta"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Baimendu gabe"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalatu aplikazio ezezagunak"</string> diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml index 9ba2f3510980..d42a7a0acb3c 100644 --- a/packages/SettingsLib/res/values-fa/strings.xml +++ b/packages/SettingsLib/res/values-fa/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"با تنظیم «حالت محدود» کنترل میشود"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"درطول تماس دردسترس نیست"</string> <string name="disabled" msgid="8017887509554714950">"غیر فعال شد"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"مجاز بودن"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"مجاز نبودن"</string> <string name="install_other_apps" msgid="3232595082023199454">"نصب برنامههای ناشناس"</string> diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml index d1cc76cab9aa..a66c8cf375a5 100644 --- a/packages/SettingsLib/res/values-fi/strings.xml +++ b/packages/SettingsLib/res/values-fi/strings.xml @@ -246,7 +246,7 @@ <item msgid="6946761421234586000">"400 %"</item> </string-array> <string name="choose_profile" msgid="343803890897657450">"Valitse profiili"</string> - <string name="category_personal" msgid="6236798763159385225">"Henkilökohtainen"</string> + <string name="category_personal" msgid="6236798763159385225">"Omat"</string> <string name="category_work" msgid="4014193632325996115">"Työ"</string> <string name="category_private" msgid="4244892185452788977">"Yksityinen"</string> <string name="category_clone" msgid="1554511758987195974">"Klooni"</string> @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Rajoitettujen asetusten mukaisesti"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Ei käytettävissä puhelujen aikana"</string> <string name="disabled" msgid="8017887509554714950">"Pois päältä"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Sallittu"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Ei sallittu"</string> <string name="install_other_apps" msgid="3232595082023199454">"Tuntemattomien sovellusten asentaminen"</string> diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml index d83389261c71..f332208d742a 100644 --- a/packages/SettingsLib/res/values-fr-rCA/strings.xml +++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Contrôlé par les paramètres restreints"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Indisponible pendant les appels"</string> <string name="disabled" msgid="8017887509554714950">"Désactivée"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Autorisée"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Non autorisée"</string> <string name="install_other_apps" msgid="3232595082023199454">"Installer les applis inconnues"</string> diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml index 07849e09ecc9..4cc8a9a37632 100644 --- a/packages/SettingsLib/res/values-fr/strings.xml +++ b/packages/SettingsLib/res/values-fr/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Contrôlé par les paramètres restreints"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Indisponible pendant les appels"</string> <string name="disabled" msgid="8017887509554714950">"Désactivée"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Autorisé"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Non autorisé"</string> <string name="install_other_apps" msgid="3232595082023199454">"Installation d\'applis inconnues"</string> diff --git a/packages/SettingsLib/res/values-gl/strings.xml b/packages/SettingsLib/res/values-gl/strings.xml index b6eacfc33293..b7a6abc2dfcd 100644 --- a/packages/SettingsLib/res/values-gl/strings.xml +++ b/packages/SettingsLib/res/values-gl/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Baixo o control de opcións restrinxidas"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Non dispoñible durante as chamadas"</string> <string name="disabled" msgid="8017887509554714950">"Desactivada"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Permiso concedido"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Permiso non concedido"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalar aplicacións descoñecidas"</string> diff --git a/packages/SettingsLib/res/values-gu/strings.xml b/packages/SettingsLib/res/values-gu/strings.xml index 57f898210efd..aa27f2a8a09b 100644 --- a/packages/SettingsLib/res/values-gu/strings.xml +++ b/packages/SettingsLib/res/values-gu/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"પ્રતિબંધિત સેટિંગ દ્વારા નિયંત્રિત"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"કૉલ દરમિયાન અનુપલબ્ધ"</string> <string name="disabled" msgid="8017887509554714950">"બંધ કરી"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"મંજૂરી છે"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"મંજૂરી નથી"</string> <string name="install_other_apps" msgid="3232595082023199454">"અજાણી ઍપ ઇન્સ્ટૉલ કરો"</string> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index 02bc92be8899..7c4d64f32cda 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"इसे पाबंदी मोड वाली सेटिंग से कंट्रोल किया जाता है"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"कॉल के दौरान उपलब्ध नहीं है"</string> <string name="disabled" msgid="8017887509554714950">"बंद किया गया"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"अनुमति है"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"अनुमति नहीं है"</string> <string name="install_other_apps" msgid="3232595082023199454">"अनजान ऐप्लिकेशन इंस्टॉल करने की अनुमति"</string> diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml index 15eb4710cbf8..ba5650f1d7a5 100644 --- a/packages/SettingsLib/res/values-hr/strings.xml +++ b/packages/SettingsLib/res/values-hr/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Kontrolira ograničena postavka"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Nije dostupno tijekom poziva"</string> <string name="disabled" msgid="8017887509554714950">"Onemogućeno"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Dopušteno"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nije dopušteno"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalacija nepoznatih aplikacija"</string> diff --git a/packages/SettingsLib/res/values-hu/strings.xml b/packages/SettingsLib/res/values-hu/strings.xml index 08ae0f870a9e..faeec8d6ed24 100644 --- a/packages/SettingsLib/res/values-hu/strings.xml +++ b/packages/SettingsLib/res/values-hu/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Korlátozott beállítás vezérli"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Nem áll rendelkezésre hívások közben"</string> <string name="disabled" msgid="8017887509554714950">"Letiltva"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Engedélyezett"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nem engedélyezett"</string> <string name="install_other_apps" msgid="3232595082023199454">"Ismeretlen alkalmazások telepítése"</string> diff --git a/packages/SettingsLib/res/values-hy/strings.xml b/packages/SettingsLib/res/values-hy/strings.xml index 347101354a3b..f2b22679b1bb 100644 --- a/packages/SettingsLib/res/values-hy/strings.xml +++ b/packages/SettingsLib/res/values-hy/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Կառավարվում է սահմանափակ ռեժիմի կարգավորումներով"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Զանգի ընթացքում հասանելի չէ"</string> <string name="disabled" msgid="8017887509554714950">"Կասեցված է"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Թույլատրված է"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Արգելված"</string> <string name="install_other_apps" msgid="3232595082023199454">"Անհայտ հավելվածների տեղադրում"</string> diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml index 85109fcf1677..7af3de0da4fe 100644 --- a/packages/SettingsLib/res/values-in/strings.xml +++ b/packages/SettingsLib/res/values-in/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Dikontrol oleh Setelan Terbatas"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Tidak tersedia selama panggilan berlangsung"</string> <string name="disabled" msgid="8017887509554714950">"Dinonaktifkan"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Diizinkan"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Tidak diizinkan"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instal aplikasi tidak dikenal"</string> diff --git a/packages/SettingsLib/res/values-is/strings.xml b/packages/SettingsLib/res/values-is/strings.xml index 3041151c617e..e6ef20fcd908 100644 --- a/packages/SettingsLib/res/values-is/strings.xml +++ b/packages/SettingsLib/res/values-is/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Stýrt af takmarkaði stillingu"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Ekki í boði á meðan á símtölum stendur"</string> <string name="disabled" msgid="8017887509554714950">"Óvirkt"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Heimilað"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Ekki heimilað"</string> <string name="install_other_apps" msgid="3232595082023199454">"Setja upp óþekkt forrit"</string> diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml index c42cab36f30d..24e7a4cfe45d 100644 --- a/packages/SettingsLib/res/values-it/strings.xml +++ b/packages/SettingsLib/res/values-it/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Gestita tramite impostazioni con restrizioni"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Non disponibile durante le chiamate"</string> <string name="disabled" msgid="8017887509554714950">"Disattivato"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Autorizzazione concessa"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Autorizzazione non concessa"</string> <string name="install_other_apps" msgid="3232595082023199454">"Installa app sconosciute"</string> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index c39521f8776f..82d90430090b 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"בשליטה של הגדרה מוגבלת"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"ההעדפה הזו לא זמינה במהלך שיחות"</string> <string name="disabled" msgid="8017887509554714950">"מושבת"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"מורשה"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"לא מורשה"</string> <string name="install_other_apps" msgid="3232595082023199454">"התקנת אפליקציות לא מוכרות"</string> diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml index bb997ff6294d..79438fa1fa2d 100644 --- a/packages/SettingsLib/res/values-ja/strings.xml +++ b/packages/SettingsLib/res/values-ja/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"制限付き設定によって管理されています"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"通話中は利用できません"</string> <string name="disabled" msgid="8017887509554714950">"無効"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"許可"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"許可しない"</string> <string name="install_other_apps" msgid="3232595082023199454">"不明なアプリのインストール"</string> diff --git a/packages/SettingsLib/res/values-ka/strings.xml b/packages/SettingsLib/res/values-ka/strings.xml index 91e8889acfa5..ea01938d93d9 100644 --- a/packages/SettingsLib/res/values-ka/strings.xml +++ b/packages/SettingsLib/res/values-ka/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"კონტროლდება შეზღუდული რეჟიმის პარამეტრით"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"მიუწვდომელია ზარების განხორციელებისას"</string> <string name="disabled" msgid="8017887509554714950">"გამორთული"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"დაშვებულია"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"დაუშვებელია"</string> <string name="install_other_apps" msgid="3232595082023199454">"უცნობი აპების ინსტალაცია"</string> diff --git a/packages/SettingsLib/res/values-kk/strings.xml b/packages/SettingsLib/res/values-kk/strings.xml index 25c92de40657..16b7c22b6bfe 100644 --- a/packages/SettingsLib/res/values-kk/strings.xml +++ b/packages/SettingsLib/res/values-kk/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Шектелген параметрлер арқылы басқарылады."</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Қоңырау шалу кезінде қолжетімді емес."</string> <string name="disabled" msgid="8017887509554714950">"Өшірілген"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Рұқсат берілген"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Рұқсат етілмеген"</string> <string name="install_other_apps" msgid="3232595082023199454">"Белгісіз қолданбаларды орнату"</string> diff --git a/packages/SettingsLib/res/values-km/strings.xml b/packages/SettingsLib/res/values-km/strings.xml index 9dadee1d34b3..de93ee94271f 100644 --- a/packages/SettingsLib/res/values-km/strings.xml +++ b/packages/SettingsLib/res/values-km/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"គ្រប់គ្រងដោយការកំណត់ដែលបានរឹតបន្តឹង"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"មិនអាចប្រើបានទេអំឡុងពេលហៅទូរសព្ទ"</string> <string name="disabled" msgid="8017887509554714950">"បិទ"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"បានអនុញ្ញាត"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"មិនបានអនុញ្ញាត"</string> <string name="install_other_apps" msgid="3232595082023199454">"ដំឡើងកម្មវិធីដែលមិនស្គាល់"</string> diff --git a/packages/SettingsLib/res/values-kn/strings.xml b/packages/SettingsLib/res/values-kn/strings.xml index 72056bb1ed7d..4c4ea64ea52f 100644 --- a/packages/SettingsLib/res/values-kn/strings.xml +++ b/packages/SettingsLib/res/values-kn/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"ನಿರ್ಬಂಧಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್ ಮೂಲಕ ನಿಯಂತ್ರಿಸಲಾಗುತ್ತದೆ"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"ಕರೆಗಳ ಸಮಯದಲ್ಲಿ ಲಭ್ಯವಿಲ್ಲ"</string> <string name="disabled" msgid="8017887509554714950">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"ಅನುಮತಿಸಲಾಗಿದೆ"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"ಅನುಮತಿ ಇಲ್ಲ"</string> <string name="install_other_apps" msgid="3232595082023199454">"ಅಪರಿಚಿತ ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ"</string> diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml index 3b965e54e145..0488543f7790 100644 --- a/packages/SettingsLib/res/values-ko/strings.xml +++ b/packages/SettingsLib/res/values-ko/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"제한된 설정으로 제어됨"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"통화 중에는 사용할 수 없습니다."</string> <string name="disabled" msgid="8017887509554714950">"사용 안함"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"허용됨"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"허용되지 않음"</string> <string name="install_other_apps" msgid="3232595082023199454">"알 수 없는 앱 설치"</string> diff --git a/packages/SettingsLib/res/values-ky/strings.xml b/packages/SettingsLib/res/values-ky/strings.xml index 3eee360ed220..b04883747ee7 100644 --- a/packages/SettingsLib/res/values-ky/strings.xml +++ b/packages/SettingsLib/res/values-ky/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Чектелген параметр аркылуу көзөмөлдөнөт"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Сүйлөшүп жаткан учурда жеткиликсиз"</string> <string name="disabled" msgid="8017887509554714950">"Өчүрүлгөн"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Уруксат берилген"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Тыюу салынган"</string> <string name="install_other_apps" msgid="3232595082023199454">"Белгисиз колдонмолорду орнотуу"</string> diff --git a/packages/SettingsLib/res/values-lo/strings.xml b/packages/SettingsLib/res/values-lo/strings.xml index 8044cce18edb..f57ed0cea03b 100644 --- a/packages/SettingsLib/res/values-lo/strings.xml +++ b/packages/SettingsLib/res/values-lo/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"ຄວບຄຸມໂດຍການຕັ້ງຄ່າທີ່ຈຳກັດໄວ້"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"ບໍ່ສາມາດໃຊ້ໄດ້ລະຫວ່າງການໂທ"</string> <string name="disabled" msgid="8017887509554714950">"ປິດການນຳໃຊ້"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"ອະນຸຍາດແລ້ວ"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"ບໍ່ອະນຸຍາດ"</string> <string name="install_other_apps" msgid="3232595082023199454">"ຕິດຕັ້ງແອັບທີ່ບໍ່ຮູ້ຈັກ"</string> diff --git a/packages/SettingsLib/res/values-lt/strings.xml b/packages/SettingsLib/res/values-lt/strings.xml index aec236a55d41..25b22cae3d0e 100644 --- a/packages/SettingsLib/res/values-lt/strings.xml +++ b/packages/SettingsLib/res/values-lt/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Valdoma pagal apribotą nustatymą"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Nepasiekiama per skambučius"</string> <string name="disabled" msgid="8017887509554714950">"Neleidžiama"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Leidžiama"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Neleidžiama"</string> <string name="install_other_apps" msgid="3232595082023199454">"Nežinomų programų diegimas"</string> diff --git a/packages/SettingsLib/res/values-lv/strings.xml b/packages/SettingsLib/res/values-lv/strings.xml index 5716f8f4194c..cdca19b8e0c8 100644 --- a/packages/SettingsLib/res/values-lv/strings.xml +++ b/packages/SettingsLib/res/values-lv/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Kontrolē ierobežots iestatījums"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Ierīce nav pieejama zvanu laikā"</string> <string name="disabled" msgid="8017887509554714950">"Atspējots"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Atļauts"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nav atļauts"</string> <string name="install_other_apps" msgid="3232595082023199454">"Nezināmu lietotņu instalēšana"</string> diff --git a/packages/SettingsLib/res/values-mk/strings.xml b/packages/SettingsLib/res/values-mk/strings.xml index bc6409da8e12..e51ca04022a7 100644 --- a/packages/SettingsLib/res/values-mk/strings.xml +++ b/packages/SettingsLib/res/values-mk/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Контролирано со ограничени поставки"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Недостапно при повици"</string> <string name="disabled" msgid="8017887509554714950">"Оневозможено"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Со дозвола"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Без дозвола"</string> <string name="install_other_apps" msgid="3232595082023199454">"Инсталирање непознати апликации"</string> diff --git a/packages/SettingsLib/res/values-ml/strings.xml b/packages/SettingsLib/res/values-ml/strings.xml index bcadd7d88059..54b6ff8ab524 100644 --- a/packages/SettingsLib/res/values-ml/strings.xml +++ b/packages/SettingsLib/res/values-ml/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"നിയന്ത്രിത ക്രമീകരണം ഉപയോഗിച്ച് നിയന്ത്രിക്കുന്നത്"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"കോളുകൾ ചെയ്യുമ്പോൾ ലഭ്യമല്ല"</string> <string name="disabled" msgid="8017887509554714950">"പ്രവർത്തനരഹിതമാക്കി"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"അനുവദനീയം"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"അനുവദിച്ചിട്ടില്ല"</string> <string name="install_other_apps" msgid="3232595082023199454">"പരിചയമില്ലാത്ത ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യുക"</string> diff --git a/packages/SettingsLib/res/values-mn/strings.xml b/packages/SettingsLib/res/values-mn/strings.xml index 2b45e85a2995..ed42362e5c1e 100644 --- a/packages/SettingsLib/res/values-mn/strings.xml +++ b/packages/SettingsLib/res/values-mn/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Хязгаарлагдсан тохиргоогоор хянадаг"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Дуудлагын үер боломжгүй"</string> <string name="disabled" msgid="8017887509554714950">"Идэвхгүйжүүлсэн"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Зөвшөөрсөн"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Зөвшөөрөөгүй"</string> <string name="install_other_apps" msgid="3232595082023199454">"Тодорхойгүй апп суулгах"</string> diff --git a/packages/SettingsLib/res/values-mr/strings.xml b/packages/SettingsLib/res/values-mr/strings.xml index 8c77b0897aed..6e7cd02b1e61 100644 --- a/packages/SettingsLib/res/values-mr/strings.xml +++ b/packages/SettingsLib/res/values-mr/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"प्रतिबंधित केलेल्या सेटिंग द्वारे नियंत्रित"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"कॉल दरम्यान उपलब्ध नाही"</string> <string name="disabled" msgid="8017887509554714950">"अक्षम"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"अनुमती आहे"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"अनुमती नाही"</string> <string name="install_other_apps" msgid="3232595082023199454">"अज्ञात अॅप्स इंस्टॉल करा"</string> diff --git a/packages/SettingsLib/res/values-ms/strings.xml b/packages/SettingsLib/res/values-ms/strings.xml index a2f95628a6a1..58d80385ff87 100644 --- a/packages/SettingsLib/res/values-ms/strings.xml +++ b/packages/SettingsLib/res/values-ms/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Dikawal oleh Tetapan Terhad"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Tidak tersedia semasa panggilan berlangsung"</string> <string name="disabled" msgid="8017887509554714950">"Dilumpuhkan"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Dibenarkan"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Tidak dibenarkan"</string> <string name="install_other_apps" msgid="3232595082023199454">"Pasang apl yang tidak diketahui"</string> diff --git a/packages/SettingsLib/res/values-my/strings.xml b/packages/SettingsLib/res/values-my/strings.xml index b0d86afe9a6c..ddd127901e18 100644 --- a/packages/SettingsLib/res/values-my/strings.xml +++ b/packages/SettingsLib/res/values-my/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"ကန့်သတ်ဆက်တင်ဖြင့် ထိန်းချုပ်ထားသည်"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"ဖုန်းခေါ်ဆိုနေချိန်တွင် မရနိုင်ပါ"</string> <string name="disabled" msgid="8017887509554714950">"ပိတ်ထားပြီး"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"ခွင့်ပြုထားသည်"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"ခွင့်မပြုပါ"</string> <string name="install_other_apps" msgid="3232595082023199454">"အမည်မသိအက်ပ် ထည့်သွင်းခြင်း"</string> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index 755df5100e5a..c8fc415528b4 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Kontrollert av en begrenset innstilling"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Utilgjengelig under samtaler"</string> <string name="disabled" msgid="8017887509554714950">"Deaktivert"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Tillatt"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Ikke tillatt"</string> <string name="install_other_apps" msgid="3232595082023199454">"Installer ukjente apper"</string> diff --git a/packages/SettingsLib/res/values-ne/strings.xml b/packages/SettingsLib/res/values-ne/strings.xml index 0a9ac1770896..5f09635e19c7 100644 --- a/packages/SettingsLib/res/values-ne/strings.xml +++ b/packages/SettingsLib/res/values-ne/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"प्रतिबन्धित सेटिङले नियन्त्रण गरेको"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"कल चलिरहेका बेला उपलब्ध छैन"</string> <string name="disabled" msgid="8017887509554714950">"असक्षम पारियो"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"अनुमति छ"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"अनुमति छैन"</string> <string name="install_other_apps" msgid="3232595082023199454">"अज्ञात एप इन्स्टल गर्ने अनुमति"</string> diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml index f71f3abfaf2b..78dfdcead634 100644 --- a/packages/SettingsLib/res/values-nl/strings.xml +++ b/packages/SettingsLib/res/values-nl/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Beheerd door beperkte instelling"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Niet beschikbaar tijdens gesprekken"</string> <string name="disabled" msgid="8017887509554714950">"Uitgezet"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Toegestaan"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Niet toegestaan"</string> <string name="install_other_apps" msgid="3232595082023199454">"Onbekende apps installeren"</string> diff --git a/packages/SettingsLib/res/values-or/strings.xml b/packages/SettingsLib/res/values-or/strings.xml index f30ae3d94d42..d6e26314a0f9 100644 --- a/packages/SettingsLib/res/values-or/strings.xml +++ b/packages/SettingsLib/res/values-or/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"ପ୍ରତିବନ୍ଧିତ ସେଟିଂ ଦ୍ୱାରା ନିୟନ୍ତ୍ରଣ କରାଯାଇଛି"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"କଲ କରିବାବେଳେ ଉପଲବ୍ଧ ନଥାଏ"</string> <string name="disabled" msgid="8017887509554714950">"ଅକ୍ଷମ ହୋଇଛି"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"ଅନୁମତି ଦିଆଯାଇଛି"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"ଅନୁମତି ନାହିଁ"</string> <string name="install_other_apps" msgid="3232595082023199454">"ଅଜଣା ଆପ ଇନଷ୍ଟଲ କରନ୍ତୁ"</string> diff --git a/packages/SettingsLib/res/values-pa/strings.xml b/packages/SettingsLib/res/values-pa/strings.xml index 2c2eab2fa871..ab5f4afd07f3 100644 --- a/packages/SettingsLib/res/values-pa/strings.xml +++ b/packages/SettingsLib/res/values-pa/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"ਪ੍ਰਤਿਬੰਧਿਤ ਸੈਟਿੰਗ ਰਾਹੀਂ ਕੰਟਰੋਲ ਕੀਤੀ ਜਾਂਦੀ ਹੈ"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"ਕਾਲਾਂ ਦੌਰਾਨ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string> <string name="disabled" msgid="8017887509554714950">"ਅਯੋਗ ਬਣਾਇਆ"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"ਮਨਜ਼ੂਰਸ਼ੁਦਾ"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"ਗੈਰ-ਮਨਜ਼ੂਰਸ਼ੁਦਾ"</string> <string name="install_other_apps" msgid="3232595082023199454">"ਅਗਿਆਤ ਐਪਾਂ ਦੀ ਸਥਾਪਨਾ"</string> diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml index aed9b06d5037..462142468e26 100644 --- a/packages/SettingsLib/res/values-pl/strings.xml +++ b/packages/SettingsLib/res/values-pl/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Obowiązują ustawienia z ograniczonym dostępem"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Niedostępne w trakcie połączeń"</string> <string name="disabled" msgid="8017887509554714950">"Wyłączona"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Dozwolone"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Niedozwolone"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalowanie nieznanych aplikacji"</string> diff --git a/packages/SettingsLib/res/values-pt-rBR/strings.xml b/packages/SettingsLib/res/values-pt-rBR/strings.xml index e16e3557dc38..482f47931f4a 100644 --- a/packages/SettingsLib/res/values-pt-rBR/strings.xml +++ b/packages/SettingsLib/res/values-pt-rBR/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlada pelas configurações restritas"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Indisponível durante ligações"</string> <string name="disabled" msgid="8017887509554714950">"Desativado"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Permitido"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Não permitido"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalar apps desconhecidos"</string> diff --git a/packages/SettingsLib/res/values-pt-rPT/strings.xml b/packages/SettingsLib/res/values-pt-rPT/strings.xml index 11f410f90497..1a9975732513 100644 --- a/packages/SettingsLib/res/values-pt-rPT/strings.xml +++ b/packages/SettingsLib/res/values-pt-rPT/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlado por uma definição restrita"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Indisponível durante as chamadas"</string> <string name="disabled" msgid="8017887509554714950">"Desativada"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Autorizada"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Não autorizada"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalar apps desconhecidas"</string> diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml index e16e3557dc38..482f47931f4a 100644 --- a/packages/SettingsLib/res/values-pt/strings.xml +++ b/packages/SettingsLib/res/values-pt/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlada pelas configurações restritas"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Indisponível durante ligações"</string> <string name="disabled" msgid="8017887509554714950">"Desativado"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Permitido"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Não permitido"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalar apps desconhecidos"</string> diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml index 83a6e68b36b4..757fee9e110e 100644 --- a/packages/SettingsLib/res/values-ro/strings.xml +++ b/packages/SettingsLib/res/values-ro/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Controlată de setarea restricționată"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Indisponibil în timpul apelurilor"</string> <string name="disabled" msgid="8017887509554714950">"Dezactivată"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Permise"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nepermise"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalarea aplicațiilor necunoscute"</string> diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml index 1ed7c3623acc..9e922a0b85b3 100644 --- a/packages/SettingsLib/res/values-ru/strings.xml +++ b/packages/SettingsLib/res/values-ru/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Контролируется настройками с ограниченным доступом"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Недоступно во время вызовов"</string> <string name="disabled" msgid="8017887509554714950">"Отключено"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Разрешено"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Запрещено"</string> <string name="install_other_apps" msgid="3232595082023199454">"Установка неизвестных приложений"</string> diff --git a/packages/SettingsLib/res/values-si/strings.xml b/packages/SettingsLib/res/values-si/strings.xml index dffa392c7947..517b00c61efb 100644 --- a/packages/SettingsLib/res/values-si/strings.xml +++ b/packages/SettingsLib/res/values-si/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"සීමා කළ සැකසීම මගින් පාලනය වේ"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"ඇමතුම් අතරතුර නොපවතී"</string> <string name="disabled" msgid="8017887509554714950">"අබල කර ඇත"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"ඉඩ දුන්"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"ඉඩ නොදෙන"</string> <string name="install_other_apps" msgid="3232595082023199454">"නොදන්නා යෙදුම් ස්ථාපනය"</string> diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml index 0f4297aec6ad..e8fb53fdcef6 100644 --- a/packages/SettingsLib/res/values-sk/strings.xml +++ b/packages/SettingsLib/res/values-sk/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Ovládané obmedzeným nastavením"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Počas hovorov nie je k dispozícii"</string> <string name="disabled" msgid="8017887509554714950">"Deaktivované"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Povolené"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nie je povolené"</string> <string name="install_other_apps" msgid="3232595082023199454">"Inštalácia neznámych aplikácií"</string> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index 744b4da576ed..7d508862bef1 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Pod nadzorom omejene nastavitve"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Ni na voljo med klici"</string> <string name="disabled" msgid="8017887509554714950">"Onemogočeno"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Dovoljene"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Ni dovoljeno"</string> <string name="install_other_apps" msgid="3232595082023199454">"Nameščanje neznanih aplikacij"</string> diff --git a/packages/SettingsLib/res/values-sq/strings.xml b/packages/SettingsLib/res/values-sq/strings.xml index 3d9622e063de..8a711d5ebcee 100644 --- a/packages/SettingsLib/res/values-sq/strings.xml +++ b/packages/SettingsLib/res/values-sq/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Kontrollohet nga \"Cilësimet e kufizuara\""</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Nuk ofrohet gjatë telefonatave"</string> <string name="disabled" msgid="8017887509554714950">"Çaktivizuar"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Lejohet"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Nuk lejohet"</string> <string name="install_other_apps" msgid="3232595082023199454">"Instalo aplikacione të panjohura"</string> diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml index 32ec5000bfd0..d57eb5c4c830 100644 --- a/packages/SettingsLib/res/values-sr/strings.xml +++ b/packages/SettingsLib/res/values-sr/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Контролишу ограничена подешавања"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Недоступно током позива"</string> <string name="disabled" msgid="8017887509554714950">"Онемогућено"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Дозвољено"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Није дозвољено"</string> <string name="install_other_apps" msgid="3232595082023199454">"Инсталирање непознатих апликација"</string> diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml index cf223f5b7bdb..5d27839daa6a 100644 --- a/packages/SettingsLib/res/values-sv/strings.xml +++ b/packages/SettingsLib/res/values-sv/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Styrs av spärrad inställning"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Ej tillgänglig under samtal"</string> <string name="disabled" msgid="8017887509554714950">"Inaktiverad"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Tillåts"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Tillåts inte"</string> <string name="install_other_apps" msgid="3232595082023199454">"Installera okända appar"</string> diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml index 26e0412b2893..9ddb7ff129ad 100644 --- a/packages/SettingsLib/res/values-sw/strings.xml +++ b/packages/SettingsLib/res/values-sw/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Imedhibitiwa na Mpangilio wenye Mipaka"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Haipatikani wakati unaongea kwa simu"</string> <string name="disabled" msgid="8017887509554714950">"Imezimwa"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Imeruhusiwa"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Hairuhusiwi"</string> <string name="install_other_apps" msgid="3232595082023199454">"Kuweka programu zisizojulikana"</string> diff --git a/packages/SettingsLib/res/values-ta/strings.xml b/packages/SettingsLib/res/values-ta/strings.xml index c2e762f417e7..68a60cf85a90 100644 --- a/packages/SettingsLib/res/values-ta/strings.xml +++ b/packages/SettingsLib/res/values-ta/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"வரையறுக்கப்பட்ட அமைப்பால் கட்டுப்படுத்தப்படுகிறது"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"அழைப்புகளின்போது பயன்படுத்த முடியாது"</string> <string name="disabled" msgid="8017887509554714950">"முடக்கப்பட்டது"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"அனுமதிக்கப்பட்டது"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"அனுமதிக்கப்படவில்லை"</string> <string name="install_other_apps" msgid="3232595082023199454">"தெரியாத ஆப்ஸ்களை நிறுவுதல்"</string> diff --git a/packages/SettingsLib/res/values-te/strings.xml b/packages/SettingsLib/res/values-te/strings.xml index f4678f3d0dd5..db4f66b955b6 100644 --- a/packages/SettingsLib/res/values-te/strings.xml +++ b/packages/SettingsLib/res/values-te/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"పరిమితం చేసిన సెట్టింగ్ ద్వారా నియంత్రించబడుతుంది"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"కాల్స్ సమయంలో అందుబాటులో ఉండదు"</string> <string name="disabled" msgid="8017887509554714950">"డిజేబుల్ చేయబడింది"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"అనుమతించినవి"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"అనుమతించబడలేదు"</string> <string name="install_other_apps" msgid="3232595082023199454">"తెలియని యాప్ల ఇన్స్టలేషన్"</string> diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml index e360ae6d5278..035644f845f1 100644 --- a/packages/SettingsLib/res/values-th/strings.xml +++ b/packages/SettingsLib/res/values-th/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"ควบคุมโดยการตั้งค่าที่จำกัด"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"ใช้งานไม่ได้ขณะสนทนาโทรศัพท์"</string> <string name="disabled" msgid="8017887509554714950">"ปิดอยู่"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"อนุญาต"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"ไม่อนุญาต"</string> <string name="install_other_apps" msgid="3232595082023199454">"ติดตั้งแอปที่ไม่รู้จัก"</string> diff --git a/packages/SettingsLib/res/values-tl/strings.xml b/packages/SettingsLib/res/values-tl/strings.xml index 09f40c761fda..4ef2f436898a 100644 --- a/packages/SettingsLib/res/values-tl/strings.xml +++ b/packages/SettingsLib/res/values-tl/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Kinokontrol ng Pinaghihigpitang Setting"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Hindi available habang may tawag"</string> <string name="disabled" msgid="8017887509554714950">"Naka-disable"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Pinapayagan"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Hindi pinapayagan"</string> <string name="install_other_apps" msgid="3232595082023199454">"Mag-install ng di-kilalang app"</string> diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml index 19b3baf6c82d..19295aa169ef 100644 --- a/packages/SettingsLib/res/values-tr/strings.xml +++ b/packages/SettingsLib/res/values-tr/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Kısıtlanmış ayar tarafından kontrol ediliyor"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Telefon aramaları sırasında kullanılamaz"</string> <string name="disabled" msgid="8017887509554714950">"Devre dışı"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"İzin verildi"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"İzin verilmiyor"</string> <string name="install_other_apps" msgid="3232595082023199454">"Bilinmeyen uygulamaları yükleme"</string> diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml index ff18f5cf10a4..e46137fd237e 100644 --- a/packages/SettingsLib/res/values-uk/strings.xml +++ b/packages/SettingsLib/res/values-uk/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Керується налаштуваннями з обмеженнями"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Недоступно під час викликів"</string> <string name="disabled" msgid="8017887509554714950">"Вимкнено"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Дозволено"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Заборонено"</string> <string name="install_other_apps" msgid="3232595082023199454">"Встановлювати невідомі додатки"</string> diff --git a/packages/SettingsLib/res/values-ur/strings.xml b/packages/SettingsLib/res/values-ur/strings.xml index a07a341fd956..72da3784aa4d 100644 --- a/packages/SettingsLib/res/values-ur/strings.xml +++ b/packages/SettingsLib/res/values-ur/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"محدود کردہ ترتیب کے زیر انتظام ہے"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"کالز کے دوران غیر دستیاب"</string> <string name="disabled" msgid="8017887509554714950">"غیر فعال"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"اجازت ہے"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"اجازت نہیں ہے"</string> <string name="install_other_apps" msgid="3232595082023199454">"نامعلوم ایپس انسٹال کریں"</string> diff --git a/packages/SettingsLib/res/values-uz/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml index 3a10aa801797..795eae45ab92 100644 --- a/packages/SettingsLib/res/values-uz/strings.xml +++ b/packages/SettingsLib/res/values-uz/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Cheklangan sozlama tomonidan boshqariladi"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Chaqiruv vaqtida ishlamaydi"</string> <string name="disabled" msgid="8017887509554714950">"Oʻchiq"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Ruxsat berilgan"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Ruxsat berilmagan"</string> <string name="install_other_apps" msgid="3232595082023199454">"Notanish ilovalarni o‘rnatish"</string> diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml index c2c035c15ce0..8f5c0c2675e4 100644 --- a/packages/SettingsLib/res/values-vi/strings.xml +++ b/packages/SettingsLib/res/values-vi/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Do chế độ Cài đặt hạn chế kiểm soát"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Không dùng được khi có cuộc gọi"</string> <string name="disabled" msgid="8017887509554714950">"Đã tắt"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Được phép"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Không được phép"</string> <string name="install_other_apps" msgid="3232595082023199454">"Cài ứng dụng không rõ nguồn"</string> diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml index 06379e1c254f..85d3c179a623 100644 --- a/packages/SettingsLib/res/values-zh-rCN/strings.xml +++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"由受限设置控制"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"通话期间无法使用"</string> <string name="disabled" msgid="8017887509554714950">"已停用"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"允许"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"不允许"</string> <string name="install_other_apps" msgid="3232595082023199454">"安装未知应用"</string> diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml index a3ae971b07c4..3ff554000a6c 100644 --- a/packages/SettingsLib/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"由「受限設定」控制"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"通話時無法使用"</string> <string name="disabled" msgid="8017887509554714950">"已停用"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"允許"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"不允許"</string> <string name="install_other_apps" msgid="3232595082023199454">"安裝不明的應用程式"</string> diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml index f670088de16b..5362d380564f 100644 --- a/packages/SettingsLib/res/values-zh-rTW/strings.xml +++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"由受限制的設定控管"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"通話時無法使用"</string> <string name="disabled" msgid="8017887509554714950">"已停用"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"允許"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"不允許"</string> <string name="install_other_apps" msgid="3232595082023199454">"安裝不明應用程式"</string> @@ -670,7 +672,7 @@ <string name="add_user_failed" msgid="4809887794313944872">"無法建立新的使用者"</string> <string name="add_guest_failed" msgid="8074548434469843443">"無法建立新訪客"</string> <string name="user_nickname" msgid="262624187455825083">"暱稱"</string> - <string name="edit_user_info_message" msgid="6677556031419002895">"這部裝置的所有使用者都能看到你選擇的名稱和相片。"</string> + <string name="edit_user_info_message" msgid="6677556031419002895">"這部裝置的所有使用者，都能看到你選擇的名稱和相片。"</string> <string name="user_add_user" msgid="7876449291500212468">"新增使用者"</string> <string name="guest_new_guest" msgid="3482026122932643557">"新增訪客"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"移除訪客"</string> diff --git a/packages/SettingsLib/res/values-zu/strings.xml b/packages/SettingsLib/res/values-zu/strings.xml index 1d792a0a2864..79ce6d7b25d0 100644 --- a/packages/SettingsLib/res/values-zu/strings.xml +++ b/packages/SettingsLib/res/values-zu/strings.xml @@ -539,6 +539,8 @@ <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Kulawulwe Isethingi Elikhawulelwe"</string> <string name="disabled_in_phone_call_text" msgid="6568931334337318320">"Akutholakali ngesikhathi samakholi"</string> <string name="disabled" msgid="8017887509554714950">"Akusebenzi"</string> + <!-- no translation found for enabled (3997122818554810678) --> + <skip /> <string name="external_source_trusted" msgid="1146522036773132905">"Kuvumelekile"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Akuvumelekile"</string> <string name="install_other_apps" msgid="3232595082023199454">"Faka ama-app angaziwa"</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/PreferenceBindings.kt b/packages/SettingsLib/src/com/android/settingslib/PrimarySwitchPreferenceBinding.kt index a64e8cc07b15..348941335311 100644 --- a/packages/SettingsLib/src/com/android/settingslib/PreferenceBindings.kt +++ b/packages/SettingsLib/src/com/android/settingslib/PrimarySwitchPreferenceBinding.kt @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("ktlint:standard:filename") // remove once we have more bindings package com.android.settingslib @@ -29,7 +28,8 @@ interface PrimarySwitchPreferenceBinding : PreferenceBinding { override fun bind(preference: Preference, metadata: PreferenceMetadata) { super.bind(preference, metadata) - (preference as PrimarySwitchPreference).apply { + // Could bind on PreferenceScreen + (preference as? PrimarySwitchPreference)?.apply { isChecked = preferenceDataStore!!.getBoolean(key, false) isSwitchEnabled = isEnabled } diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java index 9d979019be58..bf6006b1eddc 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java @@ -151,6 +151,18 @@ public class RestrictedPreferenceHelper { UserHandle.myUserId()); } + /** + * Configures the user restriction that this preference will track. This is equivalent to + * specifying {@link R.styleable#RestrictedPreference_userRestriction} in XML and allows + * configuring user restriction at runtime. + */ + public void setUserRestriction(@Nullable String userRestriction) { + mAttrUserRestriction = userRestriction == null || + RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext, userRestriction, + UserHandle.myUserId()) ? null : userRestriction; + setDisabledByAdmin(checkRestrictionEnforced()); + } + public void useAdminDisabledSummary(boolean useSummary) { mDisabledSummary = useSummary; } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index 3646842d36ef..5f88bcd8d65d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -1863,10 +1863,31 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> + " mIsLeAudioProfileConnectedFail=" + mIsLeAudioProfileConnectedFail + " mIsHeadsetProfileConnectedFail=" + mIsHeadsetProfileConnectedFail + " isConnectedSapDevice()=" + isConnectedSapDevice()); - - return mIsA2dpProfileConnectedFail || mIsHearingAidProfileConnectedFail - || (!isConnectedSapDevice() && mIsHeadsetProfileConnectedFail) - || mIsLeAudioProfileConnectedFail; + if (mIsA2dpProfileConnectedFail) { + A2dpProfile a2dpProfile = mProfileManager.getA2dpProfile(); + if (a2dpProfile != null && a2dpProfile.isEnabled(mDevice)) { + return true; + } + } + if (mIsHearingAidProfileConnectedFail) { + HearingAidProfile hearingAidProfile = mProfileManager.getHearingAidProfile(); + if (hearingAidProfile != null && hearingAidProfile.isEnabled(mDevice)) { + return true; + } + } + if (!isConnectedSapDevice() && mIsHeadsetProfileConnectedFail) { + HeadsetProfile headsetProfile = mProfileManager.getHeadsetProfile(); + if (headsetProfile != null && headsetProfile.isEnabled(mDevice)) { + return true; + } + } + if (mIsLeAudioProfileConnectedFail) { + LeAudioProfile leAudioProfile = mProfileManager.getLeAudioProfile(); + if (leAudioProfile != null && leAudioProfile.isEnabled(mDevice)) { + return true; + } + } + return false; } /** diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcast.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcast.java index 08f7806207db..f22bdaf55ce4 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcast.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcast.java @@ -89,11 +89,14 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { "com.android.settings.action.BLUETOOTH_LE_AUDIO_SHARING_STATE_CHANGE"; public static final String ACTION_LE_AUDIO_SHARING_DEVICE_CONNECTED = "com.android.settings.action.BLUETOOTH_LE_AUDIO_SHARING_DEVICE_CONNECTED"; + public static final String ACTION_LE_AUDIO_PRIVATE_BROADCAST_RECEIVED = + "com.android.settings.action.BLUETOOTH_LE_AUDIO_PRIVATE_BROADCAST_RECEIVED"; public static final String EXTRA_LE_AUDIO_SHARING_STATE = "BLUETOOTH_LE_AUDIO_SHARING_STATE"; public static final String EXTRA_BLUETOOTH_DEVICE = "BLUETOOTH_DEVICE"; public static final String EXTRA_BT_DEVICE_TO_AUTO_ADD_SOURCE = "BT_DEVICE_TO_AUTO_ADD_SOURCE"; public static final String EXTRA_START_LE_AUDIO_SHARING = "START_LE_AUDIO_SHARING"; public static final String EXTRA_PAIR_AND_JOIN_SHARING = "PAIR_AND_JOIN_SHARING"; + public static final String EXTRA_PRIVATE_BROADCAST_RECEIVE_DATA = "RECEIVE_DATA"; public static final String BLUETOOTH_LE_BROADCAST_PRIMARY_DEVICE_GROUP_ID = "bluetooth_le_broadcast_primary_device_group_id"; public static final int BROADCAST_STATE_UNKNOWN = 0; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PrivateBroadcastReceiveData.kt b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PrivateBroadcastReceiveData.kt new file mode 100644 index 000000000000..a284d2010195 --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PrivateBroadcastReceiveData.kt @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2025 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.settingslib.bluetooth + +import android.bluetooth.BluetoothDevice +import android.os.Parcel +import android.os.Parcelable +import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant.LocalBluetoothLeBroadcastSourceState +import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant.LocalBluetoothLeBroadcastSourceState.PAUSED +import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant.LocalBluetoothLeBroadcastSourceState.STREAMING +import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant.LocalBluetoothLeBroadcastSourceState.DECRYPTION_FAILED + +/** + * Data class representing information received in a private broadcast. + * This class encapsulates details about the sink device, source ID, broadcast ID, and the + * broadcast source state. + * + * @param sink The [BluetoothDevice] acting as the sink. + * @param sourceId The ID of the audio source. + * @param broadcastId The ID of the broadcast source. + * @param programInfo The program info string of the broadcast source. + * @param state The current state of the broadcast source. + */ +data class PrivateBroadcastReceiveData( + val sink: BluetoothDevice?, + val sourceId: Int = -1, + val broadcastId: Int = -1, + val programInfo: String = "", + val state: LocalBluetoothLeBroadcastSourceState?, +) : Parcelable { + + override fun describeContents(): Int = 0 + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.writeParcelable(sink, flags) + parcel.writeInt(sourceId) + parcel.writeInt(broadcastId) + parcel.writeString(programInfo) + parcel.writeSerializable(state) + } + + companion object { + @JvmField + val CREATOR: Parcelable.Creator<PrivateBroadcastReceiveData> = + object : Parcelable.Creator<PrivateBroadcastReceiveData> { + override fun createFromParcel(parcel: Parcel) = + parcel.run { + PrivateBroadcastReceiveData( + sink = readParcelable( + BluetoothDevice::class.java.classLoader, + BluetoothDevice::class.java + ), + sourceId = readInt(), + broadcastId = readInt(), + programInfo = readString() ?: "", + state = readSerializable( + LocalBluetoothLeBroadcastSourceState::class.java.classLoader, + LocalBluetoothLeBroadcastSourceState::class.java + ) + ) + } + override fun newArray(size: Int): Array<PrivateBroadcastReceiveData?> { + return arrayOfNulls(size) + } + } + + fun PrivateBroadcastReceiveData.isValid(): Boolean { + return sink != null + && sourceId != -1 + && broadcastId != -1 + && (state == STREAMING + || state == PAUSED + || state == DECRYPTION_FAILED) + } + } +} diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java index 08484bceb1fb..8d9982fe7210 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java @@ -2,9 +2,9 @@ package com.android.settingslib.graph; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyFloat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyFloat; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppCopyingHelperTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppCopyingHelperTest.java index 9ab17c49bbec..b849919cb389 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppCopyingHelperTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppCopyingHelperTest.java @@ -18,10 +18,10 @@ package com.android.settingslib.users; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java index ab28d061419c..94bb61614411 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java @@ -16,11 +16,11 @@ package com.android.settingslib.users; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.nullable; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java index 995314e44767..055487b79f78 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AvatarPhotoControllerTest.java @@ -22,7 +22,7 @@ import static com.android.settingslib.avatarpicker.AvatarPhotoController.REQUEST import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.never; diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java index e7533bc1044b..7f4d366b76d4 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java @@ -71,7 +71,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; @@ -197,7 +197,7 @@ public class WifiTrackerTest { .registerNetworkScoreCache( anyInt(), mScoreCacheCaptor.capture(), - Matchers.anyInt()); + ArgumentMatchers.anyInt()); // Capture requested keys and count down latch if present doAnswer( @@ -213,7 +213,7 @@ public class WifiTrackerTest { } return true; } - }).when(mockNetworkScoreManager).requestScores(Matchers.<NetworkKey[]>any()); + }).when(mockNetworkScoreManager).requestScores(ArgumentMatchers.<NetworkKey[]>any()); // We use a latch to detect callbacks as Tracker initialization state often invokes // callbacks @@ -464,9 +464,9 @@ public class WifiTrackerTest { startTracking(tracker); verify(mockNetworkScoreManager) .registerNetworkScoreCache( - Matchers.anyInt(), + ArgumentMatchers.anyInt(), mScoreCacheCaptor.capture(), - Matchers.anyInt()); + ArgumentMatchers.anyInt()); WifiNetworkScoreCache scoreCache = mScoreCacheCaptor.getValue(); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java index ed53d8d04988..f57ee0c0930e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java @@ -182,6 +182,8 @@ public class CachedBluetoothDeviceTest { updateProfileStatus(connectingProfile, BluetoothProfile.STATE_CONNECTING); // Set connection policy when(connectingProfile.getConnectionPolicy(mDevice)).thenReturn(connectionPolicy); + when(connectingProfile.isEnabled(mDevice)) + .thenReturn(connectionPolicy > BluetoothProfile.CONNECTION_POLICY_FORBIDDEN); // Act & Assert: // Get the expected connection summary. @@ -191,6 +193,9 @@ public class CachedBluetoothDeviceTest { @Test public void onProfileStateChanged_testConnectingToDisconnected_policyAllowed_problem() { + when(mProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile); + when(mProfileManager.getLeAudioProfile()).thenReturn(mLeAudioProfile); + String connectTimeoutString = mContext.getString(R.string.profile_connect_timeout_subtext); testTransitionFromConnectingToDisconnected(mA2dpProfile, mLeAudioProfile, @@ -205,6 +210,9 @@ public class CachedBluetoothDeviceTest { @Test public void onProfileStateChanged_testConnectingToDisconnected_policyForbidden_noProblem() { + when(mProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile); + when(mProfileManager.getLeAudioProfile()).thenReturn(mLeAudioProfile); + testTransitionFromConnectingToDisconnected(mA2dpProfile, mLeAudioProfile, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN, null); testTransitionFromConnectingToDisconnected(mHearingAidProfile, mLeAudioProfile, @@ -217,6 +225,9 @@ public class CachedBluetoothDeviceTest { @Test public void onProfileStateChanged_testConnectingToDisconnected_policyUnknown_noProblem() { + when(mProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile); + when(mProfileManager.getLeAudioProfile()).thenReturn(mLeAudioProfile); + testTransitionFromConnectingToDisconnected(mA2dpProfile, mLeAudioProfile, BluetoothProfile.CONNECTION_POLICY_UNKNOWN, null); testTransitionFromConnectingToDisconnected(mHearingAidProfile, mLeAudioProfile, @@ -1830,6 +1841,10 @@ public class CachedBluetoothDeviceTest { @Test public void getConnectionSummary_profileConnectedFail_showErrorMessage() { final A2dpProfile profile = mock(A2dpProfile.class); + when(mProfileManager.getA2dpProfile()).thenReturn(profile); + when(profile.getConnectionPolicy(mDevice)) + .thenReturn(BluetoothProfile.CONNECTION_POLICY_ALLOWED); + when(profile.isEnabled(mDevice)).thenReturn(true); mCachedDevice.onProfileStateChanged(profile, BluetoothProfile.STATE_CONNECTED); mCachedDevice.setProfileConnectedStatus(BluetoothProfile.A2DP, true); @@ -1842,6 +1857,10 @@ public class CachedBluetoothDeviceTest { @Test public void getTvConnectionSummary_profileConnectedFail_showErrorMessage() { final A2dpProfile profile = mock(A2dpProfile.class); + when(mProfileManager.getA2dpProfile()).thenReturn(profile); + when(profile.getConnectionPolicy(mDevice)) + .thenReturn(BluetoothProfile.CONNECTION_POLICY_ALLOWED); + when(profile.isEnabled(mDevice)).thenReturn(true); mCachedDevice.onProfileStateChanged(profile, BluetoothProfile.STATE_CONNECTED); mCachedDevice.setProfileConnectedStatus(BluetoothProfile.A2DP, true); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/PrivateBroadcastReceiveDataTest.kt b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/PrivateBroadcastReceiveDataTest.kt new file mode 100644 index 000000000000..5fd67a16a305 --- /dev/null +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/PrivateBroadcastReceiveDataTest.kt @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2025 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.settingslib.bluetooth + +import android.bluetooth.BluetoothAdapter +import android.bluetooth.BluetoothDevice +import android.os.Parcel +import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant.LocalBluetoothLeBroadcastSourceState +import com.android.settingslib.bluetooth.PrivateBroadcastReceiveData.Companion.isValid +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class PrivateBroadcastReceiveDataTest { + + @Test + fun parcelable() { + val original = PrivateBroadcastReceiveData( + sink = sink, + sourceId = 1, + broadcastId = 2, + programInfo = "Test Program", + state = LocalBluetoothLeBroadcastSourceState.STREAMING + ) + + val parcel = Parcel.obtain() + original.writeToParcel(parcel, 0) + parcel.setDataPosition(0) + + val recreated = PrivateBroadcastReceiveData.CREATOR.createFromParcel(parcel) + + assertEquals(original, recreated) + } + + @Test + fun isValid_validData() { + val data = PrivateBroadcastReceiveData( + sink = sink, + sourceId = 1, + broadcastId = 2, + state = LocalBluetoothLeBroadcastSourceState.STREAMING + ) + assertTrue(data.isValid()) + } + + @Test + fun isValid_nullSink() { + val data = PrivateBroadcastReceiveData( + sink = null, + sourceId = 1, + broadcastId = 2, + state = LocalBluetoothLeBroadcastSourceState.STREAMING + ) + assertFalse(data.isValid()) + } + + @Test + fun isValid_invalidSourceId() { + val data = PrivateBroadcastReceiveData( + sink = sink, + sourceId = -1, + broadcastId = 2, + state = LocalBluetoothLeBroadcastSourceState.STREAMING + ) + assertFalse(data.isValid()) + } + + @Test + fun isValid_invalidBroadcastId() { + val data = PrivateBroadcastReceiveData( + sink = sink, + sourceId = 1, + broadcastId = -1, + state = LocalBluetoothLeBroadcastSourceState.STREAMING + ) + assertFalse(data.isValid()) + } + + @Test + fun isValid_nullState() { + val data = PrivateBroadcastReceiveData( + sink = sink, + sourceId = 1, + broadcastId = 2, + state = null + ) + assertFalse(data.isValid()) + } + + @Test + fun isValid_correctStates() { + assertTrue(PrivateBroadcastReceiveData(sink, 1, 1, state = LocalBluetoothLeBroadcastSourceState.STREAMING).isValid()) + assertTrue(PrivateBroadcastReceiveData(sink, 1, 1, state = LocalBluetoothLeBroadcastSourceState.PAUSED).isValid()) + assertTrue(PrivateBroadcastReceiveData(sink, 1, 1, state = LocalBluetoothLeBroadcastSourceState.DECRYPTION_FAILED).isValid()) + } + + private companion object { + const val TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1" + + val sink: BluetoothDevice = + BluetoothAdapter.getDefaultAdapter().getRemoteLeDevice( + TEST_DEVICE_ADDRESS, + BluetoothDevice.ADDRESS_TYPE_RANDOM + ) + } +} diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index a2291123e192..0121d31b9f35 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -221,6 +221,8 @@ public class SecureSettings { Settings.Secure.EMERGENCY_GESTURE_ENABLED, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED, Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, + Settings.Secure.ADAPTIVE_CONNECTIVITY_WIFI_ENABLED, + Settings.Secure.ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED, Settings.Secure.ASSIST_HANDLES_LEARNING_TIME_ELAPSED_MILLIS, Settings.Secure.ASSIST_HANDLES_LEARNING_EVENT_COUNT, Settings.Secure.ACCESSIBILITY_BUTTON_MODE, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index a4325344709a..5eb6af62d2c3 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -358,6 +358,8 @@ public class SecureSettingsValidators { VALIDATORS.put( Secure.EMERGENCY_GESTURE_UI_LAST_STARTED_MILLIS, NONE_NEGATIVE_LONG_VALIDATOR); VALIDATORS.put(Secure.ADAPTIVE_CONNECTIVITY_ENABLED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.ADAPTIVE_CONNECTIVITY_WIFI_ENABLED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put( Secure.ASSIST_HANDLES_LEARNING_TIME_ELAPSED_MILLIS, NONE_NEGATIVE_LONG_VALIDATOR); VALIDATORS.put(Secure.ASSIST_HANDLES_LEARNING_EVENT_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/OWNERS b/packages/SettingsProvider/src/com/android/providers/settings/OWNERS index b0086c180cbd..78c87b389dfc 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/OWNERS +++ b/packages/SettingsProvider/src/com/android/providers/settings/OWNERS @@ -1,2 +1,2 @@ -per-file WritableNamespacePrefixes.java = mpgroover@google.com,tedbauer@google.com -per-file WritableNamespaces.java = mpgroover@google.com,tedbauer@google.com +per-file WritableNamespacePrefixes.java = mpgroover@google.com +per-file WritableNamespaces.java = mpgroover@google.com diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 57facdaa388c..e7527dcde95c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -2111,6 +2111,12 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, SecureSettingsProto.ADAPTIVE_CONNECTIVITY_ENABLED); + dumpSetting(s, p, + Settings.Secure.ADAPTIVE_CONNECTIVITY_WIFI_ENABLED, + SecureSettingsProto.ADAPTIVE_CONNECTIVITY_WIFI_ENABLED); + dumpSetting(s, p, + Settings.Secure.ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED, + SecureSettingsProto.ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED); final long controlsToken = p.start(SecureSettingsProto.CONTROLS); dumpSetting(s, p, diff --git a/packages/Shell/tests/src/com/android/shell/BugreportProgressServiceTest.java b/packages/Shell/tests/src/com/android/shell/BugreportProgressServiceTest.java index 433eca23080e..8031b103d72c 100644 --- a/packages/Shell/tests/src/com/android/shell/BugreportProgressServiceTest.java +++ b/packages/Shell/tests/src/com/android/shell/BugreportProgressServiceTest.java @@ -20,7 +20,7 @@ import static com.android.shell.BugreportProgressService.findSendToAccount; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.accounts.Account; diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index 5b48566d92f9..129949fd38b2 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -534,6 +534,7 @@ android_library { "androidx.compose.animation_animation-graphics", "androidx.lifecycle_lifecycle-viewmodel-compose", "kairos", + "displaylib", "aconfig_settings_flags_lib", ], libs: [ @@ -728,6 +729,7 @@ android_library { "Traceur-res", "aconfig_settings_flags_lib", "kairos", + "displaylib", ], } @@ -770,6 +772,7 @@ android_library { "androidx.compose.runtime_runtime", "kairos", "kosmos", + "displaylib", "testables", "androidx.test.rules", "platform-compat-test-rules", diff --git a/packages/SystemUI/TEST_OWNERS b/packages/SystemUI/TEST_OWNERS index eadc86e386cb..21faf036c8f6 100644 --- a/packages/SystemUI/TEST_OWNERS +++ b/packages/SystemUI/TEST_OWNERS @@ -3,3 +3,6 @@ # for restructuring and test maintenance only saff@google.com + +# Work around per-file set noparent includes +per-file *=saff@google.com diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 9dd49d6b1015..ab18612355f0 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -1846,23 +1846,23 @@ flag { } flag { - name: "notification_shade_blur" - namespace: "systemui" - description: "Enables the new blur effect on the Notification Shade." - bug: "370555223" -} - -flag { - name: "disable_shade_visible_with_blur" + name: "disable_blurred_shade_visible" namespace: "systemui" description: "Removes the check for a blur radius when determining shade window visibility" - bug: "356804470" + bug: "394977231" metadata { purpose: PURPOSE_BUGFIX } } flag { + name: "notification_shade_blur" + namespace: "systemui" + description: "Enables the new blur effect on the Notification Shade." + bug: "370555223" +} + +flag { name: "notification_row_transparency" namespace: "systemui" description: "Enables transparency on the Notification Shade." diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt index 4a39cff388a9..4f01d7fcdb51 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt @@ -82,6 +82,10 @@ class TypefaceVariantCacheImpl(var baseTypeface: Typeface, override val animatio } } +interface TextAnimatorListener : TextInterpolatorListener { + fun onInvalidate() {} +} + /** * This class provides text animation between two styles. * @@ -110,13 +114,19 @@ class TypefaceVariantCacheImpl(var baseTypeface: Typeface, override val animatio class TextAnimator( layout: Layout, private val typefaceCache: TypefaceVariantCache, - private val invalidateCallback: () -> Unit = {}, + private val listener: TextAnimatorListener? = null, ) { - @VisibleForTesting var textInterpolator = TextInterpolator(layout, typefaceCache) + var textInterpolator = TextInterpolator(layout, typefaceCache, listener) @VisibleForTesting var createAnimator: () -> ValueAnimator = { ValueAnimator.ofFloat(1f) } var animator: ValueAnimator? = null + val progress: Float + get() = textInterpolator.progress + + val linearProgress: Float + get() = textInterpolator.linearProgress + val fontVariationUtils = FontVariationUtils() sealed class PositionedGlyph { @@ -288,8 +298,9 @@ class TextAnimator( animator = buildAnimator(animation).apply { start() } } else { textInterpolator.progress = 1f + textInterpolator.linearProgress = 1f textInterpolator.rebase() - invalidateCallback() + listener?.onInvalidate() } } @@ -302,7 +313,7 @@ class TextAnimator( addUpdateListener { textInterpolator.progress = it.animatedValue as Float textInterpolator.linearProgress = it.currentPlayTime / it.duration.toFloat() - invalidateCallback() + listener?.onInvalidate() } addListener( diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt index 457f45388062..22c5258edb58 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt @@ -27,8 +27,19 @@ import android.util.MathUtils import com.android.internal.graphics.ColorUtils import java.lang.Math.max +interface TextInterpolatorListener { + fun onPaintModified() {} + + fun onRebased() {} +} + /** Provide text style linear interpolation for plain text. */ -class TextInterpolator(layout: Layout, var typefaceCache: TypefaceVariantCache) { +class TextInterpolator( + layout: Layout, + var typefaceCache: TypefaceVariantCache, + private val listener: TextInterpolatorListener? = null, +) { + /** * Returns base paint used for interpolation. * @@ -136,6 +147,7 @@ class TextInterpolator(layout: Layout, var typefaceCache: TypefaceVariantCache) */ fun onTargetPaintModified() { updatePositionsAndFonts(shapeText(layout, targetPaint), updateBase = false) + listener?.onPaintModified() } /** @@ -146,6 +158,7 @@ class TextInterpolator(layout: Layout, var typefaceCache: TypefaceVariantCache) */ fun onBasePaintModified() { updatePositionsAndFonts(shapeText(layout, basePaint), updateBase = true) + listener?.onPaintModified() } /** @@ -204,6 +217,7 @@ class TextInterpolator(layout: Layout, var typefaceCache: TypefaceVariantCache) */ fun rebase() { if (progress == 0f) { + listener?.onRebased() return } else if (progress == 1f) { basePaint.set(targetPaint) @@ -233,6 +247,8 @@ class TextInterpolator(layout: Layout, var typefaceCache: TypefaceVariantCache) } progress = 0f + linearProgress = 0f + listener?.onRebased() } /** diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ContentListState.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ContentListState.kt index 8ad96a5bcb37..62b134279267 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ContentListState.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ContentListState.kt @@ -77,6 +77,16 @@ internal constructor( list.apply { add(toIndex, removeAt(fromIndex)) } } + /** Swap the two items in the list with the given indices. */ + fun swapItems(index1: Int, index2: Int) { + list.apply { + val item1 = get(index1) + val item2 = get(index2) + set(index2, item1) + set(index1, item2) + } + } + /** Remove widget from the list and the database. */ fun onRemove(indexToRemove: Int) { if (list[indexToRemove].isWidgetContent()) { diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt index 0aef7f2c7063..dda388aeeac6 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/DragAndDropTargetState.kt @@ -18,8 +18,10 @@ package com.android.systemui.communal.ui.compose import android.content.ClipDescription import android.view.DragEvent +import androidx.compose.animation.core.tween import androidx.compose.foundation.draganddrop.dragAndDropTarget import androidx.compose.foundation.gestures.Orientation +import androidx.compose.foundation.gestures.animateScrollBy import androidx.compose.foundation.gestures.scrollBy import androidx.compose.foundation.lazy.grid.LazyGridState import androidx.compose.runtime.Composable @@ -37,6 +39,7 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp import com.android.systemui.Flags.communalWidgetResizing +import com.android.systemui.Flags.glanceableHubV2 import com.android.systemui.communal.domain.model.CommunalContentModel import com.android.systemui.communal.ui.compose.extensions.firstItemAtOffset import com.android.systemui.communal.util.WidgetPickerIntentUtils @@ -51,13 +54,14 @@ import kotlinx.coroutines.launch * @see dragAndDropTarget */ @Composable -internal fun rememberDragAndDropTargetState( +fun rememberDragAndDropTargetState( gridState: LazyGridState, contentOffset: Offset, contentListState: ContentListState, ): DragAndDropTargetState { val scope = rememberCoroutineScope() val autoScrollThreshold = with(LocalDensity.current) { 60.dp.toPx() } + val state = remember(gridState, contentOffset, contentListState, autoScrollThreshold, scope) { DragAndDropTargetState( @@ -68,11 +72,9 @@ internal fun rememberDragAndDropTargetState( scope = scope, ) } - LaunchedEffect(state) { - for (diff in state.scrollChannel) { - gridState.scrollBy(diff) - } - } + + LaunchedEffect(state) { state.processScrollRequests(scope) } + return state } @@ -83,7 +85,7 @@ internal fun rememberDragAndDropTargetState( * @see DragEvent */ @Composable -internal fun Modifier.dragAndDropTarget(dragDropTargetState: DragAndDropTargetState): Modifier { +fun Modifier.dragAndDropTarget(dragDropTargetState: DragAndDropTargetState): Modifier { val state by rememberUpdatedState(dragDropTargetState) return this then @@ -132,13 +134,79 @@ internal fun Modifier.dragAndDropTarget(dragDropTargetState: DragAndDropTargetSt * other activities. [GridDragDropState] on the other hand, handles dragging of existing items in * the communal hub grid. */ -internal class DragAndDropTargetState( +class DragAndDropTargetState( + state: LazyGridState, + contentOffset: Offset, + contentListState: ContentListState, + autoScrollThreshold: Float, + scope: CoroutineScope, +) { + private val dragDropState: DragAndDropTargetStateInternal = + if (glanceableHubV2()) { + DragAndDropTargetStateV2( + state = state, + contentListState = contentListState, + scope = scope, + autoScrollThreshold = autoScrollThreshold, + contentOffset = contentOffset, + ) + } else { + DragAndDropTargetStateV1( + state = state, + contentListState = contentListState, + scope = scope, + autoScrollThreshold = autoScrollThreshold, + contentOffset = contentOffset, + ) + } + + fun onStarted() = dragDropState.onStarted() + + fun onMoved(event: DragAndDropEvent) = dragDropState.onMoved(event) + + fun onDrop(event: DragAndDropEvent) = dragDropState.onDrop(event) + + fun onEnded() = dragDropState.onEnded() + + fun onExited() = dragDropState.onExited() + + suspend fun processScrollRequests(coroutineScope: CoroutineScope) = + dragDropState.processScrollRequests(coroutineScope) +} + +/** + * A private interface defining the API for handling drag-and-drop operations. There will be two + * implementations of this interface: V1 for devices that do not have the glanceable_hub_v2 flag + * enabled, and V2 for devices that do have that flag enabled. + * + * TODO(b/400789179): Remove this interface and the V1 implementation once glanceable_hub_v2 has + * shipped. + */ +private interface DragAndDropTargetStateInternal { + fun onStarted() = Unit + + fun onMoved(event: DragAndDropEvent) = Unit + + fun onDrop(event: DragAndDropEvent): Boolean = false + + fun onEnded() = Unit + + fun onExited() = Unit + + suspend fun processScrollRequests(coroutineScope: CoroutineScope) = Unit +} + +/** + * The V1 implementation of DragAndDropTargetStateInternal to be used when the glanceable_hub_v2 + * flag is disabled. + */ +private class DragAndDropTargetStateV1( private val state: LazyGridState, private val contentOffset: Offset, private val contentListState: ContentListState, private val autoScrollThreshold: Float, private val scope: CoroutineScope, -) { +) : DragAndDropTargetStateInternal { /** * The placeholder item that is treated as if it is being dragged across the grid. It is added * to grid once drag and drop event is started and removed when event ends. @@ -147,15 +215,21 @@ internal class DragAndDropTargetState( private var placeHolderIndex: Int? = null private var previousTargetItemKey: Any? = null - internal val scrollChannel = Channel<Float>() + private val scrollChannel = Channel<Float>() - fun onStarted() { + override suspend fun processScrollRequests(coroutineScope: CoroutineScope) { + for (diff in scrollChannel) { + state.scrollBy(diff) + } + } + + override fun onStarted() { // assume item will be added to the end. contentListState.list.add(placeHolder) placeHolderIndex = contentListState.list.size - 1 } - fun onMoved(event: DragAndDropEvent) { + override fun onMoved(event: DragAndDropEvent) { val dragOffset = event.toOffset() val targetItem = @@ -201,7 +275,7 @@ internal class DragAndDropTargetState( } } - fun onDrop(event: DragAndDropEvent): Boolean { + override fun onDrop(event: DragAndDropEvent): Boolean { return placeHolderIndex?.let { dropIndex -> val widgetExtra = event.maybeWidgetExtra() ?: return false val (componentName, user) = widgetExtra @@ -219,13 +293,13 @@ internal class DragAndDropTargetState( } ?: false } - fun onEnded() { + override fun onEnded() { placeHolderIndex = null previousTargetItemKey = null contentListState.list.remove(placeHolder) } - fun onExited() { + override fun onExited() { onEnded() } @@ -257,16 +331,186 @@ internal class DragAndDropTargetState( contentListState.onMove(currentIndex, index) } } +} +/** + * The V2 implementation of DragAndDropTargetStateInternal to be used when the glanceable_hub_v2 + * flag is enabled. + */ +private class DragAndDropTargetStateV2( + private val state: LazyGridState, + private val contentOffset: Offset, + private val contentListState: ContentListState, + private val autoScrollThreshold: Float, + private val scope: CoroutineScope, +) : DragAndDropTargetStateInternal { /** - * Parses and returns the intent extra associated with the widget that is dropped into the grid. - * - * Returns null if the drop event didn't include intent information. + * The placeholder item that is treated as if it is being dragged across the grid. It is added + * to grid once drag and drop event is started and removed when event ends. */ - private fun DragAndDropEvent.maybeWidgetExtra(): WidgetPickerIntentUtils.WidgetExtra? { - val clipData = this.toAndroidDragEvent().clipData.takeIf { it.itemCount != 0 } - return clipData?.getItemAt(0)?.intent?.let { intent -> getWidgetExtraFromIntent(intent) } + private var placeHolder = CommunalContentModel.WidgetPlaceholder() + private var placeHolderIndex: Int? = null + private var previousTargetItemKey: Any? = null + private var dragOffset = Offset.Zero + private var columnWidth = 0 + + private val scrollChannel = Channel<Float>() + + override suspend fun processScrollRequests(coroutineScope: CoroutineScope) { + while (true) { + val amount = scrollChannel.receive() + + if (state.isScrollInProgress) { + // Ignore overscrolling if a scroll is already in progress (but we still want to + // consume the scroll event so that we don't end up processing a bunch of old + // events after scrolling has finished). + continue + } + + // Perform the rest of the drag operation after scrolling has finished (or immediately + // if there will be no scrolling). + if (amount != 0f) { + scope.launch { + state.animateScrollBy(amount, tween(delayMillis = 250, durationMillis = 1000)) + performDragAction() + } + } else { + performDragAction() + } + } + } + + override fun onStarted() { + // assume item will be added to the end. + contentListState.list.add(placeHolder) + placeHolderIndex = contentListState.list.size - 1 + + // Use the width of the first item as the column width. + columnWidth = + state.layoutInfo.visibleItemsInfo.first().size.width + + state.layoutInfo.beforeContentPadding + + state.layoutInfo.afterContentPadding } - private fun DragAndDropEvent.toOffset() = this.toAndroidDragEvent().run { Offset(x, y) } + override fun onMoved(event: DragAndDropEvent) { + dragOffset = event.toOffset() + scrollChannel.trySend(computeAutoscroll(dragOffset)) + } + + override fun onDrop(event: DragAndDropEvent): Boolean { + return placeHolderIndex?.let { dropIndex -> + val widgetExtra = event.maybeWidgetExtra() ?: return false + val (componentName, user) = widgetExtra + if (componentName != null && user != null) { + // Placeholder isn't removed yet to allow the setting the right rank for items + // before adding in the new item. + contentListState.onSaveList( + newItemComponentName = componentName, + newItemUser = user, + newItemIndex = dropIndex, + ) + return@let true + } + return false + } ?: false + } + + override fun onEnded() { + placeHolderIndex = null + previousTargetItemKey = null + contentListState.list.remove(placeHolder) + } + + override fun onExited() { + onEnded() + } + + private fun performDragAction() { + val targetItem = + state.layoutInfo.visibleItemsInfo + .asSequence() + .filter { item -> contentListState.isItemEditable(item.index) } + .firstItemAtOffset(dragOffset - contentOffset) + + if ( + targetItem != null && + (!communalWidgetResizing() || targetItem.key != previousTargetItemKey) + ) { + if (communalWidgetResizing()) { + // Keep track of the previous target item, to avoid rapidly oscillating between + // items if the target item doesn't visually move as a result of the index change. + // In this case, even after the index changes, we'd still be colliding with the + // element, so it would be selected as the target item the next time this function + // runs again, which would trigger us to revert the index change we recently made. + previousTargetItemKey = targetItem.key + } + + val scrollToIndex = + if (targetItem.index == state.firstVisibleItemIndex) { + placeHolderIndex + } else if (placeHolderIndex == state.firstVisibleItemIndex) { + targetItem.index + } else { + null + } + + if (scrollToIndex != null) { + scope.launch { + state.scrollToItem(scrollToIndex, state.firstVisibleItemScrollOffset) + movePlaceholderTo(targetItem.index) + } + } else { + movePlaceholderTo(targetItem.index) + } + + placeHolderIndex = targetItem.index + } else if (targetItem == null) { + previousTargetItemKey = null + } + } + + private fun computeAutoscroll(dragOffset: Offset): Float { + val orientation = state.layoutInfo.orientation + val distanceFromStart = + if (orientation == Orientation.Horizontal) { + dragOffset.x + } else { + dragOffset.y + } + val distanceFromEnd = + if (orientation == Orientation.Horizontal) { + state.layoutInfo.viewportEndOffset - dragOffset.x + } else { + state.layoutInfo.viewportEndOffset - dragOffset.y + } + + return when { + distanceFromEnd < autoScrollThreshold -> { + (columnWidth - state.layoutInfo.beforeContentPadding).toFloat() + } + distanceFromStart < autoScrollThreshold -> { + -(columnWidth - state.layoutInfo.afterContentPadding).toFloat() + } + else -> 0f + } + } + + private fun movePlaceholderTo(index: Int) { + val currentIndex = contentListState.list.indexOf(placeHolder) + if (currentIndex != index) { + contentListState.swapItems(currentIndex, index) + } + } } + +/** + * Parses and returns the intent extra associated with the widget that is dropped into the grid. + * + * Returns null if the drop event didn't include intent information. + */ +private fun DragAndDropEvent.maybeWidgetExtra(): WidgetPickerIntentUtils.WidgetExtra? { + val clipData = this.toAndroidDragEvent().clipData.takeIf { it.itemCount != 0 } + return clipData?.getItemAt(0)?.intent?.let { intent -> getWidgetExtraFromIntent(intent) } +} + +private fun DragAndDropEvent.toOffset() = this.toAndroidDragEvent().run { Offset(x, y) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt index c972d3e3cf15..2a5addeb4951 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt @@ -19,7 +19,10 @@ package com.android.systemui.communal.ui.compose import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.spring +import androidx.compose.animation.core.tween import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.gestures.Orientation +import androidx.compose.foundation.gestures.animateScrollBy import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress import androidx.compose.foundation.gestures.scrollBy import androidx.compose.foundation.layout.Box @@ -37,13 +40,16 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.IntRect import androidx.compose.ui.unit.LayoutDirection +import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.round import androidx.compose.ui.unit.toOffset import androidx.compose.ui.unit.toSize import com.android.systemui.Flags.communalWidgetResizing +import com.android.systemui.Flags.glanceableHubV2 import com.android.systemui.communal.domain.model.CommunalContentModel import com.android.systemui.communal.shared.model.CommunalContentSize import com.android.systemui.communal.ui.compose.extensions.firstItemAtOffset @@ -62,22 +68,22 @@ fun rememberGridDragDropState( contentListState: ContentListState, updateDragPositionForRemove: (boundingBox: IntRect) -> Boolean, ): GridDragDropState { - val scope = rememberCoroutineScope() + val coroutineScope = rememberCoroutineScope() + val autoScrollThreshold = with(LocalDensity.current) { 60.dp.toPx() } + val state = remember(gridState, contentListState, updateDragPositionForRemove) { GridDragDropState( - state = gridState, + gridState = gridState, contentListState = contentListState, - scope = scope, + coroutineScope = coroutineScope, + autoScrollThreshold = autoScrollThreshold, updateDragPositionForRemove = updateDragPositionForRemove, ) } - LaunchedEffect(state) { - while (true) { - val diff = state.scrollChannel.receive() - gridState.scrollBy(diff) - } - } + + LaunchedEffect(state) { state.processScrollRequests(coroutineScope) } + return state } @@ -89,36 +95,86 @@ fun rememberGridDragDropState( * to remove the dragged item if condition met and call [ContentListState.onSaveList] to persist any * change in ordering. */ -class GridDragDropState -internal constructor( - private val state: LazyGridState, - private val contentListState: ContentListState, - private val scope: CoroutineScope, +class GridDragDropState( + val gridState: LazyGridState, + contentListState: ContentListState, + coroutineScope: CoroutineScope, + autoScrollThreshold: Float, private val updateDragPositionForRemove: (draggingBoundingBox: IntRect) -> Boolean, ) { - var draggingItemKey by mutableStateOf<String?>(null) - private set + private val dragDropState: GridDragDropStateInternal = + if (glanceableHubV2()) { + GridDragDropStateV2( + gridState = gridState, + contentListState = contentListState, + scope = coroutineScope, + autoScrollThreshold = autoScrollThreshold, + updateDragPositionForRemove = updateDragPositionForRemove, + ) + } else { + GridDragDropStateV1( + gridState = gridState, + contentListState = contentListState, + scope = coroutineScope, + updateDragPositionForRemove = updateDragPositionForRemove, + ) + } - var isDraggingToRemove by mutableStateOf(false) - private set + val draggingItemKey: String? + get() = dragDropState.draggingItemKey - internal val scrollChannel = Channel<Float>() + val isDraggingToRemove: Boolean + get() = dragDropState.isDraggingToRemove - private var draggingItemDraggedDelta by mutableStateOf(Offset.Zero) - private var draggingItemInitialOffset by mutableStateOf(Offset.Zero) + val draggingItemOffset: Offset + get() = dragDropState.draggingItemOffset - private val spacer = CommunalContentModel.Spacer(CommunalContentSize.Responsive(1)) - private var spacerIndex: Int? = null + /** + * Called when dragging is initiated. + * + * @return {@code True} if dragging a grid item, {@code False} otherwise. + */ + fun onDragStart( + offset: Offset, + screenWidth: Int, + layoutDirection: LayoutDirection, + contentOffset: Offset, + ): Boolean = dragDropState.onDragStart(offset, screenWidth, layoutDirection, contentOffset) - private var previousTargetItemKey: Any? = null + fun onDragInterrupted() = dragDropState.onDragInterrupted() + + fun onDrag(offset: Offset, layoutDirection: LayoutDirection) = + dragDropState.onDrag(offset, layoutDirection) + + suspend fun processScrollRequests(coroutineScope: CoroutineScope) = + dragDropState.processScrollRequests(coroutineScope) +} + +/** + * A private base class defining the API for handling drag-and-drop operations. There will be two + * implementations of this class: V1 for devices that do not have the glanceable_hub_v2 flag + * enabled, and V2 for devices that do have that flag enabled. + * + * TODO(b/400789179): Remove this class and the V1 implementation once glanceable_hub_v2 has + * shipped. + */ +private open class GridDragDropStateInternal(protected val state: LazyGridState) { + var draggingItemKey by mutableStateOf<String?>(null) + protected set - internal val draggingItemOffset: Offset + var isDraggingToRemove by mutableStateOf(false) + protected set + + var draggingItemDraggedDelta by mutableStateOf(Offset.Zero) + var draggingItemInitialOffset by mutableStateOf(Offset.Zero) + + val draggingItemOffset: Offset get() = draggingItemLayoutInfo?.let { item -> draggingItemInitialOffset + draggingItemDraggedDelta - item.offset.toOffset() } ?: Offset.Zero - private val draggingItemLayoutInfo: LazyGridItemInfo? + val draggingItemLayoutInfo: LazyGridItemInfo? get() = state.layoutInfo.visibleItemsInfo.firstOrNull { it.key == draggingItemKey } /** @@ -126,7 +182,45 @@ internal constructor( * * @return {@code True} if dragging a grid item, {@code False} otherwise. */ - internal fun onDragStart( + open fun onDragStart( + offset: Offset, + screenWidth: Int, + layoutDirection: LayoutDirection, + contentOffset: Offset, + ): Boolean = false + + open fun onDragInterrupted() = Unit + + open fun onDrag(offset: Offset, layoutDirection: LayoutDirection) = Unit + + open suspend fun processScrollRequests(coroutineScope: CoroutineScope) = Unit +} + +/** + * The V1 implementation of GridDragDropStateInternal to be used when the glanceable_hub_v2 flag is + * disabled. + */ +private class GridDragDropStateV1( + val gridState: LazyGridState, + private val contentListState: ContentListState, + private val scope: CoroutineScope, + private val updateDragPositionForRemove: (draggingBoundingBox: IntRect) -> Boolean, +) : GridDragDropStateInternal(gridState) { + private val scrollChannel = Channel<Float>() + + private val spacer = CommunalContentModel.Spacer(CommunalContentSize.Responsive(1)) + private var spacerIndex: Int? = null + + private var previousTargetItemKey: Any? = null + + override suspend fun processScrollRequests(coroutineScope: CoroutineScope) { + while (true) { + val diff = scrollChannel.receive() + state.scrollBy(diff) + } + } + + override fun onDragStart( offset: Offset, screenWidth: Int, layoutDirection: LayoutDirection, @@ -162,7 +256,7 @@ internal constructor( return false } - internal fun onDragInterrupted() { + override fun onDragInterrupted() { draggingItemKey?.let { if (isDraggingToRemove) { contentListState.onRemove( @@ -185,7 +279,7 @@ internal constructor( } } - internal fun onDrag(offset: Offset, layoutDirection: LayoutDirection) { + override fun onDrag(offset: Offset, layoutDirection: LayoutDirection) { // Adjust offset to match the layout direction draggingItemDraggedDelta += Offset(offset.x.directional(LayoutDirection.Ltr, layoutDirection), offset.y) @@ -282,6 +376,249 @@ internal constructor( } } +/** + * The V2 implementation of GridDragDropStateInternal to be used when the glanceable_hub_v2 flag is + * enabled. + */ +private class GridDragDropStateV2( + val gridState: LazyGridState, + private val contentListState: ContentListState, + private val scope: CoroutineScope, + private val autoScrollThreshold: Float, + private val updateDragPositionForRemove: (draggingBoundingBox: IntRect) -> Boolean, +) : GridDragDropStateInternal(gridState) { + + private val scrollChannel = Channel<Float>(Channel.UNLIMITED) + + // Used to keep track of the dragging item during scrolling (because it might be off screen + // and no longer in the list of visible items). + private var draggingItemWhileScrolling: LazyGridItemInfo? by mutableStateOf(null) + + private val spacer = CommunalContentModel.Spacer(CommunalContentSize.Responsive(1)) + private var spacerIndex: Int? = null + + private var previousTargetItemKey: Any? = null + + // Basically, the location of the user's finger on the screen. + private var currentDragPositionOnScreen by mutableStateOf(Offset.Zero) + // The offset of the grid from the top of the screen. + private var contentOffset = Offset.Zero + + // The width of one column in the grid (needed in order to auto-scroll one column at a time). + private var columnWidth = 0 + + override suspend fun processScrollRequests(coroutineScope: CoroutineScope) { + while (true) { + val amount = scrollChannel.receive() + + if (state.isScrollInProgress) { + // Ignore overscrolling if a scroll is already in progress (but we still want to + // consume the scroll event so that we don't end up processing a bunch of old + // events after scrolling has finished). + continue + } + + // We perform the rest of the drag action after scrolling has finished (or immediately + // if there will be no scrolling). + if (amount != 0f) { + coroutineScope.launch { + state.animateScrollBy(amount, tween(delayMillis = 250, durationMillis = 1000)) + performDragAction() + } + } else { + performDragAction() + } + } + } + + override fun onDragStart( + offset: Offset, + screenWidth: Int, + layoutDirection: LayoutDirection, + contentOffset: Offset, + ): Boolean { + val normalizedOffset = + Offset( + if (layoutDirection == LayoutDirection.Ltr) offset.x else screenWidth - offset.x, + offset.y, + ) + + currentDragPositionOnScreen = normalizedOffset + this.contentOffset = contentOffset + + state.layoutInfo.visibleItemsInfo + .filter { item -> contentListState.isItemEditable(item.index) } + // grid item offset is based off grid content container so we need to deduct + // before content padding from the initial pointer position + .firstItemAtOffset(normalizedOffset - contentOffset) + ?.apply { + draggingItemKey = key as String + draggingItemWhileScrolling = this + draggingItemInitialOffset = this.offset.toOffset() + columnWidth = + this.size.width + + state.layoutInfo.beforeContentPadding + + state.layoutInfo.afterContentPadding + // Add a spacer after the last widget if it is larger than the dragging widget. + // This allows overscrolling, enabling the dragging widget to be placed beyond it. + val lastWidget = contentListState.list.lastOrNull { it.isWidgetContent() } + if ( + lastWidget != null && + draggingItemLayoutInfo != null && + lastWidget.size.span > draggingItemLayoutInfo!!.span + ) { + contentListState.list.add(spacer) + spacerIndex = contentListState.list.size - 1 + } + return true + } + + return false + } + + override fun onDragInterrupted() { + draggingItemKey?.let { + if (isDraggingToRemove) { + contentListState.onRemove( + contentListState.list.indexOfFirst { it.key == draggingItemKey } + ) + isDraggingToRemove = false + updateDragPositionForRemove(IntRect.Zero) + } + // persist list editing changes on dragging ends + contentListState.onSaveList() + draggingItemKey = null + } + previousTargetItemKey = null + draggingItemDraggedDelta = Offset.Zero + draggingItemInitialOffset = Offset.Zero + currentDragPositionOnScreen = Offset.Zero + draggingItemWhileScrolling = null + // Remove spacer, if any, when a drag gesture finishes. + spacerIndex?.let { + contentListState.list.removeAt(it) + spacerIndex = null + } + } + + override fun onDrag(offset: Offset, layoutDirection: LayoutDirection) { + // Adjust offset to match the layout direction + val delta = Offset(offset.x.directional(LayoutDirection.Ltr, layoutDirection), offset.y) + draggingItemDraggedDelta += delta + currentDragPositionOnScreen += delta + + scrollChannel.trySend(computeAutoscroll(currentDragPositionOnScreen)) + } + + fun performDragAction() { + val draggingItem = draggingItemLayoutInfo ?: draggingItemWhileScrolling + if (draggingItem == null) { + return + } + + val draggingBoundingBox = + IntRect(draggingItem.offset + draggingItemOffset.round(), draggingItem.size) + val curDragPositionInGrid = (currentDragPositionOnScreen - contentOffset) + + val targetItem = + if (communalWidgetResizing()) { + val lastVisibleItemIndex = state.layoutInfo.visibleItemsInfo.last().index + state.layoutInfo.visibleItemsInfo.findLast( + fun(item): Boolean { + val itemBoundingBox = IntRect(item.offset, item.size) + return draggingItemKey != item.key && + contentListState.isItemEditable(item.index) && + itemBoundingBox.contains(curDragPositionInGrid.round()) && + // If we swap with the last visible item, and that item doesn't fit + // in the gap created by moving the current item, then the current item + // will get placed after the last visible item. In this case, it gets + // placed outside of the viewport. We avoid this here, so the user + // has to scroll first before the swap can happen. + (item.index != lastVisibleItemIndex || item.span <= draggingItem.span) + } + ) + } else { + state.layoutInfo.visibleItemsInfo + .asSequence() + .filter { item -> contentListState.isItemEditable(item.index) } + .filter { item -> draggingItem.index != item.index } + .firstItemAtOffset(curDragPositionInGrid) + } + + if ( + targetItem != null && + (!communalWidgetResizing() || targetItem.key != previousTargetItemKey) + ) { + val scrollToIndex = + if (targetItem.index == state.firstVisibleItemIndex) { + draggingItem.index + } else if (draggingItem.index == state.firstVisibleItemIndex) { + targetItem.index + } else { + null + } + if (communalWidgetResizing()) { + // Keep track of the previous target item, to avoid rapidly oscillating between + // items if the target item doesn't visually move as a result of the index change. + // In this case, even after the index changes, we'd still be colliding with the + // element, so it would be selected as the target item the next time this function + // runs again, which would trigger us to revert the index change we recently made. + previousTargetItemKey = targetItem.key + } + if (scrollToIndex != null) { + scope.launch { + // this is needed to neutralize automatic keeping the first item first. + state.scrollToItem(scrollToIndex, state.firstVisibleItemScrollOffset) + contentListState.swapItems(draggingItem.index, targetItem.index) + } + } else { + contentListState.swapItems(draggingItem.index, targetItem.index) + } + draggingItemWhileScrolling = targetItem + isDraggingToRemove = false + } else if (targetItem == null) { + isDraggingToRemove = checkForRemove(draggingBoundingBox) + previousTargetItemKey = null + } + } + + /** Calculate the amount dragged out of bound on both sides. Returns 0f if not overscrolled. */ + private fun computeAutoscroll(dragOffset: Offset): Float { + val orientation = state.layoutInfo.orientation + val distanceFromStart = + if (orientation == Orientation.Horizontal) { + dragOffset.x + } else { + dragOffset.y + } + val distanceFromEnd = + if (orientation == Orientation.Horizontal) { + state.layoutInfo.viewportEndOffset - dragOffset.x + } else { + state.layoutInfo.viewportEndOffset - dragOffset.y + } + + return when { + distanceFromEnd < autoScrollThreshold -> { + (columnWidth - state.layoutInfo.beforeContentPadding).toFloat() + } + distanceFromStart < autoScrollThreshold -> { + -(columnWidth - state.layoutInfo.afterContentPadding).toFloat() + } + else -> 0f + } + } + + /** Calls the callback with the updated drag position and returns whether to remove the item. */ + private fun checkForRemove(draggingItemBoundingBox: IntRect): Boolean { + return if (draggingItemDraggedDelta.y < 0) { + updateDragPositionForRemove(draggingItemBoundingBox) + } else { + false + } + } +} + fun Modifier.dragContainer( dragDropState: GridDragDropState, layoutDirection: LayoutDirection, diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt index 6e29e6932629..2f819d183bcc 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt @@ -34,6 +34,7 @@ import com.android.app.animation.Interpolators import com.android.internal.annotations.VisibleForTesting import com.android.systemui.animation.GlyphCallback import com.android.systemui.animation.TextAnimator +import com.android.systemui.animation.TextAnimatorListener import com.android.systemui.animation.TypefaceVariantCacheImpl import com.android.systemui.customization.R import com.android.systemui.log.core.LogLevel @@ -100,7 +101,13 @@ constructor( @VisibleForTesting var textAnimatorFactory: (Layout, () -> Unit) -> TextAnimator = { layout, invalidateCb -> val cache = TypefaceVariantCacheImpl(layout.paint.typeface, NUM_CLOCK_FONT_ANIMATION_STEPS) - TextAnimator(layout, cache, invalidateCb) + TextAnimator( + layout, + cache, + object : TextAnimatorListener { + override fun onInvalidate() = invalidateCb() + }, + ) } // Used by screenshot tests to provide stability diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt index 2af25fe339a2..da9e26ae3812 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/SimpleDigitalClockTextView.kt @@ -24,7 +24,6 @@ import android.graphics.PorterDuff import android.graphics.PorterDuffXfermode import android.graphics.Rect import android.os.VibrationEffect -import android.text.Layout import android.text.TextPaint import android.util.AttributeSet import android.util.Log @@ -39,6 +38,7 @@ import com.android.app.animation.Interpolators import com.android.internal.annotations.VisibleForTesting import com.android.systemui.animation.GSFAxes import com.android.systemui.animation.TextAnimator +import com.android.systemui.animation.TextAnimatorListener import com.android.systemui.customization.R import com.android.systemui.plugins.clocks.ClockFontAxisSetting import com.android.systemui.plugins.clocks.ClockFontAxisSetting.Companion.replace @@ -175,11 +175,6 @@ open class SimpleDigitalClockTextView( private val typefaceCache = clockCtx.typefaceCache.getVariantCache("") - @VisibleForTesting - var textAnimatorFactory: (Layout, () -> Unit) -> TextAnimator = { layout, invalidateCb -> - TextAnimator(layout, typefaceCache, invalidateCb) - } - var verticalAlignment: VerticalAlignment = VerticalAlignment.BASELINE var horizontalAlignment: HorizontalAlignment = HorizontalAlignment.CENTER @@ -247,7 +242,18 @@ open class SimpleDigitalClockTextView( val layout = this.layout if (layout != null) { if (!this::textAnimator.isInitialized) { - textAnimator = textAnimatorFactory(layout, ::invalidate) + textAnimator = + TextAnimator( + layout, + typefaceCache, + object : TextAnimatorListener { + override fun onInvalidate() = invalidate() + + override fun onRebased() = updateTextBounds() + + override fun onPaintModified() = updateTextBounds() + }, + ) setInterpolatorPaint() } else { textAnimator.updateLayout(layout) @@ -272,7 +278,7 @@ open class SimpleDigitalClockTextView( override fun onDraw(canvas: Canvas) { logger.onDraw(textAnimator.textInterpolator.shapedText) - val interpProgress = getInterpolatedProgress() + val interpProgress = textAnimator.progress val interpBounds = getInterpolatedTextBounds(interpProgress) if (interpProgress != drawnProgress) { drawnProgress = interpProgress @@ -336,7 +342,6 @@ open class SimpleDigitalClockTextView( interpolator = aodDozingInterpolator, ), ) - updateTextBoundsForTextAnimator() if (!isAnimated) { requestLayout() @@ -367,11 +372,9 @@ open class SimpleDigitalClockTextView( duration = CHARGE_ANIMATION_DURATION, ), ) - updateTextBoundsForTextAnimator() }, ), ) - updateTextBoundsForTextAnimator() } fun animateFidget(x: Float, y: Float) = animateFidget(0L) @@ -401,11 +404,9 @@ open class SimpleDigitalClockTextView( interpolator = FIDGET_INTERPOLATOR, ), ) - updateTextBoundsForTextAnimator() }, ), ) - updateTextBoundsForTextAnimator() } fun refreshText() { @@ -428,12 +429,8 @@ open class SimpleDigitalClockTextView( id == R.id.MINUTE_SECOND_DIGIT } - private fun getInterpolatedProgress(): Float { - return textAnimator.animator?.let { it.animatedValue as Float } ?: 1f - } - /** Returns the interpolated text bounding rect based on interpolation progress */ - private fun getInterpolatedTextBounds(progress: Float = getInterpolatedProgress()): VRectF { + private fun getInterpolatedTextBounds(progress: Float = textAnimator.progress): VRectF { if (progress <= 0f) { return prevTextBounds } else if (!textAnimator.isRunning || progress >= 1f) { @@ -487,6 +484,15 @@ open class SimpleDigitalClockTextView( MeasureSpec.makeMeasureSpec(measureBounds.x.roundToInt(), mode.x), MeasureSpec.makeMeasureSpec(measureBounds.y.roundToInt(), mode.y), ) + + logger.d({ + val size = VPointF.fromLong(long1) + val mode = VPoint.fromLong(long2) + "setInterpolatedSize(size=$size, mode=$mode)" + }) { + long1 = measureBounds.toLong() + long2 = mode.toLong() + } } /** Set the location of the view to match the interpolated text bounds */ @@ -514,6 +520,9 @@ open class SimpleDigitalClockTextView( targetRect.bottom.roundToInt(), ) onViewBoundsChanged?.let { it(targetRect) } + logger.d({ "setInterpolatedLocation(${VRectF.fromLong(long1)})" }) { + long1 = targetRect.toLong() + } return targetRect } @@ -616,7 +625,8 @@ open class SimpleDigitalClockTextView( * rebase if previous animator is canceled so basePaint will store the state we transition from * and targetPaint will store the state we transition to */ - private fun updateTextBoundsForTextAnimator() { + private fun updateTextBounds() { + drawnProgress = null prevTextBounds = textAnimator.textInterpolator.basePaint.getTextBounds(text) targetTextBounds = textAnimator.textInterpolator.targetPaint.getTextBounds(text) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt index 5249bbe2a861..e8c30bafbba0 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt @@ -58,7 +58,6 @@ import org.mockito.Mockito.verify import org.mockito.Mockito.`when` import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.mockito.kotlin.firstValue @SmallTest @RunWith(AndroidJUnit4::class) @@ -116,12 +115,7 @@ class SideFpsOverlayViewBinderTest : SysuiTestCase() { runCurrent() verify(kosmos.windowManager).addView(any(), any()) - verify(kosmos.windowManager).addView(viewCaptor.capture(), any()) - verify(viewCaptor.firstValue) - .announceForAccessibility( - mContext.getText(R.string.accessibility_side_fingerprint_indicator_label) - ) updateSfpsIndicatorRequests(kosmos, mContext, alternateBouncerRequest = false) runCurrent() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractorTest.kt index 046d92d58978..2ab36501d87d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractorTest.kt @@ -443,4 +443,24 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { Truth.assertThat(currentScene).isEqualTo(CommunalScenes.Communal) assertThat(transitionRepository).noTransitionsStarted() } + + @Test + @EnableFlags(FLAG_GLANCEABLE_HUB_V2) + fun testDoNotTransitionToGlanceableHub_onWakeUpFromAodDueToMotion() = + kosmos.runTest { + setCommunalV2Available(true) + + val currentScene by collectLastValue(communalSceneInteractor.currentScene) + fakeCommunalSceneRepository.changeScene(CommunalScenes.Blank) + + // Communal is not showing + Truth.assertThat(currentScene).isEqualTo(CommunalScenes.Blank) + + powerInteractor.setAwakeForTest(reason = PowerManager.WAKE_REASON_LIFT) + testScope.advanceTimeBy(100) // account for debouncing + + Truth.assertThat(currentScene).isEqualTo(CommunalScenes.Blank) + assertThat(transitionRepository) + .startedTransition(from = KeyguardState.AOD, to = KeyguardState.LOCKSCREEN) + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt index 096c3dafd01c..c3d18a3d893c 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt @@ -20,7 +20,6 @@ import android.os.PowerManager import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags import android.platform.test.flag.junit.FlagsParameterization -import android.provider.Settings import android.service.dream.dreamManager import androidx.test.filters.SmallTest import com.android.compose.animation.scene.ObservableTransitionState @@ -30,8 +29,6 @@ import com.android.systemui.Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR import com.android.systemui.Flags.FLAG_SCENE_CONTAINER import com.android.systemui.Flags.glanceableHubV2 import com.android.systemui.SysuiTestCase -import com.android.systemui.common.data.repository.batteryRepository -import com.android.systemui.common.data.repository.fake import com.android.systemui.communal.data.repository.FakeCommunalSceneRepository import com.android.systemui.communal.data.repository.communalSceneRepository import com.android.systemui.communal.data.repository.fakeCommunalSceneRepository @@ -61,8 +58,6 @@ import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.se import com.android.systemui.power.domain.interactor.powerInteractor import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.testKosmos -import com.android.systemui.user.data.repository.fakeUserRepository -import com.android.systemui.util.settings.fakeSettings import com.google.common.truth.Truth import junit.framework.Assert.assertEquals import kotlinx.coroutines.flow.flowOf @@ -171,15 +166,7 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT fun testTransitionToLockscreen_onWake_canDream_ktfRefactor() = kosmos.runTest { setCommunalAvailable(true) - if (glanceableHubV2()) { - val user = fakeUserRepository.asMainUser() - fakeSettings.putIntForUser( - Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, - 1, - user.id, - ) - batteryRepository.fake.setDevicePluggedIn(true) - } else { + if (!glanceableHubV2()) { whenever(dreamManager.canStartDreaming(anyBoolean())).thenReturn(true) } @@ -226,15 +213,7 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT fun testTransitionToGlanceableHub_onWakeup_ifAvailable() = kosmos.runTest { setCommunalAvailable(true) - if (glanceableHubV2()) { - val user = fakeUserRepository.asMainUser() - fakeSettings.putIntForUser( - Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, - 1, - user.id, - ) - batteryRepository.fake.setDevicePluggedIn(true) - } else { + if (!glanceableHubV2()) { whenever(dreamManager.canStartDreaming(anyBoolean())).thenReturn(true) } @@ -250,6 +229,25 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT } @Test + @DisableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR, FLAG_SCENE_CONTAINER) + @EnableFlags(FLAG_GLANCEABLE_HUB_V2) + fun testTransitionToLockscreen_onWakeupFromLift() = + kosmos.runTest { + setCommunalAvailable(true) + if (!glanceableHubV2()) { + whenever(dreamManager.canStartDreaming(anyBoolean())).thenReturn(true) + } + + // Device turns on. + powerInteractor.setAwakeForTest(reason = PowerManager.WAKE_REASON_LIFT) + testScope.advanceTimeBy(51L) + + // We transition to the lockscreen instead of the hub. + assertThat(transitionRepository) + .startedTransition(from = KeyguardState.DOZING, to = KeyguardState.LOCKSCREEN) + } + + @Test @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR) fun testTransitionToOccluded_onWakeup_whenOccludingActivityOnTop() = kosmos.runTest { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt index 97c746c49cba..d0762a3797c0 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt @@ -25,10 +25,13 @@ import android.view.IRemoteAnimationFinishedCallback import android.view.RemoteAnimationTarget import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.android.internal.widget.LockPatternUtils import com.android.systemui.SysuiTestCase import com.android.systemui.keyguard.WindowManagerLockscreenVisibilityManager import com.android.systemui.keyguard.domain.interactor.KeyguardDismissTransitionInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardShowWhileAwakeInteractor import com.android.systemui.statusbar.policy.KeyguardStateController +import com.android.systemui.user.domain.interactor.SelectedUserInteractor import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.time.FakeSystemClock import com.android.window.flags.Flags @@ -63,6 +66,9 @@ class WindowManagerLockscreenVisibilityManagerTest : SysuiTestCase() { @Mock private lateinit var keyguardDismissTransitionInteractor: KeyguardDismissTransitionInteractor @Mock private lateinit var keyguardTransitions: KeyguardTransitions + @Mock private lateinit var lockPatternUtils: LockPatternUtils + @Mock private lateinit var keyguardShowWhileAwakeInteractor: KeyguardShowWhileAwakeInteractor + @Mock private lateinit var selectedUserInteractor: SelectedUserInteractor @Before fun setUp() { @@ -77,6 +83,9 @@ class WindowManagerLockscreenVisibilityManagerTest : SysuiTestCase() { keyguardSurfaceBehindAnimator = keyguardSurfaceBehindAnimator, keyguardDismissTransitionInteractor = keyguardDismissTransitionInteractor, keyguardTransitions = keyguardTransitions, + selectedUserInteractor = selectedUserInteractor, + lockPatternUtils = lockPatternUtils, + keyguardShowWhileAwakeInteractor = keyguardShowWhileAwakeInteractor, ) } @@ -236,6 +245,8 @@ class WindowManagerLockscreenVisibilityManagerTest : SysuiTestCase() { .whenever(keyguardDismissTransitionInteractor) .startDismissKeyguardTransition(any(), any()) + whenever(selectedUserInteractor.getSelectedUserId()).thenReturn(-1) + underTest.onKeyguardGoingAwayRemoteAnimationStart( transit = 0, apps = arrayOf(mock<RemoteAnimationTarget>()), diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt index 83bee7c66d31..fe213a6ebbf0 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt @@ -458,6 +458,56 @@ class KeyguardRootViewModelTest(flags: FlagsParameterization) : SysuiTestCase() @Test @DisableSceneContainer + fun alpha_shadeExpansionIgnoredWhenTransitioningAwayFromLockscreen() = + testScope.runTest { + val alpha by collectLastValue(underTest.alpha(viewState)) + + keyguardTransitionRepository.sendTransitionSteps( + from = KeyguardState.AOD, + to = KeyguardState.LOCKSCREEN, + testScope, + ) + + shadeTestUtil.setQsExpansion(0f) + assertThat(alpha).isEqualTo(1f) + + keyguardTransitionRepository.sendTransitionSteps( + listOf( + TransitionStep( + from = KeyguardState.LOCKSCREEN, + to = KeyguardState.PRIMARY_BOUNCER, + transitionState = TransitionState.STARTED, + value = 0f, + ), + TransitionStep( + from = KeyguardState.LOCKSCREEN, + to = KeyguardState.PRIMARY_BOUNCER, + transitionState = TransitionState.RUNNING, + value = 0.8f, + ), + ), + testScope, + ) + val priorAlpha = alpha + shadeTestUtil.setQsExpansion(0.5f) + assertThat(alpha).isEqualTo(priorAlpha) + + keyguardTransitionRepository.sendTransitionSteps( + listOf( + TransitionStep( + from = KeyguardState.LOCKSCREEN, + to = KeyguardState.PRIMARY_BOUNCER, + transitionState = TransitionState.FINISHED, + value = 1f, + ) + ), + testScope, + ) + assertThat(alpha).isEqualTo(0f) + } + + @Test + @DisableSceneContainer fun alphaFromShadeExpansion_doesNotEmitWhenTransitionRunning() = testScope.runTest { keyguardTransitionRepository.sendTransitionSteps( diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModelTest.kt index 91cb1ff266c9..9c168298b9a5 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModelTest.kt @@ -26,6 +26,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue import com.android.systemui.coroutines.collectValues import com.android.systemui.flags.BrokenWithSceneContainer +import com.android.systemui.flags.DisableSceneContainer import com.android.systemui.flags.Flags import com.android.systemui.flags.andSceneContainer import com.android.systemui.flags.fakeFeatureFlagsClassic @@ -44,7 +45,7 @@ import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.shade.shadeTestUtil import com.android.systemui.testKosmos import com.google.common.collect.Range -import com.google.common.truth.Truth +import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.test.runCurrent @@ -101,20 +102,30 @@ class LockscreenToPrimaryBouncerTransitionViewModelTest(flags: FlagsParameteriza // immediately 0f repository.sendTransitionStep(step(0f, TransitionState.STARTED)) - runCurrent() - Truth.assertThat(actual).isEqualTo(0f) + assertThat(actual).isEqualTo(0f) repository.sendTransitionStep(step(.2f)) - runCurrent() - Truth.assertThat(actual).isEqualTo(0f) + assertThat(actual).isEqualTo(0f) repository.sendTransitionStep(step(0.8f)) - runCurrent() - Truth.assertThat(actual).isEqualTo(0f) + assertThat(actual).isEqualTo(0f) repository.sendTransitionStep(step(1f, TransitionState.FINISHED)) + assertThat(actual).isEqualTo(0f) + } + + @Test + @DisableSceneContainer + fun lockscreenAlphaEndsWithZero() = + testScope.runTest { + val alpha by collectLastValue(underTest.lockscreenAlpha) + + repository.sendTransitionStep(step(0f, TransitionState.STARTED)) runCurrent() - Truth.assertThat(actual).isEqualTo(0f) + + // Jump right to the end and validate the value + repository.sendTransitionStep(step(1f, TransitionState.FINISHED)) + assertThat(alpha).isEqualTo(0f) } @Test @@ -138,21 +149,17 @@ class LockscreenToPrimaryBouncerTransitionViewModelTest(flags: FlagsParameteriza runCurrent() // fade out repository.sendTransitionStep(step(0f, TransitionState.STARTED)) - runCurrent() - Truth.assertThat(actual).isEqualTo(1f) + assertThat(actual).isEqualTo(1f) repository.sendTransitionStep(step(.1f)) - runCurrent() - Truth.assertThat(actual).isIn(Range.open(.1f, .9f)) + assertThat(actual).isIn(Range.open(.1f, .9f)) // alpha is 1f before the full transition starts ending repository.sendTransitionStep(step(0.8f)) - runCurrent() - Truth.assertThat(actual).isEqualTo(0f) + assertThat(actual).isEqualTo(0f) repository.sendTransitionStep(step(1f, TransitionState.FINISHED)) - runCurrent() - Truth.assertThat(actual).isEqualTo(0f) + assertThat(actual).isEqualTo(0f) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/view/MediaCarouselScrollHandlerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/view/MediaCarouselScrollHandlerTest.kt index 61119cce7bc8..8592c424ca02 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/view/MediaCarouselScrollHandlerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/view/MediaCarouselScrollHandlerTest.kt @@ -235,6 +235,19 @@ class MediaCarouselScrollHandlerTest : SysuiTestCase() { verify(mediaCarousel, never()).animationTargetX = anyFloat() } + @Test + fun testScrollingDisabled_noScroll_notDismissible() { + setupMediaContainer(visibleIndex = 1, showsSettingsButton = false) + + mediaCarouselScrollHandler.scrollingDisabled = true + + clock.advanceTime(DISMISS_DELAY) + executor.runAllReady() + + verify(mediaCarousel, never()).smoothScrollTo(anyInt(), anyInt()) + verify(mediaCarousel, never()).animationTargetX = anyFloat() + } + private fun setupMediaContainer(visibleIndex: Int, showsSettingsButton: Boolean = true) { whenever(contentContainer.childCount).thenReturn(2) val child1: View = mock() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelTest.kt index e3fe24ca37c1..abecf33f611e 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelTest.kt @@ -46,12 +46,14 @@ import com.android.systemui.statusbar.disableflags.shared.model.DisableFlagsMode import com.android.systemui.statusbar.sysuiStatusBarStateController import com.android.systemui.util.animation.DisappearParameters import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent import org.junit.Test import org.junit.runner.RunWith import org.mockito.kotlin.whenever +@OptIn(ExperimentalCoroutinesApi::class) @SmallTest @RunWith(AndroidJUnit4::class) @RunWithLooper @@ -457,6 +459,20 @@ class QSFragmentComposeViewModelTest : AbstractQSFragmentComposeViewModelTest() } } + @Test + fun isEditing() = + with(kosmos) { + testScope.testWithinLifecycle { + underTest.containerViewModel.editModeViewModel.startEditing() + runCurrent() + assertThat(underTest.isEditing).isTrue() + + underTest.containerViewModel.editModeViewModel.stopEditing() + runCurrent() + assertThat(underTest.isEditing).isFalse() + } + } + private fun TestScope.setMediaState(state: MediaState) { with(kosmos) { val activeMedia = state == ACTIVE_MEDIA diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ModesDndTileTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ModesDndTileTest.kt new file mode 100644 index 000000000000..1adba6fcd45d --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ModesDndTileTest.kt @@ -0,0 +1,211 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles + +import android.app.Flags +import android.os.Handler +import android.platform.test.annotations.EnableFlags +import android.service.quicksettings.Tile +import android.testing.TestableLooper +import android.testing.TestableLooper.RunWithLooper +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.internal.logging.MetricsLogger +import com.android.settingslib.notification.modes.TestModeBuilder +import com.android.systemui.SysuiTestCase +import com.android.systemui.classifier.FalsingManagerFake +import com.android.systemui.kosmos.mainCoroutineContext +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.kosmos.testScope +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.qs.QSTile.BooleanState +import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.qs.QSHost +import com.android.systemui.qs.QsEventLogger +import com.android.systemui.qs.logging.QSLogger +import com.android.systemui.qs.shared.QSSettingsPackageRepository +import com.android.systemui.qs.tiles.base.actions.FakeQSTileIntentUserInputHandler +import com.android.systemui.qs.tiles.impl.modes.domain.interactor.ModesDndTileDataInteractor +import com.android.systemui.qs.tiles.impl.modes.domain.interactor.ModesDndTileUserActionInteractor +import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesDndTileModel +import com.android.systemui.qs.tiles.impl.modes.ui.ModesDndTileMapper +import com.android.systemui.qs.tiles.viewmodel.QSTileConfigProvider +import com.android.systemui.qs.tiles.viewmodel.QSTileConfigTestBuilder +import com.android.systemui.qs.tiles.viewmodel.QSTileUIConfig +import com.android.systemui.res.R +import com.android.systemui.statusbar.policy.data.repository.zenModeRepository +import com.android.systemui.statusbar.policy.domain.interactor.zenModeInteractor +import com.android.systemui.statusbar.policy.ui.dialog.ModesDialogDelegate +import com.android.systemui.statusbar.policy.ui.dialog.modesDialogEventLogger +import com.android.systemui.testKosmos +import com.android.systemui.util.mockito.any +import com.android.systemui.util.settings.FakeSettings +import com.android.systemui.util.settings.SecureSettings +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.After +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.MockitoAnnotations +import org.mockito.kotlin.whenever + +@EnableFlags(Flags.FLAG_MODES_UI) +@SmallTest +@RunWith(AndroidJUnit4::class) +@RunWithLooper(setAsMainLooper = true) +class ModesDndTileTest : SysuiTestCase() { + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + private val testDispatcher = kosmos.testDispatcher + + @Mock private lateinit var qsHost: QSHost + + @Mock private lateinit var metricsLogger: MetricsLogger + + @Mock private lateinit var statusBarStateController: StatusBarStateController + + @Mock private lateinit var activityStarter: ActivityStarter + + @Mock private lateinit var qsLogger: QSLogger + + @Mock private lateinit var uiEventLogger: QsEventLogger + + @Mock private lateinit var qsTileConfigProvider: QSTileConfigProvider + + @Mock private lateinit var dialogDelegate: ModesDialogDelegate + + @Mock private lateinit var settingsPackageRepository: QSSettingsPackageRepository + + private val inputHandler = FakeQSTileIntentUserInputHandler() + private val zenModeRepository = kosmos.zenModeRepository + private val tileDataInteractor = + ModesDndTileDataInteractor(context, kosmos.zenModeInteractor, testDispatcher) + private val mapper = ModesDndTileMapper(context.resources, context.theme) + + private lateinit var userActionInteractor: ModesDndTileUserActionInteractor + private lateinit var secureSettings: SecureSettings + private lateinit var testableLooper: TestableLooper + private lateinit var underTest: ModesDndTile + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + testableLooper = TestableLooper.get(this) + secureSettings = FakeSettings() + + // Allow the tile to load resources + whenever(qsHost.context).thenReturn(context) + whenever(qsHost.userContext).thenReturn(context) + + whenever(qsTileConfigProvider.getConfig(any())) + .thenReturn( + QSTileConfigTestBuilder.build { + uiConfig = + QSTileUIConfig.Resource( + iconRes = R.drawable.qs_dnd_icon_off, + labelRes = R.string.quick_settings_dnd_label, + ) + } + ) + + userActionInteractor = + ModesDndTileUserActionInteractor( + kosmos.mainCoroutineContext, + inputHandler, + dialogDelegate, + kosmos.zenModeInteractor, + kosmos.modesDialogEventLogger, + settingsPackageRepository, + ) + + underTest = + ModesDndTile( + qsHost, + uiEventLogger, + testableLooper.looper, + Handler(testableLooper.looper), + FalsingManagerFake(), + metricsLogger, + statusBarStateController, + activityStarter, + qsLogger, + qsTileConfigProvider, + tileDataInteractor, + mapper, + userActionInteractor, + ) + + underTest.initialize() + underTest.setListening(Object(), true) + + testableLooper.processAllMessages() + } + + @After + fun tearDown() { + underTest.destroy() + testableLooper.processAllMessages() + } + + @Test + fun stateUpdatesOnChange() = + testScope.runTest { + assertThat(underTest.state.state).isEqualTo(Tile.STATE_INACTIVE) + + zenModeRepository.activateMode(TestModeBuilder.MANUAL_DND) + runCurrent() + testableLooper.processAllMessages() + + assertThat(underTest.state.state).isEqualTo(Tile.STATE_ACTIVE) + } + + @Test + fun handleUpdateState_withModel_updatesState() = + testScope.runTest { + val tileState = + BooleanState().apply { + state = Tile.STATE_INACTIVE + secondaryLabel = "Old secondary label" + } + val model = ModesDndTileModel(isActivated = true) + + underTest.handleUpdateState(tileState, model) + + assertThat(tileState.state).isEqualTo(Tile.STATE_ACTIVE) + assertThat(tileState.secondaryLabel).isEqualTo("On") + } + + @Test + fun handleUpdateState_withNull_updatesState() = + testScope.runTest { + val tileState = + BooleanState().apply { + state = Tile.STATE_INACTIVE + secondaryLabel = "Old secondary label" + } + zenModeRepository.activateMode(TestModeBuilder.MANUAL_DND) + runCurrent() + + underTest.handleUpdateState(tileState, null) + + assertThat(tileState.state).isEqualTo(Tile.STATE_ACTIVE) + assertThat(tileState.secondaryLabel).isEqualTo("On") + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileDataInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileDataInteractorTest.kt new file mode 100644 index 000000000000..23d7b86df875 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileDataInteractorTest.kt @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles.impl.modes.domain.interactor + +import android.app.Flags +import android.os.UserHandle +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.settingslib.notification.modes.TestModeBuilder +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.kosmos.testScope +import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger +import com.android.systemui.statusbar.policy.data.repository.fakeZenModeRepository +import com.android.systemui.statusbar.policy.domain.interactor.zenModeInteractor +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.toCollection +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@OptIn(ExperimentalCoroutinesApi::class) +@SmallTest +@EnableFlags(Flags.FLAG_MODES_UI) +@RunWith(AndroidJUnit4::class) +class ModesDndTileDataInteractorTest : SysuiTestCase() { + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + private val dispatcher = kosmos.testDispatcher + private val zenModeRepository = kosmos.fakeZenModeRepository + + private val underTest by lazy { + ModesDndTileDataInteractor(context, kosmos.zenModeInteractor, dispatcher) + } + + @Test + @EnableFlags(Flags.FLAG_MODES_UI_DND_TILE) + fun availability_flagOn_isTrue() = + testScope.runTest { + val availability = underTest.availability(TEST_USER).toCollection(mutableListOf()) + + assertThat(availability).containsExactly(true) + } + + @Test + @DisableFlags(Flags.FLAG_MODES_UI_DND_TILE) + fun availability_flagOff_isFalse() = + testScope.runTest { + val availability = underTest.availability(TEST_USER).toCollection(mutableListOf()) + + assertThat(availability).containsExactly(false) + } + + @Test + fun tileData_dndChanges_updateActivated() = + testScope.runTest { + val model by + collectLastValue( + underTest.tileData(TEST_USER, flowOf(DataUpdateTrigger.InitialRequest)) + ) + + runCurrent() + assertThat(model!!.isActivated).isFalse() + + zenModeRepository.activateMode(TestModeBuilder.MANUAL_DND) + runCurrent() + assertThat(model!!.isActivated).isTrue() + + zenModeRepository.deactivateMode(TestModeBuilder.MANUAL_DND) + runCurrent() + assertThat(model!!.isActivated).isFalse() + } + + @Test + fun tileData_otherModeChanges_notActivated() = + testScope.runTest { + val model by + collectLastValue( + underTest.tileData(TEST_USER, flowOf(DataUpdateTrigger.InitialRequest)) + ) + + runCurrent() + assertThat(model!!.isActivated).isFalse() + + zenModeRepository.addMode("Other mode") + runCurrent() + assertThat(model!!.isActivated).isFalse() + + zenModeRepository.activateMode("Other mode") + runCurrent() + assertThat(model!!.isActivated).isFalse() + } + + private companion object { + val TEST_USER = UserHandle.of(1)!! + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileUserActionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileUserActionInteractorTest.kt new file mode 100644 index 000000000000..0a35b428bbc9 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileUserActionInteractorTest.kt @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles.impl.modes.domain.interactor + +import android.platform.test.annotations.EnableFlags +import android.provider.Settings +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.settingslib.notification.modes.TestModeBuilder.MANUAL_DND +import com.android.systemui.SysuiTestCase +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.kosmos.mainCoroutineContext +import com.android.systemui.kosmos.testScope +import com.android.systemui.qs.shared.QSSettingsPackageRepository +import com.android.systemui.qs.tiles.base.actions.QSTileIntentUserInputHandlerSubject +import com.android.systemui.qs.tiles.base.actions.qsTileIntentUserInputHandler +import com.android.systemui.qs.tiles.base.interactor.QSTileInputTestKtx +import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesDndTileModel +import com.android.systemui.statusbar.policy.data.repository.zenModeRepository +import com.android.systemui.statusbar.policy.domain.interactor.zenModeInteractor +import com.android.systemui.statusbar.policy.ui.dialog.mockModesDialogDelegate +import com.android.systemui.statusbar.policy.ui.dialog.modesDialogEventLogger +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +@EnableFlags(android.app.Flags.FLAG_MODES_UI) +class ModesDndTileUserActionInteractorTest : SysuiTestCase() { + + private val kosmos = testKosmos() + private val testScope = kosmos.testScope + private val inputHandler = kosmos.qsTileIntentUserInputHandler + private val mockDialogDelegate = kosmos.mockModesDialogDelegate + private val zenModeRepository = kosmos.zenModeRepository + private val zenModeInteractor = kosmos.zenModeInteractor + private val settingsPackageRepository = mock<QSSettingsPackageRepository>() + + private val underTest = + ModesDndTileUserActionInteractor( + kosmos.mainCoroutineContext, + inputHandler, + mockDialogDelegate, + zenModeInteractor, + kosmos.modesDialogEventLogger, + settingsPackageRepository, + ) + + @Before + fun setUp() { + whenever(settingsPackageRepository.getSettingsPackageName()).thenReturn(SETTINGS_PACKAGE) + } + + @Test + fun handleClick_dndActive_deactivatesDnd() = + testScope.runTest { + val dndMode by collectLastValue(zenModeInteractor.dndMode) + zenModeRepository.activateMode(MANUAL_DND) + assertThat(dndMode?.isActive).isTrue() + + underTest.handleInput(QSTileInputTestKtx.click(data = ModesDndTileModel(true))) + + assertThat(dndMode?.isActive).isFalse() + } + + @Test + fun handleClick_dndInactive_activatesDnd() = + testScope.runTest { + val dndMode by collectLastValue(zenModeInteractor.dndMode) + assertThat(dndMode?.isActive).isFalse() + + underTest.handleInput(QSTileInputTestKtx.click(data = ModesDndTileModel(false))) + + assertThat(dndMode?.isActive).isTrue() + } + + @Test + fun handleLongClick_active_opensSettings() = + testScope.runTest { + zenModeRepository.activateMode(MANUAL_DND) + runCurrent() + + underTest.handleInput(QSTileInputTestKtx.longClick(ModesDndTileModel(true))) + + QSTileIntentUserInputHandlerSubject.assertThat(inputHandler).handledOneIntentInput { + assertThat(it.intent.`package`).isEqualTo(SETTINGS_PACKAGE) + assertThat(it.intent.action).isEqualTo(Settings.ACTION_AUTOMATIC_ZEN_RULE_SETTINGS) + assertThat(it.intent.getStringExtra(Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID)) + .isEqualTo(MANUAL_DND.id) + } + } + + @Test + fun handleLongClick_inactive_opensSettings() = + testScope.runTest { + zenModeRepository.activateMode(MANUAL_DND) + zenModeRepository.deactivateMode(MANUAL_DND) + runCurrent() + + underTest.handleInput(QSTileInputTestKtx.longClick(ModesDndTileModel(false))) + + QSTileIntentUserInputHandlerSubject.assertThat(inputHandler).handledOneIntentInput { + assertThat(it.intent.`package`).isEqualTo(SETTINGS_PACKAGE) + assertThat(it.intent.action).isEqualTo(Settings.ACTION_AUTOMATIC_ZEN_RULE_SETTINGS) + assertThat(it.intent.getStringExtra(Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID)) + .isEqualTo(MANUAL_DND.id) + } + } + + companion object { + private const val SETTINGS_PACKAGE = "the.settings.package" + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesDndTileMapperTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesDndTileMapperTest.kt new file mode 100644 index 000000000000..29f642a4325d --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesDndTileMapperTest.kt @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles.impl.modes.ui + +import android.app.Flags +import android.graphics.drawable.TestStubDrawable +import android.platform.test.annotations.EnableFlags +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.common.shared.model.Icon +import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesDndTileModel +import com.android.systemui.qs.tiles.viewmodel.QSTileConfigTestBuilder +import com.android.systemui.qs.tiles.viewmodel.QSTileState +import com.android.systemui.qs.tiles.viewmodel.QSTileUIConfig +import com.android.systemui.res.R +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +@EnableFlags(Flags.FLAG_MODES_UI) +class ModesDndTileMapperTest : SysuiTestCase() { + val config = + QSTileConfigTestBuilder.build { + uiConfig = + QSTileUIConfig.Resource( + iconRes = R.drawable.qs_dnd_icon_off, + labelRes = R.string.quick_settings_modes_label, + ) + } + + val underTest = + ModesDndTileMapper( + context.orCreateTestableResources + .apply { + addOverride(R.drawable.qs_dnd_icon_on, TestStubDrawable()) + addOverride(R.drawable.qs_dnd_icon_off, TestStubDrawable()) + } + .resources, + context.theme, + ) + + @Test + fun map_inactiveState() { + val model = ModesDndTileModel(isActivated = false) + + val state = underTest.map(config, model) + + assertThat(state.activationState).isEqualTo(QSTileState.ActivationState.INACTIVE) + assertThat((state.icon as Icon.Loaded).res).isEqualTo(R.drawable.qs_dnd_icon_off) + assertThat(state.secondaryLabel).isEqualTo("Off") + } + + @Test + fun map_activeState() { + val model = ModesDndTileModel(isActivated = true) + + val state = underTest.map(config, model) + + assertThat(state.activationState).isEqualTo(QSTileState.ActivationState.ACTIVE) + assertThat((state.icon as Icon.Loaded).res).isEqualTo(R.drawable.qs_dnd_icon_on) + assertThat(state.secondaryLabel).isEqualTo("On") + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java index 4a304071ee97..3788049256a2 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java @@ -40,6 +40,9 @@ import android.app.IActivityManager; import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.graphics.Rect; +import android.platform.test.annotations.RequiresFlagsDisabled; +import android.platform.test.flag.junit.CheckFlagsRule; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.platform.test.flag.junit.FlagsParameterization; import android.testing.TestableLooper.RunWithLooper; import android.view.View; @@ -49,6 +52,7 @@ import androidx.test.filters.SmallTest; import com.android.app.viewcapture.ViewCaptureAwareWindowManager; import com.android.internal.colorextraction.ColorExtractor; +import com.android.systemui.Flags; import com.android.systemui.SysuiTestCase; import com.android.systemui.biometrics.AuthController; import com.android.systemui.colorextraction.SysuiColorExtractor; @@ -74,6 +78,7 @@ import com.android.systemui.user.domain.interactor.SelectedUserInteractor; import com.google.common.util.concurrent.MoreExecutors; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -92,6 +97,9 @@ import java.util.concurrent.Executor; @RunWithLooper(setAsMainLooper = true) @SmallTest public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { + @Rule public final CheckFlagsRule checkFlagsRule = + DeviceFlagsValueProvider.createCheckFlagsRule(); + @Mock private ViewCaptureAwareWindowManager mWindowManager; @Mock private DozeParameters mDozeParameters; @Spy private final NotificationShadeWindowView mNotificationShadeWindowView = spy( @@ -265,6 +273,7 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { } @Test + @RequiresFlagsDisabled(Flags.FLAG_DISABLE_BLURRED_SHADE_VISIBLE) public void setBackgroundBlurRadius_expandedWithBlurs() { mNotificationShadeWindowController.setBackgroundBlurRadius(10); verify(mNotificationShadeWindowView).setVisibility(eq(View.VISIBLE)); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java index 72b003f9f463..998a7ea805a2 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java @@ -33,7 +33,7 @@ import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS; import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_NONE; import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_PUBLIC; -import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_SENSITIVE_CONTENT; +import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_OTP; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; @@ -693,7 +693,7 @@ public class NotificationLockscreenUserManagerTest extends SysuiTestCase { mLockscreenUserManager.mConnectedToWifi.set(false); // Sensitive Content notifications are always redacted - assertEquals(REDACTION_TYPE_SENSITIVE_CONTENT, + assertEquals(REDACTION_TYPE_OTP, mLockscreenUserManager.getRedactionType(mSensitiveContentNotif)); } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt index 8165d45c93df..3ecf302204bc 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt @@ -32,23 +32,19 @@ import com.android.systemui.dump.DumpManager import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.kosmos.testScope import com.android.systemui.plugins.statusbar.StatusBarStateController -import com.android.systemui.res.R import com.android.systemui.shade.ShadeExpansionChangeEvent -import com.android.systemui.shared.Flags as SharedFlags +import com.android.systemui.shade.domain.interactor.ShadeModeInteractor import com.android.systemui.statusbar.phone.BiometricUnlockController import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.phone.ScrimController -import com.android.systemui.statusbar.policy.FakeConfigurationController import com.android.systemui.statusbar.policy.KeyguardStateController -import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController import com.android.systemui.testKosmos import com.android.systemui.util.WallpaperController import com.android.systemui.util.mockito.eq +import com.android.systemui.wallpapers.domain.interactor.WallpaperInteractor import com.android.systemui.window.domain.interactor.WindowRootViewBlurInteractor import com.android.wm.shell.appzoomout.AppZoomOut import com.google.common.truth.Truth.assertThat -import java.util.Optional -import java.util.function.Consumer import org.junit.Before import org.junit.Rule import org.junit.Test @@ -69,6 +65,8 @@ import org.mockito.Mockito.reset import org.mockito.Mockito.verify import org.mockito.Mockito.`when` import org.mockito.junit.MockitoJUnit +import java.util.Optional +import java.util.function.Consumer @RunWith(AndroidJUnit4::class) @RunWithLooper @@ -76,7 +74,7 @@ import org.mockito.junit.MockitoJUnit class NotificationShadeDepthControllerTest : SysuiTestCase() { private val kosmos = testKosmos() - @Mock private lateinit var windowRootViewBlurInteractor: WindowRootViewBlurInteractor + private val applicationScope = kosmos.testScope.backgroundScope @Mock private lateinit var statusBarStateController: StatusBarStateController @Mock private lateinit var blurUtils: BlurUtils @Mock private lateinit var biometricUnlockController: BiometricUnlockController @@ -84,7 +82,10 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { @Mock private lateinit var keyguardInteractor: KeyguardInteractor @Mock private lateinit var choreographer: Choreographer @Mock private lateinit var wallpaperController: WallpaperController + @Mock private lateinit var wallpaperInteractor: WallpaperInteractor @Mock private lateinit var notificationShadeWindowController: NotificationShadeWindowController + @Mock private lateinit var windowRootViewBlurInteractor: WindowRootViewBlurInteractor + @Mock private lateinit var shadeModeInteractor: ShadeModeInteractor @Mock private lateinit var dumpManager: DumpManager @Mock private lateinit var appZoomOutOptional: Optional<AppZoomOut> @Mock private lateinit var root: View @@ -101,7 +102,6 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { private var statusBarState = StatusBarState.SHADE private val maxBlur = 150 private lateinit var notificationShadeDepthController: NotificationShadeDepthController - private val configurationController = FakeConfigurationController() @Before fun setup() { @@ -128,14 +128,14 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { keyguardInteractor, choreographer, wallpaperController, + wallpaperInteractor, notificationShadeWindowController, dozeParameters, - context, - ResourcesSplitShadeStateController(), + shadeModeInteractor, windowRootViewBlurInteractor, appZoomOutOptional, - dumpManager, - configurationController, + applicationScope, + dumpManager ) notificationShadeDepthController.shadeAnimation = shadeAnimation notificationShadeDepthController.brightnessMirrorSpring = brightnessSpring @@ -310,19 +310,21 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { } @Test - @DisableFlags(SharedFlags.FLAG_AMBIENT_AOD) - fun onDozeAmountChanged_appliesBlur() { + fun onDozeAmountChanged_doesNotApplyBlurWithAmbientAod() { + notificationShadeDepthController.wallpaperSupportsAmbientMode = false + statusBarStateListener.onDozeAmountChanged(1f, 1f) notificationShadeDepthController.updateBlurCallback.doFrame(0) - verify(blurUtils).applyBlur(any(), eq(maxBlur), eq(false)) + verify(blurUtils).applyBlur(any(), eq(0), eq(false)) } @Test - @EnableFlags(SharedFlags.FLAG_AMBIENT_AOD) - fun onDozeAmountChanged_doesNotApplyBlurWithAmbientAod() { + fun onDozeAmountChanged_appliesBlurWithAmbientAod() { + notificationShadeDepthController.wallpaperSupportsAmbientMode = true + statusBarStateListener.onDozeAmountChanged(1f, 1f) notificationShadeDepthController.updateBlurCallback.doFrame(0) - verify(blurUtils).applyBlur(any(), eq(0), eq(false)) + verify(blurUtils).applyBlur(any(), eq(maxBlur), eq(false)) } @Test @@ -486,15 +488,10 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { } private fun enableSplitShade() { - setSplitShadeEnabled(true) + `when` (shadeModeInteractor.isSplitShade).thenReturn(true) } private fun disableSplitShade() { - setSplitShadeEnabled(false) - } - - private fun setSplitShadeEnabled(enabled: Boolean) { - overrideResource(R.bool.config_use_split_notification_shade, enabled) - configurationController.notifyConfigurationChanged() + `when` (shadeModeInteractor.isSplitShade).thenReturn(false) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt index 4993b5661373..b5cfc7e9080d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt @@ -573,6 +573,8 @@ class NotifChipsViewModelTest : SysuiTestCase() { assertThat(latest!![0]).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java) assertThat((latest!![0] as OngoingActivityChipModel.Active.Timer).startTimeMs) .isEqualTo(whenElapsed) + assertThat((latest!![0] as OngoingActivityChipModel.Active.Timer).isEventInFuture) + .isFalse() } @Test @@ -608,6 +610,8 @@ class NotifChipsViewModelTest : SysuiTestCase() { assertThat(latest!![0]).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java) assertThat((latest!![0] as OngoingActivityChipModel.Active.Timer).startTimeMs) .isEqualTo(whenElapsed) + assertThat((latest!![0] as OngoingActivityChipModel.Active.Timer).isEventInFuture) + .isTrue() } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/ChronometerStateTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/ChronometerStateTest.kt index 4e92540396d3..cd9970cfa614 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/ChronometerStateTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/ChronometerStateTest.kt @@ -35,55 +35,153 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) class ChronometerStateTest : SysuiTestCase() { - private lateinit var mockTimeSource: MutableTimeSource + private lateinit var fakeTimeSource: MutableTimeSource @Before fun setup() { - mockTimeSource = MutableTimeSource() + fakeTimeSource = MutableTimeSource() } @Test - fun initialText_isCorrect() = runTest { - val state = ChronometerState(mockTimeSource, 0L) - assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(0)) + fun initialText_isEventInFutureFalse_timeIsNow() = runTest { + fakeTimeSource.time = 3_000 + val state = + ChronometerState(fakeTimeSource, eventTimeMillis = 3_000, isEventInFuture = false) + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 0)) } @Test - fun textUpdates_withTime() = runTest { - val startTime = 1000L - val state = ChronometerState(mockTimeSource, startTime) + fun initialText_isEventInFutureFalse_timeInPast() = runTest { + fakeTimeSource.time = 3_000 + val state = + ChronometerState(fakeTimeSource, eventTimeMillis = 1_000, isEventInFuture = false) + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 2)) + } + + @Test + fun initialText_isEventInFutureFalse_timeInFuture() = runTest { + fakeTimeSource.time = 3_000 + val state = + ChronometerState(fakeTimeSource, eventTimeMillis = 5_000, isEventInFuture = false) + // When isEventInFuture=false, eventTimeMillis needs to be in the past if we want text to + // show + assertThat(state.currentTimeText).isNull() + } + + @Test + fun initialText_isEventInFutureTrue_timeIsNow() = runTest { + fakeTimeSource.time = 3_000 + val state = + ChronometerState(fakeTimeSource, eventTimeMillis = 3_000, isEventInFuture = true) + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 0)) + } + + @Test + fun initialText_isEventInFutureTrue_timeInFuture() = runTest { + fakeTimeSource.time = 3_000 + val state = + ChronometerState(fakeTimeSource, eventTimeMillis = 5_000, isEventInFuture = true) + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 2)) + } + + @Test + fun initialText_isEventInFutureTrue_timeInPast() = runTest { + fakeTimeSource.time = 3_000 + val state = + ChronometerState(fakeTimeSource, eventTimeMillis = 1_000, isEventInFuture = true) + // When isEventInFuture=true, eventTimeMillis needs to be in the future if we want text to + // show + assertThat(state.currentTimeText).isNull() + } + + @Test + fun textUpdates_isEventInFutureFalse_timeInPast() = runTest { + val eventTime = 1000L + val state = ChronometerState(fakeTimeSource, eventTime, isEventInFuture = false) val job = launch { state.run() } val elapsedTime = 5000L - mockTimeSource.time = startTime + elapsedTime + fakeTimeSource.time = eventTime + elapsedTime advanceTimeBy(elapsedTime) assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(elapsedTime / 1000)) + val additionalTime = 6000L + fakeTimeSource.time += additionalTime + advanceTimeBy(additionalTime) + assertThat(state.currentTimeText) + .isEqualTo(formatElapsedTime((elapsedTime + additionalTime) / 1000)) + job.cancelAndJoin() } @Test - fun textUpdates_toLargerValue() = runTest { - val startTime = 1000L - val state = ChronometerState(mockTimeSource, startTime) + fun textUpdates_isEventInFutureFalse_timeChangesFromFutureToPast() = runTest { + val eventTime = 15_000L + val state = ChronometerState(fakeTimeSource, eventTime, isEventInFuture = false) val job = launch { state.run() } - val elapsedTime = 15000L - mockTimeSource.time = startTime + elapsedTime - advanceTimeBy(elapsedTime) - assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(elapsedTime / 1000)) + // WHEN the time is 5 but the eventTime is 15 + fakeTimeSource.time = 5_000L + advanceTimeBy(5_000L) + // THEN no text is shown + assertThat(state.currentTimeText).isNull() + + // WHEN the time advances to 40 + fakeTimeSource.time = 40_000L + advanceTimeBy(35_000) + // THEN text is shown as 25 seconds (40 - 15) + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 25)) job.cancelAndJoin() } @Test - fun textUpdates_afterResettingBase() = runTest { + fun textUpdates_isEventInFutureTrue_timeInFuture() = runTest { + val eventTime = 15_000L + val state = ChronometerState(fakeTimeSource, eventTime, isEventInFuture = true) + val job = launch { state.run() } + + fakeTimeSource.time = 5_000L + advanceTimeBy(5_000L) + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 10)) + + val additionalTime = 6000L + fakeTimeSource.time += additionalTime + advanceTimeBy(additionalTime) + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 4)) + + job.cancelAndJoin() + } + + @Test + fun textUpdates_isEventInFutureTrue_timeChangesFromFutureToPast() = runTest { + val eventTime = 15_000L + val state = ChronometerState(fakeTimeSource, eventTime, isEventInFuture = true) + val job = launch { state.run() } + + // WHEN the time is 5 and the eventTime is 15 + fakeTimeSource.time = 5_000L + advanceTimeBy(5_000L) + // THEN 10 seconds is shown + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 10)) + + // WHEN the time advances to 40 (past the event time) + fakeTimeSource.time = 40_000L + advanceTimeBy(35_000) + // THEN no text is shown + assertThat(state.currentTimeText).isNull() + + job.cancelAndJoin() + } + + @Test + fun textUpdates_afterResettingBase_isEventInFutureFalse() = runTest { val initialElapsedTime = 30000L val startTime = 50000L - val state = ChronometerState(mockTimeSource, startTime) + val state = ChronometerState(fakeTimeSource, startTime, isEventInFuture = false) val job = launch { state.run() } - mockTimeSource.time = startTime + initialElapsedTime + fakeTimeSource.time = startTime + initialElapsedTime advanceTimeBy(initialElapsedTime) assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(initialElapsedTime / 1000)) @@ -91,15 +189,68 @@ class ChronometerStateTest : SysuiTestCase() { val newElapsedTime = 5000L val newStartTime = 100000L - val newState = ChronometerState(mockTimeSource, newStartTime) + val newState = ChronometerState(fakeTimeSource, newStartTime, isEventInFuture = false) val newJob = launch { newState.run() } - mockTimeSource.time = newStartTime + newElapsedTime + fakeTimeSource.time = newStartTime + newElapsedTime advanceTimeBy(newElapsedTime) assertThat(newState.currentTimeText).isEqualTo(formatElapsedTime(newElapsedTime / 1000)) newJob.cancelAndJoin() } + + @Test + fun textUpdates_afterResettingBase_isEventInFutureTrue() = runTest { + val initialElapsedTime = 40_000L + val eventTime = 50_000L + val state = ChronometerState(fakeTimeSource, eventTime, isEventInFuture = true) + val job = launch { state.run() } + + fakeTimeSource.time = initialElapsedTime + advanceTimeBy(initialElapsedTime) + // Time should be 50 - 40 = 10 + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 10)) + + job.cancelAndJoin() + + val newElapsedTime = 75_000L + val newEventTime = 100_000L + val newState = ChronometerState(fakeTimeSource, newEventTime, isEventInFuture = true) + val newJob = launch { newState.run() } + + fakeTimeSource.time = newElapsedTime + advanceTimeBy(newElapsedTime - initialElapsedTime) + // Time should be 100 - 75 = 25 + assertThat(newState.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 25)) + + newJob.cancelAndJoin() + } + + @Test + fun textUpdates_afterResettingisEventInFuture() = runTest { + val initialElapsedTime = 40_000L + val eventTime = 50_000L + val state = ChronometerState(fakeTimeSource, eventTime, isEventInFuture = true) + val job = launch { state.run() } + + fakeTimeSource.time = initialElapsedTime + advanceTimeBy(initialElapsedTime) + // Time should be 50 - 40 = 10 + assertThat(state.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 10)) + + job.cancelAndJoin() + + val newElapsedTime = 70_000L + val newState = ChronometerState(fakeTimeSource, eventTime, isEventInFuture = false) + val newJob = launch { newState.run() } + + fakeTimeSource.time = newElapsedTime + advanceTimeBy(newElapsedTime - initialElapsedTime) + // Time should be 70 - 50 = 20 + assertThat(newState.currentTimeText).isEqualTo(formatElapsedTime(/* elapsedSeconds= */ 20)) + + newJob.cancelAndJoin() + } } /** A fake implementation of [TimeSource] that allows the caller to set the current time */ diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt index f06244f4f637..7135cf01394a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt @@ -931,7 +931,40 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { } @Test - fun visibleChipKeys_fourPromotedNotifs_topThreeInList() = + @DisableChipsModernization + fun visibleChipKeys_chipsModOff_threePromotedNotifs_topTwoInList() = + kosmos.runTest { + val latest by collectLastValue(underTest.visibleChipKeys) + + setNotifs( + listOf( + activeNotificationModel( + key = "firstNotif", + statusBarChipIcon = createStatusBarIconViewOrNull(), + promotedContent = + PromotedNotificationContentModel.Builder("firstNotif").build(), + ), + activeNotificationModel( + key = "secondNotif", + statusBarChipIcon = createStatusBarIconViewOrNull(), + promotedContent = + PromotedNotificationContentModel.Builder("secondNotif").build(), + ), + activeNotificationModel( + key = "thirdNotif", + statusBarChipIcon = createStatusBarIconViewOrNull(), + promotedContent = + PromotedNotificationContentModel.Builder("thirdNotif").build(), + ), + ) + ) + + assertThat(latest).containsExactly("firstNotif", "secondNotif").inOrder() + } + + @Test + @EnableChipsModernization + fun visibleChipKeys_chipsModOn_fourPromotedNotifs_topThreeInList() = kosmos.runTest { val latest by collectLastValue(underTest.visibleChipKeys) @@ -1069,7 +1102,37 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { } @Test - fun visibleChipKeys_screenRecordAndCallAndPromotedNotifs_topThreeInList() = + @DisableChipsModernization + fun visibleChipKeys_chipsModOff_screenRecordAndCallAndPromotedNotifs_topTwoInList() = + kosmos.runTest { + val latest by collectLastValue(underTest.visibleChipKeys) + + val callNotificationKey = "call" + addOngoingCallState(callNotificationKey) + screenRecordState.value = ScreenRecordModel.Recording + activeNotificationListRepository.addNotif( + activeNotificationModel( + key = "notif1", + statusBarChipIcon = createStatusBarIconViewOrNull(), + promotedContent = PromotedNotificationContentModel.Builder("notif1").build(), + ) + ) + activeNotificationListRepository.addNotif( + activeNotificationModel( + key = "notif2", + statusBarChipIcon = createStatusBarIconViewOrNull(), + promotedContent = PromotedNotificationContentModel.Builder("notif2").build(), + ) + ) + + assertThat(latest) + .containsExactly(ScreenRecordChipViewModel.KEY, callNotificationKey) + .inOrder() + } + + @Test + @EnableChipsModernization + fun visibleChipKeys_chipsModOn_screenRecordAndCallAndPromotedNotifs_topThreeInList() = kosmos.runTest { val latest by collectLastValue(underTest.visibleChipKeys) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinatorTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinatorTest.java index 65763a359c0f..f9405af3f85d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinatorTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinatorTest.java @@ -16,7 +16,9 @@ package com.android.systemui.statusbar.notification.collection.coordinator; +import static android.app.NotificationChannel.SYSTEM_RESERVED_IDS; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; +import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST; @@ -340,6 +342,13 @@ public class RankingCoordinatorTest extends SysuiTestCase { } @Test + public void testAlertingSectioner_rejectsBundle() { + for (String id : SYSTEM_RESERVED_IDS) { + assertFalse(mAlertingSectioner.isInSection(makeClassifiedNotifEntry(id))); + } + } + + @Test public void statusBarStateCallbackTest() { mStatusBarStateCallback.onDozeAmountChanged(1f, 1f); verify(mInvalidationListener, times(1)) @@ -392,4 +401,11 @@ public class RankingCoordinatorTest extends SysuiTestCase { .build()); assertEquals(ambient, mEntry.getRanking().isAmbient()); } + + private NotificationEntry makeClassifiedNotifEntry(String channelId) { + NotificationChannel channel = new NotificationChannel(channelId, channelId, IMPORTANCE_LOW); + return new NotificationEntryBuilder() + .updateRanking((rankingBuilder -> rankingBuilder.setChannel(channel))) + .build(); + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractorImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractorImplTest.kt index 3116143504eb..893c17998a17 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractorImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractorImplTest.kt @@ -376,12 +376,67 @@ class PromotedNotificationContentExtractorImplTest : SysuiTestCase() { @Test @EnableFlags(PromotedNotificationUi.FLAG_NAME, StatusBarNotifChips.FLAG_NAME) fun extractContent_fromBigTextStyle() { - val entry = createEntry { setStyle(BigTextStyle()) } + val entry = createEntry { + setContentTitle(TEST_CONTENT_TITLE) + setContentText(TEST_CONTENT_TEXT) + setStyle( + BigTextStyle() + .bigText(TEST_BIG_TEXT) + .setBigContentTitle(TEST_BIG_CONTENT_TITLE) + .setSummaryText(TEST_SUMMARY_TEXT) + ) + } + + val content = extractContent(entry) + + assertThat(content).isNotNull() + assertThat(content?.style).isEqualTo(Style.BigText) + assertThat(content?.title).isEqualTo(TEST_BIG_CONTENT_TITLE) + assertThat(content?.text).isEqualTo(TEST_BIG_TEXT) + } + + @Test + @EnableFlags(PromotedNotificationUi.FLAG_NAME, StatusBarNotifChips.FLAG_NAME) + fun extractContent_fromBigTextStyle_fallbackToContentTitle() { + val entry = createEntry { + setContentTitle(TEST_CONTENT_TITLE) + setContentText(TEST_CONTENT_TEXT) + setStyle( + BigTextStyle() + .bigText(TEST_BIG_TEXT) + // bigContentTitle unset + .setSummaryText(TEST_SUMMARY_TEXT) + ) + } + + val content = extractContent(entry) + + assertThat(content).isNotNull() + assertThat(content?.style).isEqualTo(Style.BigText) + assertThat(content?.title).isEqualTo(TEST_CONTENT_TITLE) + assertThat(content?.text).isEqualTo(TEST_BIG_TEXT) + } + + @Test + @EnableFlags(PromotedNotificationUi.FLAG_NAME, StatusBarNotifChips.FLAG_NAME) + fun extractContent_fromBigTextStyle_fallbackToContentText() { + val entry = createEntry { + setContentTitle(TEST_CONTENT_TITLE) + setContentText(TEST_CONTENT_TEXT) + setStyle( + BigTextStyle() + // bigText unset + .setBigContentTitle(TEST_BIG_CONTENT_TITLE) + .setSummaryText(TEST_SUMMARY_TEXT) + ) + } val content = extractContent(entry) assertThat(content).isNotNull() assertThat(content?.style).isEqualTo(Style.BigText) + assertThat(content?.title).isEqualTo(TEST_BIG_CONTENT_TITLE) + assertThat(content?.text).isEqualTo(TEST_CONTENT_TEXT) } @Test @@ -498,6 +553,10 @@ class PromotedNotificationContentExtractorImplTest : SysuiTestCase() { private const val TEST_CONTENT_TEXT = "content text" private const val TEST_SHORT_CRITICAL_TEXT = "short" + private const val TEST_BIG_CONTENT_TITLE = "big content title" + private const val TEST_BIG_TEXT = "big text" + private const val TEST_SUMMARY_TEXT = "summary text" + private const val TEST_PROGRESS = 50 private const val TEST_PROGRESS_MAX = 100 diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java index 9f35d631bd45..99f2596dbf1d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.notification.row; import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_PUBLIC; -import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_SENSITIVE_CONTENT; +import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_OTP; import static com.android.systemui.statusbar.NotificationLockscreenUserManager.RedactionType; import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_NONE; import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL; @@ -472,7 +472,7 @@ public class NotificationContentInflaterTest extends SysuiTestCase { com.android.systemui.res.R.drawable.ic_person).setStyle(messagingStyle).build(); ExpandableNotificationRow row = mHelper.createRow(messageNotif); inflateAndWait(false, mNotificationInflater, FLAG_CONTENT_VIEW_PUBLIC, - REDACTION_TYPE_SENSITIVE_CONTENT, row); + REDACTION_TYPE_OTP, row); NotificationContentView publicView = row.getPublicLayout(); assertNotNull(publicView); // The display name should be included, but not the content or message text @@ -493,7 +493,7 @@ public class NotificationContentInflaterTest extends SysuiTestCase { .build(); ExpandableNotificationRow row = mHelper.createRow(notif); inflateAndWait(false, mNotificationInflater, FLAG_CONTENT_VIEW_PUBLIC, - REDACTION_TYPE_SENSITIVE_CONTENT, row); + REDACTION_TYPE_OTP, row); NotificationContentView publicView = row.getPublicLayout(); assertNotNull(publicView); assertFalse(hasText(publicView, contentText)); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.kt index 1b8d64d5483c..4a954b391f5f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.kt @@ -71,6 +71,7 @@ import com.android.systemui.statusbar.notification.collection.provider.HighPrior import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor import com.android.systemui.statusbar.notification.headsup.HeadsUpManager import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier +import com.android.systemui.statusbar.notification.promoted.domain.interactor.PackageDemotionInteractor import com.android.systemui.statusbar.notification.row.icon.AppIconProvider import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider import com.android.systemui.statusbar.notification.row.icon.appIconProvider @@ -80,6 +81,9 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController import com.android.systemui.testKosmos import com.android.systemui.util.kotlin.JavaAdapter import com.android.systemui.wmshell.BubblesManager +import java.util.Optional +import kotlin.test.assertNotNull +import kotlin.test.fail import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals @@ -107,9 +111,6 @@ import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import platform.test.runner.parameterized.ParameterizedAndroidJunit4 import platform.test.runner.parameterized.Parameters -import java.util.Optional -import kotlin.test.assertNotNull -import kotlin.test.fail /** Tests for [NotificationGutsManager]. */ @SmallTest @@ -149,6 +150,7 @@ class NotificationGutsManagerTest(flags: FlagsParameterization) : SysuiTestCase( @Mock private lateinit var launcherApps: LauncherApps @Mock private lateinit var shortcutManager: ShortcutManager @Mock private lateinit var channelEditorDialogController: ChannelEditorDialogController + @Mock private lateinit var packageDemotionInteractor: PackageDemotionInteractor @Mock private lateinit var peopleNotificationIdentifier: PeopleNotificationIdentifier @Mock private lateinit var contextTracker: UserContextProvider @Mock private lateinit var bubblesManager: BubblesManager @@ -214,6 +216,7 @@ class NotificationGutsManagerTest(flags: FlagsParameterization) : SysuiTestCase( launcherApps, shortcutManager, channelEditorDialogController, + packageDemotionInteractor, contextTracker, assistantFeedbackController, Optional.of(bubblesManager), @@ -521,6 +524,7 @@ class NotificationGutsManagerTest(flags: FlagsParameterization) : SysuiTestCase( any<NotificationIconStyleProvider>(), eq(onUserInteractionCallback), eq(channelEditorDialogController), + any<PackageDemotionInteractor>(), eq(statusBarNotification.packageName), any<NotificationChannel>(), eq(entry), @@ -560,6 +564,7 @@ class NotificationGutsManagerTest(flags: FlagsParameterization) : SysuiTestCase( any<NotificationIconStyleProvider>(), eq(onUserInteractionCallback), eq(channelEditorDialogController), + any<PackageDemotionInteractor>(), eq(statusBarNotification.packageName), any<NotificationChannel>(), eq(entry), @@ -597,6 +602,7 @@ class NotificationGutsManagerTest(flags: FlagsParameterization) : SysuiTestCase( any<NotificationIconStyleProvider>(), eq(onUserInteractionCallback), eq(channelEditorDialogController), + any<PackageDemotionInteractor>(), eq(statusBarNotification.packageName), any<NotificationChannel>(), eq(entry), diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.kt index 96ae07035ed2..5f817de58b40 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.kt @@ -64,6 +64,7 @@ import com.android.systemui.statusbar.RankingBuilder import com.android.systemui.statusbar.notification.AssistantFeedbackController import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder +import com.android.systemui.statusbar.notification.promoted.domain.interactor.PackageDemotionInteractor import com.android.systemui.statusbar.notification.row.icon.AppIconProvider import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider import com.android.systemui.statusbar.notification.row.icon.appIconProvider @@ -105,6 +106,7 @@ class NotificationInfoTest : SysuiTestCase() { private val onUserInteractionCallback = mock<OnUserInteractionCallback>() private val mockINotificationManager = mock<INotificationManager>() private val channelEditorDialogController = mock<ChannelEditorDialogController>() + private val packageDemotionInteractor = mock<PackageDemotionInteractor>() private val assistantFeedbackController = mock<AssistantFeedbackController>() @Before @@ -871,6 +873,7 @@ class NotificationInfoTest : SysuiTestCase() { onUserInteractionCallback: OnUserInteractionCallback = this.onUserInteractionCallback, channelEditorDialogController: ChannelEditorDialogController = this.channelEditorDialogController, + packageDemotionInteractor: PackageDemotionInteractor = this.packageDemotionInteractor, pkg: String = TEST_PACKAGE_NAME, notificationChannel: NotificationChannel = this.notificationChannel, entry: NotificationEntry = this.entry, @@ -892,6 +895,7 @@ class NotificationInfoTest : SysuiTestCase() { iconStyleProvider, onUserInteractionCallback, channelEditorDialogController, + packageDemotionInteractor, pkg, notificationChannel, entry, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationMenuRowTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationMenuRowTest.java index 9fdfca14a5b2..af52c31b1c53 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationMenuRowTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationMenuRowTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.platform.test.annotations.DisableFlags; import android.provider.Settings; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -38,6 +39,7 @@ import android.view.ViewGroup; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; +import com.android.systemui.Flags; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; @@ -413,6 +415,7 @@ public class NotificationMenuRowTest extends LeakCheckedTest { assertTrue("when alpha is .5, menu is visible", row.isMenuVisible()); } + @DisableFlags(Flags.FLAG_MAGNETIC_NOTIFICATION_SWIPES) @Test public void testOnTouchMove() { NotificationMenuRow row = Mockito.spy( diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt index 31413b06e5fd..063a04ab9f37 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt @@ -36,8 +36,8 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.res.R import com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_NONE +import com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_OTP import com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_PUBLIC -import com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_SENSITIVE_CONTENT import com.android.systemui.statusbar.NotificationLockscreenUserManager.RedactionType import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips import com.android.systemui.statusbar.notification.ConversationNotificationProcessor @@ -538,7 +538,7 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { false, notificationInflater, FLAG_CONTENT_VIEW_PUBLIC, - REDACTION_TYPE_SENSITIVE_CONTENT, + REDACTION_TYPE_OTP, newRow, ) // The display name should be included, but not the content or message text @@ -566,7 +566,7 @@ class NotificationRowContentBinderImplTest : SysuiTestCase() { false, notificationInflater, FLAG_CONTENT_VIEW_PUBLIC, - REDACTION_TYPE_SENSITIVE_CONTENT, + REDACTION_TYPE_OTP, newRow, ) var publicView = newRow.publicLayout diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/PromotedNotificationInfoTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/PromotedNotificationInfoTest.java index 5638e0b434aa..388729743f9e 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/PromotedNotificationInfoTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/PromotedNotificationInfoTest.java @@ -48,6 +48,7 @@ import com.android.systemui.res.R; import com.android.systemui.statusbar.notification.AssistantFeedbackController; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; +import com.android.systemui.statusbar.notification.promoted.domain.interactor.PackageDemotionInteractor; import com.android.systemui.statusbar.notification.row.icon.AppIconProvider; import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider; @@ -92,6 +93,8 @@ public class PromotedNotificationInfoTest extends SysuiTestCase { @Mock private ChannelEditorDialogController mChannelEditorDialogController; @Mock + private PackageDemotionInteractor mPackageDemotionInteractor; + @Mock private AssistantFeedbackController mAssistantFeedbackController; @Mock private TelecomManager mTelecomManager; @@ -138,6 +141,7 @@ public class PromotedNotificationInfoTest extends SysuiTestCase { mMockIconStyleProvider, mOnUserInteractionCallback, mChannelEditorDialogController, + mPackageDemotionInteractor, TEST_PACKAGE_NAME, mNotificationChannel, mEntry, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/shared/TestActiveNotificationModel.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/shared/TestActiveNotificationModel.kt index 531b30b9547a..0fb0548582ce 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/shared/TestActiveNotificationModel.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/shared/TestActiveNotificationModel.kt @@ -18,27 +18,27 @@ package com.android.systemui.statusbar.notification.shared import com.google.common.truth.Correspondence val byKey: Correspondence<ActiveNotificationModel, String> = - Correspondence.transforming({ it?.key }, "has a key of") + Correspondence.transforming({ it.key }, "has a key of") val byIsAmbient: Correspondence<ActiveNotificationModel, Boolean> = - Correspondence.transforming({ it?.isAmbient }, "has an isAmbient value of") + Correspondence.transforming({ it.isAmbient }, "has an isAmbient value of") val byIsSuppressedFromStatusBar: Correspondence<ActiveNotificationModel, Boolean> = Correspondence.transforming( - { it?.isSuppressedFromStatusBar }, + { it.isSuppressedFromStatusBar }, "has an isSuppressedFromStatusBar value of", ) val byIsSilent: Correspondence<ActiveNotificationModel, Boolean> = - Correspondence.transforming({ it?.isSilent }, "has an isSilent value of") + Correspondence.transforming({ it.isSilent }, "has an isSilent value of") val byIsRowDismissed: Correspondence<ActiveNotificationModel, Boolean> = - Correspondence.transforming({ it?.isRowDismissed }, "has an isRowDismissed value of") + Correspondence.transforming({ it.isRowDismissed }, "has an isRowDismissed value of") val byIsLastMessageFromReply: Correspondence<ActiveNotificationModel, Boolean> = Correspondence.transforming( - { it?.isLastMessageFromReply }, + { it.isLastMessageFromReply }, "has an isLastMessageFromReply value of", ) val byIsPulsing: Correspondence<ActiveNotificationModel, Boolean> = - Correspondence.transforming({ it?.isPulsing }, "has an isPulsing value of") + Correspondence.transforming({ it.isPulsing }, "has an isPulsing value of") val byIsPromoted: Correspondence<ActiveNotificationModel, Boolean> = Correspondence.transforming( - { it?.promotedContent != null }, + { it.promotedContent != null }, "has (or doesn't have) a promoted content model", ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManagerImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManagerImplTest.kt index ccc8be7de038..6c6ba933c03a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManagerImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManagerImplTest.kt @@ -130,7 +130,9 @@ class MagneticNotificationRowManagerImplTest : SysuiTestCase() { kosmos.testScope.runTest { // GIVEN a threshold of 100 px val threshold = 100f - underTest.setSwipeThresholdPx(threshold) + underTest.onDensityChange( + threshold / MagneticNotificationRowManager.MAGNETIC_DETACH_THRESHOLD_DP + ) // GIVEN that targets are set and the rows are being pulled setTargets() @@ -150,7 +152,9 @@ class MagneticNotificationRowManagerImplTest : SysuiTestCase() { kosmos.testScope.runTest { // GIVEN a threshold of 100 px val threshold = 100f - underTest.setSwipeThresholdPx(threshold) + underTest.onDensityChange( + threshold / MagneticNotificationRowManager.MAGNETIC_DETACH_THRESHOLD_DP + ) // GIVEN that targets are set and the rows are being pulled canRowBeDismissed = false @@ -172,7 +176,9 @@ class MagneticNotificationRowManagerImplTest : SysuiTestCase() { kosmos.testScope.runTest { // GIVEN a threshold of 100 px val threshold = 100f - underTest.setSwipeThresholdPx(threshold) + underTest.onDensityChange( + threshold / MagneticNotificationRowManager.MAGNETIC_DETACH_THRESHOLD_DP + ) // GIVEN that targets are set and the rows are being pulled setTargets() @@ -192,7 +198,9 @@ class MagneticNotificationRowManagerImplTest : SysuiTestCase() { kosmos.testScope.runTest { // GIVEN a threshold of 100 px val threshold = 100f - underTest.setSwipeThresholdPx(threshold) + underTest.onDensityChange( + threshold / MagneticNotificationRowManager.MAGNETIC_DETACH_THRESHOLD_DP + ) // GIVEN that targets are set and the rows are being pulled canRowBeDismissed = false @@ -294,6 +302,29 @@ class MagneticNotificationRowManagerImplTest : SysuiTestCase() { assertThat(underTest.isSwipedViewRoundableSet).isFalse() } + @Test + fun isMagneticRowDismissible_isDismissibleWhenDetached() = + kosmos.testScope.runTest { + setDetachedState() + + val isDismissible = underTest.isMagneticRowSwipeDetached(swipedRow) + assertThat(isDismissible).isTrue() + } + + @Test + fun setMagneticRowTranslation_whenDetached_belowAttachThreshold_reattaches() = + kosmos.testScope.runTest { + // GIVEN that the swiped view has been detached + setDetachedState() + + // WHEN setting a new translation above the attach threshold + val translation = 50f + underTest.setMagneticRowTranslation(swipedRow, translation) + + // THEN the swiped view reattaches magnetically and the state becomes PULLING + assertThat(underTest.currentState).isEqualTo(State.PULLING) + } + @After fun tearDown() { // We reset the manager so that all MagneticRowListener can cancel all animations @@ -302,7 +333,9 @@ class MagneticNotificationRowManagerImplTest : SysuiTestCase() { private fun setDetachedState() { val threshold = 100f - underTest.setSwipeThresholdPx(threshold) + underTest.onDensityChange( + threshold / MagneticNotificationRowManager.MAGNETIC_DETACH_THRESHOLD_DP + ) // Set the pulling state setTargets() @@ -327,8 +360,8 @@ class MagneticNotificationRowManagerImplTest : SysuiTestCase() { private fun MagneticRowListener.asTestableListener(rowIndex: Int): MagneticRowListener { val delegate = this return object : MagneticRowListener { - override fun setMagneticTranslation(translation: Float) { - delegate.setMagneticTranslation(translation) + override fun setMagneticTranslation(translation: Float, trackEagerly: Boolean) { + delegate.setMagneticTranslation(translation, trackEagerly) } override fun triggerMagneticForce( diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelperTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelperTest.java index 789701f5e4b0..de48f4018989 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelperTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelperTest.java @@ -49,6 +49,7 @@ import android.view.ViewConfiguration; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; +import com.android.systemui.Flags; import com.android.systemui.SysuiTestCase; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.flags.FakeFeatureFlags; @@ -362,6 +363,7 @@ public class NotificationSwipeHelperTest extends SysuiTestCase { verify(mSwipeHelper, times(1)).isFalseGesture(); } + @DisableFlags(Flags.FLAG_MAGNETIC_NOTIFICATION_SWIPES) @Test public void testIsDismissGesture_farEnough() { doReturn(false).when(mSwipeHelper).isFalseGesture(); @@ -374,6 +376,20 @@ public class NotificationSwipeHelperTest extends SysuiTestCase { verify(mSwipeHelper, times(1)).isFalseGesture(); } + @EnableFlags(Flags.FLAG_MAGNETIC_NOTIFICATION_SWIPES) + @Test + public void testIsDismissGesture_magneticSwipeIsDismissible() { + doReturn(false).when(mSwipeHelper).isFalseGesture(); + doReturn(false).when(mSwipeHelper).swipedFarEnough(); + doReturn(false).when(mSwipeHelper).swipedFastEnough(); + doReturn(true).when(mCallback).isMagneticViewDetached(any()); + when(mCallback.canChildBeDismissedInDirection(any(), anyBoolean())).thenReturn(true); + when(mEvent.getActionMasked()).thenReturn(MotionEvent.ACTION_UP); + + assertTrue("Should be a dismissal", mSwipeHelper.isDismissGesture(mEvent)); + verify(mSwipeHelper, times(1)).isFalseGesture(); + } + @Test public void testIsDismissGesture_notFarOrFastEnough() { doReturn(false).when(mSwipeHelper).isFalseGesture(); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt index 08ecbac1582c..41cca19346f0 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt @@ -38,6 +38,7 @@ import com.android.systemui.statusbar.ui.fakeSystemBarUtilsProxy import com.android.systemui.testKosmos import com.google.common.truth.Expect import com.google.common.truth.Truth.assertThat +import kotlin.math.roundToInt import org.junit.Assume import org.junit.Before import org.junit.Rule @@ -1572,7 +1573,11 @@ class StackScrollAlgorithmTest(flags: FlagsParameterization) : SysuiTestCase() { fullStackHeight: Float = 3000f, ) { ambientState.headsUpTop = headsUpTop - ambientState.headsUpBottom = headsUpBottom + if (NotificationsHunSharedAnimationValues.isEnabled) { + headsUpAnimator.headsUpAppearHeightBottom = headsUpBottom.roundToInt() + } else { + ambientState.headsUpBottom = headsUpBottom + } ambientState.stackTop = stackTop ambientState.stackCutoff = stackCutoff diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModelImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModelImplTest.kt index 12cf3b6cd2cf..2da692b4cb45 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModelImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModelImplTest.kt @@ -1513,7 +1513,39 @@ class HomeStatusBarViewModelImplTest : SysuiTestCase() { @Test @DisableSceneContainer - fun shadeShown_sceneFlagOff_noStatusBarViewsShown() = + fun shadeSlightlyShown_sceneFlagOff_statusBarViewsShown() = + kosmos.runTest { + val clockVisible by collectLastValue(underTest.isClockVisible) + val notifIconsVisible by collectLastValue(underTest.isNotificationIconContainerVisible) + val systemInfoVisible by collectLastValue(underTest.systemInfoCombinedVis) + transitionKeyguardToGone() + + kosmos.shadeTestUtil.setShadeExpansion(0.1f) + + assertThat(clockVisible!!.visibility).isEqualTo(View.VISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.VISIBLE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.VISIBLE) + } + + @Test + @DisableSceneContainer + fun shadeHalfShown_sceneFlagOff_noStatusBarViewsShown() = + kosmos.runTest { + val clockVisible by collectLastValue(underTest.isClockVisible) + val notifIconsVisible by collectLastValue(underTest.isNotificationIconContainerVisible) + val systemInfoVisible by collectLastValue(underTest.systemInfoCombinedVis) + transitionKeyguardToGone() + + kosmos.shadeTestUtil.setShadeExpansion(0.5f) + + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + } + + @Test + @DisableSceneContainer + fun shadeFullyShown_sceneFlagOff_noStatusBarViewsShown() = kosmos.runTest { val clockVisible by collectLastValue(underTest.isClockVisible) val notifIconsVisible by collectLastValue(underTest.isNotificationIconContainerVisible) @@ -1527,6 +1559,83 @@ class HomeStatusBarViewModelImplTest : SysuiTestCase() { assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) } + /** Regression test for b/394257529#comment24. */ + @Test + @DisableSceneContainer + fun qqsToQsTransition_sceneFlagOff_statusBarViewsNeverShown() = + kosmos.runTest { + val clockVisible by collectLastValue(underTest.isClockVisible) + val notifIconsVisible by collectLastValue(underTest.isNotificationIconContainerVisible) + val systemInfoVisible by collectLastValue(underTest.systemInfoCombinedVis) + transitionKeyguardToGone() + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 1f, qsExpansion = 0f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 0.9f, qsExpansion = 0.1f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 0.6f, qsExpansion = 0.4f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 0.5f, qsExpansion = 0.5f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 0.2f, qsExpansion = 0.8f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 0f, qsExpansion = 1f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + } + + /** Regression test for b/394257529#comment24. */ + @Test + @DisableSceneContainer + fun qsToQqsTransition_sceneFlagOff_statusBarViewsNeverShown() = + kosmos.runTest { + val clockVisible by collectLastValue(underTest.isClockVisible) + val notifIconsVisible by collectLastValue(underTest.isNotificationIconContainerVisible) + val systemInfoVisible by collectLastValue(underTest.systemInfoCombinedVis) + transitionKeyguardToGone() + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 0f, qsExpansion = 1f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 0.3f, qsExpansion = 0.7f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 0.5f, qsExpansion = 0.5f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 0.7f, qsExpansion = 0.3f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + + kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion = 1f, qsExpansion = 0f) + assertThat(clockVisible!!.visibility).isEqualTo(View.INVISIBLE) + assertThat(notifIconsVisible!!.visibility).isEqualTo(View.GONE) + assertThat(systemInfoVisible!!.baseVisibility.visibility).isEqualTo(View.GONE) + } + @Test @EnableSceneContainer fun shadeShown_sceneFlagOn_noStatusBarViewsShown() = diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java index 9a0b8125fb25..b8be34378891 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java @@ -282,6 +282,33 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { assertThat(mThemeOverlayController.mThemeStyle).isEqualTo(Style.TONAL_SPOT); } + @Test + @HardwareColors(color = "BLK", options = { + "BLK|MONOCHROMATIC|#FF0000", + "*|VIBRANT|home_wallpaper" + }) + @EnableFlags(com.android.systemui.Flags.FLAG_HARDWARE_COLOR_STYLES) + public void start_checkHardwareColor_storeInSecureSetting() { + // getWallpaperColors should not be called + ArgumentCaptor<Runnable> registrationRunnable = ArgumentCaptor.forClass(Runnable.class); + verify(mMainExecutor).execute(registrationRunnable.capture()); + registrationRunnable.getValue().run(); + verify(mWallpaperManager, never()).getWallpaperColors(anyInt()); + + assertThat(mThemeOverlayController.mThemeStyle).isEqualTo(Style.MONOCHROMATIC); + assertThat(mThemeOverlayController.mCurrentColors.get(0).getMainColors().get( + 0).toArgb()).isEqualTo(Color.RED); + + ArgumentCaptor<String> updatedSetting = ArgumentCaptor.forClass(String.class); + verify(mSecureSettings).putStringForUser( + eq(Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES), updatedSetting.capture(), + anyInt()); + + assertThat(updatedSetting.getValue().contains( + "android.theme.customization.theme_style\":\"MONOCHROMATIC")).isTrue(); + assertThat(updatedSetting.getValue().contains( + "android.theme.customization.system_palette\":\"ffff0000")).isTrue(); + } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryImplTest.kt index cc6a7b93eef3..a0f1a5ce386e 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryImplTest.kt @@ -18,6 +18,7 @@ package com.android.systemui.wallpapers.data.repository import android.app.WallpaperInfo import android.app.WallpaperManager +import android.app.WallpaperManager.FLAG_LOCK import android.content.ComponentName import android.content.Intent import android.content.pm.UserInfo @@ -29,6 +30,7 @@ import com.android.app.wallpaperManager import com.android.internal.R import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.broadcastDispatcher +import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository import com.android.systemui.coroutines.collectLastValue import com.android.systemui.kosmos.testScope import com.android.systemui.res.R as SysUIR @@ -44,6 +46,7 @@ import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.eq import org.mockito.kotlin.any import org.mockito.kotlin.doAnswer import org.mockito.kotlin.mock @@ -64,6 +67,7 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { private val testScope = kosmos.testScope private val userRepository = kosmos.fakeUserRepository private val broadcastDispatcher = kosmos.broadcastDispatcher + private val configRepository = kosmos.fakeConfigurationRepository // Initialized in each test since certain flows rely on mocked data that isn't // modifiable after start, like wallpaperManager.isWallpaperSupported @@ -251,10 +255,18 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { secureSettings.putInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1) context.orCreateTestableResources.addOverride( R.bool.config_dozeSupportsAodWallpaper, - true, + false, ) - + configRepository.onAnyConfigurationChange() val latest by collectLastValue(underTest.wallpaperSupportsAmbientMode) + assertThat(latest).isFalse() + + // Validate that a configuration change recalculates the flow + context.orCreateTestableResources.addOverride( + R.bool.config_dozeSupportsAodWallpaper, + true, + ) + configRepository.onAnyConfigurationChange() assertThat(latest).isTrue() } @@ -275,17 +287,17 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { @Test @EnableFlags(SharedFlags.FLAG_EXTENDED_WALLPAPER_EFFECTS) - fun shouldSendNotificationLayout_setExtendedEffectsWallpaper_launchSendLayoutJob() = + fun shouldSendNotificationLayout_setExtendedEffectsWallpaper() = testScope.runTest { underTest = kosmos.wallpaperRepository val latest by collectLastValue(underTest.shouldSendFocalArea) - val extedendEffectsWallpaper = + val extendedEffectsWallpaper = mock<WallpaperInfo>().apply { whenever(this.component).thenReturn(ComponentName(context, focalAreaTarget)) } whenever(kosmos.wallpaperManager.getWallpaperInfoForUser(any())) - .thenReturn(extedendEffectsWallpaper) + .thenReturn(extendedEffectsWallpaper) broadcastDispatcher.sendIntentToMatchingReceiversOnly( context, Intent(Intent.ACTION_WALLPAPER_CHANGED), @@ -295,7 +307,7 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { @Test @EnableFlags(SharedFlags.FLAG_EXTENDED_WALLPAPER_EFFECTS) - fun shouldSendNotificationLayout_setNotExtendedEffectsWallpaper_cancelSendLayoutJob() = + fun shouldSendNotificationLayout_setNotExtendedEffectsWallpaper() = testScope.runTest { underTest = kosmos.wallpaperRepository val latest by collectLastValue(underTest.shouldSendFocalArea) @@ -322,6 +334,51 @@ class WallpaperRepositoryImplTest : SysuiTestCase() { assertThat(latest).isFalse() } + @Test + @EnableFlags(SharedFlags.FLAG_EXTENDED_WALLPAPER_EFFECTS) + fun shouldSendNotificationLayout_setExtendedEffectsWallpaperOnlyForHomescreen() = + testScope.runTest { + underTest = kosmos.wallpaperRepository + val latest by collectLastValue(underTest.shouldSendFocalArea) + val extendedEffectsWallpaper = + mock<WallpaperInfo>().apply { + whenever(this.component).thenReturn(ComponentName("", focalAreaTarget)) + } + + whenever(kosmos.wallpaperManager.lockScreenWallpaperExists()).thenReturn(true) + whenever(kosmos.wallpaperManager.getWallpaperInfoForUser(any())) + .thenReturn(extendedEffectsWallpaper) + whenever(kosmos.wallpaperManager.getWallpaperInfo(eq(FLAG_LOCK), any())) + .thenReturn(UNSUPPORTED_WP) + broadcastDispatcher.sendIntentToMatchingReceiversOnly( + context, + Intent(Intent.ACTION_WALLPAPER_CHANGED), + ) + assertThat(latest).isFalse() + } + + @Test + @EnableFlags(SharedFlags.FLAG_EXTENDED_WALLPAPER_EFFECTS) + fun shouldSendNotificationLayout_setExtendedEffectsWallpaperOnlyForLockscreen() = + testScope.runTest { + underTest = kosmos.wallpaperRepository + val latest by collectLastValue(underTest.shouldSendFocalArea) + val extendedEffectsWallpaper = + mock<WallpaperInfo>().apply { + whenever(this.component).thenReturn(ComponentName("", focalAreaTarget)) + } + whenever(kosmos.wallpaperManager.lockScreenWallpaperExists()).thenReturn(true) + whenever(kosmos.wallpaperManager.getWallpaperInfoForUser(any())) + .thenReturn(UNSUPPORTED_WP) + whenever(kosmos.wallpaperManager.getWallpaperInfo(eq(FLAG_LOCK), any())) + .thenReturn(extendedEffectsWallpaper) + broadcastDispatcher.sendIntentToMatchingReceiversOnly( + context, + Intent(Intent.ACTION_WALLPAPER_CHANGED), + ) + assertThat(latest).isTrue() + } + private companion object { val USER_WITH_UNSUPPORTED_WP = UserInfo(/* id= */ 3, /* name= */ "user3", /* flags= */ 0) val UNSUPPORTED_WP = diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockLogger.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockLogger.kt index f9ff75d5fdc8..5b67edda73cc 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockLogger.kt +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockLogger.kt @@ -55,9 +55,9 @@ class ClockLogger(private val view: View?, buffer: MessageBuffer, tag: String) : } fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { - d({ "onLayout($bool1, ${VRect(long1.toULong())})" }) { + d({ "onLayout($bool1, ${VRect.fromLong(long1)})" }) { bool1 = changed - long1 = VRect(left, top, right, bottom).data.toLong() + long1 = VRect(left, top, right, bottom).toLong() } } @@ -116,7 +116,7 @@ class ClockLogger(private val view: View?, buffer: MessageBuffer, tag: String) : } fun animateFidget(x: Float, y: Float) { - d({ "animateFidget(${VPointF(long1.toULong())})" }) { long1 = VPointF(x, y).data.toLong() } + d({ "animateFidget(${VPointF.fromLong(long1)})" }) { long1 = VPointF(x, y).toLong() } } companion object { diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/VPoint.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/VPoint.kt index 1fb37ec28835..de62f9c8be74 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/VPoint.kt +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/VPoint.kt @@ -56,6 +56,8 @@ value class VPointF(val data: ULong) { fun toPointF() = PointF(x, y) + fun toLong(): Long = data.toLong() + fun lengthSq(): Float = x * x + y * y fun length(): Float = sqrt(lengthSq()) @@ -110,6 +112,8 @@ value class VPointF(val data: ULong) { companion object { val ZERO = VPointF(0, 0) + fun fromLong(data: Long) = VPointF(data.toULong()) + fun max(lhs: VPointF, rhs: VPointF) = VPointF(max(lhs.x, rhs.x), max(lhs.y, rhs.y)) fun min(lhs: VPointF, rhs: VPointF) = VPointF(min(lhs.x, rhs.x), min(lhs.y, rhs.y)) @@ -148,6 +152,8 @@ value class VPoint(val data: ULong) { fun toPoint() = Point(x, y) + fun toLong(): Long = data.toLong() + fun abs() = VPoint(abs(x), abs(y)) operator fun component1(): Int = x @@ -191,6 +197,8 @@ value class VPoint(val data: ULong) { companion object { val ZERO = VPoint(0, 0) + fun fromLong(data: Long) = VPoint(data.toULong()) + fun max(lhs: VPoint, rhs: VPoint) = VPoint(max(lhs.x, rhs.x), max(lhs.y, rhs.y)) fun min(lhs: VPoint, rhs: VPoint) = VPoint(min(lhs.x, rhs.x), min(lhs.y, rhs.y)) diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/VRect.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/VRect.kt index 3c1adf22a405..1bd29aa6a073 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/VRect.kt +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/VRect.kt @@ -84,6 +84,10 @@ value class VRectF(val data: ULong) { val size: VPointF get() = VPointF(width, height) + fun toRectF(): RectF = RectF(left, top, right, bottom) + + fun toLong(): Long = data.toLong() + override fun toString() = "($left, $top) -> ($right, $bottom)" companion object { @@ -91,6 +95,8 @@ value class VRectF(val data: ULong) { private fun fromBits(value: Short): Float = Half.toFloat(Half.intBitsToHalf(value.toInt())) + fun fromLong(data: Long) = VRectF(data.toULong()) + fun fromCenter(center: VPointF, size: VPointF): VRectF { return VRectF( center.x - size.x / 2, @@ -162,11 +168,17 @@ value class VRect(val data: ULong) { val size: VPoint get() = VPoint(width, height) + fun toRect(): Rect = Rect(left, top, right, bottom) + + fun toLong(): Long = data.toLong() + override fun toString() = "($left, $top) -> ($right, $bottom)" companion object { val ZERO = VRect(0, 0, 0, 0) + fun fromLong(data: Long) = VRect(data.toULong()) + fun fromCenter(center: VPoint, size: VPoint): VRect { return VRect( (center.x - size.x / 2).toShort(), diff --git a/packages/SystemUI/res-keyguard/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml index 1a49bbb27c8f..0524b34e6b2e 100644 --- a/packages/SystemUI/res-keyguard/values-ar/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ar/strings.xml @@ -21,11 +21,11 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"أدخل رقم التعريف الشخصي (PIN)"</string> - <string name="keyguard_enter_pin" msgid="8114529922480276834">"أدخِل رقم التعريف الشخصي"</string> + <string name="keyguard_enter_pin" msgid="8114529922480276834">"يُرجى إدخال رقم التعريف الشخصي"</string> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"أدخل النقش"</string> <string name="keyguard_enter_pattern" msgid="7616595160901084119">"ارسم النقش"</string> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"أدخل كلمة المرور"</string> - <string name="keyguard_enter_password" msgid="6483623792371009758">"أدخِل كلمة المرور"</string> + <string name="keyguard_enter_password" msgid="6483623792371009758">"يُرجى إدخال كلمة المرور"</string> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"بطاقة غير صالحة."</string> <string name="keyguard_charged" msgid="5478247181205188995">"اكتمل الشحن"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • جارٍ الشحن لاسلكيًا"</string> diff --git a/packages/SystemUI/res-keyguard/values-hi/strings.xml b/packages/SystemUI/res-keyguard/values-hi/strings.xml index 9eb89b67fdde..cd63405f1c00 100644 --- a/packages/SystemUI/res-keyguard/values-hi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hi/strings.xml @@ -23,7 +23,7 @@ <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"अपना पिन डालें"</string> <string name="keyguard_enter_pin" msgid="8114529922480276834">"पिन डालें"</string> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"अपना पैटर्न डालें"</string> - <string name="keyguard_enter_pattern" msgid="7616595160901084119">"पैटर्न ड्रॉ करें"</string> + <string name="keyguard_enter_pattern" msgid="7616595160901084119">"पैटर्न बनाएं"</string> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"अपना पासवर्ड डालें"</string> <string name="keyguard_enter_password" msgid="6483623792371009758">"पासवर्ड डालें"</string> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"गलत कार्ड."</string> diff --git a/packages/SystemUI/res-keyguard/values-iw/strings.xml b/packages/SystemUI/res-keyguard/values-iw/strings.xml index f014c298e2c6..67ee3ed1b99d 100644 --- a/packages/SystemUI/res-keyguard/values-iw/strings.xml +++ b/packages/SystemUI/res-keyguard/values-iw/strings.xml @@ -23,7 +23,7 @@ <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"מה קוד האימות שלך?"</string> <string name="keyguard_enter_pin" msgid="8114529922480276834">"צריך להזין קוד אימות"</string> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"יש להזין קו ביטול נעילה"</string> - <string name="keyguard_enter_pattern" msgid="7616595160901084119">"צריך לצייר קו ביטול נעילה"</string> + <string name="keyguard_enter_pattern" msgid="7616595160901084119">"צריך לצייר את קו פתיחת הנעילה"</string> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"יש להזין סיסמה"</string> <string name="keyguard_enter_password" msgid="6483623792371009758">"צריך להזין סיסמה"</string> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"כרטיס לא חוקי."</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml index 6b08a3a420cc..dbfc4940614a 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml @@ -62,7 +62,7 @@ <string name="kg_bio_try_again_or_pin" msgid="4752168242723808390">"请重试，或输入 PIN 码"</string> <string name="kg_bio_try_again_or_password" msgid="1473132729225398039">"请重试，或输入密码"</string> <string name="kg_bio_try_again_or_pattern" msgid="4867893307468801501">"请重试，或绘制解锁图案"</string> - <string name="kg_bio_too_many_attempts_pin" msgid="5850845723433047605">"如果出错的尝试次数太多，必须输入 PIN 码才能解锁"</string> + <string name="kg_bio_too_many_attempts_pin" msgid="5850845723433047605">"如果错误次数太多，则必须输入 PIN 码才能解锁"</string> <string name="kg_bio_too_many_attempts_password" msgid="5551690347827728042">"如果多次尝试失败，必须输入密码才能解锁"</string> <string name="kg_bio_too_many_attempts_pattern" msgid="736884689355181602">"如果出错的尝试次数太多，必须绘制图案才能解锁"</string> <string name="kg_unlock_with_pin_or_fp" msgid="5635161174698729890">"请使用 PIN 码或指纹解锁"</string> diff --git a/packages/SystemUI/res/drawable/notification_2025_smart_reply_button_background.xml b/packages/SystemUI/res/drawable/notification_2025_smart_reply_button_background.xml index d398f60ddc3c..84e228e436cb 100644 --- a/packages/SystemUI/res/drawable/notification_2025_smart_reply_button_background.xml +++ b/packages/SystemUI/res/drawable/notification_2025_smart_reply_button_background.xml @@ -21,9 +21,9 @@ <item> <inset android:insetLeft="0dp" - android:insetTop="8dp" + android:insetTop="6dp" android:insetRight="0dp" - android:insetBottom="8dp"> + android:insetBottom="6dp"> <shape android:shape="rectangle"> <corners android:radius="@dimen/notification_2025_smart_reply_button_corner_radius" /> <stroke android:width="@dimen/smart_reply_button_stroke_width" diff --git a/packages/SystemUI/res/layout/bluetooth_device_item.xml b/packages/SystemUI/res/layout/bluetooth_device_item.xml index 124aec6a92dd..da2ec43e470c 100644 --- a/packages/SystemUI/res/layout/bluetooth_device_item.xml +++ b/packages/SystemUI/res/layout/bluetooth_device_item.xml @@ -52,7 +52,7 @@ android:gravity="center_vertical" android:textSize="14sp" /> - <TextView + <com.android.systemui.util.DelayableMarqueeTextView android:layout_width="0dp" android:layout_height="wrap_content" android:id="@+id/bluetooth_device_summary" @@ -60,7 +60,9 @@ android:paddingEnd="10dp" android:paddingBottom="15dp" android:maxLines="1" - android:ellipsize="end" + android:ellipsize="marquee" + android:marqueeRepeatLimit="1" + android:singleLine="true" app:layout_constraintTop_toBottomOf="@+id/bluetooth_device_name" app:layout_constraintStart_toEndOf="@+id/bluetooth_device_icon" app:layout_constraintEnd_toStartOf="@+id/guideline" diff --git a/packages/SystemUI/res/layout/sidefps_view.xml b/packages/SystemUI/res/layout/sidefps_view.xml index e80ed26cffe5..22599a35ed64 100644 --- a/packages/SystemUI/res/layout/sidefps_view.xml +++ b/packages/SystemUI/res/layout/sidefps_view.xml @@ -20,6 +20,7 @@ android:id="@+id/sidefps_animation" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:contentDescription="@string/accessibility_side_fingerprint_indicator_label" app:lottie_autoPlay="true" app:lottie_loop="true" app:lottie_rawRes="@raw/sfps_pulse"/>
\ No newline at end of file diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index cbec8c2e0b82..62363358f663 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Ontdemp omgewing"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Nutsgoed"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Intydse Onderskrifte"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Nota"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Deblokkeer toestelmikrofoon?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Deblokkeer toestelkamera?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Gebruik verdeelde skerm met app aan die regterkant"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Gebruik verdeelde skerm met app aan die linkerkant"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Gebruik volskerm"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Gebruik rekenaaraansig"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Skakel oor na app regs of onder terwyl jy verdeelde skerm gebruik"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Skakel oor na app links of bo terwyl jy verdeelde skerm gebruik"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Tydens verdeelde skerm: verplaas ’n app van een skerm na ’n ander"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 655f06037922..e180d114a75a 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"በዙሪያ ያሉትን ድምፅ-ከል አንሳ"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"መሣሪያዎች"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"የቀጥታ መግለጫ ጽሑፍ"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"ማስታወሻ"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"የመሣሪያ ማይክሮፎን እገዳ ይነሳ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"የመሣሪያ ካሜራ እገዳ ይነሳ?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"መተግበሪያ በስተቀኝ ላይ ሆኖ የተከፈለ ማያ ገፅን ይጠቀሙ"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"መተግበሪያ በስተግራ ላይ ሆኖ የተከፈለ ማያ ገፅን ይጠቀሙ"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ሙሉ ገፅ ዕይታን ይጠቀሙ"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"የዴስክቶፕ ዕይታ ይጠቀሙ"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"የተከፈለ ማያ ገጽን ሲጠቀሙ በቀኝ ወይም ከታች ወዳለ መተግበሪያ ይቀይሩ"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"የተከፈለ ማያ ገጽን ሲጠቀሙ በቀኝ ወይም ከላይ ወዳለ መተግበሪያ ይቀይሩ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"በተከፈለ ማያ ገጽ ወቅት፡- መተግበሪያን ከአንዱ ወደ ሌላው ተካ"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index b2d71da5b61d..416eee837b22 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"الأصوات المحيطة"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"اليسرى"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"اليمنى"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"الأصوات المحيطة"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"الأصوات المحيطة بالجهة اليسرى"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"الأصوات المحيطة بالجهة اليمنى"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"توسيع لوحة التحكّم الموحّدة إلى عناصر تحكُّم منفصلة على اليسار واليمين"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"تصغير عناصر التحكّم في الصوت إلى لوحة تحكُّم موحّدة"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"كتم الأصوات المحيطة"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"إعادة الأصوات المحيطة"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"الأدوات"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"النسخ النصي التلقائي"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"ملاحظات"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"هل تريد إزالة حظر ميكروفون الجهاز؟"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"هل تريد إزالة حظر كاميرا الجهاز؟"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"استخدام \"وضع تقسيم الشاشة\" مع تثبيت التطبيق على اليمين"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"استخدام \"وضع تقسيم الشاشة\" مع تثبيت التطبيق على اليسار"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"استخدام وضع ملء الشاشة"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"استخدام وضع العرض المخصّص للكمبيوتر المكتبي"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"التبديل إلى التطبيق على اليسار أو الأسفل أثناء استخدام \"تقسيم الشاشة\""</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"التبديل إلى التطبيق على اليمين أو الأعلى أثناء استخدام \"تقسيم الشاشة\""</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"استبدال تطبيق بآخر في وضع \"تقسيم الشاشة\""</string> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index 6aa9d66ab48f..4340f2132e78 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"আশ-পাশৰ ধ্বনি আনমিউট কৰক"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"সঁজুলি"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"লাইভ কেপশ্বন"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"টোকা"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ডিভাইচৰ মাইক্ৰ\'ফ\'ন অৱৰোধৰ পৰা আঁতৰাবনে?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ডিভাইচৰ কেমেৰা অৱৰোধৰ পৰা আঁতৰাবনে?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"সোঁফালে থকা এপ্টোৰ সৈতে বিভাজিত স্ক্ৰীন ব্যৱহাৰ কৰক"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"বাওঁফালে থকা এপ্টোৰ সৈতে বিভাজিত স্ক্ৰীন ব্যৱহাৰ কৰক"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"পূৰ্ণ স্ক্ৰীন ব্যৱহাৰ কৰক"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ডেস্কটপ ভিউ ব্যৱহাৰ কৰক"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"বিভাজিত স্ক্ৰীন ব্যৱহাৰ কৰাৰ সময়ত সোঁফালে অথবা তলত থকা এপলৈ সলনি কৰক"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"বিভাজিত স্ক্ৰীন ব্যৱহাৰ কৰাৰ সময়ত বাওঁফালে অথবা ওপৰত থকা এপলৈ সলনি কৰক"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"বিভাজিত স্ক্ৰীনৰ ব্যৱহাৰ কৰাৰ সময়ত: কোনো এপ্ এখন স্ক্ৰীনৰ পৰা আনখনলৈ নিয়ক"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index b87432f5d342..226c39dad194 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Ətraf mühiti səssiz rejimdən çıxarın"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Alətlər"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Canlı Altyazı"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Qeyd"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Cihaz mikrofonu blokdan çıxarılsın?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Cihaz kamerası blokdan çıxarılsın?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Tətbiq sağda olmaqla bölünmüş ekranı istifadə edin"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Tətbiq solda olmaqla bölünmüş ekranı istifadə edin"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Tam ekrandan istifadə edin"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Masaüstü görünüşdən istifadə edin"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Bölünmüş ekran istifadə edərkən sağda və ya aşağıda tətbiqə keçin"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Bölünmüş ekran istifadə edərkən solda və ya yuxarıda tətbiqə keçin"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Bölünmüş ekran rejimində: tətbiqi birindən digərinə dəyişin"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index a875e7361335..0d7619d36e75 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Uključi zvuk okruženja"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Alatke"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Titl uživo"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Beleška"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Želite da odblokirate mikrofon uređaja?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Želite da odblokirate kameru uređaja?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Koristi podeljeni ekran sa aplikacijom s desne strane"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Koristi podeljeni ekran sa aplikacijom s leve strane"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Koristi prikaz preko celog ekrana"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Koristi prikaz za računare"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Pređi u aplikaciju zdesna ili ispod dok je podeljen ekran"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Pređite u aplikaciju sleva ili iznad dok koristite podeljeni ekran"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"U režimu podeljenog ekrana: zamena jedne aplikacije drugom"</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 75d0a44f38a1..809b60b712a1 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Уключыць навакольныя гукі"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Інструменты"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Аўтаматычныя субцітры"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Нататка"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Разблакіраваць мікрафон прылады?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Разблакіраваць камеру прылады?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Падзяліць экран і памясціць праграму справа"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Падзяліць экран і памясціць праграму злева"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Выкарыстоўваць поўнаэкранны рэжым"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Выкарыстоўваць версію для камп’ютараў"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Пераключыцца на праграму справа або ўнізе на падзеленым экране"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Пераключыцца на праграму злева або ўверсе на падзеленым экране"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"У рэжыме падзеленага экрана замяніць адну праграму на іншую"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 4f3d64124e04..9f7a9cdda45b 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Околни звуци"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Ляво"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Дясно"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Околни звуци"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Околни звуци отляво"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Околни звуци отдясно"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Разгъване до отделни контроли за ляво и дясно"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Свиване до обединена контрола"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Спиране на околните звуци"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Включване на околните звуци"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Инструменти"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Надписи на живо"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Бележка"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Да се отблокира ли микрофонът на устройството?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Да се отблокира ли камерата на устройството?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Използване на разделен екран с приложението вдясно"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Използване на разделен екран с приложението вляво"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Използване режима на цял екран"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Използване на изгледа за настолни компютри"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Превключване към приложението вдясно/отдолу в режима на разделен екран"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Превключване към приложението вляво/отгоре в режима на разделен екран"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"При разделен екран: замяна на дадено приложение с друго"</string> @@ -1003,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Добавяне към позиция <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Невалидна позиция."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Позиция <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Панелът вече е добавен"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Панелът е добавен"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Панелът е премахнат"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Редактор за бързи настройки."</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 3fd699db612f..f1d97700c6f3 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"সারাউন্ডিং আনমিউট করুন"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"টুল"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"লাইভ ক্যাপশন"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"মনে রাখবেন"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ডিভাইসের মাইক্রোফোন আনব্লক করতে চান?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ডিভাইসের ক্যামেরা আনব্লক করতে চান?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ডানদিকে বর্তমান অ্যাপে স্প্লিট স্ক্রিন ব্যবহার করুন"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"বাঁদিকে বর্তমান অ্যাপে স্প্লিট স্ক্রিন ব্যবহার করুন"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ফুল-স্ক্রিন মোড ব্যবহার করুন"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ডেস্কটপ ভিউ ব্যবহার করুন"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"স্প্লিট স্ক্রিন ব্যবহার করার সময় ডানদিকের বা নিচের অ্যাপে পাল্টে নিন"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"স্প্লিট স্ক্রিন ব্যবহার করার সময় বাঁদিকের বা উপরের অ্যাপে পাল্টে নিন"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"\'স্প্লিট স্ক্রিন\' থাকাকালীন: একটি অ্যাপ থেকে অন্যটিতে পাল্টান"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 0b5af1771614..57b83d933f53 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Uključivanje zvuka okruženja"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Alati"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Automatski titlovi"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Bilješka"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Deblokirati mikrofon uređaja?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Deblokirati kameru uređaja?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Korištenje podijeljenog ekrana s aplikacijom na desnoj strani"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Korištenje podijeljenog ekrana s aplikacijom na lijevoj strani"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Korištenje prikaza preko cijelog ekrana"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Korištenje prikaza na računaru"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Prelazak u aplikaciju desno ili ispod uz podijeljeni ekran"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Pređite u aplikaciju lijevo ili iznad dok koristite podijeljeni ekran"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Za vrijeme podijeljenog ekrana: zamjena jedne aplikacije drugom"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 0225d2b27ca8..d2f942eeb628 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Entorn"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Esquerra"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Dreta"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Entorn"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Entorn esquerre"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Entorn dret"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Desplega els controls separats d\'esquerra i dreta"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Replega per unificar el control"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Silencia l\'entorn"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Deixa de silenciar l\'entorn"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Eines"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Subtítols instantanis"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Nota"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vols desbloquejar el micròfon del dispositiu?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vols desbloquejar la càmera del dispositiu?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Utilitzar la pantalla dividida amb l\'aplicació a la dreta"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Utilitzar la pantalla dividida amb l\'aplicació a l\'esquerra"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Utilitza la pantalla completa"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Utilitza la visualització per a ordinadors"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Canvia a l\'aplicació de la dreta o de sota amb la pantalla dividida"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Canvia a l\'aplicació de l\'esquerra o de dalt amb la pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Durant el mode de pantalla dividida: substitueix una app per una altra"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 8a6980e355c0..5149f9d8c1af 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Zapnout zvuk okolí"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Nástroje"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Okamžité titulky"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Poznámka"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Odblokovat mikrofon zařízení?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Odblokovat fotoaparát zařízení?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Použít rozdělenou obrazovku s aplikací vpravo"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Použít rozdělenou obrazovku s aplikací vlevo"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Použít celou obrazovku"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Použít zobrazení na počítači"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Přepnout na aplikaci vpravo nebo dole v režimu rozdělené obrazovky"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Přepnout na aplikaci vlevo nebo nahoře v režimu rozdělené obrazovky"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"V režimu rozdělené obrazovky: nahradit jednu aplikaci druhou"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 60c5c1c5e1c0..baf010ddae5d 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Ignorer ikke omgivelser"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Værktøjer"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Livetekstning"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Note"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vil du fjerne blokeringen af enhedens mikrofon?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vil du fjerne blokeringen af enhedens kamera?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Brug opdelt skærm med appen til højre"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Brug opdelt skærm med appen til venstre"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Brug fuld skærm"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Brug computervenlig visning"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Skift til en app til højre eller nedenfor, når du bruger opdelt skærm"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Skift til en app til venstre eller ovenfor, når du bruger opdelt skærm"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ved opdelt skærm: Udskift én app med en anden"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 66b60b18cdae..8c8e994dd9cc 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Stummschaltung der Umgebungsgeräusche aufheben"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Tools"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Automatische Untertitel"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Notiz"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Blockierung des Gerätemikrofons aufheben?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Blockierung der Gerätekamera aufheben?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Splitscreen mit der App auf der rechten Seite nutzen"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Splitscreen mit der App auf der linken Seite nutzen"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Vollbildmodus verwenden"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Desktop-Ansicht verwenden"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Im Splitscreen-Modus zu einer App rechts oder unten wechseln"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Im Splitscreen-Modus zu einer App links oder oben wechseln"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Im Splitscreen: eine App durch eine andere ersetzen"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 639aee2d038e..daebf7006498 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Κατάργηση σίγασης ήχων περιβάλλοντος"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Εργαλεία"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Ζωντανοί υπότιτλοι"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Σημείωση"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Κατάργηση αποκλεισμού μικροφώνου συσκευής;"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Κατάργηση αποκλεισμού κάμερας συσκευής;"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Χρήση διαχωρισμού οθόνης με την εφαρμογή στα δεξιά"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Χρήση διαχωρισμού οθόνης με την εφαρμογή στα αριστερά"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Χρήση πλήρους οθόνης"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Χρήση προβολής για υπολογιστές"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Εναλλαγή στην εφαρμογή δεξιά ή κάτω κατά τη χρήση διαχωρισμού οθόνης"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Εναλλαγή σε εφαρμογή αριστερά ή επάνω κατά τη χρήση διαχωρισμού οθόνης"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Κατά τον διαχωρισμό οθόνης: αντικατάσταση μιας εφαρμογής με άλλη"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 62441c8682f3..875b21a72166 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Surroundings"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Left"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Right"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Surroundings"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Left surroundings"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Right surroundings"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Expand to left and right separated controls"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Collapse to unified control"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Mute surroundings"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Unmute surroundings"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Tools"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Live Caption"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Note"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Unblock device microphone?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Unblock device camera?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Use split screen with app on the right"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Use split screen with app on the left"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Use fullscreen"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Use desktop view"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Switch to the app on the right or below while using split screen"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to the app on the left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: Replace an app from one to another"</string> @@ -1003,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Add to position <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Position invalid."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Position <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Tile already added"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Tile added"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Tile removed"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Quick settings editor."</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 69aca1fb223e..4e4295ab56a2 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -432,6 +432,7 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Unmute surroundings"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Tools"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Live Caption"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"Settings"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Note"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Unblock device microphone?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Unblock device camera?"</string> @@ -904,7 +905,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Use split screen with app on the right"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Use split screen with app on the left"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Use full screen"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Use desktop view"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Switch to app on right or below while using split screen"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to app on left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: replace an app from one to another"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 62441c8682f3..875b21a72166 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Surroundings"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Left"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Right"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Surroundings"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Left surroundings"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Right surroundings"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Expand to left and right separated controls"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Collapse to unified control"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Mute surroundings"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Unmute surroundings"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Tools"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Live Caption"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Note"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Unblock device microphone?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Unblock device camera?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Use split screen with app on the right"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Use split screen with app on the left"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Use fullscreen"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Use desktop view"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Switch to the app on the right or below while using split screen"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to the app on the left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: Replace an app from one to another"</string> @@ -1003,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Add to position <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Position invalid."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Position <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Tile already added"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Tile added"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Tile removed"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Quick settings editor."</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 62441c8682f3..875b21a72166 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Surroundings"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Left"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Right"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Surroundings"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Left surroundings"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Right surroundings"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Expand to left and right separated controls"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Collapse to unified control"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Mute surroundings"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Unmute surroundings"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Tools"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Live Caption"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Note"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Unblock device microphone?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Unblock device camera?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Use split screen with app on the right"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Use split screen with app on the left"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Use fullscreen"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Use desktop view"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Switch to the app on the right or below while using split screen"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to the app on the left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: Replace an app from one to another"</string> @@ -1003,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Add to position <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Position invalid."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Position <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Tile already added"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Tile added"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Tile removed"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Quick settings editor."</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 840afd45cdf2..c2dd040426a8 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -423,18 +423,16 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Sonido envolvente"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Izquierda"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Derecha"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Sonido envolvente"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Entorno de la izquierda"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Entorno de la derecha"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Expandir los controles separados a la izquierda y a la derecha"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Contraer al control unificado"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Silenciar el sonido envolvente"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Activar el sonido envolvente"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Herramientas"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Subtitulado instantáneo"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"Configuración"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Nota"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"¿Quieres desbloquear el micrófono del dispositivo?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"¿Quieres desbloquear la cámara del dispositivo?"</string> @@ -907,7 +905,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Usar la pantalla dividida con la app a la derecha"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Usar la pantalla dividida con la app a la izquierda"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Usar la pantalla completa"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Usar la vista para computadoras de escritorio"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Ubicar la app a la derecha o abajo cuando usas la pantalla dividida"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Ubicar la app a la izquierda o arriba cuando usas la pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Durante pantalla dividida: Reemplaza una app con otra"</string> @@ -1003,8 +1002,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Agregar a la posición <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Posición no válida"</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Posición <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Tarjeta ya agregada"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Se agregó la tarjeta"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Se quitó la tarjeta"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Editor de Configuración rápida"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 177f298d0121..7902db813708 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Dejar de silenciar alrededores"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Herramientas"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Subtítulos automáticos"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Nota"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"¿Desbloquear el micrófono del dispositivo?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"¿Desbloquear la cámara del dispositivo?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Usar la pantalla dividida con la aplicación a la derecha"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Usar la pantalla dividida con la aplicación a la izquierda"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Usar pantalla completa"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Usar vista para ordenador"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Cambiar a la aplicación de la derecha o de abajo en pantalla dividida"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Cambiar a la app de la izquierda o de arriba en pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Con pantalla dividida: reemplazar una aplicación por otra"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index be021fc96f9d..723a3eb1f401 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Ümbritsevate helide vaigistuse tühistamine"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Tööriistad"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Reaalajas subtiitrid"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Märkus"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Kas tühistada seadme mikrofoni blokeerimine?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Kas tühistada seadme kaamera blokeerimine?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Jagatud ekraanikuva kasutamine, rakendus kuvatakse paremal"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Jagatud ekraanikuva kasutamine, rakendus kuvatakse vasakul"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Lülita täisekraanile"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Kasuta arvutivaadet"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Paremale või alumisele rakendusele lülitamine jagatud ekraani ajal"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Vasakule või ülemisele rakendusele lülitamine jagatud ekraani ajal"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ekraanikuva jagamise ajal: ühe rakenduse asendamine teisega"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index edcc17225ace..55b223ae5ac1 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Aktibatu ingurunearen audioa"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Tresnak"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Istanteko azpitituluak"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Oharra"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Gailuaren mikrofonoa desblokeatu nahi duzu?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Gailuaren kamera desblokeatu nahi duzu?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Erabili pantaila zatitua eta ezarri aplikazio hau eskuinean"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Erabili pantaila zatitua eta ezarri aplikazio hau ezkerrean"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Erabili pantaila osoa"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Erabili ordenagailuetarako ikuspegia"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Aldatu eskuineko edo beheko aplikaziora pantaila zatitua erabiltzean"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Aldatu ezkerreko edo goiko aplikaziora pantaila zatitua erabiltzean"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Pantaila zatituan zaudela, ordeztu aplikazio bat beste batekin"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index f1f6a14568a5..c28ec975e931 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"صدادار کردن پیرامون"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ابزارها"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"زیرنویس زنده ناشنوایان"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"یادداشت"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"میکروفون دستگاه لغو انسداد شود؟"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"دوربین دستگاه لغو انسداد شود؟"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"استفاده از صفحهٔ دونیمه با قرار گرفتن برنامه در سمت راست"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"استفاده از صفحهٔ دونیمه با قرار گرفتن برنامه در سمت چپ"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"استفاده از حالت تمامصفحه"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"استفاده از نمای ویژه رایانه رومیزی"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"رفتن به برنامه سمت راست یا پایین درحین استفاده از صفحهٔ دونیمه"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"رفتن به برنامه سمت چپ یا بالا درحین استفاده از صفحهٔ دونیمه"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"درحین صفحهٔ دونیمه: برنامهای را با دیگری جابهجا میکند"</string> @@ -1003,8 +1006,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"افزودن به موقعیت <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"موقعیت نامعتبر است."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"موقعیت <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"کاشی قبلاً اضافه شده است"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"کاشی اضافه شد"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"کاشی حذف شد"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"ویرایشگر تنظیمات سریع."</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 747659956dbf..98f4883fe880 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -437,6 +437,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Poista ympäristön mykistys"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Työkalut"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Livetekstitys"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Muistiinpano"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Kumotaanko laitteen mikrofonin esto?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Kumotaanko laitteen kameran esto?"</string> @@ -909,7 +911,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Käytä jaettua näyttöä niin, että sovellus on oikealla"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Käytä jaettua näyttöä niin, että sovellus on vasemmalla"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Käytä koko näytön tilaa"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Käytä tietokonenäkymää"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Vaihda sovellukseen oikealla tai alapuolella jaetussa näytössä"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Vaihda sovellukseen vasemmalla tai yläpuolella jaetussa näytössä"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Jaetun näytön aikana: korvaa sovellus toisella"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index e22f306b0d57..95adcd3e05a4 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Réactiver les sons de l\'environnement"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Outils"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Sous-titres instantanés"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Note"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Débloquer le microphone de l\'appareil?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Débloquer l\'appareil photo de l\'appareil?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Utiliser l\'Écran divisé avec l\'appli à droite"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Utiliser l\'Écran divisé avec l\'appli à gauche"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Utiliser le mode plein écran"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Utiliser l\'affichage sur ordinateur de bureau"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Passer à l\'appli à droite ou en dessous avec l\'Écran divisé"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Passer à l\'appli à gauche ou au-dessus avec l\'Écran divisé"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"En mode d\'écran divisé : remplacer une appli par une autre"</string> @@ -1003,8 +1006,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Ajouter à la position <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Position incorrecte."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Position <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Tuile déjà ajoutée"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Tuile ajoutée"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Tuile retirée"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Éditeur de paramètres rapides."</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index cceab1c3689b..04c147cdd5a7 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Réactiver le mode Sons environnants"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Outils"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Sous-titres instantanés"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Note"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Débloquer le micro de l\'appareil ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Débloquer la caméra de l\'appareil ?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Utiliser l\'écran partagé avec l\'appli sur la droite"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Utiliser l\'écran partagé avec l\'appli sur la gauche"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Utiliser le mode plein écran"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Utiliser l\'affichage sur ordinateur"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Passer à l\'appli à droite ou en dessous avec l\'écran partagé"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Passez à l\'appli à gauche ou au-dessus avec l\'écran partagé"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"En mode écran partagé : Remplacer une appli par une autre"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index f54a634eaa18..6ab779a2569c 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Activar o son ambiental"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Ferramentas"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Subtítulos instantáneos"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Nota"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Queres desbloquear o micrófono do dispositivo?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Queres desbloquear a cámara do dispositivo?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Usar pantalla dividida coa aplicación na dereita"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Usar pantalla dividida coa aplicación na esquerda"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Usar a pantalla completa"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Usar a vista para ordenadores"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Cambiar á aplicación da dereita ou de abaixo coa pantalla dividida"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Cambiar á aplicación da esquerda ou de arriba coa pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"En modo de pantalla dividida: Substituír unha aplicación por outra"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 1830b347f829..a0dbf73fa73f 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -438,6 +438,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"આસપાસના અવાજો અનમ્યૂટ કરો"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ટૂલ"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"લાઇવ કૅપ્શન"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"નોંધ"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ડિવાઇસના માઇક્રોફોનને અનબ્લૉક કરીએ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ડિવાઇસના કૅમેરાને અનબ્લૉક કરીએ?"</string> @@ -910,7 +912,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"હાલની ઍપને જમણી બાજુએ રાખીને વિભાજિત સ્ક્રીનનો ઉપયોગ કરો"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"હાલની ઍપને ડાબી બાજુએ રાખીને વિભાજિત સ્ક્રીનનો ઉપયોગ કરો"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"પૂર્ણ સ્ક્રીનનો ઉપયોગ કરો"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ડેસ્કટૉપ વ્યૂનો ઉપયોગ કરો"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"વિભાજિત સ્ક્રીનનો ઉપયોગ કરતી વખતે જમણી બાજુ કે નીચેની ઍપ પર સ્વિચ કરો"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"વિભાજિત સ્ક્રીનનો ઉપયોગ કરતી વખતે ડાબી બાજુની કે ઉપરની ઍપ પર સ્વિચ કરો"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"વિભાજિત સ્ક્રીન દરમિયાન: એક ઍપને બીજી ઍપમાં બદલો"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 644980062f9f..0b8666115cb6 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"आस-पास के वॉल्यूम को अनम्यूट करें"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"टूल"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"लाइव कैप्शन"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"नोट"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"क्या आपको माइक्रोफ़ोन का ऐक्सेस अनब्लॉक करना है?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"क्या आपको कैमरे का ऐक्सेस अनब्लॉक करना है?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"स्प्लिट स्क्रीन की सुविधा चालू करें और इस ऐप्लिकेशन को दाईं ओर दिखाएं"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"स्प्लिट स्क्रीन की सुविधा चालू करें और इस ऐप्लिकेशन को बाईं ओर दिखाएं"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"फ़ुल स्क्रीन मोड का इस्तेमाल करें"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"डेस्कटॉप व्यू मोड का इस्तेमाल करें"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"स्प्लिट स्क्रीन पर, दाईं ओर या नीचे के ऐप पर स्विच करने के लिए"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"स्प्लिट स्क्रीन पर, बाईं ओर या ऊपर के ऐप पर स्विच करने के लिए"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"स्प्लिट स्क्रीन के दौरान: एक ऐप्लिकेशन को दूसरे ऐप्लिकेशन से बदलें"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 7db95fe316ce..608b498d2100 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Uključi zvuk okruženja"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Alati"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Automatski titlovi"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Napomena"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Želite li deblokirati mikrofon uređaja?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Želite li deblokirati kameru uređaja?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Upotreba podijeljenog zaslona s aplikacijom s desne strane"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Upotreba podijeljenog zaslona s aplikacijom s lijeve strane"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Upotreba prikaza na cijelom zaslonu"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Upotreba prikaza na računalu"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Prelazak na aplikaciju zdesna ili ispod uz podijeljeni zaslon"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Prelazak na aplikaciju slijeva ili iznad uz podijeljeni zaslon"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Tijekom podijeljenog zaslona: zamijeni aplikaciju drugom"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 906ce54f33fd..36187b97d70b 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Környezet némításának feloldása"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Eszközök"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Élő feliratozás"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Megjegyzés"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Feloldja az eszköz mikrofonjának letiltását?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Feloldja az eszköz kamerájának letiltását?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Osztott képernyő használata, az alkalmazás a jobb oldalon van"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Osztott képernyő használata, az alkalmazás a bal oldalon van"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Teljes képernyő használata"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Asztali nézet használata"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Váltás a jobb oldalt, illetve lent lévő appra osztott képernyő esetén"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Váltás a bal oldalt, illetve fent lévő appra osztott képernyő esetén"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Osztott képernyőn: az egyik alkalmazás lecserélése egy másikra"</string> @@ -1003,8 +1006,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Hozzáadás a következő pozícióhoz: <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Érvénytelen pozíció."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"<xliff:g id="POSITION">%1$d</xliff:g>. hely"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"A kártya már hozzá van adva"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Kártya hozzáadva"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Kártya eltávolítva"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Gyorsbeállítások szerkesztője"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 57a822e138c2..6a7543f754fd 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Շրջակայք"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Ձախ"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Աջ"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Շրջակայք"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Ձախ շրջակայք"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Աջ շրջակայք"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Ծավալել՝ դարձնելով կառավարման աջ և ձախ առանձնացված տարրեր"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Ծալել՝ դարձնելով կառավարման մեկ միասնական տարր"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Անջատել շրջակայքի ձայները"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Միացնել շրջակայքի ձայները"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Գործիքներ"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Կենդանի ենթագրեր"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Նշում"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Արգելահանե՞լ սարքի խոսափողը"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Արգելահանե՞լ սարքի տեսախցիկը"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Տրոհել էկրանը և տեղավորել այս հավելվածը աջ կողմում"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Տրոհել էկրանը և տեղավորել այս հավելվածը ձախ կողմում"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Օգտագործեք լիաէկրան ռեժիմը"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Օգտագործեք համակարգչային տարբերակը"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Անցեք աջ կողմի կամ ներքևի հավելվածին տրոհված էկրանի միջոցով"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Անցեք աջ կողմի կամ վերևի հավելվածին տրոհված էկրանի միջոցով"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Տրոհված էկրանի ռեժիմում մեկ հավելվածը փոխարինել մյուսով"</string> @@ -1003,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Ավելացնել դիրք <xliff:g id="POSITION">%1$d</xliff:g>-ում"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Դիրքն անվավեր է։"</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Դիրք <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Սալիկն արդեն ավելացվել է"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Սալիկն ավելացվեց"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Սալիկը հեռացվեց"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Արագ կարգավորումների խմբագրիչ:"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 2d38c8fa8e7a..c09e03c428d2 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Bunyikan suara sekitar"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Alat"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Teks Otomatis"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Catatan"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Berhenti memblokir mikrofon perangkat?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Berhenti memblokir kamera perangkat?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Gunakan layar terpisah dengan aplikasi di sebelah kanan"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Gunakan layar terpisah dengan aplikasi di sebelah kiri"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Gunakan layar penuh"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Gunakan tampilan desktop"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Beralih ke aplikasi di bagian kanan atau bawah saat menggunakan layar terpisah"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Beralih ke aplikasi di bagian kiri atau atas saat menggunakan layar terpisah"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Dalam layar terpisah: ganti salah satu aplikasi dengan yang lain"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 5c37bdb40161..b853a5561c4c 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Umhverfi"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Vinstri"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Hægri"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Umhverfi"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Umhverfi til vinstri"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Umhverfi til hægri"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Aðskilja stýringar til vinstri og hægri"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Taka saman í eina stýringu"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Þagga umhverfi"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Kveikja á hljóði umhverfis"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Verkfæri"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Skjátextar í rauntíma"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Glósa"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Opna fyrir hljóðnema tækisins?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Opna fyrir myndavél tækisins?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Notaðu skjáskiptingu fyrir forritið til hægri"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Notaðu skjáskiptingu fyrir forritið til vinstri"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Nota allan skjáinn"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Nota tölvuútgáfu"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Skiptu í forrit til hægri eða fyrir neðan þegar skjáskipting er notuð"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Skiptu í forrit til vinstri eða fyrir ofan þegar skjáskipting er notuð"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Í skjáskiptingu: Skipta forriti út fyrir annað forrit"</string> @@ -1003,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Bæta við í stöðu <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Staða ógild."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Staða <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Skífu hefur þegar verið bætt við"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Reit bætt við"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Reitur fjarlægður"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Flýtistillingaritill."</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index a21b6dbac247..ceb1ca1c5cb4 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Audio ambientale"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Sinistra"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Destra"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Audio ambientale"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Audio ambientale a sinistra"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Audio ambientale a destra"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Espandi controlli separati a sinistra e a destra"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Comprimi in controllo unificato"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Disattiva audio ambientale"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Riattiva audio ambientale"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Strumenti"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Sottotitoli in tempo reale"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Nota"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vuoi sbloccare il microfono del dispositivo?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vuoi sbloccare la fotocamera del dispositivo?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Utilizza lo schermo diviso con l\'app a destra"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Utilizza lo schermo diviso con l\'app a sinistra"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Utilizza la modalità a schermo intero"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Utilizza la visualizzazione desktop"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Passa all\'app a destra o sotto mentre usi lo schermo diviso"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Passa all\'app a sinistra o sopra mentre usi lo schermo diviso"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Con lo schermo diviso: sostituisci un\'app con un\'altra"</string> @@ -1003,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Aggiungi alla posizione <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Posizione non valida."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Posizione <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Riquadro già aggiunto"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Riquadro aggiunto"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Riquadro rimosso"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Editor di impostazioni rapide."</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 936b10e520d5..8123c7e2ea38 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -252,10 +252,8 @@ <string name="accessibility_bluetooth_name" msgid="7300973230214067678">"התבצע חיבור אל <xliff:g id="BLUETOOTH">%s</xliff:g>."</string> <string name="accessibility_cast_name" msgid="7344437925388773685">"מחובר אל <xliff:g id="CAST">%s</xliff:g>."</string> <string name="accessibility_expand_group" msgid="521237935987978624">"הרחבת הקבוצה."</string> - <!-- no translation found for accessibility_add_device_to_group (5446422960697860806) --> - <skip /> - <!-- no translation found for accessibility_remove_device_from_group (3114694270949142228) --> - <skip /> + <string name="accessibility_add_device_to_group" msgid="5446422960697860806">"הוספת מכשיר לקבוצה"</string> + <string name="accessibility_remove_device_from_group" msgid="3114694270949142228">"הסרת מכשיר מקבוצה"</string> <string name="accessibility_open_application" msgid="1749126077501259712">"פתיחת האפליקציה."</string> <string name="accessibility_not_connected" msgid="4061305616351042142">"אין חיבור."</string> <string name="data_connection_roaming" msgid="375650836665414797">"נדידה"</string> @@ -333,8 +331,7 @@ <string name="quick_settings_bluetooth_secondary_label_input" msgid="3887552721233148132">"קלט"</string> <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="5553051568867097111">"מכשירי שמיעה"</string> <string name="quick_settings_bluetooth_secondary_label_transient" msgid="3882884317600669650">"ההפעלה מתבצעת…"</string> - <!-- no translation found for quick_settings_brightness_unable_adjust_msg (4124028416057617517) --> - <skip /> + <string name="quick_settings_brightness_unable_adjust_msg" msgid="4124028416057617517">"אי אפשר לשנות את הבהירות כי היא נקבעת על ידי האפליקציה העליונה"</string> <string name="quick_settings_rotation_unlocked_label" msgid="2359922767950346112">"סיבוב אוטומטי"</string> <string name="accessibility_quick_settings_rotation" msgid="4800050198392260738">"סיבוב אוטומטי של המסך"</string> <string name="quick_settings_location_label" msgid="2621868789013389163">"מיקום"</string> @@ -438,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"ביטול השתקת הרעשים בסביבה"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"כלים"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"כתוביות מיידיות"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"פתק"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"לבטל את חסימת המיקרופון של המכשיר?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"לבטל את חסימת המצלמה של המכשיר?"</string> @@ -910,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"שימוש במסך מפוצל כשהאפליקציה בצד ימין"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"שימוש במסך מפוצל כשהאפליקציה בצד שמאל"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"שימוש במסך מלא"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"שימוש בתצוגה למחשב"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"מעבר לאפליקציה משמאל או למטה בזמן שימוש במסך מפוצל"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"מעבר לאפליקציה מימין או למעלה בזמן שימוש במסך מפוצל"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"כשהמסך מפוצל: החלפה בין אפליקציה אחת לאחרת"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index d5ecfe538b89..2fc703c44ca2 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -423,18 +423,16 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"周囲の音"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"左"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"右"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"周囲の音"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"周囲の音（左）"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"周囲の音（右）"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"開く - 左右それぞれで制御する"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"閉じる - まとめて制御する"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"周囲の音をミュート"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"周囲の音のミュートを解除"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ツール"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"自動字幕起こし"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"設定"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"注"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"デバイスのマイクのブロックを解除しますか？"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"デバイスのカメラのブロックを解除しますか？"</string> @@ -907,7 +905,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"分割画面の使用（アプリを右側に表示）"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"分割画面の使用（アプリを左側に表示）"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"全画面表示に切り替える"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"デスクトップ ビューを使用する"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"分割画面の使用時に右側または下部のアプリに切り替える"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"分割画面の使用時に左側または上部のアプリに切り替える"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"分割画面中: アプリを順に置換する"</string> @@ -1003,8 +1002,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"ポジション <xliff:g id="POSITION">%1$d</xliff:g> に追加"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"位置が無効です。"</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"位置: <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"タイルはすでに追加されています"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"タイルを追加しました"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"タイルを削除しました"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"クイック設定エディタ"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 2e3dc98eb153..86f8e33b2d76 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -423,18 +423,16 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"გარემოცვა"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"მარცხენა"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"მარჯვენა"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"გარემოცვა"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"მარცხენა გარემოცვა"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"მარჯვენა გარემოცვა"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"განცალკევებული მართვის საშუალებების გაფართოება მარცხნივ და მარჯვნივ"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"ერთიანი მართვის ჩაკეცვა"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"გარემოცვის დადუმება"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"გარემოცვის დადუმების მოხსნა"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ხელსაწყოები"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"ავტოსუბტიტრები"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"პარამეტრები"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"ჩანიშვნა"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"გსურთ მოწყობილობის მიკროფონის განბლოკვა?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"გსურთ მოწყობილობის კამერის განბლოკვა?"</string> @@ -907,7 +905,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ეკრანის გაყოფის გამოყენება აპზე მარჯვნივ"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ეკრანის გაყოფის გამოყენება აპზე მარცხნივ"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"სრული ეკრანის გამოყენება"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"დესკტოპის ხედის გამოყენება"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ეკრანის გაყოფის გამოყენებისას აპზე მარჯვნივ ან ქვემოთ გადართვა"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ეკრანის გაყოფის გამოყენებისას აპზე მარცხნივ ან ზემოთ გადართვა"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ეკრანის გაყოფის დროს: ერთი აპის მეორით ჩანაცვლება"</string> @@ -1003,8 +1002,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"დამატება პოზიციაზე <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"პოზიცია არასწორია."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"პოზიცია <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"მოზაიკის ფილა უკვე დამატებულია"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"მოზაიკის ფილა დაემატა"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"მოზაიკის ფილა ამოიშალა"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"სწრაფი პარამეტრების რედაქტორი."</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 1c4d31a6b758..1a7532b938d7 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -247,7 +247,7 @@ <string name="accessibility_bluetooth_device_settings_gear" msgid="3314916468105272540">"Құрылғы деректерін конфигурациялау үшін басыңыз."</string> <string name="accessibility_bluetooth_device_settings_gear_with_name" msgid="114373701123165491">"<xliff:g id="DEVICE_NAME">%s</xliff:g>. Құрылғы мәліметтерін конфигурациялау"</string> <string name="accessibility_bluetooth_device_settings_see_all" msgid="5260390270128256620">"Барлық құрылғыны көру"</string> - <string name="accessibility_bluetooth_device_settings_pair_new_device" msgid="7988547106800504256">"Жаңа құрылғыны жұптау"</string> + <string name="accessibility_bluetooth_device_settings_pair_new_device" msgid="7988547106800504256">"Жаңа құрылғымен жұптау"</string> <string name="accessibility_battery_unknown" msgid="1807789554617976440">"Батарея зарядының мөлшері белгісіз."</string> <string name="accessibility_bluetooth_name" msgid="7300973230214067678">"<xliff:g id="BLUETOOTH">%s</xliff:g> қосылған."</string> <string name="accessibility_cast_name" msgid="7344437925388773685">"<xliff:g id="CAST">%s</xliff:g> трансляциясына қосылды."</string> @@ -306,7 +306,7 @@ <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_tile_subtitle" msgid="212752719010829550">"Құрылғыны жалғау не ажырату үшін түртіңіз."</string> - <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Жаңа құрылғыны жұптау"</string> + <string name="pair_new_bluetooth_devices" msgid="4601767620843349645">"Жаңа құрылғымен жұптау"</string> <string name="see_all_bluetooth_devices" msgid="1761596816620200433">"Барлығын көру"</string> <string name="turn_on_bluetooth" msgid="5681370462180289071">"Bluetooth-ты пайдалану"</string> <string name="quick_settings_bluetooth_device_connected" msgid="7884777006729260996">"Қосылды"</string> @@ -415,7 +415,7 @@ <string name="quick_settings_hearing_devices_connected" msgid="6519069502397037781">"Қосулы"</string> <string name="quick_settings_hearing_devices_disconnected" msgid="8907061223998176187">"Ажыратулы"</string> <string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Есту құрылғылары"</string> - <string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Жаңа құрылғыны жұптау"</string> + <string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Жаңа құрылғымен жұптау"</string> <string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Жаңа құрылғыны жұптау үшін басыңыз."</string> <string name="hearing_devices_presets_error" msgid="350363093458408536">"Параметрлер жинағын жаңарту мүмкін болмады."</string> <string name="hearing_devices_preset_label" msgid="7878267405046232358">"Параметрлер жинағы"</string> @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Айналаның дыбысын қосу"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Құралдар"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Live Caption"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Ескертпе"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Құрылғы микрофонын блоктан шығару керек пе?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Құрылғы камерасын блоктан шығару керек пе?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Қолданбаны бөлінген экранның оң жағынан пайдалану"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Қолданбаны бөлінген экранның сол жағынан пайдалану"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Толық экранды пайдалану"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Компьютерлік нұсқаны пайдалану"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Бөлінген экранда оң не төмен жақтағы қолданбаға ауысу"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Бөлінген экранда сол не жоғары жақтағы қолданбаға ауысу"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Экранды бөлу кезінде: бір қолданбаны басқасымен алмастыру"</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 8b3bfcc1d30b..43c5c700d206 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"បើកសំឡេងមជ្ឈដ្ឋានជុំវិញ"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ឧបករណ៍"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"អក្សររត់ក្នុងពេលជាក់ស្ដែង"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"កំណត់ចំណាំ"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ឈប់ទប់ស្កាត់មីក្រូហ្វូនរបស់ឧបករណ៍ឬ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ឈប់ទប់ស្កាត់កាមេរ៉ារបស់ឧបករណ៍ឬ?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ប្រើមុខងារបំបែកអេក្រង់ជាមួយកម្មវិធីនៅខាងស្ដាំ"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ប្រើមុខងារបំបែកអេក្រង់ជាមួយកម្មវិធីនៅខាងឆ្វេង"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ប្រើអេក្រង់ពេញ"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ប្រើទិដ្ឋភាពលើកុំព្យូទ័រ"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ប្ដូរទៅកម្មវិធីនៅខាងស្ដាំ ឬខាងក្រោម ពេលកំពុងប្រើមុខងារបំបែកអេក្រង់"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ប្ដូរទៅកម្មវិធីនៅខាងឆ្វេង ឬខាងលើ ពេលកំពុងប្រើមុខងារបំបែកអេក្រង់"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ក្នុងអំឡុងពេលប្រើមុខងារបំបែកអេក្រង់៖ ជំនួសកម្មវិធីពីមួយទៅមួយទៀត"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 50f8c60537ba..8de5281e0a3f 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -423,18 +423,16 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"ಆ್ಯಂಬಿಯೆಂಟ್ ವಾಲ್ಯೂಮ್"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"ಎಡ"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"ಬಲ"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"ಆ್ಯಂಬಿಯೆಂಟ್ ವಾಲ್ಯೂಮ್"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"ಎಡಭಾಗದ ಆ್ಯಂಬಿಯೆಂಟ್ ವಾಲ್ಯೂಮ್"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"ಬಲಭಾಗದ ಆ್ಯಂಬಿಯೆಂಟ್ ವಾಲ್ಯೂಮ್"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"ಪ್ರತ್ಯೇಕ ಎಡ ಮತ್ತು ಬಲ ಕಂಟ್ರೋಲ್ಗಳಿಗಾಗಿ ವಿಸ್ತರಿಸಿ"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"ಯೂನಿಫೈಡ್ ಕಂಟ್ರೋಲ್ಗಾಗಿ ಕುಗ್ಗಿಸಿ"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"ಆ್ಯಂಬಿಯೆಂಟ್ ವಾಲ್ಯೂಮ್ ಅನ್ನು ಮ್ಯೂಟ್ ಮಾಡಿ"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"ಆ್ಯಂಬಿಯೆಂಟ್ ವಾಲ್ಯೂಮ್ ಅನ್ನು ಅನ್ಮ್ಯೂಟ್ ಮಾಡಿ"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ಟೂಲ್ಗಳು"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"ಲೈವ್ ಕ್ಯಾಪ್ಶನ್"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"ಟಿಪ್ಪಣಿ"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ಸಾಧನದ ಮೈಕ್ರೋಫೋನ್ ನಿರ್ಬಂಧವನ್ನು ತೆಗೆಯಬೇಕೆ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ಸಾಧನದ ಕ್ಯಾಮರಾ ನಿರ್ಬಂಧವನ್ನು ತೆಗೆಯಬೇಕೆ?"</string> @@ -907,7 +905,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ಬಲಭಾಗದಲ್ಲಿ ಆ್ಯಪ್ ಮೂಲಕ ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ ಬಳಸಿ"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ಎಡಭಾಗದಲ್ಲಿ ಆ್ಯಪ್ ಮೂಲಕ ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ ಬಳಸಿ"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ಫುಲ್ಸ್ಕ್ರೀನ್ ಅನ್ನು ಬಳಸಿ"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ಡೆಸ್ಕ್ಟಾಪ್ ವೀಕ್ಷಣೆಯನ್ನು ಬಳಸಿ"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ಸ್ಕ್ರೀನ್ ಬೇರ್ಪಡಿಸಿ ಮೋಡ್ ಬಳಸುವಾಗ ಬಲಭಾಗ ಅಥವಾ ಕೆಳಭಾಗದಲ್ಲಿರುವ ಆ್ಯಪ್ಗೆ ಬದಲಿಸಿ"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ಸ್ಕ್ರೀನ್ ಬೇರ್ಪಡಿಸಿ ಮೋಡ್ ಬಳಸುವಾಗ ಎಡಭಾಗ ಅಥವಾ ಮೇಲ್ಭಾಗದಲ್ಲಿರುವ ಆ್ಯಪ್ಗೆ ಬದಲಿಸಿ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ಸ್ಕ್ರೀನ್ ಬೇರ್ಪಡಿಸುವ ಸಮಯದಲ್ಲಿ: ಒಂದು ಆ್ಯಪ್ನಿಂದ ಮತ್ತೊಂದು ಆ್ಯಪ್ಗೆ ಬದಲಿಸಿ"</string> @@ -1003,8 +1002,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"<xliff:g id="POSITION">%1$d</xliff:g> ಸ್ಥಾನಕ್ಕೆ ಸೇರಿಸಿ"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"ಸ್ಥಾನವು ಅಮಾನ್ಯವಾಗಿದೆ."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"ಸ್ಥಾನ <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"ಟೈಲ್ ಅನ್ನು ಈಗಾಗಲೇ ಸೇರಿಸಲಾಗಿದೆ"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"ಟೈಲ್ ಸೇರಿಸಲಾಗಿದೆ"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"ಟೈಲ್ ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳ ಎಡಿಟರ್."</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 7342f32f116e..c3a1a1a63bc5 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"주변 소리 음소거 해제"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"도구"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"실시간 자막"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"메모"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"기기 마이크를 차단 해제하시겠습니까?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"기기 카메라를 차단 해제하시겠습니까?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"앱이 오른쪽에 오도록 화면 분할 사용"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"앱이 왼쪽에 오도록 화면 분할 사용"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"전체 화면 사용"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"데스크톱 뷰 사용"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"화면 분할을 사용하는 중에 오른쪽 또는 아래쪽에 있는 앱으로 전환"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"화면 분할을 사용하는 중에 왼쪽 또는 위쪽에 있는 앱으로 전환하기"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"화면 분할 중: 다른 앱으로 바꾸기"</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index f21ee1a401b7..23cc8ee23fb6 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Айланадагы үндөрдү чыгаруу"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Куралдар"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Ыкчам коштомо жазуулар"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Учкай маалымат"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Түзмөктүн микрофонун бөгөттөн чыгарасызбы?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Түзмөктүн камерасын бөгөттөн чыгарасызбы?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Колдонмону оңго жылдырып, экранды бөлүү"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Колдонмону солго жылдырып, экранды бөлүү"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Толук экранды колдонуу"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Компьютердик версияны колдонуу"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Бөлүнгөн экранда сол же төмөн жактагы колдонмого которулуу"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Бөлүнгөн экранды колдонуп жатканда сол же жогору жактагы колдонмого которулуңуз"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Экранды бөлүү режиминде бир колдонмону экинчисине алмаштыруу"</string> @@ -1003,8 +1006,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"<xliff:g id="POSITION">%1$d</xliff:g>-позицияга кошуу"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Абал жараксыз."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"<xliff:g id="POSITION">%1$d</xliff:g>-позиция"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Карточка кошулган"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Карта кошулду"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Карта өчүрүлдү"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Ыкчам параметрлер түзөткүчү."</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 4c778d1ac869..69b79b89cb80 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"ສຽງແວດລ້ອມ"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"ຊ້າຍ"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"ຂວາ"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"ສຽງແວດລ້ອມ"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"ສຽງແວດລ້ອມຂ້າງຊ້າຍ"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"ສຽງແວດລ້ອມຂ້າງຂວາ"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"ຂະຫຍາຍເປັນການຄວບຄຸມທີ່ແຍກເບື້ອງຊ້າຍ ແລະ ຂວາ"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"ຫຍໍ້ລົງເປັນການຄວບຄຸມແບບຮວມ"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"ປິດສຽງແວດລ້ອມ"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"ເຊົາປິດສຽງແວດລ້ອມ"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ເຄື່ອງມື"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"ຄຳບັນຍາຍສົດ"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"ບັນທຶກ"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ປົດບລັອກໄມໂຄຣໂຟນອຸປະກອນບໍ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ປົດບລັອກກ້ອງຖ່າຍຮູບອຸປະກອນບໍ?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ໃຊ້ໂໝດແບ່ງໜ້າຈໍໂດຍໃຫ້ແອັບຢູ່ເບື້ອງຂວາ"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ໃຊ້ໂໝດແບ່ງໜ້າຈໍໂດຍໃຫ້ແອັບຢູ່ເບື້ອງຊ້າຍ"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ໃຊ້ແບບເຕັມຈໍ"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ໃຊ້ມຸມມອງເດັສທັອບ"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ສະຫຼັບໄປໃຊ້ແອັບຢູ່ຂວາ ຫຼື ທາງລຸ່ມໃນຂະນະທີ່ໃຊ້ແບ່ງໜ້າຈໍ"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ສະຫຼັບໄປໃຊ້ແອັບຢູ່ຊ້າຍ ຫຼື ທາງເທິງໃນຂະນະທີ່ໃຊ້ແບ່ງໜ້າຈໍ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ໃນລະຫວ່າງແບ່ງໜ້າຈໍ: ໃຫ້ປ່ຽນຈາກແອັບໜຶ່ງເປັນອີກແອັບໜຶ່ງ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index f387a4ed4178..1ed102d9869b 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -423,18 +423,16 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Aplinka"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Kairė"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Dešinė"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Aplinka"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Aplinka kairėje"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Aplinka dešinėje"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Išskleisti į atskirus kairįjį ir dešinįjį valdiklius"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Sutraukti į bendrą valdiklį"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Nutildyti aplinką"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Įjungti aplinkos garsą"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Įrankiai"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Subtitrai realiuoju laiku"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"Nustatymai"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Pastaba"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Panaikinti įrenginio mikrofono blokavimą?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Panaikinti įrenginio fotoaparato blokavimą?"</string> @@ -907,7 +905,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Naudokite išskaidyto ekrano režimą su programa dešinėje"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Naudokite išskaidyto ekrano režimą su programa kairėje"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Naudoti viso ekrano režimą"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Naudoti rodinio versiją staliniams kompiuteriams"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Perjunkite į programą dešinėje arba apačioje išskaidyto ekrano režimu"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Perjunkite į programą kairėje arba viršuje išskaidyto ekrano režimu"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Išskaidyto ekrano režimu: pakeisti iš vienos programos į kitą"</string> @@ -1003,8 +1002,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Pridėkite <xliff:g id="POSITION">%1$d</xliff:g> pozicijoje"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Padėtis netinkama."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"<xliff:g id="POSITION">%1$d</xliff:g> pozicija"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Išklotinė jau pridėta"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Išklotinė pridėta"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Išklotinė pašalinta"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Sparčiųjų nustatymų redagavimo priemonė."</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index fd549219134f..06bc60102c48 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Ieslēgt apkārtnes skaņas"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Rīki"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Subtitri reāllaikā"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Piezīme"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vai atbloķēt ierīces mikrofonu?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vai vēlaties atbloķēt ierīces kameru?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Izmantot ekrāna sadalīšanu ar lietotni labajā pusē"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Izmantot ekrāna sadalīšanu ar lietotni kreisajā pusē"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Izmantot pilnekrāna režīmu"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Izmantot skatu datorā"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Pāriet uz lietotni pa labi/lejā, kamēr izmantojat sadalīto ekrānu."</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Pāriet uz lietotni pa kreisi/augšā, kamēr izmantojat sadalīto ekrānu."</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ekrāna sadalīšanas režīmā: pārvietot lietotni no viena ekrāna uz otru"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 2afe93ea7aae..c1a5d365c4b0 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Вклучи го звукот на опкружувањето"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Алатки"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Автоматски титлови"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Белешка"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Да се одблокира пристапот до микрофонот на уредот?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Да се одблокира пристапот до камерата на уредот?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Користете поделен екран со апликацијата оддесно"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Користете поделен екран со апликацијата одлево"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Користете цел екран"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Користете приказ на компјутер"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Префрлете се на апликацијата десно или долу при користењето поделен екран"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Префрлете се на апликацијата лево или горе при користењето поделен екран"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"При поделен екран: префрлете ги аплик. од едната на другата страна"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 48d07cb2ae28..fc004c06360c 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"സറൗണ്ടിംഗ്സ് അൺമ്യൂട്ട് ചെയ്യുക"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ടൂളുകൾ"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"തത്സമയ ക്യാപ്ഷൻ"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"കുറിപ്പ്"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ഉപകരണ മൈക്രോഫോൺ അൺബ്ലോക്ക് ചെയ്യണോ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ഉപകരണ ക്യാമറ അൺബ്ലോക്ക് ചെയ്യണോ?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"വലതുവശത്തുള്ള ആപ്പിനൊപ്പം സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുക"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ഇടതുവശത്തുള്ള ആപ്പിനൊപ്പം സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുക"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"പൂർണ സ്ക്രീൻ ഉപയോഗിക്കുക"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ഡെസ്ക്ടോപ്പ് വ്യൂ ഉപയോഗിക്കുക"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുമ്പോൾ വലതുവശത്തെ/താഴത്തെ ആപ്പിലേക്ക് മാറുക"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുമ്പോൾ ഇടതുവശത്തെ/മുകളിലെ ആപ്പിലേക്ക് മാറൂ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"സ്ക്രീൻ വിഭജന മോഡിൽ: ഒരു ആപ്പിൽ നിന്ന് മറ്റൊന്നിലേക്ക് മാറുക"</string> @@ -1003,8 +1006,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"<xliff:g id="POSITION">%1$d</xliff:g> എന്ന സ്ഥാനത്തേക്ക് ചേർക്കുക"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"സ്ഥാനം അസാധുവാണ്."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"സ്ഥാനം <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"ടൈൽ ഇതിനകം ചേർത്തിട്ടുണ്ട്"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"ടൈൽ ചേർത്തു"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"ടൈൽ നീക്കം ചെയ്തു"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"ദ്രുത ക്രമീകരണ എഡിറ്റർ."</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index c7fb7da28ead..7d53c479a4b9 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Орчин тойрны дууг нээх"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Хэрэгсэл"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Шууд тайлбар"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Тэмдэглэл"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Төхөөрөмжийн микрофоныг блокоос гаргах уу?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Төхөөрөмжийн камерыг блокоос гаргах уу?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Аппыг баруун талд байгаагаар дэлгэцийг хуваахыг ашиглах"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Аппыг зүүн талд байгаагаар дэлгэцийг хуваахыг ашиглах"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Бүтэн дэлгэцийг ашиглах"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Дэлгэц дээр харагдах байдлыг ашиглах"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Дэлгэц хуваахыг ашиглаж байхдаа баруун талд эсвэл доор байх апп руу сэлгэ"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Дэлгэц хуваахыг ашиглаж байхдаа зүүн талд эсвэл дээр байх апп руу сэлгэ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Дэлгэц хуваах үеэр: аппыг нэгээс нөгөөгөөр солих"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 2c5a9a85845d..9eca378c63b3 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"जवळपासचे आवाज अनम्यूट करा"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"टूल"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"लाइव्ह कॅप्शन"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"टीप"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"डिव्हाइसचा मायक्रोफोन अनब्लॉक करायचा आहे का?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"डिव्हाइसचा कॅमेरा अनब्लॉक करायचा आहे का?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ॲप उजवीकडे ठेवून स्प्लिट स्क्रीन वापरा"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ॲप डावीकडे ठेवून स्प्लिट स्क्रीन वापरा"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"फुल स्क्रीन वापरा"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"डेस्कटॉप दृश्य पहा"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"स्प्लिट स्क्रीन वापरताना उजवीकडील किंवा खालील अॅपवर स्विच करा"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"स्प्लिट स्क्रीन वापरताना डावीकडील किंवा वरील अॅपवर स्विच करा"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"स्प्लिट स्क्रीनदरम्यान: एक अॅप दुसऱ्या अॅपने बदला"</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 557509860f07..7f7c77743b5d 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Persekitaran"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Kiri"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Kanan"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Persekitaran"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Persekitaran kiri"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Persekitaran kanan"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Kembangkan kepada kawalan berasingan sebelah kiri dan kanan"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Kuncupkan kepada kawalan yang disatukan"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Redamkan persekitaran"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Nyahredam persekitaran"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Alatan"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Sari Kata Langsung"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Nota"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Nyahsekat mikrofon peranti?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Nyahsekat kamera peranti?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Gunakan skrin pisah dengan apl pada sebelah kanan"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Gunakan skrin pisah dengan apl pada sebelah kiri"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Gunakan skrin penuh"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Gunakan paparan desktop"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Tukar kepada apl di sebelah kanan/bawah semasa menggunakan skrin pisah"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Tukar kepada apl di sebelah kiri/atas semasa menggunakan skrin pisah"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Semasa skrin pisah: gantikan apl daripada satu apl kepada apl lain"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index b428422e5f07..42cfe5eeb5fb 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"ဝန်းကျင်အသံ ပြန်ဖွင့်ရန်"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"တူးလ်များ"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"တိုက်ရိုက်စာတန်း"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"မှတ်စု"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"စက်၏မိုက်ခရိုဖုန်းကို ပြန်ဖွင့်မလား။"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"စက်၏ကင်မရာကို ပြန်ဖွင့်မလား။"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"အက်ပ်ကို ညာ၌ထားကာ မျက်နှာပြင် ခွဲ၍ပြသခြင်း သုံးရန်"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"အက်ပ်ကို ဘယ်၌ထားကာ မျက်နှာပြင် ခွဲ၍ပြသခြင်း သုံးရန်"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ဖန်သားပြင်အပြည့် သုံးရန်"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ဒက်စ်တော့မြင်ကွင်း သုံးရန်"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"မျက်နှာပြင်ခွဲ၍ပြသခြင်း သုံးစဉ် ညာ (သို့) အောက်ရှိအက်ပ်သို့ ပြောင်းရန်"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"မျက်နှာပြင် ခွဲ၍ပြသခြင်းသုံးစဉ် ဘယ် (သို့) အထက်ရှိအက်ပ်သို့ ပြောင်းရန်"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"မျက်နှာပြင် ခွဲ၍ပြသစဉ်- အက်ပ်တစ်ခုကို နောက်တစ်ခုနှင့် အစားထိုးရန်"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 95740758c6e7..3b6e891708bc 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Slå på lyden for omgivelsene"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Verktøy"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Direkteteksting"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Merknad"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vil du oppheve blokkeringen av enhetsmikrofonen?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vil du oppheve blokkeringen av enhetskameraet?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Bruk delt skjerm med appen til høyre"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Bruk delt skjerm med appen til venstre"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Bruk fullskjerm"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Bruk datamaskinvisning"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Bytt til appen til høyre eller under mens du bruker delt skjerm"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Bytt til appen til venstre eller over mens du bruker delt skjerm"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"I delt skjerm: Bytt ut en app"</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 4d37f8fd760b..936a0a653220 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"वरपरका आवाज अनम्युट गर्नुहोस्"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"टुलहरू"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"लाइभ क्याप्सन"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"नोट"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"डिभाइसको माइक्रोफोन अनब्लक गर्ने हो?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"डिभाइसको क्यामेरा अनब्लक गर्ने हो?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"हालको एप दायाँ भागमा पारेर स्प्लिट स्क्रिन प्रयोग गर्नुहोस्"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"हालको एप बायाँ भागमा पारेर स्प्लिट स्क्रिन प्रयोग गर्नुहोस्"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"फुल स्क्रिन प्रयोग गर्नुहोस्"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"डेस्कटप भ्यू प्रयोग गर्नुहोस्"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"स्प्लिट स्क्रिन प्रयोग गर्दै गर्दा दायाँ वा तलको एप चलाउनुहोस्"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"स्प्लिट स्क्रिन प्रयोग गर्दै गर्दा बायाँ वा माथिको एप चलाउनुहोस्"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"स्प्लिट स्क्रिन प्रयोग गरिएका बेला: एउटा स्क्रिनमा भएको एप अर्कोमा लैजानुहोस्"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 26d87522595b..2a81bb424c8e 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Omgevingsgeluid"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Links"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Rechts"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Omgevingsgeluid"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Omgevingsgeluid links"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Omgevingsgeluid rechts"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Uitvouwen naar gescheiden bediening voor links en rechts"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Samenvouwen tot geïntegreerde bediening"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Omgevingsgeluid uitzetten"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Omgevingsgeluid aanzetten"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Tools"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Live ondertiteling"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Notitie"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Microfoon van apparaat niet meer blokkeren?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Apparaatcamera niet meer blokkeren?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Gesplitst scherm gebruiken met de app aan de rechterkant"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Gesplitst scherm gebruiken met de app aan de linkerkant"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Volledig scherm gebruiken"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Desktopweergave gebruiken"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Naar de app rechts of onderaan gaan als je een gesplitst scherm gebruikt"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Naar de app links of bovenaan gaan als je een gesplitst scherm gebruikt"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Tijdens gesplitst scherm: een app vervangen door een andere"</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index a0e360cf6bcb..e12fe7ecb39e 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"ପରିପାର୍ଶ୍ୱକୁ ଅନମ୍ୟୁଟ କରନ୍ତୁ"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ଟୁଲ"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"ଲାଇଭ କେପ୍ସନ"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"ନୋଟ"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ଡିଭାଇସର ମାଇକ୍ରୋଫୋନକୁ ଅନବ୍ଲକ କରିବେ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ଡିଭାଇସର କେମେରାକୁ ଅନବ୍ଲକ କରିବେ?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ଡାହାଣରେ ଆପ ସହିତ ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ବାମରେ ଆପ ସହିତ ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ ବ୍ୟବହାର କରନ୍ତୁ"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ଡେସ୍କଟପ ଭ୍ୟୁ ବ୍ୟବହାର କରନ୍ତୁ"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ବ୍ୟବହାର କରିବା ସମୟରେ ଡାହାଣପଟର ବା ତଳର ଆପକୁ ସୁଇଚ କରନ୍ତୁ"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ବ୍ୟବହାର କରିବା ସମୟରେ ବାମପଟର ବା ଉପରର ଆପକୁ ସୁଇଚ କରନ୍ତୁ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ସମୟରେ: କୌଣସି ଆପକୁ ଗୋଟିଏରୁ ଅନ୍ୟ ଏକ ଆପରେ ବଦଳାନ୍ତୁ"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index f2a6612bdb8a..26d26dc1e795 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"ਆਲੇ-ਦੁਆਲੇ ਦੇ ਸ਼ੋਰ ਨੂੰ ਅਣਮਿਊਟ ਕਰੋ"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ਟੂਲ"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"ਲਾਈਵ ਸੁਰਖੀਆਂ"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"ਨੋਟ-ਕਥਨ"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"ਕੀ ਡੀਵਾਈਸ ਦੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਨੂੰ ਅਣਬਲਾਕ ਕਰਨਾ ਹੈ?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"ਕੀ ਡੀਵਾਈਸ ਦੇ ਕੈਮਰੇ ਨੂੰ ਅਣਬਲਾਕ ਕਰਨਾ ਹੈ?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ਸੱਜੇ ਪਾਸੇ ਵਾਲੀ ਐਪ ਨਾਲ ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ਖੱਬੇ ਪਾਸੇ ਵਾਲੀ ਐਪ ਨਾਲ ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ਪੂਰੀ ਸਕ੍ਰੀਨ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ਡੈਸਕਟਾਪ ਦ੍ਰਿਸ਼ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵੇਲੇ ਸੱਜੇ ਜਾਂ ਹੇਠਾਂ ਮੌਜੂਦ ਐਪ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵੇਲੇ ਖੱਬੇ ਜਾਂ ਉੱਪਰ ਮੌਜੂਦ ਐਪ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੌਰਾਨ: ਇੱਕ ਐਪ ਨਾਲ ਦੂਜੀ ਐਪ ਨੂੰ ਬਦਲੋ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 99e99e1a2e6a..6b526f292507 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Wyłącz wyciszenie otoczenia"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Narzędzia"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Napisy na żywo"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Notatka"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Odblokować mikrofon urządzenia?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Odblokować aparat urządzenia?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Podziel ekran z aplikacją widoczną po prawej"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Podziel ekran z aplikacją widoczną po lewej"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Użyj trybu pełnoekranowego"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Użyj wersji na komputery"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Przełącz się na aplikację po prawej lub poniżej na podzielonym ekranie"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Przełącz się na aplikację po lewej lub powyżej na podzielonym ekranie"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Podczas podzielonego ekranu: zastępowanie aplikacji"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 4663dba04bc2..07f87ee1a0cc 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Ativar som ambiente"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Ferramentas"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Legenda instantânea"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Observação"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Desbloquear o microfone do dispositivo?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Desbloquear a câmera do dispositivo?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Usar a tela dividida com o app à direita"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Usar a tela dividida com o app à esquerda"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Usar tela cheia"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Usar a versão para computadores"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Mudar para o app à direita ou abaixo ao usar a tela dividida"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Mudar para o app à esquerda ou acima ao usar a tela dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Com a tela dividida: substituir um app por outro"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 7a0e4f6e68b2..de1057d543c8 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -423,18 +423,16 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Ambiente"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Esquerda"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Direita"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Ambiente"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Ambiente à esquerda"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Ambiente à direita"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Expandir para controlos separados do lado direito e esquerdo"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Reduzir para controlo unificado"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Desativar som do ambiente"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Reativar som do ambiente"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Ferramentas"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Legendas instantâneas"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"Definições"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Nota"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Desbloquear o microfone do dispositivo?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Desbloquear a câmara do dispositivo?"</string> @@ -907,7 +905,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Use o ecrã dividido com a app à direita"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Use o ecrã dividido com a app à esquerda"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Use o ecrã inteiro"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Use a vista de computador"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Mudar para a app à direita ou abaixo enquanto usa o ecrã dividido"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Mude para a app à esquerda ou acima enquanto usa o ecrã dividido"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Durante o ecrã dividido: substituir uma app por outra"</string> @@ -1003,8 +1002,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Adicione à posição <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Posição inválida."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Posição <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Mosaico já adicionado"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Cartão adicionado"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Cartão removido"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Editor de definições rápidas."</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 4663dba04bc2..07f87ee1a0cc 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Ativar som ambiente"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Ferramentas"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Legenda instantânea"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Observação"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Desbloquear o microfone do dispositivo?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Desbloquear a câmera do dispositivo?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Usar a tela dividida com o app à direita"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Usar a tela dividida com o app à esquerda"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Usar tela cheia"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Usar a versão para computadores"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Mudar para o app à direita ou abaixo ao usar a tela dividida"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Mudar para o app à esquerda ou acima ao usar a tela dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Com a tela dividida: substituir um app por outro"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index e8b826b940f4..a6b4983aa0ae 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Activează sunetul ambiental"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Instrumente"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Subtitrări live"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Notă"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Deblochezi microfonul dispozitivului?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Deblochezi camera dispozitivului?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Folosește ecranul împărțit cu aplicația în dreapta"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Folosește ecranul împărțit cu aplicația în stânga"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Folosește ecranul complet"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Folosește afișarea pe desktop"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Treci la aplicația din dreapta sau de mai jos cu ecranul împărțit"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Treci la aplicația din stânga sau de mai sus cu ecranul împărțit"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"În modul ecran împărțit: înlocuiește o aplicație cu alta"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 52458ebd176d..693024bcb274 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Окружающие звуки"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Левый"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Правый"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Окружающие звуки"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Звуки слева"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Звуки справа"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Разделить на левый и правый элемент управления"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Объединить в один элемент управления"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Заглушить окружающие звуки"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Не заглушать окружающие звуки"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Инструменты"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Автоматические субтитры"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Заметка"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Разблокировать микрофон устройства?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Разблокировать камеру устройства?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Разделить экран и поместить открытое приложение справа"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Разделить экран и поместить открытое приложение слева"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Полноэкранный режим"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Версия для ПК"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Перейти к приложению справа или внизу на разделенном экране"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Перейти к приложению слева или вверху на разделенном экране"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"В режиме разделения экрана заменить одно приложение другим"</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 84a981f9db89..8632e13397d2 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"අවට නිහඬ නොකරන්න"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"මෙවලම්"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"සජීවී සිරස්තල"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"සටහන"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"උපාංග මයික්රෆෝනය අවහිර කිරීම ඉවත් කරන්නද?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"උපාංග කැමරාව අවහිර කිරීම ඉවත් කරන්නද?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"දකුණේ යෙදුම සමග බෙදීම් තිරය භාවිතා කරන්න"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"වම් පැත්තේ යෙදුම සමග බෙදීම් තිරය භාවිතා කරන්න"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"පූර්ණ තිරය භාවිතා කරන්න"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ඩෙස්ක්ටොප් දසුන භාවිතා කරන්න"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"බෙදුම් තිරය භාවිත කරන අතරතුර දකුණේ හෝ පහළින් ඇති යෙදුමට මාරු වන්න"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"බෙදුම් තිරය භාවිත කරන අතරතුර වමේ හෝ ඉහළ ඇති යෙදුමට මාරු වන්න"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"බෙදුම් තිරය අතරතුර: යෙදුමක් එකකින් තවත් එකක් ප්රතිස්ථාපනය කරන්න"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 78a332a6c45c..03509f314b2b 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Okolie"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Vľavo"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Vpravo"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Okolie"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Okolie zľava"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Okolie sprava"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Rozbaliť na samostatné ovládanie ľavej a pravej strany"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Zbaliť na jednotné ovládanie"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Vypnúť zvuk okolia"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Zapnúť zvuk okolia"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Nástroje"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Živý prepis"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Poznámka"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Chcete odblokovať mikrofón zariadenia?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Chcete odblokovať kameru zariadenia?"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Rozdelenie obrazovky, aktuálna aplikácia vpravo"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Rozdelenie obrazovky, aktuálna aplikácia vľavo"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Používať celú obrazovku"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Používať zobrazenie v počítači"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Prechod na aplikáciu vpravo alebo dole pri rozdelenej obrazovke"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Prechod na aplikáciu vľavo alebo hore pri rozdelenej obrazovke"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Počas rozdelenej obrazovky: nahradenie aplikácie inou"</string> @@ -1003,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Pridať na <xliff:g id="POSITION">%1$d</xliff:g>. pozíciu"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Pozícia je neplatná."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"<xliff:g id="POSITION">%1$d</xliff:g>. pozícia"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Karta už bola pridaná"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Karta bola pridaná"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Karta bola odstránená"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Editor rýchlych nastavení"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 93649f5039d0..10a236c0ed5b 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -423,18 +423,16 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"Okolica"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"Levo"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"Desno"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"Okolica"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"Okolica na levi"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"Okolica na desni"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"Razširitev na ločene kontrolnike za levo in desno stran"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"Strnitev v enotni kontrolnik"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"Izklop okoliškega zvoka"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Vklop okoliškega zvoka"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Orodja"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Samodejni podnapisi"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"Nastavitve"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Opomba"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Želite odblokirati mikrofon v napravi?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Želite odblokirati fotoaparat v napravi?"</string> @@ -907,7 +905,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Uporaba razdeljenega zaslona z aplikacijo na desni"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Uporaba razdeljenega zaslona z aplikacijo na levi"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Uporaba celozaslonskega načina"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Uporaba pogleda za namizni računalnik"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Preklop na aplikacijo desno ali spodaj med uporabo razdeljenega zaslona"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Preklop na aplikacijo levo ali zgoraj med uporabo razdeljenega zaslona"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Pri razdeljenem zaslonu: medsebojna zamenjava aplikacij"</string> @@ -1003,8 +1002,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Dodajanje na položaj <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Položaj je neveljaven."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Položaj <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Ploščica je že dodana"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Ploščica je bila dodana"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Ploščica je bila odstranjena"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Urejevalnik hitrih nastavitev."</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 5e69808d7f63..a32fc8aaf267 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Anulo vendosjen në heshtje të ambientit rrethues"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Veglat"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Titrat në çast"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Shënim"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Të zhbllokohet mikrofoni i pajisjes?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Të zhbllokohet kamera e pajisjes?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Përdor ekranin e ndarë me aplikacionin në të djathtë"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Përdor ekranin e ndarë me aplikacionin në të majtë"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Përdor ekranin e plotë"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Përdor pamjen e desktopit"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Kalo tek aplikacioni djathtas ose poshtë kur përdor ekranin e ndarë"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Kalo tek aplikacioni në të majtë ose sipër kur përdor ekranin e ndarë"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Gjatë ekranit të ndarë: zëvendëso një aplikacion me një tjetër"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 1b645a8e2017..f99301c44e7d 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Укључи звук окружења"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Алатке"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Титл уживо"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Белешка"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Желите да одблокирате микрофон уређаја?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Желите да одблокирате камеру уређаја?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Користи подељени екран са апликацијом с десне стране"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Користи подељени екран са апликацијом с леве стране"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Користи приказ преко целог екрана"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Користи приказ за рачунаре"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Пређи у апликацију здесна или испод док је подељен екран"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Пређите у апликацију слева или изнад док користите подељени екран"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"У режиму подељеног екрана: замена једне апликације другом"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index a4129e0afb18..0085ed26e4cd 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Slå på omgivningsljudet"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Verktyg"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Live Caption"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Anteckning"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vill du återaktivera enhetens mikrofon?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vill du återaktivera enhetens kamera?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Använd delad skärm med appen till höger"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Använd delad skärm med appen till vänster"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Använd helskärm"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Använd datorvyn"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Byt till appen till höger eller nedanför när du använder delad skärm"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Byt till appen till vänster eller ovanför när du använder delad skärm"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Med delad skärm: ersätt en app med en annan"</string> @@ -1003,8 +1006,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Lägg till på position <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Positionen är ogiltig."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Position <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Kortet har redan lagts till"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Kortet har lagts till"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Kortet har tagits bort"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Redigerare för snabbinställningar."</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index cb82afff7f91..b7d208a95d85 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Rejesha sauti ya mazingira"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Zana"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Manukuu Papo Hapo"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Dokezo"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Ungependa kuwacha kuzuia maikrofoni ya kifaa?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Ungependa kuacha kuzuia kamera ya kifaa?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Tumia hali ya kugawa skrini na programu ya sasa iwe upande wa kulia"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Tumia hali ya kugawa skrini na programu ya sasa iwe upande wa kushoto"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Tumia skrini nzima"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Tumia mwonekano wa kompyuta"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Badilisha ili uende kwenye programu iliyo kulia au chini unapotumia hali ya kugawa skrini"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Badilisha uende kwenye programu iliyo kushoto au juu unapotumia hali ya kugawa skrini"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ukigawanya skrini: badilisha kutoka programu moja hadi nyingine"</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 77be6ea6a64b..473be6f14093 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"சுற்றுப்புறங்களின் ஒலியை இயக்கும்"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"கருவிகள்"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"உடனடி வசனம்"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"குறிப்பு"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"சாதனத்தின் மைக்ரோஃபோனுக்கான தடுப்பை நீக்கவா?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"சாதனத்தின் கேமராவுக்கான தடுப்பை நீக்கவா?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ஆப்ஸ் வலதுபுறம் வரும்படி திரைப் பிரிப்பைப் பயன்படுத்துதல்"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ஆப்ஸ் இடதுபுறம் வரும்படி திரைப் பிரிப்பைப் பயன்படுத்துதல்"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"முழுத்திரையைப் பயன்படுத்து"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"டெஸ்க்டாப் காட்சியைப் பயன்படுத்து"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"திரைப் பிரிப்பைப் பயன்படுத்தும்போது வலது/கீழ் உள்ள ஆப்ஸுக்கு மாறுதல்"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"திரைப் பிரிப்பைப் பயன்படுத்தும்போது இடது/மேலே உள்ள ஆப்ஸுக்கு மாறுதல்"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"திரைப் பிரிப்பின்போது: ஓர் ஆப்ஸுக்குப் பதிலாக மற்றொன்றை மாற்றுதல்"</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index b4665190f33d..a75dd225bb24 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -423,18 +423,16 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"పరిసరాలు"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"ఎడమ వైపునకు"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"కుడి వైపునకు"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"పరిసరాలు"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"ఎడమ వైపు పరిసరాలు"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"కుడి వైపు పరిసరాలు"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"ఎడమ, కుడి అని వేరు చేయబడిన కంట్రోల్స్కు విస్తరించండి"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"యూనిఫైడ్ కంట్రోల్కు కుదించండి"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"పరిసరాలను మ్యూట్ చేయండి"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"పరిసరాలను అన్మ్యూట్ చేయండి"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"టూల్స్"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"లైవ్ క్యాప్షన్"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"సెట్టింగ్లు"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"గమనిక"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"పరికరం మైక్రోఫోన్ను అన్బ్లాక్ చేయమంటారా?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"పరికరంలోని కెమెరాను అన్బ్లాక్ చేయమంటారా?"</string> @@ -907,7 +905,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"కుడి వైపు ప్రస్తుత యాప్తో స్ప్లిట్ స్క్రీన్ను ఉపయోగించండి"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ఎడమ వైపు ప్రస్తుత యాప్తో స్ప్లిట్ స్క్రీన్ను ఉపయోగించండి"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ఫుల్ స్క్రీన్ను ఉపయోగించండి"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"డెస్క్టాప్ వీక్షణను ఉపయోగించండి"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"స్ప్లిట్ స్క్రీన్ ఉపయోగిస్తున్నప్పుడు కుడి లేదా కింద యాప్నకు మారండి"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"స్ప్లిట్ స్క్రీన్ ఉపయోగిస్తున్నప్పుడు ఎడమ లేదా పైన యాప్నకు మారండి"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"స్ప్లిట్ స్క్రీన్ సమయంలో: ఒక దాన్నుండి మరో దానికి యాప్ రీప్లేస్ చేయండి"</string> @@ -1004,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"<xliff:g id="POSITION">%1$d</xliff:g> స్థానానికి జోడించండి"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"ప్రస్తుత పొజిషన్ చెల్లదు."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"స్థానం <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"టైల్ను ఇప్పటికే జోడించారు"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"టైల్ జోడించబడింది"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"టైల్ తీసివేయబడింది"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"శీఘ్ర సెట్టింగ్ల ఎడిటర్."</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index e816c04a5e65..e1413f2ebe65 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -423,18 +423,17 @@ <string name="hearing_devices_ambient_label" msgid="629440938614895797">"เสียงแวดล้อม"</string> <string name="hearing_devices_ambient_control_left" msgid="3586965448230412600">"ซ้าย"</string> <string name="hearing_devices_ambient_control_right" msgid="6192137602448918383">"ขวา"</string> - <!-- no translation found for hearing_devices_ambient_control_description (3663947879732939509) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_left_description (4440988622896213511) --> - <skip /> - <!-- no translation found for hearing_devices_ambient_control_right_description (2230461103493378003) --> - <skip /> + <string name="hearing_devices_ambient_control_description" msgid="3663947879732939509">"เสียงแวดล้อม"</string> + <string name="hearing_devices_ambient_control_left_description" msgid="4440988622896213511">"เสียงแวดล้อมด้านซ้าย"</string> + <string name="hearing_devices_ambient_control_right_description" msgid="2230461103493378003">"เสียงแวดล้อมด้านขวา"</string> <string name="hearing_devices_ambient_expand_controls" msgid="2131816068187709200">"ขยายเป็นการควบคุมที่แยกด้านซ้ายและขวา"</string> <string name="hearing_devices_ambient_collapse_controls" msgid="2261097656446201581">"ยุบเป็นการควบคุมแบบรวม"</string> <string name="hearing_devices_ambient_mute" msgid="1836882837647429416">"ปิดเสียงแวดล้อม"</string> <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"เปิดเสียงแวดล้อม"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"เครื่องมือ"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"คำบรรยายสด"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"จดบันทึก"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"เลิกบล็อกไมโครโฟนของอุปกรณ์ใช่ไหม"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"เลิกบล็อกกล้องของอุปกรณ์ใช่ไหม"</string> @@ -907,7 +906,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"ใช้โหมดแยกหน้าจอโดยให้แอปอยู่ด้านขวา"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"ใช้โหมดแยกหน้าจอโดยให้แอปอยู่ด้านซ้าย"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"ใช้โหมดเต็มหน้าจอ"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ใช้มุมมองบนเดสก์ท็อป"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"เปลี่ยนไปใช้แอปทางด้านขวาหรือด้านล่างขณะใช้โหมดแยกหน้าจอ"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"เปลี่ยนไปใช้แอปทางด้านซ้ายหรือด้านบนขณะใช้โหมดแยกหน้าจอ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ระหว่างใช้โหมดแยกหน้าจอ: เปลี่ยนแอปหนึ่งเป็นอีกแอปหนึ่ง"</string> @@ -1003,8 +1003,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"เพิ่มไปยังตำแหน่ง <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"ตำแหน่งไม่ถูกต้อง"</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"ตำแหน่ง <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"เพิ่มการ์ดแล้ว"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"เพิ่มชิ้นส่วนแล้ว"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"นำชิ้นส่วนออกแล้ว"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"ตัวแก้ไขการตั้งค่าด่วน"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index d996218c64db..aff1621dd4cf 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -435,6 +435,7 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"I-unmute ang paligid"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Mga Tool"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Instant Caption"</string> + <string name="hearing_devices_settings_button" msgid="999474385481812222">"Mga Setting"</string> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Tala"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"I-unblock ang mikropono ng device?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"I-unblock ang camera ng device?"</string> @@ -907,7 +908,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Gumamit ng split screen nang nasa kanan ang app"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Gumamit ng split screen nang nasa kaliwa ang app"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Gamitin ang full screen"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Gamitin ang desktop view"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Lumipat sa app sa kanan o ibaba habang ginagamit ang split screen"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Lumipat sa app sa kaliwa o itaas habang ginagamit ang split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Habang nasa split screen: magpalit-palit ng app"</string> @@ -1003,8 +1005,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"Idagdag sa posisyong <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"Invalid ang posisyon."</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"Posisyon <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"Naidagdag na ang tile"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"Idinagdag ang tile"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"Inalis ang tile"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"Editor ng Mga mabilisang setting."</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 9d789417b09f..eb5b95143af7 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Çevredeki sesleri aç"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Araçlar"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Canlı Altyazı"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Not"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Cihaz mikrofonunun engellemesi kaldırılsın mı?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Cihaz kamerasının engellemesi kaldırılsın mı?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Sağdaki uygulamayla birlikte bölünmüş ekranı kullan"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Soldaki uygulamayla birlikte bölünmüş ekranı kullan"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Tam ekran kullanın"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Masaüstü görünümünü kullanın"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Bölünmüş ekran kullanırken sağdaki veya alttaki uygulamaya geçiş yap"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Bölünmüş ekran kullanırken soldaki veya üstteki uygulamaya geçiş yapın"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Bölünmüş ekran etkinken: Bir uygulamayı başkasıyla değiştir"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 97e5bb70313f..1f5d0aac98c6 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Увімкнути звуки оточення"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Інструменти"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Живі субтитри"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Нотатка"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Надати доступ до мікрофона?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Надати доступ до камери пристрою?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Розділити екран і показувати додаток праворуч"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Розділити екран і показувати додаток ліворуч"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Використовувати повноекранний режим"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Використовувати версію для комп’ютера"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Перейти до додатка праворуч або внизу на розділеному екрані"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Під час розділення екрана перемикатися на додаток ліворуч або вгорі"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Під час розділення екрана: замінити додаток іншим"</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index 41ba6b235284..bcaa91240d53 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -252,8 +252,8 @@ <string name="accessibility_bluetooth_name" msgid="7300973230214067678">"<xliff:g id="BLUETOOTH">%s</xliff:g> سے منسلک ہیں۔"</string> <string name="accessibility_cast_name" msgid="7344437925388773685">"<xliff:g id="CAST">%s</xliff:g> سے منسلک ہے۔"</string> <string name="accessibility_expand_group" msgid="521237935987978624">"گروپ کو پھیلائیں۔"</string> - <string name="accessibility_add_device_to_group" msgid="5446422960697860806">"آلہ کو گروپ شامل کریں۔"</string> - <string name="accessibility_remove_device_from_group" msgid="3114694270949142228">"آلہ کو گروپ سے ہٹائیں"</string> + <string name="accessibility_add_device_to_group" msgid="5446422960697860806">"آلہ کو گروپ میں شامل کریں۔"</string> + <string name="accessibility_remove_device_from_group" msgid="3114694270949142228">"آلہ کو گروپ سے ہٹائیں۔"</string> <string name="accessibility_open_application" msgid="1749126077501259712">"ایپلیکیشن کھولیں۔"</string> <string name="accessibility_not_connected" msgid="4061305616351042142">"مربوط نہیں ہے۔"</string> <string name="data_connection_roaming" msgid="375650836665414797">"رومنگ"</string> @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"اطراف کی آواز چالو کریں"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"ٹولز"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"لائیو کیپشن"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"نوٹ"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"آلے کا مائیکروفون غیر مسدود کریں؟"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"آلے کا کیمرا غیر مسدود کریں؟"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"بائیں جانب ایپ کے ساتھ اسپلٹ اسکرین کا استعمال کریں"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"دائیں جانب ایپ کے ساتھ اسپلٹ اسکرین کا استعمال کریں"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"فُل اسکرین استعمال کریں"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"ڈیسک ٹاپ منظر استعمال کریں"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"اسپلٹ اسکرین کا استعمال کرتے ہوئے دائیں یا نیچے ایپ پر سوئچ کریں"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"اسپلٹ اسکرین کا استعمال کرتے ہوئے بائیں یا اوپر ایپ پر سوئچ کریں"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"اسپلٹ اسکرین کے دوران: ایک ایپ کو دوسرے سے تبدیل کریں"</string> @@ -1003,8 +1006,7 @@ <string name="accessibility_qs_edit_tile_add_to_position" msgid="9029163095148274690">"پوزیشن <xliff:g id="POSITION">%1$d</xliff:g> میں شامل کریں"</string> <string name="accessibilit_qs_edit_tile_add_move_invalid_position" msgid="2858467994472624487">"پوزیشن غلط ہے۔"</string> <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"پوزیشن <xliff:g id="POSITION">%1$d</xliff:g>"</string> - <!-- no translation found for accessibility_qs_edit_tile_already_added (5900071201690226752) --> - <skip /> + <string name="accessibility_qs_edit_tile_already_added" msgid="5900071201690226752">"ٹائل پہلے ہی شامل کر دیا گیا ہے"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"ٹائل کو شامل کیا گیا"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"ٹائل کو ہٹا دیا گیا"</string> <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"فوری ترتیبات کا ایڈیٹر۔"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index f713ddc13b80..bf070b5535bd 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Atrof-muhitni sukutdan chiqarish"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Vositalar"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Jonli izoh"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Qayd"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Qurilma mikrofoni blokdan chiqarilsinmi?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Qurilma kamerasi blokdan chiqarilsinmi?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Ekranni ajratib, joriy ilovani oʻngga joylash"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Ekranni ajratib, joriy ilovani chapga joylash"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Butun ekrandan foydalanish"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Desktop versiyadan foydalanish"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Ajratilgan ekranda oʻngdagi yoki pastdagi ilovaga almashish"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Ajratilgan ekranda chapdagi yoki yuqoridagi ilovaga almashish"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ajratilgan rejimda ilovalarni oʻzaro almashtirish"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 2f266a781525..9e11f3813842 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Bật tiếng xung quanh"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Công cụ"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Phụ đề trực tiếp"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Ghi chú"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Bỏ chặn micrô của thiết bị?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Bỏ chặn camera của thiết bị?"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Dùng tính năng chia đôi màn hình với ứng dụng ở bên phải"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Dùng tính năng chia đôi màn hình với ứng dụng ở bên trái"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Dùng chế độ toàn màn hình"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Dùng chế độ xem trên máy tính để bàn"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Chuyển sang ứng dụng bên phải hoặc ở dưới khi đang chia đôi màn hình"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Chuyển sang ứng dụng bên trái hoặc ở trên khi đang chia đôi màn hình"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Trong chế độ chia đôi màn hình: thay một ứng dụng bằng ứng dụng khác"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 480debcb239b..cbc4e5183f43 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -150,7 +150,7 @@ <string name="cast_to_other_device_stop_dialog_title" msgid="7836517190930357326">"停止投屏吗？"</string> <string name="cast_to_other_device_stop_dialog_message_entire_screen_with_device" msgid="1474703115926205251">"您正在将整个屏幕投放到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”上"</string> <string name="cast_to_other_device_stop_dialog_message_entire_screen" msgid="8419219169553867625">"您正在将整个屏幕投放到附近的设备上"</string> - <string name="cast_to_other_device_stop_dialog_message_specific_app_with_device" msgid="2715934698604085519">"您正在将“<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>”投放到“<xliff:g id="DEVICE_NAME">%2$s</xliff:g>”上"</string> + <string name="cast_to_other_device_stop_dialog_message_specific_app_with_device" msgid="2715934698604085519">"目前正在将“<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>”投放到“<xliff:g id="DEVICE_NAME">%2$s</xliff:g>”"</string> <string name="cast_to_other_device_stop_dialog_message_specific_app" msgid="8616103075630934513">"您正在将“<xliff:g id="APP_BEING_SHARED_NAME">%1$s</xliff:g>”投放到附近的设备上"</string> <string name="cast_to_other_device_stop_dialog_message_generic_with_device" msgid="9213582497852420203">"您正在向“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”上投放内容"</string> <string name="cast_to_other_device_stop_dialog_message_generic" msgid="4100272100480415076">"您正在向附近的设备投放内容"</string> @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"取消周围声音静音"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"工具"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"实时字幕"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"记事"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"要解锁设备麦克风吗？"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"要解锁设备摄像头吗？"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"使用分屏模式，并将应用置于右侧"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"使用分屏模式，并将应用置于左侧"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"使用全屏"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"使用桌面版视图"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"使用分屏模式时，切换到右侧或下方的应用"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"使用分屏模式时，切换到左侧或上方的应用"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"在分屏期间：将一个应用替换为另一个应用"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index bc9e0c580901..0e1de31e0a08 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"取消環境聲音靜音"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"工具"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"即時字幕"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"筆記"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"要解除封鎖裝置麥克風嗎？"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"要解除封鎖裝置相機嗎？"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"使用分割螢幕，並在右側顯示應用程式"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"使用分割螢幕，並在左側顯示應用程式"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"使用全螢幕"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"使用桌面電腦檢視模式"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"使用分割螢幕時，切換至右邊或下方的應用程式"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"使用分割螢幕時，切換至左邊或上方的應用程式"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"使用分割螢幕期間：更換應用程式"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 02fda5a68313..a34333bcbc80 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -435,6 +435,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"取消環境靜音"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"工具"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"即時字幕"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"筆記"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"要解除封鎖裝置麥克風嗎？"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"解除封鎖裝置相機？"</string> @@ -907,7 +909,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"使用分割畫面，並在右側顯示應用程式"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"使用分割畫面，並在左側顯示應用程式"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"使用全螢幕模式"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"使用電腦檢視畫面"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"使用分割畫面時，切換到右邊或上方的應用程式"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"使用分割畫面時，切換到左邊或上方的應用程式"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"使用分割畫面期間：更換應用程式"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 886cbdf2b097..7d43adc83376 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -437,6 +437,8 @@ <string name="hearing_devices_ambient_unmute" msgid="2187938085943876814">"Susa ukuthula ezindaweni ezizungezile"</string> <string name="hearing_devices_tools_label" msgid="1929081464316074476">"Amathuluzi"</string> <string name="quick_settings_hearing_devices_live_caption_title" msgid="1054814050932225451">"Okushuthwe Bukhoma"</string> + <!-- no translation found for hearing_devices_settings_button (999474385481812222) --> + <skip /> <string name="quick_settings_notes_label" msgid="1028004078001002623">"Inothi"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"Vulela imakrofoni yedivayisi?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"Vulela ikhamera yedivayisi?"</string> @@ -909,7 +911,8 @@ <string name="system_multitasking_rhs" msgid="8779289852395243004">"Sebenzisa ukuhlukanisa isikrini nge-app kwesokudla"</string> <string name="system_multitasking_lhs" msgid="7348595296208696452">"Sebenzisa ukuhlukanisa isikrini nge-app kwesokunxele"</string> <string name="system_multitasking_full_screen" msgid="4221409316059910349">"Sebenzisa isikrini esigcwele"</string> - <string name="system_multitasking_desktop_view" msgid="8829838918507805921">"Sebenzisa ukubuka kwedeskithophu"</string> + <!-- no translation found for system_multitasking_desktop_view (8871367687089347180) --> + <skip /> <string name="system_multitasking_splitscreen_focus_rhs" msgid="3838578650313318508">"Shintshela ku-app ngakwesokudla noma ngezansi ngenkathi usebenzisa uhlukanisa isikrini"</string> <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Shintshela ku-app ngakwesokunxele noma ngaphezulu ngenkathi usebenzisa ukuhlukanisa isikrini"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ngesikhathi sokuhlukaniswa kwesikrini: shintsha i-app ngenye"</string> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 78e719f6289a..549fdefd8f7a 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -115,7 +115,7 @@ <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" --> <string name="quick_settings_tiles_stock" translatable="false"> - internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue,hearing_devices,notes,desktopeffects + internet,bt,flashlight,dnd,modes_dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue,hearing_devices,notes,desktopeffects </string> <!-- The tiles to display in QuickSettings --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 8c1fd65d96d4..cd94a265aa80 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -3181,8 +3181,6 @@ <string name="controls_media_active_session">The current media session cannot be hidden.</string> <!-- Label for a button that will hide media controls [CHAR_LIMIT=30] --> <string name="controls_media_dismiss_button">Hide</string> - <!-- Label for button to resume media playback [CHAR_LIMIT=NONE] --> - <string name="controls_media_resume">Resume</string> <!-- Label for button to go to media control settings screen [CHAR_LIMIT=30] --> <string name="controls_media_settings_button">Settings</string> <!-- Description for media control's playing media item, including information for the media's title, the artist, and source app [CHAR LIMIT=NONE]--> diff --git a/packages/SystemUI/res/values/tiles_states_strings.xml b/packages/SystemUI/res/values/tiles_states_strings.xml index faf06f3d39f0..bcd49b91d894 100644 --- a/packages/SystemUI/res/values/tiles_states_strings.xml +++ b/packages/SystemUI/res/values/tiles_states_strings.xml @@ -85,6 +85,16 @@ <item>On</item> </string-array> + <!-- State names for dnd (Do not disturb) mode tile: unavailable, off, on. + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as + if they could appear. [CHAR LIMIT=32] --> + <string-array name="tile_states_modes_dnd"> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> + </string-array> + <!-- State names for flashlight tile: unavailable, off, on. This subtitle is shown when the tile is in that particular state but does not set its own subtitle, so some of these may never appear on screen. They should still be translated as diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index d84b034eade8..60ec051315d0 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -124,7 +124,6 @@ import com.android.settingslib.Utils; import com.android.settingslib.WirelessUtils; import com.android.settingslib.fuelgauge.BatteryStatus; import com.android.systemui.CoreStartable; -import com.android.systemui.Dumpable; import com.android.systemui.Flags; import com.android.systemui.biometrics.AuthController; import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider; @@ -301,7 +300,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, CoreSt private final Provider<SceneInteractor> mSceneInteractor; private final Provider<AlternateBouncerInteractor> mAlternateBouncerInteractor; private final Provider<CommunalSceneInteractor> mCommunalSceneInteractor; - private final KeyguardServiceShowLockscreenInteractor mKeyguardServiceShowLockscreenInteractor; + private final Provider<KeyguardServiceShowLockscreenInteractor> + mKeyguardServiceShowLockscreenInteractor; private final AuthController mAuthController; private final UiEventLogger mUiEventLogger; private final Set<String> mAllowFingerprintOnOccludingActivitiesFromPackage; @@ -2219,7 +2219,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, CoreSt Provider<JavaAdapter> javaAdapter, Provider<SceneInteractor> sceneInteractor, Provider<CommunalSceneInteractor> communalSceneInteractor, - KeyguardServiceShowLockscreenInteractor keyguardServiceShowLockscreenInteractor) { + Provider<KeyguardServiceShowLockscreenInteractor> + keyguardServiceShowLockscreenInteractor) { mContext = context; mSubscriptionManager = subscriptionManager; mUserTracker = userTracker; @@ -2553,7 +2554,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, CoreSt if (KeyguardWmStateRefactor.isEnabled()) { mJavaAdapter.get().alwaysCollectFlow( - mKeyguardServiceShowLockscreenInteractor.getShowNowEvents(), + mKeyguardServiceShowLockscreenInteractor.get().getShowNowEvents(), this::onKeyguardServiceShowLockscreenNowEvents ); } diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java index c78f75a334fd..e3afe2e190e9 100644 --- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java @@ -778,18 +778,26 @@ public class SwipeHelper implements Gefingerpoken, Dumpable { protected boolean swipedFarEnough() { float translation = getTranslation(mTouchedView); - return Math.abs(translation) > SWIPED_FAR_ENOUGH_SIZE_FRACTION * getSize( - mTouchedView); + return Math.abs(translation) > SWIPED_FAR_ENOUGH_SIZE_FRACTION * getSize(mTouchedView); } public boolean isDismissGesture(MotionEvent ev) { float translation = getTranslation(mTouchedView); return ev.getActionMasked() == MotionEvent.ACTION_UP && !mFalsingManager.isUnlockingDisabled() - && !isFalseGesture() && (swipedFastEnough() || swipedFarEnough()) + && !isFalseGesture() && isSwipeDismissible() && mCallback.canChildBeDismissedInDirection(mTouchedView, translation > 0); } + /** Can the swipe gesture on the touched view be considered as a dismiss intention */ + public boolean isSwipeDismissible() { + if (magneticNotificationSwipes()) { + return mCallback.isMagneticViewDetached(mTouchedView) || swipedFastEnough(); + } else { + return swipedFastEnough() || swipedFarEnough(); + } + } + /** Returns true if the gesture should be rejected. */ public boolean isFalseGesture() { boolean falsingDetected = mCallback.isAntiFalsingNeeded(); @@ -970,6 +978,13 @@ public class SwipeHelper implements Gefingerpoken, Dumpable { void onMagneticInteractionEnd(View view, float velocity); /** + * Determine if a view managed by magnetic interactions is magnetically detached + * @param view The magnetic view + * @return if the view is detached according to its magnetic state. + */ + boolean isMagneticViewDetached(View view); + + /** * Called when the child is long pressed and available to start drag and drop. * * @param v the view that was long pressed. diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FingerprintPropertyRepository.kt b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FingerprintPropertyRepository.kt index 39f55803bb73..c4e1ccf6b62e 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FingerprintPropertyRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FingerprintPropertyRepository.kt @@ -31,7 +31,7 @@ import com.android.systemui.biometrics.shared.model.SensorStrength import com.android.systemui.biometrics.shared.model.toSensorStrength import com.android.systemui.biometrics.shared.model.toSensorType import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/PromptRepository.kt b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/PromptRepository.kt index 230b30bc548e..cce33fdf16c1 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/PromptRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/PromptRepository.kt @@ -21,7 +21,7 @@ import android.util.Log import com.android.systemui.biometrics.AuthController import com.android.systemui.biometrics.shared.model.PromptKind import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import javax.inject.Inject import kotlinx.coroutines.channels.awaitClose diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt index 40313e3158aa..6484116233ca 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt @@ -21,7 +21,7 @@ import android.content.res.Configuration import com.android.systemui.biometrics.data.repository.DisplayStateRepository import com.android.systemui.biometrics.shared.model.DisplayRotation import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.display.data.repository.DisplayRepository diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinder.kt index 30b98a658821..ceb2b10ab517 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinder.kt @@ -99,11 +99,6 @@ constructor( show() } else if (showIndicatorForDeviceEntry) { show() - overlayView?.announceForAccessibility( - applicationContext.resources.getString( - R.string.accessibility_side_fingerprint_indicator_label - ) - ) } else { hide() } @@ -182,6 +177,11 @@ constructor( overlayShowAnimator.start() + /** + * Intercepts TYPE_WINDOW_STATE_CHANGED accessibility event, preventing Talkback + * from speaking @string/accessibility_fingerprint_label twice when sensor location + * indicator is in focus + */ it.setAccessibilityDelegate( object : View.AccessibilityDelegate() { override fun dispatchPopulateAccessibilityEvent( @@ -190,8 +190,7 @@ constructor( ): Boolean { return if ( event.getEventType() === - android.view.accessibility.AccessibilityEvent - .TYPE_WINDOW_STATE_CHANGED + AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED ) { true } else { diff --git a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothAutoOnRepository.kt b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothAutoOnRepository.kt index 7f1cb5da474d..dea3c472a476 100644 --- a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothAutoOnRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothAutoOnRepository.kt @@ -21,7 +21,7 @@ import android.util.Log import com.android.settingslib.bluetooth.BluetoothCallback import com.android.settingslib.bluetooth.LocalBluetoothManager import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt index 5a5a51e53d63..8d066bbaa915 100644 --- a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt +++ b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt @@ -419,6 +419,8 @@ constructor( } nameView.text = item.deviceName summaryView.text = item.connectionSummary + // needed for marquee + summaryView.isSelected = true actionIconView.setOnClickListener { mutableDeviceItemClick.value = diff --git a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothStateInteractor.kt b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothStateInteractor.kt index 55d4d3efbe27..9e0f10277197 100644 --- a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothStateInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothStateInteractor.kt @@ -22,7 +22,7 @@ import android.bluetooth.BluetoothAdapter.STATE_ON import com.android.settingslib.bluetooth.BluetoothCallback import com.android.settingslib.bluetooth.LocalBluetoothManager import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/DeviceItemInteractor.kt b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/DeviceItemInteractor.kt index b606c19b3503..e458b8092cda 100644 --- a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/DeviceItemInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/DeviceItemInteractor.kt @@ -24,7 +24,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice import com.android.settingslib.bluetooth.LocalBluetoothManager import com.android.settingslib.volume.domain.interactor.AudioModeInteractor import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/SimBouncerRepository.kt b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/SimBouncerRepository.kt index b9e1c55fbade..89208364178d 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/SimBouncerRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/SimBouncerRepository.kt @@ -28,7 +28,7 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback import com.android.systemui.bouncer.data.model.SimBouncerModel import com.android.systemui.bouncer.data.model.SimPukInputModel import com.android.systemui.broadcast.BroadcastDispatcher -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/brightness/data/repository/ScreenBrightnessRepository.kt b/packages/SystemUI/src/com/android/systemui/brightness/data/repository/ScreenBrightnessRepository.kt index e6d6293733d4..636b3ab66dd5 100644 --- a/packages/SystemUI/src/com/android/systemui/brightness/data/repository/ScreenBrightnessRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/brightness/data/repository/ScreenBrightnessRepository.kt @@ -24,7 +24,7 @@ import com.android.systemui.brightness.shared.model.BrightnessLog import com.android.systemui.brightness.shared.model.LinearBrightness import com.android.systemui.brightness.shared.model.formatBrightness import com.android.systemui.brightness.shared.model.logDiffForTable -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt b/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt index 183a3cc26b95..724670d955dd 100644 --- a/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt +++ b/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt @@ -32,7 +32,7 @@ import com.android.internal.annotations.VisibleForTesting import com.android.systemui.Dumpable import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.BroadcastRunning import com.android.systemui.dagger.qualifiers.Main diff --git a/packages/SystemUI/src/com/android/systemui/camera/data/repository/CameraSensorPrivacyRepository.kt b/packages/SystemUI/src/com/android/systemui/camera/data/repository/CameraSensorPrivacyRepository.kt index 7816a1487c01..dac5b7efaade 100644 --- a/packages/SystemUI/src/com/android/systemui/camera/data/repository/CameraSensorPrivacyRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/camera/data/repository/CameraSensorPrivacyRepository.kt @@ -19,7 +19,7 @@ package com.android.systemui.camera.data.repository import android.hardware.SensorPrivacyManager import android.hardware.SensorPrivacyManager.Sensors.CAMERA import android.os.UserHandle -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalSettingsInteractor.kt b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalSettingsInteractor.kt index ae89b39175c1..0d7a2d9707d7 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalSettingsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalSettingsInteractor.kt @@ -17,7 +17,7 @@ package com.android.systemui.communal.domain.interactor import android.content.pm.UserInfo -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.communal.data.model.FEATURE_AUTO_OPEN import com.android.systemui.communal.data.model.FEATURE_ENABLED import com.android.systemui.communal.data.model.FEATURE_MANUAL_OPEN diff --git a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt index 857fa5cac3e2..756edb3d048d 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt @@ -247,7 +247,7 @@ constructor( showsOnlyActiveMedia = false } falsingProtectionNeeded = false - disablePagination = true + disableScrolling = true init(MediaHierarchyManager.LOCATION_COMMUNAL_HUB) } } diff --git a/packages/SystemUI/src/com/android/systemui/controls/settings/ControlsSettingsRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/settings/ControlsSettingsRepositoryImpl.kt index 6f579a3986c8..d7ffbb2e76b8 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/settings/ControlsSettingsRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/settings/ControlsSettingsRepositoryImpl.kt @@ -18,7 +18,7 @@ package com.android.systemui.controls.settings import android.provider.Settings -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt index 69378b475938..449a995b782a 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt @@ -27,7 +27,7 @@ import com.android.systemui.Dumpable import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryRepository.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryRepository.kt index 675f00a89d23..b7315cc994a8 100644 --- a/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryRepository.kt @@ -1,7 +1,7 @@ package com.android.systemui.deviceentry.data.repository import com.android.internal.widget.LockPatternUtils -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/display/data/repository/DeviceStateRepository.kt b/packages/SystemUI/src/com/android/systemui/display/data/repository/DeviceStateRepository.kt index 29044d017d2d..f4db2cc71b38 100644 --- a/packages/SystemUI/src/com/android/systemui/display/data/repository/DeviceStateRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/display/data/repository/DeviceStateRepository.kt @@ -27,7 +27,7 @@ import android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFI import android.hardware.devicestate.DeviceStateManager import android.hardware.devicestate.feature.flags.Flags as DeviceStateManagerFlags import com.android.internal.R -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.display.data.repository.DeviceStateRepository.DeviceState import java.util.concurrent.Executor diff --git a/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayMetricsRepository.kt b/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayMetricsRepository.kt index cef45dcae43e..3c554b9ff66b 100644 --- a/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayMetricsRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayMetricsRepository.kt @@ -19,7 +19,7 @@ package com.android.systemui.display.data.repository import android.content.Context import android.content.res.Configuration import android.util.DisplayMetrics -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.log.LogBuffer diff --git a/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayRepository.kt b/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayRepository.kt index 721d116004f3..101e8cc23f17 100644 --- a/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayRepository.kt @@ -27,6 +27,7 @@ import android.os.Handler import android.util.Log import android.view.Display import android.view.IWindowManager +import com.android.app.displaylib.DisplayRepository as DisplayRepositoryFromLib import com.android.app.tracing.FlowTracing.traceEach import com.android.app.tracing.traceSection import com.android.systemui.dagger.SysUISingleton @@ -60,7 +61,7 @@ import kotlinx.coroutines.flow.scan import kotlinx.coroutines.flow.stateIn /** Repository for providing access to display related information and events. */ -interface DisplayRepository { +interface DisplayRepository : DisplayRepositoryFromLib { /** Display change event indicating a change to the given displayId has occurred. */ val displayChangeEvent: Flow<Int> @@ -74,13 +75,6 @@ interface DisplayRepository { val displayIdsWithSystemDecorations: StateFlow<Set<Int>> /** - * Provides the current set of displays. - * - * Consider using [displayIds] if only the [Display.getDisplayId] is needed. - */ - val displays: StateFlow<Set<Display>> - - /** * Provides the current set of display ids. * * Note that it is preferred to use this instead of [displays] if only the diff --git a/packages/SystemUI/src/com/android/systemui/flags/PluggedInCondition.kt b/packages/SystemUI/src/com/android/systemui/flags/PluggedInCondition.kt index dc08570447a5..e5920924a4be 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/PluggedInCondition.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/PluggedInCondition.kt @@ -16,7 +16,7 @@ package com.android.systemui.flags -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.statusbar.policy.BatteryController import dagger.Lazy import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/stickykeys/data/repository/StickyKeysRepository.kt b/packages/SystemUI/src/com/android/systemui/keyboard/stickykeys/data/repository/StickyKeysRepository.kt index 922bc15c0633..4e7164ff12d7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/stickykeys/data/repository/StickyKeysRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/stickykeys/data/repository/StickyKeysRepository.kt @@ -21,7 +21,7 @@ import android.hardware.input.InputManager.StickyModifierStateListener import android.hardware.input.StickyModifierState import android.provider.Settings import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.keyboard.stickykeys.StickyKeysLogger diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 757464976261..79685088fed7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -673,7 +673,8 @@ public class KeyguardService extends Service { if (SceneContainerFlag.isEnabled()) { mDeviceEntryInteractorLazy.get().lockNow("doKeyguardTimeout"); } else if (KeyguardWmStateRefactor.isEnabled()) { - mKeyguardServiceShowLockscreenInteractor.onKeyguardServiceDoKeyguardTimeout(); + mKeyguardServiceShowLockscreenInteractor + .onKeyguardServiceDoKeyguardTimeout(options); } mKeyguardViewMediator.doKeyguardTimeout(options); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/WindowManagerLockscreenVisibilityManager.kt b/packages/SystemUI/src/com/android/systemui/keyguard/WindowManagerLockscreenVisibilityManager.kt index 58692746d1e0..51b953ef290c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/WindowManagerLockscreenVisibilityManager.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/WindowManagerLockscreenVisibilityManager.kt @@ -22,11 +22,14 @@ import android.util.Log import android.view.IRemoteAnimationFinishedCallback import android.view.RemoteAnimationTarget import android.view.WindowManager +import com.android.internal.widget.LockPatternUtils import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.domain.interactor.KeyguardDismissTransitionInteractor +import com.android.systemui.keyguard.domain.interactor.KeyguardShowWhileAwakeInteractor import com.android.systemui.keyguard.ui.binder.KeyguardSurfaceBehindParamsApplier import com.android.systemui.statusbar.policy.KeyguardStateController +import com.android.systemui.user.domain.interactor.SelectedUserInteractor import com.android.window.flags.Flags import com.android.wm.shell.keyguard.KeyguardTransitions import java.util.concurrent.Executor @@ -46,6 +49,9 @@ constructor( private val keyguardSurfaceBehindAnimator: KeyguardSurfaceBehindParamsApplier, private val keyguardDismissTransitionInteractor: KeyguardDismissTransitionInteractor, private val keyguardTransitions: KeyguardTransitions, + private val selectedUserInteractor: SelectedUserInteractor, + private val lockPatternUtils: LockPatternUtils, + private val keyguardShowWhileAwakeInteractor: KeyguardShowWhileAwakeInteractor, ) { /** @@ -92,12 +98,23 @@ constructor( * second timeout). */ private var isKeyguardGoingAway = false - private set(value) { + private set(goingAway) { // TODO(b/278086361): Extricate the keyguard state controller. - keyguardStateController.notifyKeyguardGoingAway(value) - field = value + keyguardStateController.notifyKeyguardGoingAway(goingAway) + + if (goingAway) { + keyguardGoingAwayRequestedForUserId = selectedUserInteractor.getSelectedUserId() + } + + field = goingAway } + /** + * The current user ID when we asked WM to start the keyguard going away animation. This is used + * for validation when user switching occurs during unlock. + */ + private var keyguardGoingAwayRequestedForUserId: Int = -1 + /** Callback provided by WM to call once we're done with the going away animation. */ private var goingAwayRemoteAnimationFinishedCallback: IRemoteAnimationFinishedCallback? = null @@ -171,6 +188,14 @@ constructor( nonApps: Array<RemoteAnimationTarget>, finishedCallback: IRemoteAnimationFinishedCallback, ) { + goingAwayRemoteAnimationFinishedCallback = finishedCallback + + if (maybeStartTransitionIfUserSwitchedDuringGoingAway()) { + Log.d(TAG, "User switched during keyguard going away - ending remote animation.") + endKeyguardGoingAwayAnimation() + return + } + // If we weren't expecting the keyguard to be going away, WM triggered this transition. if (!isKeyguardGoingAway) { // Since WM triggered this, we're likely not transitioning to GONE yet. See if we can @@ -198,7 +223,6 @@ constructor( } if (apps.isNotEmpty()) { - goingAwayRemoteAnimationFinishedCallback = finishedCallback keyguardSurfaceBehindAnimator.applyParamsToSurface(apps[0]) } else { // Nothing to do here if we have no apps, end the animation, which will cancel it and WM @@ -211,6 +235,7 @@ constructor( // If WM cancelled the animation, we need to end immediately even if we're still using the // animation. endKeyguardGoingAwayAnimation() + maybeStartTransitionIfUserSwitchedDuringGoingAway() } /** @@ -301,6 +326,29 @@ constructor( } } + /** + * If necessary, start a transition to show/hide keyguard in response to a user switch during + * keyguard going away. + * + * Returns [true] if a transition was started, or false if a transition was not necessary. + */ + private fun maybeStartTransitionIfUserSwitchedDuringGoingAway(): Boolean { + val currentUser = selectedUserInteractor.getSelectedUserId() + if (currentUser != keyguardGoingAwayRequestedForUserId) { + if (lockPatternUtils.isSecure(currentUser)) { + keyguardShowWhileAwakeInteractor.onSwitchedToSecureUserWhileKeyguardGoingAway() + } else { + keyguardDismissTransitionInteractor.startDismissKeyguardTransition( + reason = "User switch during keyguard going away, and new user is insecure" + ) + } + + return true + } else { + return false + } + } + companion object { private val TAG = "WindowManagerLsVis" } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/DoNotDisturbQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/DoNotDisturbQuickAffordanceConfig.kt index 07ed194dd68f..40861929add7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/DoNotDisturbQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/DoNotDisturbQuickAffordanceConfig.kt @@ -30,7 +30,7 @@ import com.android.settingslib.notification.modes.EnableDndDialogFactory import com.android.settingslib.notification.modes.EnableDndDialogMetricsLogger import com.android.systemui.animation.Expandable import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfig.kt index e2642a0964c1..683c11a88b89 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfig.kt @@ -20,7 +20,7 @@ package com.android.systemui.keyguard.data.quickaffordance import android.content.Context import com.android.systemui.animation.Expandable import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt index 3555f06ce96f..a1dafb1438ca 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt @@ -24,7 +24,7 @@ import androidx.annotation.DrawableRes import com.android.systemui.res.R import com.android.systemui.animation.Expandable import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.controls.ControlsServiceInfo diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt index ad79177fdd76..01ff0e1344c6 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt @@ -23,7 +23,7 @@ import android.content.SharedPreferences import com.android.systemui.backup.BackupHelper import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.res.R import com.android.systemui.settings.UserFileManager diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfig.kt index 1c9bc9f39663..10fc4c2a02ff 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfig.kt @@ -23,7 +23,7 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.animation.Expandable -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfig.kt index d12c42a754f0..7c33e29bf25a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfig.kt @@ -21,7 +21,7 @@ import android.content.Context import com.android.systemui.res.R import com.android.systemui.animation.Expandable import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt index 760adbf58d93..56ea26e88b23 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt @@ -26,7 +26,7 @@ import android.service.quickaccesswallet.WalletCard import android.util.Log import com.android.systemui.animation.Expandable import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepository.kt index 0f5f31302670..30476b991baf 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepository.kt @@ -35,7 +35,7 @@ import com.android.systemui.biometrics.data.repository.FingerprintPropertyReposi import com.android.systemui.biometrics.shared.model.SensorStrength import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt index 4d999df69588..396f60645f00 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepository.kt @@ -24,7 +24,7 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback import com.android.systemui.biometrics.AuthController import com.android.systemui.biometrics.shared.model.AuthenticationReason import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DevicePostureRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DevicePostureRepository.kt index 7c430920cb46..59e6a08c4511 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DevicePostureRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DevicePostureRepository.kt @@ -17,7 +17,7 @@ package com.android.systemui.keyguard.data.repository import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.shared.model.DevicePosture diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt index affcd33b7170..cd0efdae337d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt @@ -24,7 +24,7 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback import com.android.systemui.biometrics.AuthController import com.android.systemui.biometrics.data.repository.FacePropertyRepository import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardServiceShowLockscreenRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardServiceShowLockscreenRepository.kt new file mode 100644 index 000000000000..16c2d14b78ae --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardServiceShowLockscreenRepository.kt @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.data.repository + +import android.os.IRemoteCallback +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject + +/** + * Holds an IRemoteCallback along with the current user ID at the time the callback was provided. + */ +data class ShowLockscreenCallback(val userId: Int, val remoteCallback: IRemoteCallback) + +/** Maintains state related to KeyguardService requests to show the lockscreen. */ +@SysUISingleton +class KeyguardServiceShowLockscreenRepository @Inject constructor() { + val showLockscreenCallbacks = ArrayList<ShowLockscreenCallback>() + + /** + * Adds a callback that we'll notify when we show the lockscreen (or affirmatively decide not to + * show it). + */ + fun addShowLockscreenCallback(forUser: Int, callback: IRemoteCallback) { + synchronized(showLockscreenCallbacks) { + showLockscreenCallbacks.add(ShowLockscreenCallback(forUser, callback)) + } + } + + companion object { + private const val TAG = "ShowLockscreenRepository" + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/TrustRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/TrustRepository.kt index c5a6fa199c58..63a0286832d0 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/TrustRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/TrustRepository.kt @@ -20,7 +20,7 @@ import android.app.trust.TrustManager import com.android.keyguard.TrustGrantFlags import com.android.keyguard.logging.TrustRepositoryLogger import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt index 54af8f5b9806..f53421d539fe 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt @@ -101,14 +101,14 @@ constructor( ) .collect { ( - _, + detailedWakefulness, startedStep, canWakeDirectlyToGone, ) -> val isKeyguardOccludedLegacy = keyguardInteractor.isKeyguardOccluded.value val biometricUnlockMode = keyguardInteractor.biometricUnlockState.value.mode val primaryBouncerShowing = keyguardInteractor.primaryBouncerShowing.value - val shouldShowCommunal = communalSettingsInteractor.autoOpenEnabled.value + val autoOpenCommunal = communalSettingsInteractor.autoOpenEnabled.value if (!maybeHandleInsecurePowerGesture()) { val shouldTransitionToLockscreen = @@ -135,8 +135,12 @@ constructor( (!KeyguardWmStateRefactor.isEnabled && canDismissLockscreen()) || (KeyguardWmStateRefactor.isEnabled && canWakeDirectlyToGone) + // Avoid transitioning to communal automatically if the device is waking + // up due to motion. val shouldTransitionToCommunal = - communalSettingsInteractor.isV2FlagEnabled() && shouldShowCommunal + communalSettingsInteractor.isV2FlagEnabled() && + autoOpenCommunal && + !detailedWakefulness.isAwakeFromMotionOrLift() if (shouldTransitionToGone) { // TODO(b/360368320): Adapt for scene framework diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt index 1fc41085f772..4aaa1fab4c65 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt @@ -34,8 +34,9 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor import com.android.systemui.keyguard.shared.model.BiometricUnlockMode.Companion.isWakeAndUnlock import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.power.domain.interactor.PowerInteractor +import com.android.systemui.power.shared.model.WakefulnessModel import com.android.systemui.scene.shared.flag.SceneContainerFlag -import com.android.systemui.util.kotlin.Utils.Companion.sample +import com.android.systemui.util.kotlin.Utils.Companion.sample as sampleCombine import com.android.systemui.util.kotlin.sample import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds @@ -121,9 +122,10 @@ constructor( private fun shouldTransitionToCommunal( shouldShowCommunal: Boolean, isCommunalAvailable: Boolean, + wakefulness: WakefulnessModel, ) = if (communalSettingsInteractor.isV2FlagEnabled()) { - shouldShowCommunal + shouldShowCommunal && !wakefulness.isAwakeFromMotionOrLift() } else { isCommunalAvailable && dreamManager.canStartDreaming(false) } @@ -148,14 +150,14 @@ constructor( } scope.launch { - powerInteractor.isAwake + powerInteractor.detailedWakefulness .debounce(50L) - .filterRelevantKeyguardStateAnd { isAwake -> isAwake } - .sample( + .filterRelevantKeyguardStateAnd { wakefulness -> wakefulness.isAwake() } + .sampleCombine( communalInteractor.isCommunalAvailable, communalSettingsInteractor.autoOpenEnabled, ) - .collect { (_, isCommunalAvailable, shouldShowCommunal) -> + .collect { (detailedWakefulness, isCommunalAvailable, shouldShowCommunal) -> val isKeyguardOccludedLegacy = keyguardInteractor.isKeyguardOccluded.value val primaryBouncerShowing = keyguardInteractor.primaryBouncerShowing.value val isKeyguardGoingAway = keyguardInteractor.isKeyguardGoingAway.value @@ -186,7 +188,11 @@ constructor( } else if (isKeyguardOccludedLegacy) { startTransitionTo(KeyguardState.OCCLUDED) } else if ( - shouldTransitionToCommunal(shouldShowCommunal, isCommunalAvailable) + shouldTransitionToCommunal( + shouldShowCommunal, + isCommunalAvailable, + detailedWakefulness, + ) ) { if (!SceneContainerFlag.isEnabled) { transitionToGlanceableHub() @@ -208,7 +214,7 @@ constructor( scope.launch { powerInteractor.detailedWakefulness .filterRelevantKeyguardStateAnd { it.isAwake() } - .sample( + .sampleCombine( communalSettingsInteractor.autoOpenEnabled, communalInteractor.isCommunalAvailable, keyguardInteractor.biometricUnlockState, @@ -217,7 +223,7 @@ constructor( ) .collect { ( - _, + detailedWakefulness, shouldShowCommunal, isCommunalAvailable, biometricUnlockState, @@ -245,7 +251,11 @@ constructor( ) } } else if ( - shouldTransitionToCommunal(shouldShowCommunal, isCommunalAvailable) + shouldTransitionToCommunal( + shouldShowCommunal, + isCommunalAvailable, + detailedWakefulness, + ) ) { if (!SceneContainerFlag.isEnabled) { transitionToGlanceableHub() diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractor.kt index b55bb383c308..07a31e16384c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractor.kt @@ -17,16 +17,27 @@ package com.android.systemui.keyguard.domain.interactor import android.annotation.SuppressLint +import android.app.KeyguardManager.LOCK_ON_USER_SWITCH_CALLBACK +import android.os.Bundle +import android.os.IRemoteCallback +import android.os.RemoteException +import android.util.Log +import com.android.systemui.CoreStartable import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.keyguard.data.repository.KeyguardServiceShowLockscreenRepository +import com.android.systemui.keyguard.data.repository.ShowLockscreenCallback +import com.android.systemui.settings.UserTracker +import com.android.systemui.user.domain.interactor.SelectedUserInteractor +import dagger.Lazy import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.launch /** - * Logic around requests by [KeyguardService] to show keyguard right now, even though the device is - * awake and not going to sleep. + * Logic around requests by [KeyguardService] and friends to show keyguard right now, even though + * the device is awake and not going to sleep. * * This can happen if WM#lockNow() is called, if KeyguardService#showDismissibleKeyguard is called * because we're folding with "continue using apps on fold" set to "swipe up to continue", or if the @@ -38,7 +49,28 @@ import kotlinx.coroutines.launch @SysUISingleton class KeyguardServiceShowLockscreenInteractor @Inject -constructor(@Background val backgroundScope: CoroutineScope) { +constructor( + @Background val backgroundScope: CoroutineScope, + private val selectedUserInteractor: SelectedUserInteractor, + private val repository: KeyguardServiceShowLockscreenRepository, + private val userTracker: UserTracker, + private val wmLockscreenVisibilityInteractor: Lazy<WindowManagerLockscreenVisibilityInteractor>, + private val keyguardEnabledInteractor: KeyguardEnabledInteractor, +) : CoreStartable { + + override fun start() { + backgroundScope.launch { + // Whenever we tell ATMS that lockscreen is visible, notify any showLockscreenCallbacks. + // This is not the only place we notify the lockNowCallbacks - there are cases where we + // decide not to show the lockscreen despite being asked to, and we need to notify the + // callback in those cases as well. + wmLockscreenVisibilityInteractor.get().lockscreenVisibility.collect { visible -> + if (visible) { + notifyShowLockscreenCallbacks() + } + } + } + } /** * Emits whenever [KeyguardService] receives a call that indicates we should show the lockscreen @@ -57,9 +89,38 @@ constructor(@Background val backgroundScope: CoroutineScope) { /** * Called by [KeyguardService] when it receives a doKeyguardTimeout() call. This indicates that * the device locked while the screen was on. + * + * We'll show keyguard, and if provided, save the lock on user switch callback, to notify it + * later when we successfully show. */ - fun onKeyguardServiceDoKeyguardTimeout() { + fun onKeyguardServiceDoKeyguardTimeout(options: Bundle? = null) { backgroundScope.launch { + if (options?.getBinder(LOCK_ON_USER_SWITCH_CALLBACK) != null) { + val userId = userTracker.userId + + // This callback needs to be invoked after we show the lockscreen (or decide not to + // show it) otherwise System UI will crash in 20 seconds, as a security measure. + repository.addShowLockscreenCallback( + userId, + IRemoteCallback.Stub.asInterface( + options.getBinder(LOCK_ON_USER_SWITCH_CALLBACK) + ), + ) + + Log.d( + TAG, + "Showing lockscreen now - setting required callback for user $userId. " + + "SysUI will crash if this callback is not invoked.", + ) + + // If the keyguard is disabled or suppressed, we'll never actually show the + // lockscreen. Notify the callback so we don't crash. + if (!keyguardEnabledInteractor.isKeyguardEnabledAndNotSuppressed()) { + Log.d(TAG, "Keyguard is disabled or suppressed, notifying callbacks now.") + notifyShowLockscreenCallbacks() + } + } + showNowEvents.emit(ShowWhileAwakeReason.KEYGUARD_TIMEOUT_WHILE_SCREEN_ON) } } @@ -74,4 +135,33 @@ constructor(@Background val backgroundScope: CoroutineScope) { showNowEvents.emit(ShowWhileAwakeReason.FOLDED_WITH_SWIPE_UP_TO_CONTINUE) } } + + /** Notifies the callbacks that we've either locked, or decided not to lock. */ + private fun notifyShowLockscreenCallbacks() { + var callbacks: MutableList<ShowLockscreenCallback> + synchronized(repository.showLockscreenCallbacks) { + callbacks = ArrayList(repository.showLockscreenCallbacks) + repository.showLockscreenCallbacks.clear() + } + + val iter: MutableIterator<ShowLockscreenCallback> = callbacks.listIterator() + while (iter.hasNext()) { + val callback = iter.next() + iter.remove() + if (callback.userId != selectedUserInteractor.getSelectedUserId()) { + Log.i(TAG, "Not notifying lockNowCallback due to user mismatch") + continue + } + Log.i(TAG, "Notifying lockNowCallback") + try { + callback.remoteCallback.sendResult(null) + } catch (e: RemoteException) { + Log.e(TAG, "Could not issue LockNowCallback sendResult", e) + } + } + } + + companion object { + private const val TAG = "ShowLockscreenInteractor" + } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractor.kt index a8000a568a6a..c67939a0738a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractor.kt @@ -16,15 +16,20 @@ package com.android.systemui.keyguard.domain.interactor +import android.annotation.SuppressLint import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository import com.android.systemui.util.kotlin.sample import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge +import kotlinx.coroutines.launch /** The reason we're showing lockscreen while awake, used for logging. */ enum class ShowWhileAwakeReason(private val logReason: String) { @@ -38,6 +43,9 @@ enum class ShowWhileAwakeReason(private val logReason: String) { ), KEYGUARD_TIMEOUT_WHILE_SCREEN_ON( "Timed out while the screen was kept on, or WM#lockNow() was called." + ), + SWITCHED_TO_SECURE_USER_WHILE_GOING_AWAY( + "User switch to secure user occurred during keyguardGoingAway sequence, so we're locking." ); override fun toString(): String { @@ -68,6 +76,7 @@ enum class ShowWhileAwakeReason(private val logReason: String) { class KeyguardShowWhileAwakeInteractor @Inject constructor( + @Background val backgroundScope: CoroutineScope, biometricSettingsRepository: BiometricSettingsRepository, keyguardEnabledInteractor: KeyguardEnabledInteractor, keyguardServiceShowLockscreenInteractor: KeyguardServiceShowLockscreenInteractor, @@ -91,6 +100,15 @@ constructor( .filter { reshow -> reshow } .map { ShowWhileAwakeReason.KEYGUARD_REENABLED } + /** + * Emits whenever a user switch to a secure user occurs during keyguard going away. + * + * This is an event flow, hence the SharedFlow. + */ + @SuppressLint("SharedFlowCreation") + val switchedToSecureUserDuringGoingAway: MutableSharedFlow<ShowWhileAwakeReason> = + MutableSharedFlow() + /** Emits whenever we should show lockscreen while the screen is on, for any reason. */ val showWhileAwakeEvents: Flow<ShowWhileAwakeReason> = merge( @@ -108,5 +126,15 @@ constructor( keyguardServiceShowLockscreenInteractor.showNowEvents.filter { keyguardEnabledInteractor.isKeyguardEnabledAndNotSuppressed() }, + switchedToSecureUserDuringGoingAway, ) + + /** A user switch to a secure user occurred while we were going away. We need to re-lock. */ + fun onSwitchedToSecureUserWhileKeyguardGoingAway() { + backgroundScope.launch { + switchedToSecureUserDuringGoingAway.emit( + ShowWhileAwakeReason.SWITCHED_TO_SECURE_USER_WHILE_GOING_AWAY + ) + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionCoreStartable.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionCoreStartable.kt index 2b4582a2a096..780b7fb06b5a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionCoreStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionCoreStartable.kt @@ -29,6 +29,7 @@ constructor( private val auditLogger: KeyguardTransitionAuditLogger, private val statusBarDisableFlagsInteractor: StatusBarDisableFlagsInteractor, private val keyguardStateCallbackInteractor: KeyguardStateCallbackInteractor, + private val keyguardServiceShowLockscreenInteractor: KeyguardServiceShowLockscreenInteractor, ) : CoreStartable { override fun start() { @@ -54,6 +55,7 @@ constructor( auditLogger.start() statusBarDisableFlagsInteractor.start() keyguardStateCallbackInteractor.start() + keyguardServiceShowLockscreenInteractor.start() } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt index 6d8a943d3e28..830afeac7b96 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt @@ -31,10 +31,8 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac import com.android.systemui.keyguard.domain.interactor.PulseExpansionInteractor import com.android.systemui.keyguard.shared.model.Edge import com.android.systemui.keyguard.shared.model.KeyguardState.AOD -import com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING import com.android.systemui.keyguard.shared.model.KeyguardState.GONE import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN -import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED import com.android.systemui.keyguard.shared.model.KeyguardState.OFF import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING @@ -165,43 +163,27 @@ constructor( .onStart { emit(false) } .distinctUntilChanged() - private val isOnLockscreen: Flow<Boolean> = + private val isOnOrGoingToLockscreen: Flow<Boolean> = combine( - keyguardTransitionInteractor.isFinishedIn(LOCKSCREEN).onStart { emit(false) }, - anyOf( - keyguardTransitionInteractor.isInTransition(Edge.create(to = LOCKSCREEN)), - keyguardTransitionInteractor.isInTransition(Edge.create(from = LOCKSCREEN)), - ), - ) { onLockscreen, transitioningToOrFromLockscreen -> - onLockscreen || transitioningToOrFromLockscreen + keyguardTransitionInteractor.transitionValue(LOCKSCREEN).map { it == 1f }, + keyguardTransitionInteractor.isInTransition(Edge.create(to = LOCKSCREEN)), + ) { onLockscreen, transitioningToLockscreen -> + onLockscreen || transitioningToLockscreen } .distinctUntilChanged() private val alphaOnShadeExpansion: Flow<Float> = combineTransform( - anyOf( - keyguardTransitionInteractor.isInTransition( - edge = Edge.create(from = LOCKSCREEN, to = Scenes.Gone), - edgeWithoutSceneContainer = Edge.create(from = LOCKSCREEN, to = GONE), - ), - keyguardTransitionInteractor.isInTransition( - edge = Edge.create(from = Overlays.Bouncer, to = LOCKSCREEN), - edgeWithoutSceneContainer = - Edge.create(from = PRIMARY_BOUNCER, to = LOCKSCREEN), - ), - keyguardTransitionInteractor.isInTransition( - Edge.create(from = LOCKSCREEN, to = DREAMING) - ), - keyguardTransitionInteractor.isInTransition( - Edge.create(from = LOCKSCREEN, to = OCCLUDED) - ), + keyguardTransitionInteractor.isInTransition( + edge = Edge.create(from = Overlays.Bouncer, to = LOCKSCREEN), + edgeWithoutSceneContainer = Edge.create(from = PRIMARY_BOUNCER, to = LOCKSCREEN), ), - isOnLockscreen, + isOnOrGoingToLockscreen, shadeInteractor.qsExpansion, shadeInteractor.shadeExpansion, - ) { disabledTransitionRunning, isOnLockscreen, qsExpansion, shadeExpansion -> + ) { disabledTransitionRunning, isOnOrGoingToLockscreen, qsExpansion, shadeExpansion -> // Fade out quickly as the shade expands - if (isOnLockscreen && !disabledTransitionRunning) { + if (isOnOrGoingToLockscreen && !disabledTransitionRunning) { val alpha = 1f - MathUtils.constrainedMap( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModel.kt index 3758afa61ed4..9312bca04994 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModel.kt @@ -66,6 +66,9 @@ constructor( transitionAnimation.sharedFlow( duration = FromLockscreenTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION, onStep = alphaForAnimationStep, + // Rapid swipes to bouncer, and may end up skipping intermediate values that would've + // caused a complete fade out of lockscreen elements. Ensure it goes to 0f. + onFinish = { 0f }, ) val lockscreenAlpha: Flow<Float> = shortcutsAlpha diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt index 309b6751176c..c2efc7559487 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt @@ -1256,7 +1256,7 @@ class LegacyMediaDataManagerImpl( return MediaAction( Icon.createWithResource(context, iconId).setTint(themeText).loadDrawable(context), action, - context.getString(R.string.controls_media_resume), + context.getString(R.string.controls_media_button_play), if (Flags.mediaControlsUiUpdate()) { context.getDrawable(R.drawable.ic_media_play_button_container) } else { diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt index dbd2250a75b0..a7c5a36b804a 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt @@ -521,7 +521,7 @@ constructor( return MediaAction( Icon.createWithResource(context, iconId).setTint(themeText).loadDrawable(context), action, - context.getString(R.string.controls_media_resume), + context.getString(R.string.controls_media_button_play), if (Flags.mediaControlsUiUpdate()) { context.getDrawable(R.drawable.ic_media_play_button_container) } else { diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessor.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessor.kt index 94df4b353c94..ca4a65953cba 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessor.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessor.kt @@ -1193,7 +1193,7 @@ class MediaDataProcessor( return MediaAction( Icon.createWithResource(context, iconId).setTint(themeText).loadDrawable(context), action, - context.getString(R.string.controls_media_resume), + context.getString(R.string.controls_media_button_play), if (Flags.mediaControlsUiUpdate()) { context.getDrawable(R.drawable.ic_media_play_button_container) } else { diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt index ac6343c6bb64..71b3223b77be 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt @@ -159,8 +159,8 @@ constructor( /** Is the player currently visible (at the end of the transformation */ private var playersVisible: Boolean = false - /** Are we currently disabling pagination only allowing one media session to show */ - private var currentlyDisablePagination: Boolean = false + /** Are we currently disabling scolling, only allowing the first media session to show */ + private var currentlyDisableScrolling: Boolean = false /** * The desired location where we'll be at the end of the transformation. Usually this matches @@ -1130,21 +1130,22 @@ constructor( val endShowsActive = hostStates[currentEndLocation]?.showsOnlyActiveMedia ?: true val startShowsActive = hostStates[currentStartLocation]?.showsOnlyActiveMedia ?: endShowsActive - val startDisablePagination = hostStates[currentStartLocation]?.disablePagination ?: false - val endDisablePagination = hostStates[currentEndLocation]?.disablePagination ?: false + val startDisableScrolling = hostStates[currentStartLocation]?.disableScrolling ?: false + val endDisableScrolling = hostStates[currentEndLocation]?.disableScrolling ?: false if ( currentlyShowingOnlyActive != endShowsActive || - currentlyDisablePagination != endDisablePagination || + currentlyDisableScrolling != endDisableScrolling || ((currentTransitionProgress != 1.0f && currentTransitionProgress != 0.0f) && (startShowsActive != endShowsActive || - startDisablePagination != endDisablePagination)) + startDisableScrolling != endDisableScrolling)) ) { // Whenever we're transitioning from between differing states or the endstate differs // we reset the translation currentlyShowingOnlyActive = endShowsActive - currentlyDisablePagination = endDisablePagination + currentlyDisableScrolling = endDisableScrolling mediaCarouselScrollHandler.resetTranslation(animate = true) + mediaCarouselScrollHandler.scrollingDisabled = currentlyDisableScrolling } } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaCarouselScrollHandler.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaCarouselScrollHandler.kt index 9cf4a7b3a007..68865d65139c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaCarouselScrollHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaCarouselScrollHandler.kt @@ -127,6 +127,9 @@ class MediaCarouselScrollHandler( scrollView.relativeScrollX = newRelativeScroll } + /** Is scrolling disabled for the carousel */ + var scrollingDisabled: Boolean = false + /** Does the dismiss currently show the setting cog? */ var showsSettingsButton: Boolean = false @@ -270,6 +273,10 @@ class MediaCarouselScrollHandler( } private fun onTouch(motionEvent: MotionEvent): Boolean { + if (scrollingDisabled) { + return false + } + val isUp = motionEvent.action == MotionEvent.ACTION_UP if (gestureDetector.onTouchEvent(motionEvent)) { if (isUp) { @@ -349,6 +356,10 @@ class MediaCarouselScrollHandler( } fun onScroll(down: MotionEvent, lastMotion: MotionEvent, distanceX: Float): Boolean { + if (scrollingDisabled) { + return false + } + val totalX = lastMotion.x - down.x val currentTranslation = scrollView.getContentTranslation() if (currentTranslation != 0.0f || !scrollView.canScrollHorizontally((-totalX).toInt())) { @@ -405,6 +416,10 @@ class MediaCarouselScrollHandler( } private fun onFling(vX: Float, vY: Float): Boolean { + if (scrollingDisabled) { + return false + } + if (vX * vX < 0.5 * vY * vY) { return false } @@ -575,6 +590,9 @@ class MediaCarouselScrollHandler( * @param destIndex destination index to indicate where the scroll should end. */ fun scrollToPlayer(sourceIndex: Int = -1, destIndex: Int) { + if (scrollingDisabled) { + return + } if (sourceIndex >= 0 && sourceIndex < mediaContent.childCount) { scrollView.relativeScrollX = sourceIndex * playerWidthPlusPadding } @@ -596,6 +614,9 @@ class MediaCarouselScrollHandler( * @param step A positive number means next, and negative means previous. */ fun scrollByStep(step: Int) { + if (scrollingDisabled) { + return + } val destIndex = visibleMediaIndex + step if (destIndex >= mediaContent.childCount || destIndex < 0) { if (!showsSettingsButton) return diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaHost.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaHost.kt index a518349ea424..37af7642b105 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaHost.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaHost.kt @@ -295,7 +295,7 @@ class MediaHost( changedListener?.invoke() } - override var disablePagination: Boolean = false + override var disableScrolling: Boolean = false set(value) { if (field == value) { return @@ -320,7 +320,7 @@ class MediaHost( mediaHostState.visible = visible mediaHostState.disappearParameters = disappearParameters.deepCopy() mediaHostState.falsingProtectionNeeded = falsingProtectionNeeded - mediaHostState.disablePagination = disablePagination + mediaHostState.disableScrolling = disableScrolling return mediaHostState } @@ -349,7 +349,7 @@ class MediaHost( if (!disappearParameters.equals(other.disappearParameters)) { return false } - if (disablePagination != other.disablePagination) { + if (disableScrolling != other.disableScrolling) { return false } return true @@ -363,7 +363,7 @@ class MediaHost( result = 31 * result + showsOnlyActiveMedia.hashCode() result = 31 * result + if (visible) 1 else 2 result = 31 * result + disappearParameters.hashCode() - result = 31 * result + disablePagination.hashCode() + result = 31 * result + disableScrolling.hashCode() return result } } @@ -423,10 +423,11 @@ interface MediaHostState { var disappearParameters: DisappearParameters /** - * Whether pagination should be disabled for this host, meaning that when there are multiple - * media sessions, only the first one will appear. + * Whether scrolling should be disabled for this host, meaning that when there are multiple + * media sessions, it will not be possible to scroll between media sessions or swipe away the + * entire media carousel. The first media session will always be shown. */ - var disablePagination: Boolean + var disableScrolling: Boolean /** Get a copy of this view state, deepcopying all appropriate members */ fun copy(): MediaHostState diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaSwitchingController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaSwitchingController.java index f79693138e24..d0c6a3e6a3ef 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaSwitchingController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaSwitchingController.java @@ -66,6 +66,7 @@ import androidx.annotation.VisibleForTesting; import androidx.core.graphics.drawable.IconCompat; import com.android.internal.annotations.GuardedBy; +import com.android.media.flags.Flags; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.BluetoothUtils; @@ -78,7 +79,6 @@ import com.android.settingslib.media.InputMediaDevice; import com.android.settingslib.media.InputRouteManager; import com.android.settingslib.media.LocalMediaManager; import com.android.settingslib.media.MediaDevice; -import com.android.settingslib.media.flags.Flags; import com.android.settingslib.utils.ThreadUtils; import com.android.systemui.animation.ActivityTransitionAnimator; import com.android.systemui.animation.DialogTransitionAnimator; @@ -226,7 +226,7 @@ public class MediaSwitchingController InfoMediaManager.createInstance(mContext, packageName, userHandle, lbm, token); mLocalMediaManager = new LocalMediaManager(mContext, lbm, imm, packageName); mMetricLogger = new MediaOutputMetricLogger(mContext, mPackageName); - mOutputMediaItemListProxy = new OutputMediaItemListProxy(); + mOutputMediaItemListProxy = new OutputMediaItemListProxy(context); mDialogTransitionAnimator = dialogTransitionAnimator; mNearbyMediaDevicesManager = nearbyMediaDevicesManager; mMediaOutputColorSchemeLegacy = MediaOutputColorSchemeLegacy.fromSystemColors(mContext); @@ -308,7 +308,8 @@ public class MediaSwitchingController } private MediaController getMediaController() { - if (mToken != null && Flags.usePlaybackInfoForRoutingControls()) { + if (mToken != null + && com.android.settingslib.media.flags.Flags.usePlaybackInfoForRoutingControls()) { return new MediaController(mContext, mToken); } else { for (NotificationEntry entry : mNotifCollection.getAllNotifs()) { @@ -577,19 +578,35 @@ public class MediaSwitchingController private void buildMediaItems(List<MediaDevice> devices) { synchronized (mMediaDevicesLock) { - List<MediaItem> updatedMediaItems = - buildMediaItems(mOutputMediaItemListProxy.getOutputMediaItemList(), devices); - mOutputMediaItemListProxy.clearAndAddAll(updatedMediaItems); + if (!mLocalMediaManager.isPreferenceRouteListingExist()) { + attachRangeInfo(devices); + Collections.sort(devices, Comparator.naturalOrder()); + } + if (Flags.fixOutputMediaItemListIndexOutOfBoundsException()) { + // For the first time building list, to make sure the top device is the connected + // device. + boolean needToHandleMutingExpectedDevice = + hasMutingExpectedDevice() && !isCurrentConnectedDeviceRemote(); + final MediaDevice connectedMediaDevice = + needToHandleMutingExpectedDevice ? null : getCurrentConnectedMediaDevice(); + mOutputMediaItemListProxy.updateMediaDevices( + devices, + getSelectedMediaDevice(), + connectedMediaDevice, + needToHandleMutingExpectedDevice, + getConnectNewDeviceItem()); + } else { + List<MediaItem> updatedMediaItems = + buildMediaItems( + mOutputMediaItemListProxy.getOutputMediaItemList(), devices); + mOutputMediaItemListProxy.clearAndAddAll(updatedMediaItems); + } } } protected List<MediaItem> buildMediaItems( List<MediaItem> oldMediaItems, List<MediaDevice> devices) { synchronized (mMediaDevicesLock) { - if (!mLocalMediaManager.isPreferenceRouteListingExist()) { - attachRangeInfo(devices); - Collections.sort(devices, Comparator.naturalOrder()); - } // For the first time building list, to make sure the top device is the connected // device. boolean needToHandleMutingExpectedDevice = @@ -648,8 +665,7 @@ public class MediaSwitchingController .map(MediaItem::createDeviceMediaItem) .collect(Collectors.toList()); - boolean shouldAddFirstSeenSelectedDevice = - com.android.media.flags.Flags.enableOutputSwitcherDeviceGrouping(); + boolean shouldAddFirstSeenSelectedDevice = Flags.enableOutputSwitcherDeviceGrouping(); if (shouldAddFirstSeenSelectedDevice) { finalMediaItems.clear(); @@ -675,7 +691,7 @@ public class MediaSwitchingController } private boolean enableInputRouting() { - return com.android.media.flags.Flags.enableAudioInputDeviceRoutingAndVolumeControl(); + return Flags.enableAudioInputDeviceRoutingAndVolumeControl(); } private void buildInputMediaItems(List<MediaDevice> devices) { @@ -703,8 +719,7 @@ public class MediaSwitchingController if (connectedMediaDevice != null) { selectedDevicesIds.add(connectedMediaDevice.getId()); } - boolean groupSelectedDevices = - com.android.media.flags.Flags.enableOutputSwitcherDeviceGrouping(); + boolean groupSelectedDevices = Flags.enableOutputSwitcherDeviceGrouping(); int nextSelectedItemIndex = 0; boolean suggestedDeviceAdded = false; boolean displayGroupAdded = false; @@ -879,6 +894,11 @@ public class MediaSwitchingController return mLocalMediaManager.getCurrentConnectedDevice(); } + @VisibleForTesting + void clearMediaItemList() { + mOutputMediaItemListProxy.clear(); + } + boolean addDeviceToPlayMedia(MediaDevice device) { mMetricLogger.logInteractionExpansion(device); return mLocalMediaManager.addDeviceToPlayMedia(device); diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/OutputMediaItemListProxy.java b/packages/SystemUI/src/com/android/systemui/media/dialog/OutputMediaItemListProxy.java index 1c9c0b102cb7..45ca2c6ee8e5 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/OutputMediaItemListProxy.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/OutputMediaItemListProxy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2025 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. @@ -16,22 +16,175 @@ package com.android.systemui.media.dialog; +import android.content.Context; + +import androidx.annotation.Nullable; + +import com.android.media.flags.Flags; +import com.android.settingslib.media.MediaDevice; +import com.android.systemui.res.R; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.stream.Collectors; /** A proxy of holding the list of Output Switcher's output media items. */ public class OutputMediaItemListProxy { + private final Context mContext; private final List<MediaItem> mOutputMediaItemList; - public OutputMediaItemListProxy() { + // Use separated lists to hold different media items and create the list of output media items + // by using those separated lists and group dividers. + private final List<MediaItem> mSelectedMediaItems; + private final List<MediaItem> mSuggestedMediaItems; + private final List<MediaItem> mSpeakersAndDisplaysMediaItems; + @Nullable private MediaItem mConnectNewDeviceMediaItem; + + public OutputMediaItemListProxy(Context context) { + mContext = context; mOutputMediaItemList = new CopyOnWriteArrayList<>(); + mSelectedMediaItems = new CopyOnWriteArrayList<>(); + mSuggestedMediaItems = new CopyOnWriteArrayList<>(); + mSpeakersAndDisplaysMediaItems = new CopyOnWriteArrayList<>(); } /** Returns the list of output media items. */ public List<MediaItem> getOutputMediaItemList() { + if (Flags.fixOutputMediaItemListIndexOutOfBoundsException()) { + if (isEmpty() && !mOutputMediaItemList.isEmpty()) { + // Ensures mOutputMediaItemList is empty when all individual media item lists are + // empty, preventing unexpected state issues. + mOutputMediaItemList.clear(); + } else if (!isEmpty() && mOutputMediaItemList.isEmpty()) { + // When any individual media item list is modified, the cached mOutputMediaItemList + // is emptied. On the next request for the output media item list, a fresh list is + // created and stored in the cache. + mOutputMediaItemList.addAll(createOutputMediaItemList()); + } + } return mOutputMediaItemList; } + private List<MediaItem> createOutputMediaItemList() { + List<MediaItem> finalMediaItems = new CopyOnWriteArrayList<>(); + finalMediaItems.addAll(mSelectedMediaItems); + if (!mSuggestedMediaItems.isEmpty()) { + finalMediaItems.add( + MediaItem.createGroupDividerMediaItem( + mContext.getString( + R.string.media_output_group_title_suggested_device))); + finalMediaItems.addAll(mSuggestedMediaItems); + } + if (!mSpeakersAndDisplaysMediaItems.isEmpty()) { + finalMediaItems.add( + MediaItem.createGroupDividerMediaItem( + mContext.getString( + R.string.media_output_group_title_speakers_and_displays))); + finalMediaItems.addAll(mSpeakersAndDisplaysMediaItems); + } + if (mConnectNewDeviceMediaItem != null) { + finalMediaItems.add(mConnectNewDeviceMediaItem); + } + return finalMediaItems; + } + + /** Updates the list of output media items with a given list of media devices. */ + public void updateMediaDevices( + List<MediaDevice> devices, + List<MediaDevice> selectedDevices, + @Nullable MediaDevice connectedMediaDevice, + boolean needToHandleMutingExpectedDevice, + @Nullable MediaItem connectNewDeviceMediaItem) { + Set<String> selectedOrConnectedMediaDeviceIds = + selectedDevices.stream().map(MediaDevice::getId).collect(Collectors.toSet()); + if (connectedMediaDevice != null) { + selectedOrConnectedMediaDeviceIds.add(connectedMediaDevice.getId()); + } + + List<MediaItem> selectedMediaItems = new ArrayList<>(); + List<MediaItem> suggestedMediaItems = new ArrayList<>(); + List<MediaItem> speakersAndDisplaysMediaItems = new ArrayList<>(); + Map<String, MediaItem> deviceIdToMediaItemMap = new HashMap<>(); + buildMediaItems( + devices, + selectedOrConnectedMediaDeviceIds, + needToHandleMutingExpectedDevice, + selectedMediaItems, + suggestedMediaItems, + speakersAndDisplaysMediaItems, + deviceIdToMediaItemMap); + + List<MediaItem> updatedSelectedMediaItems = new CopyOnWriteArrayList<>(); + List<MediaItem> updatedSuggestedMediaItems = new CopyOnWriteArrayList<>(); + List<MediaItem> updatedSpeakersAndDisplaysMediaItems = new CopyOnWriteArrayList<>(); + if (isEmpty()) { + updatedSelectedMediaItems.addAll(selectedMediaItems); + updatedSuggestedMediaItems.addAll(suggestedMediaItems); + updatedSpeakersAndDisplaysMediaItems.addAll(speakersAndDisplaysMediaItems); + } else { + Set<String> updatedDeviceIds = new HashSet<>(); + // Preserve the existing media item order while updating with the latest device + // information. Some items may retain their original group (suggested, speakers and + // displays) to maintain this order. + updateMediaItems( + mSelectedMediaItems, + updatedSelectedMediaItems, + deviceIdToMediaItemMap, + updatedDeviceIds); + updateMediaItems( + mSuggestedMediaItems, + updatedSuggestedMediaItems, + deviceIdToMediaItemMap, + updatedDeviceIds); + updateMediaItems( + mSpeakersAndDisplaysMediaItems, + updatedSpeakersAndDisplaysMediaItems, + deviceIdToMediaItemMap, + updatedDeviceIds); + + // Append new media items that are not already in the existing lists to the output list. + List<MediaItem> remainingMediaItems = new ArrayList<>(); + remainingMediaItems.addAll( + getRemainingMediaItems(selectedMediaItems, updatedDeviceIds)); + remainingMediaItems.addAll( + getRemainingMediaItems(suggestedMediaItems, updatedDeviceIds)); + remainingMediaItems.addAll( + getRemainingMediaItems(speakersAndDisplaysMediaItems, updatedDeviceIds)); + updatedSpeakersAndDisplaysMediaItems.addAll(remainingMediaItems); + } + + if (Flags.enableOutputSwitcherDeviceGrouping() && !updatedSelectedMediaItems.isEmpty()) { + MediaItem selectedMediaItem = updatedSelectedMediaItems.get(0); + Optional<MediaDevice> mediaDeviceOptional = selectedMediaItem.getMediaDevice(); + if (mediaDeviceOptional.isPresent()) { + MediaItem updatedMediaItem = + MediaItem.createDeviceMediaItem( + mediaDeviceOptional.get(), /* isFirstDeviceInGroup= */ true); + updatedSelectedMediaItems.remove(0); + updatedSelectedMediaItems.add(0, updatedMediaItem); + } + } + + mSelectedMediaItems.clear(); + mSelectedMediaItems.addAll(updatedSelectedMediaItems); + mSuggestedMediaItems.clear(); + mSuggestedMediaItems.addAll(updatedSuggestedMediaItems); + mSpeakersAndDisplaysMediaItems.clear(); + mSpeakersAndDisplaysMediaItems.addAll(updatedSpeakersAndDisplaysMediaItems); + mConnectNewDeviceMediaItem = connectNewDeviceMediaItem; + + // The cached mOutputMediaItemList is cleared upon any update to individual media item + // lists. This ensures getOutputMediaItemList() computes and caches a fresh list on the next + // invocation. + mOutputMediaItemList.clear(); + } + /** Updates the list of output media items with the given list. */ public void clearAndAddAll(List<MediaItem> updatedMediaItems) { mOutputMediaItemList.clear(); @@ -40,16 +193,112 @@ public class OutputMediaItemListProxy { /** Removes the media items with muting expected devices. */ public void removeMutingExpectedDevices() { + if (Flags.fixOutputMediaItemListIndexOutOfBoundsException()) { + mSelectedMediaItems.removeIf((MediaItem::isMutingExpectedDevice)); + mSuggestedMediaItems.removeIf((MediaItem::isMutingExpectedDevice)); + mSpeakersAndDisplaysMediaItems.removeIf((MediaItem::isMutingExpectedDevice)); + if (mConnectNewDeviceMediaItem != null + && mConnectNewDeviceMediaItem.isMutingExpectedDevice()) { + mConnectNewDeviceMediaItem = null; + } + } mOutputMediaItemList.removeIf((MediaItem::isMutingExpectedDevice)); } /** Clears the output media item list. */ public void clear() { + if (Flags.fixOutputMediaItemListIndexOutOfBoundsException()) { + mSelectedMediaItems.clear(); + mSuggestedMediaItems.clear(); + mSpeakersAndDisplaysMediaItems.clear(); + mConnectNewDeviceMediaItem = null; + } mOutputMediaItemList.clear(); } /** Returns whether the output media item list is empty. */ public boolean isEmpty() { - return mOutputMediaItemList.isEmpty(); + if (Flags.fixOutputMediaItemListIndexOutOfBoundsException()) { + return mSelectedMediaItems.isEmpty() + && mSuggestedMediaItems.isEmpty() + && mSpeakersAndDisplaysMediaItems.isEmpty() + && (mConnectNewDeviceMediaItem == null); + } else { + return mOutputMediaItemList.isEmpty(); + } + } + + private void buildMediaItems( + List<MediaDevice> devices, + Set<String> selectedOrConnectedMediaDeviceIds, + boolean needToHandleMutingExpectedDevice, + List<MediaItem> selectedMediaItems, + List<MediaItem> suggestedMediaItems, + List<MediaItem> speakersAndDisplaysMediaItems, + Map<String, MediaItem> deviceIdToMediaItemMap) { + for (MediaDevice device : devices) { + String deviceId = device.getId(); + MediaItem mediaItem = MediaItem.createDeviceMediaItem(device); + if (needToHandleMutingExpectedDevice && device.isMutingExpectedDevice()) { + selectedMediaItems.add(0, mediaItem); + } else if (!needToHandleMutingExpectedDevice + && selectedOrConnectedMediaDeviceIds.contains(device.getId())) { + if (Flags.enableOutputSwitcherDeviceGrouping()) { + selectedMediaItems.add(mediaItem); + } else { + selectedMediaItems.add(0, mediaItem); + } + } else if (device.isSuggestedDevice()) { + suggestedMediaItems.add(mediaItem); + } else { + speakersAndDisplaysMediaItems.add(mediaItem); + } + deviceIdToMediaItemMap.put(deviceId, mediaItem); + } + } + + /** Returns a list of media items that remains the same order as the existing media items. */ + private void updateMediaItems( + List<MediaItem> existingMediaItems, + List<MediaItem> updatedMediaItems, + Map<String, MediaItem> deviceIdToMediaItemMap, + Set<String> updatedDeviceIds) { + List<String> existingDeviceIds = getDeviceIds(existingMediaItems); + for (String deviceId : existingDeviceIds) { + MediaItem mediaItem = deviceIdToMediaItemMap.get(deviceId); + if (mediaItem != null) { + updatedMediaItems.add(mediaItem); + updatedDeviceIds.add(deviceId); + } + } + } + + /** + * Returns media items from the input list that are not associated with the given device IDs. + */ + private List<MediaItem> getRemainingMediaItems( + List<MediaItem> mediaItems, Set<String> deviceIds) { + List<MediaItem> remainingMediaItems = new ArrayList<>(); + for (MediaItem item : mediaItems) { + Optional<MediaDevice> mediaDeviceOptional = item.getMediaDevice(); + if (mediaDeviceOptional.isPresent()) { + String deviceId = mediaDeviceOptional.get().getId(); + if (!deviceIds.contains(deviceId)) { + remainingMediaItems.add(item); + } + } + } + return remainingMediaItems; + } + + /** Returns a list of media device IDs for the given list of media items. */ + private List<String> getDeviceIds(List<MediaItem> mediaItems) { + List<String> deviceIds = new ArrayList<>(); + for (MediaItem item : mediaItems) { + if (item != null && item.getMediaDevice().isPresent()) { + deviceIds.add(item.getMediaDevice().get().getId()); + } + } + return deviceIds; } } diff --git a/packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/DismissibleHorizontalPager.kt b/packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/DismissibleHorizontalPager.kt index fea5b3267562..8df916fe6969 100644 --- a/packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/DismissibleHorizontalPager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/DismissibleHorizontalPager.kt @@ -82,6 +82,7 @@ fun DismissibleHorizontalPager( modifier: Modifier = Modifier, key: ((Int) -> Any)? = null, pageSpacing: Dp = 0.dp, + isFalseTouchDetected: Boolean, indicator: @Composable BoxScope.() -> Unit, pageContent: @Composable PagerScope.(page: Int) -> Unit, ) { @@ -142,7 +143,7 @@ fun DismissibleHorizontalPager( Box(modifier = modifier) { HorizontalPager( state = state.pagerState, - userScrollEnabled = state.isScrollingEnabled, + userScrollEnabled = state.isScrollingEnabled && !isFalseTouchDetected, key = key, pageSpacing = pageSpacing, pageContent = pageContent, diff --git a/packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/Media.kt b/packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/Media.kt index 9eb55a8eff2e..7543e0f2af2e 100644 --- a/packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/Media.kt +++ b/packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/Media.kt @@ -36,6 +36,8 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.gestures.awaitFirstDown import androidx.compose.foundation.hoverable import androidx.compose.foundation.indication import androidx.compose.foundation.interaction.DragInteraction @@ -44,6 +46,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.PressInteraction import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -52,6 +55,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ButtonDefaults @@ -72,7 +76,9 @@ import androidx.compose.runtime.Stable import androidx.compose.runtime.getValue import androidx.compose.runtime.key import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -89,10 +95,15 @@ import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.drawscope.clipRect import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.pointer.PointerEventPass +import androidx.compose.ui.input.pointer.PointerEventType +import androidx.compose.ui.input.pointer.PointerInputChange import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.Layout import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.semantics.clearAndSetSemantics +import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Dp @@ -202,6 +213,8 @@ private fun CardCarouselContent( ) { viewModel.cards.size } + var isFalseTouchDetected: Boolean by + remember(behavior.isCarouselScrollFalseTouch) { mutableStateOf(false) } val roundedCornerShape = RoundedCornerShape(32.dp) @@ -229,7 +242,16 @@ private fun CardCarouselContent( ) } }, - modifier = modifier.padding(8.dp).clip(roundedCornerShape), + isFalseTouchDetected = isFalseTouchDetected, + modifier = + modifier.padding(8.dp).clip(roundedCornerShape).pointerInput(behavior) { + if (behavior.isCarouselScrollFalseTouch != null) { + awaitEachGesture { + awaitFirstDown(false, PointerEventPass.Initial) + isFalseTouchDetected = behavior.isCarouselScrollFalseTouch.invoke() + } + } + }, ) { index -> Card( viewModel = viewModel.cards[index], @@ -384,7 +406,7 @@ private fun ContentScope.CardForegroundContent( ) ) { // Always add the first/top row, regardless of presentation style. - Box(modifier = Modifier.fillMaxWidth()) { + BoxWithConstraints(modifier = Modifier.fillMaxWidth()) { // Icon. Icon( icon = viewModel.icon, @@ -401,7 +423,20 @@ private fun ContentScope.CardForegroundContent( modifier = Modifier.align(Alignment.TopEnd), ) { viewModel.outputSwitcherChips.fastForEach { chip -> - OutputSwitcherChip(viewModel = chip, colorScheme = colorScheme) + OutputSwitcherChip( + viewModel = chip, + colorScheme = colorScheme, + modifier = + Modifier + // Each chip must be limited to 40% of the width of the card at + // most. + // + // The underlying assumption is that there'll never be more than one + // chip with text and one more icon-only chip. Only the one with + // text + // can ever end up being too wide. + .widthIn(max = this@BoxWithConstraints.maxWidth * 0.4f), + ) } } } @@ -645,11 +680,20 @@ private fun ContentScope.Navigation( if (isSeekBarVisible) { // To allow the seek bar slider to fade in and out, it's tagged as an element. Element(key = Media.Elements.SeekBarSlider, modifier = Modifier.weight(1f)) { + val sliderDragDelta = remember { + // Not a mutableStateOf - this is never accessed in composition and + // using an anonymous object avoids generics boxing of inline Offset. + object { + var value = Offset.Zero + } + } Slider( interactionSource = interactionSource, value = viewModel.progress, onValueChange = { progress -> viewModel.onScrubChange(progress) }, - onValueChangeFinished = { viewModel.onScrubFinished() }, + onValueChangeFinished = { + viewModel.onScrubFinished(sliderDragDelta.value) + }, colors = colors, thumb = { SeekBarThumb(interactionSource = interactionSource, colors = colors) @@ -662,7 +706,44 @@ private fun ContentScope.Navigation( modifier = Modifier.fillMaxWidth(), ) }, - modifier = Modifier.fillMaxWidth(), + modifier = + Modifier.fillMaxWidth() + .clearAndSetSemantics { + contentDescription = viewModel.contentDescription + } + .pointerInput(Unit) { + // Track and report the drag delta to the view-model so it + // can + // decide whether to accept the next onValueChangeFinished + // or + // reject it if the drag was overly vertical. + awaitPointerEventScope { + var down: PointerInputChange? = null + while (true) { + val event = + awaitPointerEvent(PointerEventPass.Initial) + when (event.type) { + PointerEventType.Press -> { + // A new gesture has begun. Record the + // initial + // down input change. + down = event.changes.last() + } + + PointerEventType.Move -> { + // The pointer has moved. If it's the same + // pointer as the latest down, calculate and + // report the drag delta. + val change = event.changes.last() + if (change.id == down?.id) { + sliderDragDelta.value = + change.position - down.position + } + } + } + } + } + }, ) } } @@ -958,6 +1039,8 @@ private fun OutputSwitcherChip( text = viewModel.text, style = MaterialTheme.typography.bodySmall, color = colorScheme.onPrimary, + maxLines = 1, + overflow = TextOverflow.Ellipsis, ) } } @@ -1084,7 +1167,12 @@ data class MediaUiBehavior( val isCarouselDismissible: Boolean = true, val isCarouselScrollingEnabled: Boolean = true, val carouselVisibility: MediaCarouselVisibility = MediaCarouselVisibility.WhenNotEmpty, - val isFalsingProtectionNeeded: Boolean = false, + /** + * If provided, this callback will be consulted at the beginning of each carousel scroll gesture + * to see if the falsing system thinks that it's a false touch. If it then returns `true`, the + * scroll will be canceled. + */ + val isCarouselScrollFalseTouch: (() -> Boolean)? = null, ) @Stable diff --git a/packages/SystemUI/src/com/android/systemui/media/remedia/ui/viewmodel/MediaNavigationViewModel.kt b/packages/SystemUI/src/com/android/systemui/media/remedia/ui/viewmodel/MediaNavigationViewModel.kt index c34c7337290f..a3689926e937 100644 --- a/packages/SystemUI/src/com/android/systemui/media/remedia/ui/viewmodel/MediaNavigationViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/media/remedia/ui/viewmodel/MediaNavigationViewModel.kt @@ -17,6 +17,7 @@ package com.android.systemui.media.remedia.ui.viewmodel import androidx.annotation.FloatRange +import androidx.compose.ui.geometry.Offset /** * Models UI state for the navigation component of the UI (potentially containing the seek bar and @@ -58,7 +59,9 @@ sealed interface MediaNavigationViewModel { * A callback to invoke once the user finishes "scrubbing" (e.g. stopped moving the thumb of * the seek bar). The position/progress should be committed. */ - val onScrubFinished: () -> Unit, + val onScrubFinished: (delta: Offset) -> Unit, + /** Accessibility string to attach to the seekbar UI element. */ + val contentDescription: String, ) : MediaNavigationViewModel /** The seek bar should be hidden. */ diff --git a/packages/SystemUI/src/com/android/systemui/media/remedia/ui/viewmodel/MediaViewModel.kt b/packages/SystemUI/src/com/android/systemui/media/remedia/ui/viewmodel/MediaViewModel.kt index b4f3d2724e75..19b08fa212db 100644 --- a/packages/SystemUI/src/com/android/systemui/media/remedia/ui/viewmodel/MediaViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/media/remedia/ui/viewmodel/MediaViewModel.kt @@ -17,13 +17,18 @@ package com.android.systemui.media.remedia.ui.viewmodel import android.content.Context +import android.icu.text.MeasureFormat +import android.icu.util.Measure +import android.icu.util.MeasureUnit import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.ImageBitmap +import com.android.systemui.classifier.Classifier import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.lifecycle.ExclusiveActivatable @@ -31,11 +36,15 @@ import com.android.systemui.media.remedia.domain.interactor.MediaInteractor import com.android.systemui.media.remedia.domain.model.MediaActionModel import com.android.systemui.media.remedia.shared.model.MediaColorScheme import com.android.systemui.media.remedia.shared.model.MediaSessionState +import com.android.systemui.plugins.FalsingManager import com.android.systemui.res.R import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject +import java.util.Locale +import kotlin.math.abs import kotlin.math.roundToLong +import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.awaitCancellation /** Models UI state for a media element. */ @@ -43,6 +52,7 @@ class MediaViewModel @AssistedInject constructor( private val interactor: MediaInteractor, + private val falsingSystem: FalsingSystem, @Assisted private val context: Context, @Assisted private val carouselVisibility: MediaCarouselVisibility, ) : ExclusiveActivatable() { @@ -105,13 +115,24 @@ constructor( isScrubbing = true seekProgress = progress }, - onScrubFinished = { - interactor.seek( - sessionKey = session.key, - to = (seekProgress * session.durationMs).roundToLong(), - ) + onScrubFinished = { dragDelta -> + if ( + dragDelta.isHorizontal() && + !falsingSystem.isFalseTouch(Classifier.MEDIA_SEEKBAR) + ) { + interactor.seek( + sessionKey = session.key, + to = (seekProgress * session.durationMs).roundToLong(), + ) + } isScrubbing = false }, + contentDescription = + context.getString( + R.string.controls_media_seekbar_description, + formatTimeContentDescription(session.positionMs), + formatTimeContentDescription(session.durationMs), + ), ) } else { MediaNavigationViewModel.Hidden @@ -139,20 +160,36 @@ constructor( R.string.controls_media_dismiss_button ), onClick = { - interactor.hide(session.key) - isGutsVisible = false + falsingSystem.runIfNotFalseTap( + FalsingManager.LOW_PENALTY + ) { + interactor.hide(session.key) + isGutsVisible = false + } }, ) } else { MediaGutsButtonViewModel( text = context.getString(R.string.cancel), - onClick = { isGutsVisible = false }, + onClick = { + falsingSystem.runIfNotFalseTap( + FalsingManager.LOW_PENALTY + ) { + isGutsVisible = false + } + }, ) }, secondaryAction = MediaGutsButtonViewModel( text = context.getString(R.string.cancel), - onClick = { isGutsVisible = false }, + onClick = { + falsingSystem.runIfNotFalseTap( + FalsingManager.LOW_PENALTY + ) { + isGutsVisible = false + } + }, ) .takeIf { session.canBeHidden }, settingsButton = @@ -165,7 +202,11 @@ constructor( res = R.string.controls_media_settings_button ), ), - onClick = { interactor.openMediaSettings() }, + onClick = { + falsingSystem.runIfNotFalseTap(FalsingManager.LOW_PENALTY) { + interactor.openMediaSettings() + } + }, ), onLongClick = { isGutsVisible = false }, ) @@ -178,7 +219,12 @@ constructor( icon = session.outputDevice.icon, text = session.outputDevice.name, onClick = { - // TODO(b/397989775): tell the UI to show the output switcher. + falsingSystem.runIfNotFalseTap( + FalsingManager.MODERATE_PENALTY + ) { + // TODO(b/397989775): tell the UI to show the output + // switcher. + } }, ) ) @@ -189,12 +235,16 @@ constructor( return MediaSecondaryActionViewModel.Action( icon = session.outputDevice.icon, onClick = { - // TODO(b/397989775): tell the UI to show the output switcher. + falsingSystem.runIfNotFalseTap(FalsingManager.MODERATE_PENALTY) { + // TODO(b/397989775): tell the UI to show the output switcher. + } }, ) } - override val onClick = session.onClick + override val onClick = { + falsingSystem.runIfNotFalseTap(FalsingManager.LOW_PENALTY) { session.onClick() } + } override val onClickLabel = context.getString(R.string.controls_media_playing_item_description) override val onLongClick = { isGutsVisible = true } @@ -230,7 +280,14 @@ constructor( MediaPlayPauseActionViewModel( state = mediaSessionState, icon = icon, - onClick = onClick ?: {}, + onClick = + onClick?.let { + { + falsingSystem.runIfNotFalseTap(FalsingManager.MODERATE_PENALTY) { + it() + } + } + }, ) is MediaActionModel.None, is MediaActionModel.ReserveSpace -> null @@ -240,14 +297,80 @@ constructor( private fun MediaActionModel.toSecondaryActionViewModel(): MediaSecondaryActionViewModel { return when (this) { is MediaActionModel.Action -> - MediaSecondaryActionViewModel.Action(icon = icon, onClick = onClick) + MediaSecondaryActionViewModel.Action( + icon = icon, + onClick = + onClick?.let { + { + falsingSystem.runIfNotFalseTap(FalsingManager.MODERATE_PENALTY) { + it() + } + } + }, + ) is MediaActionModel.ReserveSpace -> MediaSecondaryActionViewModel.ReserveSpace is MediaActionModel.None -> MediaSecondaryActionViewModel.None } } + /** + * Returns a time string suitable for content description, e.g. "12 minutes 34 seconds" + * + * Follows same logic as Chronometer#formatDuration + */ + private fun formatTimeContentDescription(milliseconds: Long): String { + var seconds = milliseconds.milliseconds.inWholeSeconds + + val hours = + if (seconds >= OneHourInSec) { + seconds / OneHourInSec + } else { + 0 + } + seconds -= hours * OneHourInSec + + val minutes = + if (seconds >= OneMinuteInSec) { + seconds / OneMinuteInSec + } else { + 0 + } + seconds -= minutes * OneMinuteInSec + + val measures = arrayListOf<Measure>() + if (hours > 0) { + measures.add(Measure(hours, MeasureUnit.HOUR)) + } + if (minutes > 0) { + measures.add(Measure(minutes, MeasureUnit.MINUTE)) + } + measures.add(Measure(seconds, MeasureUnit.SECOND)) + + return MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.WIDE) + .formatMeasures(*measures.toTypedArray()) + } + + /** + * Returns `true` if this [Offset] is the same or larger on the horizontal axis than the + * vertical axis. + */ + private fun Offset.isHorizontal(): Boolean { + return abs(x) >= abs(y) + } + + interface FalsingSystem { + fun runIfNotFalseTap(@FalsingManager.Penalty penalty: Int, block: () -> Unit) + + fun isFalseTouch(@Classifier.InteractionType interactionType: Int): Boolean + } + @AssistedFactory interface Factory { fun create(context: Context, carouselVisibility: MediaCarouselVisibility): MediaViewModel } + + companion object { + private const val OneMinuteInSec = 60 + private const val OneHourInSec = OneMinuteInSec * 60 + } } diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/taskswitcher/data/repository/ActivityTaskManagerTasksRepository.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/taskswitcher/data/repository/ActivityTaskManagerTasksRepository.kt index 4ff54d4eae65..42d27619f60f 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/taskswitcher/data/repository/ActivityTaskManagerTasksRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/taskswitcher/data/repository/ActivityTaskManagerTasksRepository.kt @@ -26,7 +26,7 @@ import android.os.IBinder import android.util.Log import android.view.Display import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepository.kt b/packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepository.kt index 43bd6aa37b5a..faa77e51ec24 100644 --- a/packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepository.kt @@ -24,7 +24,7 @@ import android.content.IntentFilter import android.os.PowerManager import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.power.shared.model.DozeScreenStateModel diff --git a/packages/SystemUI/src/com/android/systemui/power/shared/model/WakefulnessModel.kt b/packages/SystemUI/src/com/android/systemui/power/shared/model/WakefulnessModel.kt index 297c6af5a4a7..f368c53c5b39 100644 --- a/packages/SystemUI/src/com/android/systemui/power/shared/model/WakefulnessModel.kt +++ b/packages/SystemUI/src/com/android/systemui/power/shared/model/WakefulnessModel.kt @@ -61,6 +61,11 @@ data class WakefulnessModel( (lastWakeReason == WakeSleepReason.TAP || lastWakeReason == WakeSleepReason.GESTURE) } + fun isAwakeFromMotionOrLift(): Boolean { + return isAwake() && + (lastWakeReason == WakeSleepReason.MOTION || lastWakeReason == WakeSleepReason.LIFT) + } + override fun logDiffs(prevVal: WakefulnessModel, row: TableRowLogger) { row.logChange(columnName = "wakefulness", value = toString()) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt index 8920c86282da..a4386dee7264 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt @@ -421,7 +421,7 @@ constructor( } override fun isCustomizing(): Boolean { - return viewModel.containerViewModel.editModeViewModel.isEditing.value + return viewModel.isEditing } override fun closeCustomizer() { @@ -657,7 +657,8 @@ constructor( */ !alwaysCompose || (viewModel.isQsVisibleAndAnyShadeExpanded && - viewModel.expansionState.progress < 1f) + viewModel.expansionState.progress < 1f && + !viewModel.isEditing) }, ) } @@ -784,7 +785,8 @@ constructor( */ !alwaysCompose || (viewModel.isQsVisibleAndAnyShadeExpanded && - viewModel.expansionState.progress > 0f) + viewModel.expansionState.progress > 0f && + !viewModel.isEditing) }, ) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt index 767acc5fa76a..b61fa9cfe264 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt @@ -35,7 +35,6 @@ import com.android.systemui.animation.ShadeInterpolation import com.android.systemui.classifier.Classifier import com.android.systemui.classifier.domain.interactor.FalsingInteractor import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.Edge @@ -307,6 +306,12 @@ constructor( val animateTilesExpansion: Boolean get() = inFirstPage && !mediaSuddenlyAppearingInLandscape + val isEditing by + hydrator.hydratedStateOf( + traceName = "isEditing", + source = containerViewModel.editModeViewModel.isEditing, + ) + private val inFirstPage: Boolean get() = inFirstPageViewModel.inFirstPage diff --git a/packages/SystemUI/src/com/android/systemui/qs/footer/data/repository/ForegroundServicesRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/footer/data/repository/ForegroundServicesRepository.kt index bd9d70c13572..eb99fec7a0a8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/footer/data/repository/ForegroundServicesRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/footer/data/repository/ForegroundServicesRepository.kt @@ -17,7 +17,7 @@ package com.android.systemui.qs.footer.data.repository import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.qs.FgsManagerController import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt index 865ae9a37d87..22971a9eb703 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt @@ -85,6 +85,15 @@ constructor( val pagerState = rememberPagerState(0) { pages.size } + LaunchedEffect(listening, pagerState) { + snapshotFlow { listening() } + .collect { + if (!listening()) { + pagerState.scrollToPage(0) + } + } + } + // Used to track if this is currently in the first page or not, for animations LaunchedEffect(key1 = pagerState) { snapshotFlow { pagerState.currentPage == 0 }.collect { viewModel.inFirstPage = it } diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt index 69b967a68c3c..eb0947f2f844 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt @@ -113,6 +113,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.util.fastMap +import com.android.compose.gesture.effect.rememberOffsetOverscrollEffectFactory import com.android.compose.modifiers.height import com.android.systemui.common.ui.compose.load import com.android.systemui.qs.panels.shared.model.SizedTile @@ -215,7 +216,9 @@ fun DefaultEditTileGrid( containerColor = Color.Transparent, topBar = { EditModeTopBar(onStopEditing = onStopEditing, onReset = reset) }, ) { innerPadding -> - CompositionLocalProvider(LocalOverscrollFactory provides null) { + CompositionLocalProvider( + LocalOverscrollFactory provides rememberOffsetOverscrollEffectFactory() + ) { val scrollState = rememberScrollState() AutoScrollGrid(listState, scrollState, innerPadding) diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/QSSettingsRestoredRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/QSSettingsRestoredRepository.kt index 1cd5d100ec00..e3a8ffd0f480 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/QSSettingsRestoredRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/QSSettingsRestoredRepository.kt @@ -6,7 +6,7 @@ import android.os.UserHandle import android.provider.Settings import android.util.Log import com.android.systemui.broadcast.BroadcastDispatcher -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.common.shared.model.PackageChangeModel.Empty.user import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/CallbackControllerAutoAddable.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/CallbackControllerAutoAddable.kt index 88a49ee109aa..53d2554f0e82 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/CallbackControllerAutoAddable.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/CallbackControllerAutoAddable.kt @@ -16,7 +16,7 @@ package com.android.systemui.qs.pipeline.domain.autoaddable -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.qs.pipeline.domain.model.AutoAddSignal import com.android.systemui.qs.pipeline.domain.model.AutoAddTracking import com.android.systemui.qs.pipeline.domain.model.AutoAddable diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/DeviceControlsAutoAddable.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/DeviceControlsAutoAddable.kt index 76bfad936116..a3b4c71c7641 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/DeviceControlsAutoAddable.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/DeviceControlsAutoAddable.kt @@ -16,7 +16,7 @@ package com.android.systemui.qs.pipeline.domain.autoaddable -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.qs.pipeline.domain.model.AutoAddSignal import com.android.systemui.qs.pipeline.domain.model.AutoAddTracking diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/NightDisplayAutoAddable.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/NightDisplayAutoAddable.kt index e9c91ca0db12..66af6d8b3e18 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/NightDisplayAutoAddable.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/NightDisplayAutoAddable.kt @@ -19,7 +19,7 @@ package com.android.systemui.qs.pipeline.domain.autoaddable import android.content.Context import android.hardware.display.ColorDisplayManager import android.hardware.display.NightDisplayListener -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.NightDisplayListenerModule import com.android.systemui.dagger.SysUISingleton import com.android.systemui.qs.pipeline.domain.model.AutoAddSignal diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/SafetyCenterAutoAddable.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/SafetyCenterAutoAddable.kt index 88d7f06dfada..ff3fd3781181 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/SafetyCenterAutoAddable.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/SafetyCenterAutoAddable.kt @@ -21,7 +21,7 @@ import android.content.pm.PackageManager import android.content.res.Resources import android.text.TextUtils import com.android.systemui.res.R -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/WorkTileAutoAddable.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/WorkTileAutoAddable.kt index 3f619c08261d..c66c9dc9ba6a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/WorkTileAutoAddable.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/WorkTileAutoAddable.kt @@ -18,7 +18,7 @@ package com.android.systemui.qs.pipeline.domain.autoaddable import android.content.pm.UserInfo import android.os.UserHandle -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.qs.pipeline.data.restoreprocessors.WorkTileRestoreProcessor import com.android.systemui.qs.pipeline.domain.model.AutoAddSignal diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java index c6fc868b3dc8..0db05c1355ab 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java @@ -92,6 +92,7 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy private static final long DEFAULT_STALE_TIMEOUT = 10 * DateUtils.MINUTE_IN_MILLIS; protected static final Object ARG_SHOW_TRANSIENT_ENABLING = new Object(); + protected static final Object ARG_SHOW_TRANSIENT_DISABLING = new Object(); private static final int READY_STATE_NOT_READY = 0; private static final int READY_STATE_READYING = 1; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SubtitleArrayMapping.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SubtitleArrayMapping.kt index 61a8fa3d2a6e..cd0b70e5e988 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SubtitleArrayMapping.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SubtitleArrayMapping.kt @@ -27,6 +27,7 @@ object SubtitleArrayMapping { subtitleIdsMap["cell"] = R.array.tile_states_cell subtitleIdsMap["battery"] = R.array.tile_states_battery subtitleIdsMap["dnd"] = R.array.tile_states_dnd + subtitleIdsMap["modes_dnd"] = R.array.tile_states_modes_dnd subtitleIdsMap["flashlight"] = R.array.tile_states_flashlight subtitleIdsMap["rotation"] = R.array.tile_states_rotation subtitleIdsMap["bt"] = R.array.tile_states_bt diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index 4b1c90f0c2ce..9aeaa22c549e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -56,6 +56,7 @@ import com.android.systemui.plugins.qs.TileDetailsViewModel; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.qs.QSHost; import com.android.systemui.qs.QsEventLogger; +import com.android.systemui.qs.flags.QsInCompose; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.res.R; @@ -196,11 +197,18 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { protected void handleUpdateState(BooleanState state, Object arg) { checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_BLUETOOTH); final boolean transientEnabling = arg == ARG_SHOW_TRANSIENT_ENABLING; - final boolean enabled = transientEnabling || mController.isBluetoothEnabled(); + final boolean transientDisabling = + QsInCompose.isEnabled() && arg == ARG_SHOW_TRANSIENT_DISABLING; + final boolean enabled = + transientEnabling || (mController.isBluetoothEnabled() && !transientDisabling); final boolean connected = mController.isBluetoothConnected(); final boolean connecting = mController.isBluetoothConnecting(); - state.isTransient = transientEnabling || connecting || - mController.getBluetoothState() == BluetoothAdapter.STATE_TURNING_ON; + state.isTransient = transientEnabling || transientDisabling || connecting + || mController.getBluetoothState() == BluetoothAdapter.STATE_TURNING_ON; + if (QsInCompose.isEnabled()) { + state.isTransient = state.isTransient + || mController.getBluetoothState() == BluetoothAdapter.STATE_TURNING_OFF; + } if (!enabled || !connected || state.isTransient) { stopListeningToStaleDeviceMetadata(); } @@ -208,7 +216,8 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { state.value = enabled; state.label = mContext.getString(R.string.quick_settings_bluetooth_label); state.secondaryLabel = TextUtils.emptyIfNull( - getSecondaryLabel(enabled, connecting, connected, state.isTransient)); + getSecondaryLabel(enabled, connecting, connected, + state.isTransient && transientEnabling)); state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_bluetooth); state.stateDescription = ""; @@ -241,8 +250,13 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { private void toggleBluetooth() { final boolean isEnabled = mState.value; - // Immediately enter transient enabling state when turning bluetooth on. - refreshState(isEnabled ? null : ARG_SHOW_TRANSIENT_ENABLING); + if (QsInCompose.isEnabled()) { + // Immediately enter transient enabling state when toggling bluetooth state. + refreshState(isEnabled ? ARG_SHOW_TRANSIENT_DISABLING : ARG_SHOW_TRANSIENT_ENABLING); + } else { + // Immediately enter transient enabling state when turning bluetooth on. + refreshState(isEnabled ? ARG_SHOW_TRANSIENT_DISABLING : null); + } mController.setBluetoothEnabled(!isEnabled); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ModesDndTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/ModesDndTile.kt new file mode 100644 index 000000000000..52b02066c35a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ModesDndTile.kt @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles + +import android.content.Intent +import android.os.Handler +import android.os.Looper +import androidx.annotation.DrawableRes +import androidx.annotation.VisibleForTesting +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.coroutineScope +import androidx.lifecycle.repeatOnLifecycle +import com.android.app.tracing.coroutines.launchTraced as launch +import com.android.internal.logging.MetricsLogger +import com.android.systemui.animation.Expandable +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.modes.shared.ModesUi +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.FalsingManager +import com.android.systemui.plugins.qs.QSTile.BooleanState +import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.qs.QSHost +import com.android.systemui.qs.QsEventLogger +import com.android.systemui.qs.asQSTileIcon +import com.android.systemui.qs.logging.QSLogger +import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.qs.tiles.impl.modes.domain.interactor.ModesDndTileDataInteractor +import com.android.systemui.qs.tiles.impl.modes.domain.interactor.ModesDndTileUserActionInteractor +import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesDndTileModel +import com.android.systemui.qs.tiles.impl.modes.ui.ModesDndTileMapper +import com.android.systemui.qs.tiles.viewmodel.QSTileConfigProvider +import com.android.systemui.qs.tiles.viewmodel.QSTileState +import com.android.systemui.res.R +import javax.inject.Inject +import kotlinx.coroutines.runBlocking + +/** + * Standalone tile used to control the DND Mode. Contrast to [ModesTile] (the tile that opens a + * dialog showing the list of all modes) and [DndTile] (the tile used to toggle interruption + * filtering in the pre-MODES_UI world). + */ +class ModesDndTile +@Inject +constructor( + host: QSHost, + uiEventLogger: QsEventLogger, + @Background backgroundLooper: Looper, + @Main mainHandler: Handler, + falsingManager: FalsingManager, + metricsLogger: MetricsLogger, + statusBarStateController: StatusBarStateController, + activityStarter: ActivityStarter, + qsLogger: QSLogger, + qsTileConfigProvider: QSTileConfigProvider, + private val dataInteractor: ModesDndTileDataInteractor, + private val tileMapper: ModesDndTileMapper, + private val userActionInteractor: ModesDndTileUserActionInteractor, +) : + QSTileImpl<BooleanState>( + host, + uiEventLogger, + backgroundLooper, + mainHandler, + falsingManager, + metricsLogger, + statusBarStateController, + activityStarter, + qsLogger, + ) { + + private lateinit var tileState: QSTileState + private val config = qsTileConfigProvider.getConfig(TILE_SPEC) + + init { + lifecycle.coroutineScope.launch { + lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) { + dataInteractor.tileData().collect { refreshState(it) } + } + } + } + + override fun isAvailable(): Boolean = ModesUi.isEnabled && android.app.Flags.modesUiDndTile() + + override fun getTileLabel(): CharSequence = + mContext.getString(R.string.quick_settings_dnd_label) + + override fun newTileState(): BooleanState = BooleanState() + + override fun handleClick(expandable: Expandable?) = runBlocking { + userActionInteractor.handleClick() + } + + override fun getLongClickIntent(): Intent? = userActionInteractor.getSettingsIntent() + + @VisibleForTesting + public override fun handleUpdateState(state: BooleanState?, arg: Any?) { + val model = arg as? ModesDndTileModel ?: dataInteractor.getCurrentTileModel() + + tileState = tileMapper.map(config, model) + state?.apply { + value = model.isActivated + this.state = tileState.activationState.legacyState + icon = + tileState.icon?.asQSTileIcon() + ?: maybeLoadResourceIcon(iconResId(model.isActivated)) + label = tileLabel + secondaryLabel = tileState.secondaryLabel + contentDescription = tileState.contentDescription + expandedAccessibilityClassName = tileState.expandedAccessibilityClassName + } + } + + @DrawableRes + private fun iconResId(activated: Boolean): Int = + if (activated) R.drawable.qs_dnd_icon_on else R.drawable.qs_dnd_icon_off + + companion object { + const val TILE_SPEC = "modes_dnd" + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/interactor/FlashlightTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/interactor/FlashlightTileDataInteractor.kt index 1544804c3291..38eb5947bd71 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/interactor/FlashlightTileDataInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/interactor/FlashlightTileDataInteractor.kt @@ -17,7 +17,7 @@ package com.android.systemui.qs.tiles.impl.flashlight.domain.interactor import android.os.UserHandle -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor import com.android.systemui.qs.tiles.impl.flashlight.domain.model.FlashlightTileModel diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileDataInteractor.kt new file mode 100644 index 000000000000..b1ae3ba4381a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileDataInteractor.kt @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles.impl.modes.domain.interactor + +import android.content.Context +import android.os.UserHandle +import com.android.app.tracing.coroutines.flow.flowName +import com.android.settingslib.notification.modes.ZenMode +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.modes.shared.ModesUi +import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger +import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor +import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesDndTileModel +import com.android.systemui.shade.ShadeDisplayAware +import com.android.systemui.statusbar.policy.domain.interactor.ZenModeInteractor +import javax.inject.Inject +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.filterNotNull +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map + +class ModesDndTileDataInteractor +@Inject +constructor( + @ShadeDisplayAware val context: Context, + val zenModeInteractor: ZenModeInteractor, + @Background val bgDispatcher: CoroutineDispatcher, +) : QSTileDataInteractor<ModesDndTileModel> { + + override fun tileData( + user: UserHandle, + triggers: Flow<DataUpdateTrigger>, + ): Flow<ModesDndTileModel> = tileData() + + /** + * An adapted version of the base class' [tileData] method for use in an old-style tile. + * + * TODO(b/299909989): Remove after the transition. + */ + fun tileData() = + zenModeInteractor.dndMode + .filterNotNull() + .map { dndMode -> buildTileData(dndMode) } + .flowName("tileData") + .flowOn(bgDispatcher) + .distinctUntilChanged() + + fun getCurrentTileModel() = buildTileData(zenModeInteractor.getDndMode()) + + private fun buildTileData(dndMode: ZenMode): ModesDndTileModel { + return ModesDndTileModel(isActivated = dndMode.isActive) + } + + override fun availability(user: UserHandle): Flow<Boolean> = + flowOf(ModesUi.isEnabled && android.app.Flags.modesUiDndTile()) +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileUserActionInteractor.kt new file mode 100644 index 000000000000..e8fcea070ede --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesDndTileUserActionInteractor.kt @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles.impl.modes.domain.interactor + +import android.content.Intent +import android.provider.Settings.ACTION_AUTOMATIC_ZEN_RULE_SETTINGS +import android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID +import android.util.Log +import com.android.systemui.animation.Expandable +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.qs.shared.QSSettingsPackageRepository +import com.android.systemui.qs.tiles.base.actions.QSTileIntentUserInputHandler +import com.android.systemui.qs.tiles.base.interactor.QSTileInput +import com.android.systemui.qs.tiles.base.interactor.QSTileUserActionInteractor +import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesDndTileModel +import com.android.systemui.qs.tiles.viewmodel.QSTileUserAction +import com.android.systemui.statusbar.policy.domain.interactor.ZenModeInteractor +import com.android.systemui.statusbar.policy.ui.dialog.ModesDialogDelegate +import com.android.systemui.statusbar.policy.ui.dialog.ModesDialogEventLogger +import javax.inject.Inject +import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.withContext + +@SysUISingleton +class ModesDndTileUserActionInteractor +@Inject +constructor( + @Main private val mainContext: CoroutineContext, + private val qsTileIntentUserInputHandler: QSTileIntentUserInputHandler, + // TODO(b/353896370): The domain layer should not have to depend on the UI layer. + private val dialogDelegate: ModesDialogDelegate, + private val zenModeInteractor: ZenModeInteractor, + private val dialogEventLogger: ModesDialogEventLogger, + private val settingsPackageRepository: QSSettingsPackageRepository, +) : QSTileUserActionInteractor<ModesDndTileModel> { + + override suspend fun handleInput(input: QSTileInput<ModesDndTileModel>) { + with(input) { + when (action) { + is QSTileUserAction.Click, + is QSTileUserAction.ToggleClick -> { + handleClick() + } + is QSTileUserAction.LongClick -> { + handleLongClick(action.expandable) + } + } + } + } + + suspend fun handleClick() { + val dnd = zenModeInteractor.dndMode.value + if (dnd == null) { + Log.wtf(TAG, "No DND!?") + return + } + + if (!dnd.isActive) { + if (zenModeInteractor.shouldAskForZenDuration(dnd)) { + dialogEventLogger.logOpenDurationDialog(dnd) + withContext(mainContext) { + // NOTE: The dialog handles turning on the mode itself. + val dialog = dialogDelegate.makeDndDurationDialog() + dialog.show() + } + } else { + dialogEventLogger.logModeOn(dnd) + zenModeInteractor.activateMode(dnd) + } + } else { + dialogEventLogger.logModeOff(dnd) + zenModeInteractor.deactivateMode(dnd) + } + } + + private fun handleLongClick(expandable: Expandable?) { + val intent = getSettingsIntent() + if (intent != null) { + qsTileIntentUserInputHandler.handle(expandable, intent) + } + } + + fun getSettingsIntent(): Intent? { + val dnd = zenModeInteractor.dndMode.value + if (dnd == null) { + Log.wtf(TAG, "No DND!?") + return null + } + + return Intent(ACTION_AUTOMATIC_ZEN_RULE_SETTINGS) + .putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, dnd.id) + .setPackage(settingsPackageRepository.getSettingsPackageName()) + } + + companion object { + const val TAG = "ModesDndTileUserActionInteractor" + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/model/ModesDndTileModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/model/ModesDndTileModel.kt new file mode 100644 index 000000000000..eab798897aa3 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/model/ModesDndTileModel.kt @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles.impl.modes.domain.model + +data class ModesDndTileModel(val isActivated: Boolean) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesDndTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesDndTileMapper.kt new file mode 100644 index 000000000000..4869b6f74554 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesDndTileMapper.kt @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles.impl.modes.ui + +import android.content.res.Resources +import android.widget.Switch +import com.android.systemui.common.shared.model.Icon +import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper +import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesDndTileModel +import com.android.systemui.qs.tiles.viewmodel.QSTileConfig +import com.android.systemui.qs.tiles.viewmodel.QSTileState +import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware +import javax.inject.Inject + +class ModesDndTileMapper +@Inject +constructor(@ShadeDisplayAware private val resources: Resources, val theme: Resources.Theme) : + QSTileDataToStateMapper<ModesDndTileModel> { + override fun map(config: QSTileConfig, data: ModesDndTileModel): QSTileState = + QSTileState.build(resources, theme, config.uiConfig) { + val iconResource = + if (data.isActivated) R.drawable.qs_dnd_icon_on else R.drawable.qs_dnd_icon_off + icon = + Icon.Loaded( + resources.getDrawable(iconResource, theme), + res = iconResource, + contentDescription = null, + ) + + activationState = + if (data.isActivated) { + QSTileState.ActivationState.ACTIVE + } else { + QSTileState.ActivationState.INACTIVE + } + label = resources.getString(R.string.quick_settings_dnd_label) + secondaryLabel = + resources.getString( + if (data.isActivated) R.string.zen_mode_on else R.string.zen_mode_off + ) + contentDescription = label + supportedActions = + setOf(QSTileState.UserAction.CLICK, QSTileState.UserAction.LONG_CLICK) + expandedAccessibilityClass = Switch::class + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/sensorprivacy/SensorPrivacyToggleTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/sensorprivacy/SensorPrivacyToggleTileDataInteractor.kt index 7117629622e6..a8e9c5663f39 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/sensorprivacy/SensorPrivacyToggleTileDataInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/sensorprivacy/SensorPrivacyToggleTileDataInteractor.kt @@ -22,7 +22,7 @@ import android.hardware.SensorPrivacyManager.Sensors.Sensor import android.os.UserHandle import android.provider.DeviceConfig import android.util.Log -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt index 7bb831baec20..3ad0867192d3 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt @@ -33,7 +33,7 @@ import com.android.systemui.bouncer.domain.interactor.SimBouncerInteractor import com.android.systemui.bouncer.shared.logging.BouncerUiEvent import com.android.systemui.classifier.FalsingCollector import com.android.systemui.classifier.FalsingCollectorActual -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.DisplayId diff --git a/packages/SystemUI/src/com/android/systemui/security/data/repository/SecurityRepository.kt b/packages/SystemUI/src/com/android/systemui/security/data/repository/SecurityRepository.kt index 7e967f436ecb..0b039fecc19e 100644 --- a/packages/SystemUI/src/com/android/systemui/security/data/repository/SecurityRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/security/data/repository/SecurityRepository.kt @@ -17,7 +17,7 @@ package com.android.systemui.security.data.repository import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.security.data.model.SecurityModel diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java index dafb1a559d59..8d7cc922c38b 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java @@ -498,7 +498,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW } private boolean isExpanded(NotificationShadeWindowState state) { - boolean visForBlur = !Flags.disableShadeVisibleWithBlur() && state.backgroundBlurRadius > 0; + boolean visForBlur = !Flags.disableBlurredShadeVisible() && state.backgroundBlurRadius > 0; boolean isExpanded = !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded() || state.panelVisible || state.keyguardFadingAway || state.bouncerShowing || state.headsUpNotificationShowing diff --git a/packages/SystemUI/src/com/android/systemui/shade/data/repository/PrivacyChipRepository.kt b/packages/SystemUI/src/com/android/systemui/shade/data/repository/PrivacyChipRepository.kt index 91c92cc8cd2f..ce74cb7d54d2 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/data/repository/PrivacyChipRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/data/repository/PrivacyChipRepository.kt @@ -20,7 +20,7 @@ import android.content.IntentFilter import android.os.UserHandle import android.safetycenter.SafetyCenterManager import com.android.systemui.broadcast.BroadcastDispatcher -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index 657c86b10f16..e66b21866902 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -1088,14 +1088,18 @@ public class KeyguardIndicationController { if (!TextUtils.equals(mTopIndicationView.getText(), newIndication)) { mWakeLock.setAcquired(true); + final KeyguardIndication.Builder builder = new KeyguardIndication.Builder() + .setMessage(newIndication) + .setTextColor(ColorStateList.valueOf( + useMisalignmentColor + ? mContext.getColor(R.color.misalignment_text_color) + : Color.WHITE)); + if (mBiometricMessage != null && newIndication == mBiometricMessage) { + builder.setForceAccessibilityLiveRegionAssertive(); + } + mTopIndicationView.switchIndication(newIndication, - new KeyguardIndication.Builder() - .setMessage(newIndication) - .setTextColor(ColorStateList.valueOf( - useMisalignmentColor - ? mContext.getColor(R.color.misalignment_text_color) - : Color.WHITE)) - .build(), + builder.build(), true, () -> mWakeLock.setAcquired(false)); } return; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java index 3180a06ae787..fdcd39d1d616 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java @@ -34,7 +34,7 @@ public interface NotificationLockscreenUserManager { value = { REDACTION_TYPE_NONE, REDACTION_TYPE_PUBLIC, - REDACTION_TYPE_SENSITIVE_CONTENT}) + REDACTION_TYPE_OTP}) @interface RedactionType {} /** @@ -52,7 +52,7 @@ public interface NotificationLockscreenUserManager { * Indicates that a notification should have its main content redacted, due to detected * sensitive content, such as a One-Time Password */ - int REDACTION_TYPE_SENSITIVE_CONTENT = 1 << 1; + int REDACTION_TYPE_OTP = 1 << 1; /** * @param userId user Id diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java index ec04edb0f810..339f898be251 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java @@ -795,7 +795,7 @@ public class NotificationLockscreenUserManagerImpl implements } if (shouldShowSensitiveContentRedactedView(ent)) { - return REDACTION_TYPE_SENSITIVE_CONTENT; + return REDACTION_TYPE_OTP; } return REDACTION_TYPE_NONE; } @@ -920,7 +920,7 @@ public class NotificationLockscreenUserManagerImpl implements // notification's "when" time, or the notification entry creation time private long getEarliestNotificationTime(NotificationEntry notif) { long notifWhenWallClock = notif.getSbn().getNotification().getWhen(); - long creationTimeDelta = SystemClock.elapsedRealtime() - notif.getCreationTime(); + long creationTimeDelta = SystemClock.uptimeMillis() - notif.getCreationTime(); long creationTimeWallClock = System.currentTimeMillis() - creationTimeDelta; return Math.min(notifWhenWallClock, creationTimeWallClock); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt index bdfdb8191356..81685ab6cf6a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt @@ -19,8 +19,6 @@ package com.android.systemui.statusbar import android.animation.Animator import android.animation.AnimatorListenerAdapter import android.animation.ValueAnimator -import android.content.Context -import android.content.res.Configuration import android.os.SystemClock import android.util.IndentingPrintWriter import android.util.Log @@ -38,21 +36,20 @@ import com.android.systemui.Flags import com.android.systemui.Flags.spatialModelAppPushback import com.android.systemui.animation.ShadeInterpolation import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dump.DumpManager import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.plugins.statusbar.StatusBarStateController -import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.ShadeExpansionChangeEvent import com.android.systemui.shade.ShadeExpansionListener -import com.android.systemui.shared.Flags.ambientAod +import com.android.systemui.shade.domain.interactor.ShadeModeInteractor import com.android.systemui.statusbar.phone.BiometricUnlockController import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.phone.ScrimController -import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.KeyguardStateController -import com.android.systemui.statusbar.policy.SplitShadeStateController import com.android.systemui.util.WallpaperController +import com.android.systemui.wallpapers.domain.interactor.WallpaperInteractor import com.android.systemui.window.domain.interactor.WindowRootViewBlurInteractor import com.android.wm.shell.appzoomout.AppZoomOut import java.io.PrintWriter @@ -78,14 +75,14 @@ constructor( private val keyguardInteractor: KeyguardInteractor, private val choreographer: Choreographer, private val wallpaperController: WallpaperController, + private val wallpaperInteractor: WallpaperInteractor, private val notificationShadeWindowController: NotificationShadeWindowController, private val dozeParameters: DozeParameters, - @ShadeDisplayAware private val context: Context, - private val splitShadeStateController: SplitShadeStateController, + private val shadeModeInteractor: ShadeModeInteractor, private val windowRootViewBlurInteractor: WindowRootViewBlurInteractor, private val appZoomOutOptional: Optional<AppZoomOut>, + @Application private val applicationScope: CoroutineScope, dumpManager: DumpManager, - configurationController: ConfigurationController, ) : ShadeExpansionListener, Dumpable { companion object { private const val WAKE_UP_ANIMATION_ENABLED = true @@ -107,12 +104,13 @@ constructor( private var isOpen: Boolean = false private var isBlurred: Boolean = false private var listeners = mutableListOf<DepthListener>() - private var inSplitShade: Boolean = false private var prevTracking: Boolean = false private var prevTimestamp: Long = -1 private var prevShadeDirection = 0 private var prevShadeVelocity = 0f + private var prevDozeAmount: Float = 0f + @VisibleForTesting var wallpaperSupportsAmbientMode: Boolean = false // tracks whether app launch transition is in progress. This involves two independent factors // that control blur, shade expansion and app launch animation from outside sysui. // They can complete out of order, this flag will be reset by the animation that finishes later. @@ -228,8 +226,10 @@ constructor( scheduleUpdate() } - /** Blur radius of the wake-up animation on this frame. */ - private var wakeAndUnlockBlurRadius = 0f + private data class WakeAndUnlockBlurData(val radius: Float, val useZoom: Boolean = true) + + /** Blur radius of the wake and unlock animation on this frame, and whether to zoom out. */ + private var wakeAndUnlockBlurData = WakeAndUnlockBlurData(0f) set(value) { if (field == value) return field = value @@ -256,14 +256,18 @@ constructor( ShadeInterpolation.getNotificationScrimAlpha(qsPanelExpansion) * shadeExpansion combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(qsExpandedRatio)) combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(transitionToFullShadeProgress)) - var shadeRadius = max(combinedBlur, wakeAndUnlockBlurRadius) + var shadeRadius = max(combinedBlur, wakeAndUnlockBlurData.radius) if (areBlursDisabledForAppLaunch || blursDisabledForUnlock) { shadeRadius = 0f } var blur = shadeRadius.toInt() - val zoomOut = blurRadiusToZoomOut(blurRadius = shadeRadius) + // If the blur comes from waking up, we don't want to zoom out the background + val zoomOut = + if (shadeRadius != wakeAndUnlockBlurData.radius|| wakeAndUnlockBlurData.useZoom) + blurRadiusToZoomOut(blurRadius = shadeRadius) + else 0f // Make blur be 0 if it is necessary to stop blur effect. if (scrimsVisible) { if (!Flags.notificationShadeBlur()) { @@ -283,7 +287,7 @@ constructor( private fun blurRadiusToZoomOut(blurRadius: Float): Float { var zoomOut = MathUtils.saturate(blurUtils.ratioOfBlurRadius(blurRadius)) - if (inSplitShade) { + if (shadeModeInteractor.isSplitShade) { zoomOut = 0f } @@ -348,14 +352,14 @@ constructor( startDelay = keyguardStateController.keyguardFadingAwayDelay interpolator = Interpolators.FAST_OUT_SLOW_IN addUpdateListener { animation: ValueAnimator -> - wakeAndUnlockBlurRadius = - blurUtils.blurRadiusOfRatio(animation.animatedValue as Float) + wakeAndUnlockBlurData = + WakeAndUnlockBlurData(blurUtils.blurRadiusOfRatio(animation.animatedValue as Float)) } addListener( object : AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator) { keyguardAnimator = null - wakeAndUnlockBlurRadius = 0f + wakeAndUnlockBlurData = WakeAndUnlockBlurData(0f) } } ) @@ -391,15 +395,23 @@ constructor( } override fun onDozeAmountChanged(linear: Float, eased: Float) { - wakeAndUnlockBlurRadius = - if (ambientAod()) { - 0f - } else { - blurUtils.blurRadiusOfRatio(eased) - } + prevDozeAmount = eased + updateWakeBlurRadius(prevDozeAmount) } } + private fun updateWakeBlurRadius(ratio: Float) { + wakeAndUnlockBlurData = WakeAndUnlockBlurData(getNewWakeBlurRadius(ratio), false) + } + + private fun getNewWakeBlurRadius(ratio: Float): Float { + return if (!wallpaperSupportsAmbientMode) { + 0f + } else { + blurUtils.blurRadiusOfRatio(ratio) + } + } + init { dumpManager.registerCriticalDumpable(javaClass.name, this) if (WAKE_UP_ANIMATION_ENABLED) { @@ -413,15 +425,16 @@ constructor( } shadeAnimation.setStiffness(SpringForce.STIFFNESS_LOW) shadeAnimation.setDampingRatio(SpringForce.DAMPING_RATIO_NO_BOUNCY) - updateResources() - configurationController.addCallback( - object : ConfigurationController.ConfigurationListener { - override fun onConfigChanged(newConfig: Configuration?) { - updateResources() + applicationScope.launch { + wallpaperInteractor.wallpaperSupportsAmbientMode.collect { supported -> + wallpaperSupportsAmbientMode = supported + if (getNewWakeBlurRadius(prevDozeAmount) == wakeAndUnlockBlurData.radius + && !wakeAndUnlockBlurData.useZoom) { + // Update wake and unlock radius only if the previous value comes from wake-up. + updateWakeBlurRadius(prevDozeAmount) } } - ) - initBlurListeners() + } } private fun initBlurListeners() { @@ -440,10 +453,6 @@ constructor( } } - private fun updateResources() { - inSplitShade = splitShadeStateController.shouldUseSplitNotificationShade(context.resources) - } - fun addListener(listener: DepthListener) { listeners.add(listener) } @@ -611,7 +620,8 @@ constructor( it.println("shouldApplyShadeBlur: ${shouldApplyShadeBlur()}") it.println("shadeAnimation: ${shadeAnimation.radius}") it.println("brightnessMirrorRadius: ${brightnessMirrorSpring.radius}") - it.println("wakeAndUnlockBlur: $wakeAndUnlockBlurRadius") + it.println("wakeAndUnlockBlurRadius: ${wakeAndUnlockBlurData.radius}") + it.println("wakeAndUnlockBlurUsesZoom: ${wakeAndUnlockBlurData.useZoom}") it.println("blursDisabledForAppLaunch: $blursDisabledForAppLaunch") it.println("appLaunchTransitionIsInProgress: $appLaunchTransitionIsInProgress") it.println("qsPanelExpansion: $qsPanelExpansion") diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerExt.kt b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerExt.kt index 6148b407d3bf..8fc95092be10 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerExt.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerExt.kt @@ -16,7 +16,7 @@ package com.android.systemui.statusbar -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.plugins.statusbar.StatusBarStateController import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt index 2fe627020ebf..1a802d634894 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt @@ -141,7 +141,7 @@ constructor( // When we're promoting notifications automatically, the `when` time set on the // notification will likely just be set to the current time, which would cause the chip // to always show "now". We don't want early testers to get that experience since it's - // not what will happen at launch, so just don't show any time. + // not what will happen at launch, so just don't show any time.onometerstate return OngoingActivityChipModel.Active.IconOnly( this.key, icon, @@ -194,14 +194,14 @@ constructor( } } is PromotedNotificationContentModel.When.Chronometer -> { - // TODO(b/364653005): Check isCountDown and support CountDown. return OngoingActivityChipModel.Active.Timer( this.key, icon, colors, startTimeMs = this.promotedContent.time.elapsedRealtimeMillis, - onClickListenerLegacy, - clickBehavior, + isEventInFuture = this.promotedContent.time.isCountDown, + onClickListenerLegacy = onClickListenerLegacy, + clickBehavior = clickBehavior, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/ChipChronometerBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/ChipChronometerBinder.kt index 2032ec8af78c..1eb46d8cc3d5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/ChipChronometerBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/ChipChronometerBinder.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.chips.ui.binder +import android.annotation.ElapsedRealtimeLong import com.android.systemui.statusbar.chips.ui.view.ChipChronometer object ChipChronometerBinder { @@ -25,9 +26,11 @@ object ChipChronometerBinder { * @param startTimeMs the time this event started, relative to * [com.android.systemui.util.time.SystemClock.elapsedRealtime]. See * [android.widget.Chronometer.setBase]. + * @param isCountDown see [android.widget.Chronometer.setCountDown]. */ - fun bind(startTimeMs: Long, view: ChipChronometer) { + fun bind(@ElapsedRealtimeLong startTimeMs: Long, isCountDown: Boolean, view: ChipChronometer) { view.base = startTimeMs + view.isCountDown = isCountDown view.start() } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/OngoingActivityChipBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/OngoingActivityChipBinder.kt index 6f8552738d33..77e0dde3dec5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/OngoingActivityChipBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/OngoingActivityChipBinder.kt @@ -315,7 +315,11 @@ object OngoingActivityChipBinder { chipShortTimeDeltaView.visibility = View.GONE } is OngoingActivityChipModel.Active.Timer -> { - ChipChronometerBinder.bind(chipModel.startTimeMs, chipTimeView) + ChipChronometerBinder.bind( + chipModel.startTimeMs, + chipModel.isEventInFuture, + chipTimeView, + ) chipTimeView.visibility = View.VISIBLE chipTextView.visibility = View.GONE diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/ChipContent.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/ChipContent.kt index 55d753662a65..fa8d25623d67 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/ChipContent.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/ChipContent.kt @@ -74,25 +74,31 @@ fun ChipContent(viewModel: OngoingActivityChipModel.Active, modifier: Modifier = val textMeasurer = rememberTextMeasurer() when (viewModel) { is OngoingActivityChipModel.Active.Timer -> { - val timerState = rememberChronometerState(startTimeMillis = viewModel.startTimeMs) - val text = timerState.currentTimeText - Text( - text = text, - style = textStyle, - color = textColor, - softWrap = false, - modifier = - modifier - .hideTextIfDoesNotFit( - text = text, - textStyle = textStyle, - textMeasurer = textMeasurer, - maxTextWidth = maxTextWidth, - startPadding = startPadding, - endPadding = endPadding, - ) - .neverDecreaseWidth(density), - ) + val timerState = + rememberChronometerState( + eventTimeMillis = viewModel.startTimeMs, + isCountDown = viewModel.isEventInFuture, + timeSource = viewModel.timeSource, + ) + timerState.currentTimeText?.let { text -> + Text( + text = text, + style = textStyle, + color = textColor, + softWrap = false, + modifier = + modifier + .hideTextIfDoesNotFit( + text = text, + textStyle = textStyle, + textMeasurer = textMeasurer, + maxTextWidth = maxTextWidth, + startPadding = startPadding, + endPadding = endPadding, + ) + .neverDecreaseWidth(density), + ) + } } is OngoingActivityChipModel.Active.Countdown -> { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/OngoingActivityChips.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/OngoingActivityChips.kt index 7080c3402b08..407849b9fae0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/OngoingActivityChips.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/OngoingActivityChips.kt @@ -36,18 +36,18 @@ fun OngoingActivityChips( iconViewStore: NotificationIconContainerViewBinder.IconViewStore?, modifier: Modifier = Modifier, ) { - Row( - modifier = - modifier - .fillMaxHeight() - .padding(start = dimensionResource(R.dimen.ongoing_activity_chip_margin_start)), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = - Arrangement.spacedBy(dimensionResource(R.dimen.ongoing_activity_chip_margin_start)), - ) { - chips.active - .filter { !it.isHidden } - .forEach { + val shownChips = chips.active.filter { !it.isHidden } + if (shownChips.isNotEmpty()) { + Row( + modifier = + modifier + .fillMaxHeight() + .padding(start = dimensionResource(R.dimen.ongoing_activity_chip_margin_start)), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = + Arrangement.spacedBy(dimensionResource(R.dimen.ongoing_activity_chip_margin_start)), + ) { + shownChips.forEach { key(it.key) { OngoingActivityChip( model = it, @@ -56,5 +56,6 @@ fun OngoingActivityChips( ) } } + } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/model/OngoingActivityChipModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/model/OngoingActivityChipModel.kt index 8e470742f174..d37a46e58882 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/model/OngoingActivityChipModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/model/OngoingActivityChipModel.kt @@ -18,12 +18,14 @@ package com.android.systemui.statusbar.chips.ui.model import android.annotation.CurrentTimeMillisLong import android.annotation.ElapsedRealtimeLong +import android.os.SystemClock import android.view.View import com.android.systemui.animation.Expandable import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.statusbar.StatusBarIconView import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips +import com.android.systemui.statusbar.chips.ui.viewmodel.TimeSource import com.android.systemui.statusbar.core.StatusBarConnectedDisplays /** Model representing the display of an ongoing activity as a chip in the status bar. */ @@ -105,6 +107,19 @@ sealed class OngoingActivityChipModel { * [android.widget.Chronometer.setBase]. */ @ElapsedRealtimeLong val startTimeMs: Long, + + /** + * The [TimeSource] that should be used to track the current time for this timer. Should + * be compatible with [startTimeMs]. + */ + val timeSource: TimeSource = TimeSource { SystemClock.elapsedRealtime() }, + + /** + * True if this chip represents an event starting in the future and false if this chip + * represents an event that has already started. If true, [startTimeMs] should be in the + * future. Otherwise, [startTimeMs] should be in the past. + */ + val isEventInFuture: Boolean = false, override val onClickListenerLegacy: View.OnClickListener?, override val clickBehavior: ClickBehavior, override val isHidden: Boolean = false, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/ChronometerState.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/ChronometerState.kt index 62789782d0a9..0fc7f82f785a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/ChronometerState.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/ChronometerState.kt @@ -15,7 +15,7 @@ */ package com.android.systemui.statusbar.chips.ui.viewmodel -import android.os.SystemClock +import android.annotation.ElapsedRealtimeLong import android.text.format.DateUtils.formatElapsedTime import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -27,6 +27,7 @@ import androidx.compose.runtime.setValue import androidx.lifecycle.Lifecycle import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.repeatOnLifecycle +import kotlin.math.absoluteValue import kotlinx.coroutines.delay /** Platform-optimized interface for getting current time */ @@ -34,18 +35,50 @@ fun interface TimeSource { fun getCurrentTime(): Long } -/** Holds and manages the state for a Chronometer */ -class ChronometerState(private val timeSource: TimeSource, private val startTimeMillis: Long) { - private var currentTimeMillis by mutableLongStateOf(0L) +/** + * Holds and manages the state for a Chronometer, which shows a timer in a format like "MM:SS" or + * "H:MM:SS". + * + * If [isEventInFuture] is false, then this Chronometer is counting up from an event that started in + * the past, like a phone call that was answered. [eventTimeMillis] represents the time the event + * started and the timer will tick up: 04:00, 04:01, ... No timer is shown if [eventTimeMillis] is + * in the future and [isEventInFuture] is false. + * + * If [isEventInFuture] is true, then this Chronometer is counting down to an event that will occur + * in the future, like a future meeting. [eventTimeMillis] represents the time the event will occur + * and the timer will tick down: 04:00, 03:59, ... No timer is shown if [eventTimeMillis] is in the + * past and [isEventInFuture] is true. + */ +class ChronometerState( + private val timeSource: TimeSource, + @ElapsedRealtimeLong private val eventTimeMillis: Long, + private val isEventInFuture: Boolean, +) { + private var currentTimeMillis by mutableLongStateOf(timeSource.getCurrentTime()) private val elapsedTimeMillis: Long - get() = maxOf(0L, currentTimeMillis - startTimeMillis) + get() = + if (isEventInFuture) { + eventTimeMillis - currentTimeMillis + } else { + currentTimeMillis - eventTimeMillis + } - val currentTimeText: String by derivedStateOf { formatElapsedTime(elapsedTimeMillis / 1000) } + /** + * The current timer string in a format like "MM:SS" or "H:MM:SS", or null if we shouldn't show + * the timer string. + */ + val currentTimeText: String? by derivedStateOf { + if (elapsedTimeMillis < 0) { + null + } else { + formatElapsedTime(elapsedTimeMillis / 1000) + } + } suspend fun run() { while (true) { currentTimeMillis = timeSource.getCurrentTime() - val delaySkewMillis = (currentTimeMillis - startTimeMillis) % 1000L + val delaySkewMillis = (eventTimeMillis - currentTimeMillis).absoluteValue % 1000L delay(1000L - delaySkewMillis) } } @@ -54,13 +87,16 @@ class ChronometerState(private val timeSource: TimeSource, private val startTime /** Remember and manage the ChronometerState */ @Composable fun rememberChronometerState( - startTimeMillis: Long, - timeSource: TimeSource = remember { TimeSource { SystemClock.elapsedRealtime() } }, + eventTimeMillis: Long, + isCountDown: Boolean, + timeSource: TimeSource, ): ChronometerState { val state = - remember(timeSource, startTimeMillis) { ChronometerState(timeSource, startTimeMillis) } + remember(timeSource, eventTimeMillis, isCountDown) { + ChronometerState(timeSource, eventTimeMillis, isCountDown) + } val lifecycleOwner = LocalLifecycleOwner.current - LaunchedEffect(lifecycleOwner, timeSource, startTimeMillis) { + LaunchedEffect(lifecycleOwner, timeSource, eventTimeMillis) { lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { state.run() } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/disableflags/data/repository/DisableFlagsRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/disableflags/data/repository/DisableFlagsRepository.kt index aeeb0427d24b..e91e9777d48e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/disableflags/data/repository/DisableFlagsRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/disableflags/data/repository/DisableFlagsRepository.kt @@ -14,7 +14,7 @@ package com.android.systemui.statusbar.disableflags.data.repository -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.DisplayId diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index 3d8ba7f335bd..d031d831bf5a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java @@ -29,8 +29,6 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICAT import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; -import static com.android.systemui.statusbar.notification.collection.BundleEntry.ROOT_BUNDLES; -import static com.android.systemui.statusbar.notification.collection.GroupEntry.ROOT_ENTRY; import static com.android.systemui.statusbar.notification.collection.NotifCollection.REASON_NOT_CANCELED; import static java.util.Objects.requireNonNull; @@ -41,7 +39,6 @@ import android.app.Notification; import android.app.Notification.MessagingStyle.Message; import android.app.NotificationChannel; import android.app.NotificationManager.Policy; -import android.app.PendingIntent; import android.app.Person; import android.app.RemoteInput; import android.app.RemoteInputHistoryItem; @@ -68,7 +65,6 @@ import com.android.systemui.statusbar.notification.collection.listbuilder.plugga import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifDismissInterceptor; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender; -import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; import com.android.systemui.statusbar.notification.headsup.PinnedStatus; import com.android.systemui.statusbar.notification.icon.IconPack; import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel; @@ -81,14 +77,14 @@ import com.android.systemui.statusbar.notification.row.shared.NotificationRowCon import com.android.systemui.statusbar.notification.shared.NotificationBundleUi; import com.android.systemui.util.ListenerSet; -import kotlinx.coroutines.flow.MutableStateFlow; -import kotlinx.coroutines.flow.StateFlow; -import kotlinx.coroutines.flow.StateFlowKt; - import java.util.ArrayList; import java.util.List; import java.util.Objects; +import kotlinx.coroutines.flow.MutableStateFlow; +import kotlinx.coroutines.flow.StateFlow; +import kotlinx.coroutines.flow.StateFlowKt; + /** * Represents a notification that the system UI knows about * @@ -497,7 +493,8 @@ public final class NotificationEntry extends ListEntry { public @Nullable List<NotificationEntry> getAttachedNotifChildren() { if (NotificationBundleUi.isEnabled()) { if (isGroupSummary()) { - return ((GroupEntry) getParent()).getChildren(); + GroupEntry parent = (GroupEntry) getParent(); + return parent != null ? new ArrayList<>(parent.getChildren()) : null; } } else { if (row == null) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinator.java index 1f32b945ce7e..cda535de86c4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinator.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.notification.collection.coordinator; +import static android.app.NotificationChannel.SYSTEM_RESERVED_IDS; + import android.annotation.NonNull; import android.annotation.Nullable; @@ -99,7 +101,11 @@ public class RankingCoordinator implements Coordinator { NotificationPriorityBucketKt.BUCKET_ALERTING) { @Override public boolean isInSection(PipelineEntry entry) { - return mHighPriorityProvider.isHighPriority(entry); + return mHighPriorityProvider.isHighPriority(entry) + && entry.getRepresentativeEntry() != null + && entry.getRepresentativeEntry().getChannel() != null + && !SYSTEM_RESERVED_IDS.contains( + entry.getRepresentativeEntry().getChannel().getId()); } @Nullable diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerExt.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerExt.kt index 6525b6f1186b..376735025abd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerExt.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerExt.kt @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.notification.headsup -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.statusbar.notification.collection.NotificationEntry import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt index 2aafe8c81381..d35c3b617246 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt @@ -20,6 +20,7 @@ import android.app.Notification import android.app.Notification.BigPictureStyle import android.app.Notification.BigTextStyle import android.app.Notification.CallStyle +import android.app.Notification.EXTRA_BIG_TEXT import android.app.Notification.EXTRA_CHRONOMETER_COUNT_DOWN import android.app.Notification.EXTRA_PROGRESS import android.app.Notification.EXTRA_PROGRESS_INDETERMINATE @@ -27,8 +28,10 @@ import android.app.Notification.EXTRA_PROGRESS_MAX import android.app.Notification.EXTRA_SUB_TEXT import android.app.Notification.EXTRA_TEXT import android.app.Notification.EXTRA_TITLE +import android.app.Notification.EXTRA_TITLE_BIG import android.app.Notification.EXTRA_VERIFICATION_ICON import android.app.Notification.EXTRA_VERIFICATION_TEXT +import android.app.Notification.InboxStyle import android.app.Notification.ProgressStyle import android.content.Context import android.graphics.drawable.Icon @@ -105,8 +108,8 @@ constructor( contentBuilder.shortCriticalText = notification.shortCriticalText() contentBuilder.lastAudiblyAlertedMs = entry.lastAudiblyAlertedMs contentBuilder.profileBadgeResId = null // TODO - contentBuilder.title = notification.title() - contentBuilder.text = notification.text() + contentBuilder.title = notification.resolveTitle(recoveredBuilder.style) + contentBuilder.text = notification.resolveText(recoveredBuilder.style) contentBuilder.skeletonLargeIcon = notification.skeletonLargeIcon(imageModelProvider) contentBuilder.oldProgress = notification.oldProgress() @@ -127,8 +130,39 @@ constructor( private fun Notification.title(): CharSequence? = extras?.getCharSequence(EXTRA_TITLE) + private fun Notification.bigTitle(): CharSequence? = extras?.getCharSequence(EXTRA_TITLE_BIG) + + private fun Notification.Style.bigTitleOverridesTitle(): Boolean { + return when (this) { + is BigTextStyle, + is BigPictureStyle, + is InboxStyle -> true + else -> false + } + } + + private fun Notification.resolveTitle(style: Notification.Style?): CharSequence? { + return if (style?.bigTitleOverridesTitle() == true) { + bigTitle() + } else { + null + } ?: title() + } + private fun Notification.text(): CharSequence? = extras?.getCharSequence(EXTRA_TEXT) + private fun Notification.bigText(): CharSequence? = extras?.getCharSequence(EXTRA_BIG_TEXT) + + private fun Notification.Style.bigTextOverridesText(): Boolean = this is BigTextStyle + + private fun Notification.resolveText(style: Notification.Style?): CharSequence? { + return if (style?.bigTextOverridesText() == true) { + bigText() + } else { + null + } ?: text() + } + private fun Notification.subText(): String? = extras?.getString(EXTRA_SUB_TEXT) private fun Notification.shortCriticalText(): String? { @@ -233,13 +267,13 @@ constructor( private fun BigPictureStyle.extractContent( contentBuilder: PromotedNotificationContentModel.Builder ) { - // TODO? + // Big title is handled in resolveTitle, and big picture is unsupported. } private fun BigTextStyle.extractContent( contentBuilder: PromotedNotificationContentModel.Builder ) { - // TODO? + // Big title and big text are handled in resolveTitle and resolveText. } private fun CallStyle.extractContent( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/domain/interactor/PackageDemotionInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/domain/interactor/PackageDemotionInteractor.kt new file mode 100644 index 000000000000..14295357c54f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/domain/interactor/PackageDemotionInteractor.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2025 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.promoted.domain.interactor + +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject + +/** A class which can receive both a demotion signal and a single handler of that signal */ +@SysUISingleton +class PackageDemotionInteractor @Inject constructor() { + private var demotionSignalHandler: ((packageName: String, uid: Int) -> Unit)? = null + + /** + * called after sending a the demotion signal to + * [android.app.INotificationManager.setCanBePromoted] + */ + fun onPackageDemoted(packageName: String, uid: Int) { + demotionSignalHandler?.invoke(packageName, uid) + } + + /** sets the [handler] that will be called when [onPackageDemoted] is called. */ + fun setOnPackageDemotionHandler(handler: (packageName: String, uid: Int) -> Unit) { + demotionSignalHandler = handler + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java index 292f74a65554..f36a0cf51b97 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java @@ -19,6 +19,8 @@ package com.android.systemui.statusbar.notification.row; import static com.android.systemui.Flags.notificationColorUpdateLogger; import static com.android.systemui.Flags.physicalNotificationMovement; +import static java.lang.Math.abs; + import android.animation.AnimatorListenerAdapter; import android.content.Context; import android.content.res.Configuration; @@ -29,6 +31,7 @@ import android.util.FloatProperty; import android.util.IndentingPrintWriter; import android.util.Log; import android.view.View; +import android.view.ViewConfiguration; import android.view.ViewGroup; import android.view.ViewParent; import android.widget.FrameLayout; @@ -110,14 +113,27 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro protected SpringAnimation mMagneticAnimator = new SpringAnimation( this /* object */, DynamicAnimation.TRANSLATION_X); + private int mTouchSlop; + protected MagneticRowListener mMagneticRowListener = new MagneticRowListener() { @Override - public void setMagneticTranslation(float translation) { - if (mMagneticAnimator.isRunning()) { - mMagneticAnimator.animateToFinalPosition(translation); - } else { + public void setMagneticTranslation(float translation, boolean trackEagerly) { + if (!mMagneticAnimator.isRunning()) { setTranslation(translation); + return; + } + + if (trackEagerly) { + float delta = abs(getTranslation() - translation); + if (delta > mTouchSlop) { + mMagneticAnimator.animateToFinalPosition(translation); + } else { + mMagneticAnimator.cancel(); + setTranslation(translation); + } + } else { + mMagneticAnimator.animateToFinalPosition(translation); } } @@ -183,6 +199,7 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro private void initDimens() { mContentShift = getResources().getDimensionPixelSize( R.dimen.shelf_transform_content_shift); + mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/MagicActionBackgroundDrawable.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/MagicActionBackgroundDrawable.kt index d02f636728fc..fe3a856e711e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/MagicActionBackgroundDrawable.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/MagicActionBackgroundDrawable.kt @@ -18,7 +18,9 @@ package com.android.systemui.statusbar.notification.row import android.animation.ValueAnimator import android.content.Context +import android.content.res.ColorStateList import android.graphics.Canvas +import android.graphics.Color import android.graphics.ColorFilter import android.graphics.Paint import android.graphics.Path @@ -31,9 +33,27 @@ import android.graphics.RectF import android.graphics.Shader import com.android.systemui.res.R import com.android.wm.shell.shared.animation.Interpolators +import android.graphics.drawable.RippleDrawable +import androidx.core.content.ContextCompat class MagicActionBackgroundDrawable( context: Context, +) : RippleDrawable( + ContextCompat.getColorStateList( + context, + R.color.notification_ripple_untinted_color + ) ?: ColorStateList.valueOf(Color.TRANSPARENT), + createBaseDrawable(context), null +) { + companion object { + private fun createBaseDrawable(context: Context): Drawable { + return BaseBackgroundDrawable(context) + } + } +} + +class BaseBackgroundDrawable( + context: Context, ) : Drawable() { private val cornerRadius = context.resources.getDimension(R.dimen.magic_action_button_corner_radius) @@ -42,6 +62,14 @@ class MagicActionBackgroundDrawable( private val buttonShape = Path() // Color and style + private val bgPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + val bgColor = + context.getColor( + com.android.internal.R.color.materialColorSurfaceContainerHigh + ) + color = bgColor + style = Paint.Style.FILL + } private val outlinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { val outlineColor = context.getColor( @@ -91,6 +119,7 @@ class MagicActionBackgroundDrawable( canvas.save() // Draw background canvas.clipPath(buttonShape) + canvas.drawPath(buttonShape, bgPaint) // Apply gradient to outline canvas.drawPath(buttonShape, outlinePaint) updateGradient(boundsF) @@ -119,11 +148,13 @@ class MagicActionBackgroundDrawable( } override fun setAlpha(alpha: Int) { + bgPaint.alpha = alpha outlinePaint.alpha = alpha invalidateSelf() } override fun setColorFilter(colorFilter: ColorFilter?) { + bgPaint.colorFilter = colorFilter outlinePaint.colorFilter = colorFilter invalidateSelf() } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java index 3ffc052b5acc..ff4b835eb3c0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.notification.row; import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE; -import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_SENSITIVE_CONTENT; +import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_OTP; import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_CONTRACTED; import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_EXPANDED; import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_HEADSUP; @@ -236,7 +236,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder ); } if (LockscreenOtpRedaction.isSingleLineViewEnabled()) { - if (bindParams.redactionType == REDACTION_TYPE_SENSITIVE_CONTENT) { + if (bindParams.redactionType == REDACTION_TYPE_OTP) { result.mPublicInflatedSingleLineViewModel = SingleLineViewInflater.inflateSingleLineViewModel( entry.getSbn().getNotification(), @@ -469,7 +469,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder if ((reInflateFlags & FLAG_CONTENT_VIEW_PUBLIC) != 0) { logger.logAsyncTaskProgress(row.getLoggingKey(), "creating public remote view"); if (LockscreenOtpRedaction.isEnabled() - && bindParams.redactionType == REDACTION_TYPE_SENSITIVE_CONTENT) { + && bindParams.redactionType == REDACTION_TYPE_OTP) { result.newPublicView = createSensitiveContentMessageNotification( NotificationBundleUi.isEnabled() ? row.getEntryAdapter().getSbn().getNotification() @@ -1355,7 +1355,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder } if (LockscreenOtpRedaction.isSingleLineViewEnabled()) { - if (mBindParams.redactionType == REDACTION_TYPE_SENSITIVE_CONTENT) { + if (mBindParams.redactionType == REDACTION_TYPE_OTP) { result.mPublicInflatedSingleLineViewModel = SingleLineViewInflater.inflateSingleLineViewModel( mEntry.getSbn().getNotification(), diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java index 676c96ebc9d9..b3357d01ab7a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.notification.row; +import static android.app.Flags.notificationsRedesignTemplates; + import android.annotation.NonNull; import android.annotation.Nullable; import android.app.Flags; @@ -719,9 +721,12 @@ public class NotificationContentView extends FrameLayout implements Notification * height, the notification is clipped instead of being further shrunk. */ private int getMinContentHeightHint() { + int actionListHeight = mContext.getResources().getDimensionPixelSize( + notificationsRedesignTemplates() + ? com.android.internal.R.dimen.notification_2025_action_list_height + : com.android.internal.R.dimen.notification_action_list_height); if (mIsChildInGroup && isVisibleOrTransitioning(VISIBLE_TYPE_SINGLELINE)) { - return mContext.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.notification_action_list_height); + return actionListHeight; } // Transition between heads-up & expanded, or pinned. @@ -756,9 +761,7 @@ public class NotificationContentView extends FrameLayout implements Notification } else if (mExpandedChild != null) { hint = getViewHeight(VISIBLE_TYPE_EXPANDED); } else if (mContractedChild != null) { - hint = getViewHeight(VISIBLE_TYPE_CONTRACTED) - + mContext.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.notification_action_list_height); + hint = getViewHeight(VISIBLE_TYPE_CONTRACTED) + actionListHeight; } else { hint = getMinHeight(); } @@ -1244,7 +1247,7 @@ public class NotificationContentView extends FrameLayout implements Notification final boolean isSingleLineViewPresent = mSingleLineView != null; if (shouldShowSingleLineView && !isSingleLineViewPresent) { - Log.wtf(TAG, "calculateVisibleType: SingleLineView is not available!"); + Log.e(TAG, "calculateVisibleType: SingleLineView is not available!"); } final int collapsedVisualType = shouldShowSingleLineView && isSingleLineViewPresent @@ -1271,7 +1274,7 @@ public class NotificationContentView extends FrameLayout implements Notification final boolean shouldShowSingleLineView = mIsChildInGroup && !isGroupExpanded(); final boolean isSingleLinePresent = mSingleLineView != null; if (shouldShowSingleLineView && !isSingleLinePresent) { - Log.wtf(TAG, "getVisualTypeForHeight: singleLineView is not available."); + Log.e(TAG, "getVisualTypeForHeight: singleLineView is not available."); } if (!mUserExpanding && shouldShowSingleLineView && isSingleLinePresent) { @@ -1613,12 +1616,14 @@ public class NotificationContentView extends FrameLayout implements Notification actionContainer.setVisibility(VISIBLE); // Set notification_action_list_margin_target's bottom margin to 0 when showing bubble if (actionListMarginTarget != null) { - ViewGroup.LayoutParams lp = actionListMarginTarget.getLayoutParams(); - if (lp instanceof ViewGroup.MarginLayoutParams) { - final ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) lp; - if (mlp.bottomMargin > 0) { - mlp.setMargins(mlp.leftMargin, mlp.topMargin, mlp.rightMargin, 0); - } + removeBottomMargin(actionListMarginTarget); + } + if (notificationsRedesignTemplates()) { + // Similar treatment for smart reply margin + LinearLayout smartReplyContainer = layout.findViewById( + com.android.internal.R.id.smart_reply_container); + if (smartReplyContainer != null) { + removeBottomMargin(smartReplyContainer); } } } else { @@ -1626,6 +1631,16 @@ public class NotificationContentView extends FrameLayout implements Notification } } + private static void removeBottomMargin(ViewGroup actionListMarginTarget) { + ViewGroup.LayoutParams lp = actionListMarginTarget.getLayoutParams(); + if (lp instanceof MarginLayoutParams) { + final MarginLayoutParams mlp = (MarginLayoutParams) lp; + if (mlp.bottomMargin > 0) { + mlp.setMargins(mlp.leftMargin, mlp.topMargin, mlp.rightMargin, 0); + } + } + } + @MainThread public void setBubblesEnabledForUser(boolean enabled) { mBubblesEnabledForUser = enabled; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java index 9a75253295d5..55a564944f00 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java @@ -71,6 +71,7 @@ import com.android.systemui.statusbar.notification.collection.provider.HighPrior import com.android.systemui.statusbar.notification.collection.render.NotifGutsViewListener; import com.android.systemui.statusbar.notification.collection.render.NotifGutsViewManager; import com.android.systemui.statusbar.notification.headsup.HeadsUpManager; +import com.android.systemui.statusbar.notification.promoted.domain.interactor.PackageDemotionInteractor; import com.android.systemui.statusbar.notification.row.icon.AppIconProvider; import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider; import com.android.systemui.statusbar.notification.shared.NotificationBundleUi; @@ -100,6 +101,7 @@ public class NotificationGutsManager implements NotifGutsViewManager, CoreStarta private final AccessibilityManager mAccessibilityManager; private final HighPriorityProvider mHighPriorityProvider; private final ChannelEditorDialogController mChannelEditorDialogController; + private final PackageDemotionInteractor mPackageDemotionInteractor; private final OnUserInteractionCallback mOnUserInteractionCallback; // Dependencies: @@ -155,6 +157,7 @@ public class NotificationGutsManager implements NotifGutsViewManager, CoreStarta LauncherApps launcherApps, ShortcutManager shortcutManager, ChannelEditorDialogController channelEditorDialogController, + PackageDemotionInteractor packageDemotionInteractor, UserContextProvider contextTracker, AssistantFeedbackController assistantFeedbackController, Optional<BubblesManager> bubblesManagerOptional, @@ -184,6 +187,7 @@ public class NotificationGutsManager implements NotifGutsViewManager, CoreStarta mShortcutManager = shortcutManager; mContextTracker = contextTracker; mChannelEditorDialogController = channelEditorDialogController; + mPackageDemotionInteractor = packageDemotionInteractor; mAssistantFeedbackController = assistantFeedbackController; mBubblesManagerOptional = bubblesManagerOptional; mUiEventLogger = uiEventLogger; @@ -429,6 +433,7 @@ public class NotificationGutsManager implements NotifGutsViewManager, CoreStarta mIconStyleProvider, mOnUserInteractionCallback, mChannelEditorDialogController, + mPackageDemotionInteractor, packageName, row.getEntry().getChannel(), row.getEntry(), diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java index 661122510c6c..904911fcf545 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java @@ -74,6 +74,7 @@ import com.android.systemui.Dependency; import com.android.systemui.res.R; import com.android.systemui.statusbar.notification.AssistantFeedbackController; import com.android.systemui.statusbar.notification.collection.NotificationEntry; +import com.android.systemui.statusbar.notification.promoted.domain.interactor.PackageDemotionInteractor; import com.android.systemui.statusbar.notification.row.icon.AppIconProvider; import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider; @@ -193,6 +194,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G NotificationIconStyleProvider iconStyleProvider, OnUserInteractionCallback onUserInteractionCallback, ChannelEditorDialogController channelEditorDialogController, + PackageDemotionInteractor packageDemotionInteractor, String pkg, NotificationChannel notificationChannel, NotificationEntry entry, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java index e89a76fd5a69..286f07b7413d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java @@ -32,7 +32,6 @@ import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import android.service.notification.StatusBarNotification; import android.util.ArrayMap; import android.view.LayoutInflater; import android.view.View; @@ -358,7 +357,9 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl final float dismissThreshold = getDismissThreshold(); final boolean snappingToDismiss = delta < -dismissThreshold || delta > dismissThreshold; if (mSnappingToDismiss != snappingToDismiss) { - getMenuView().performHapticFeedback(CLOCK_TICK); + if (!Flags.magneticNotificationSwipes()) { + getMenuView().performHapticFeedback(CLOCK_TICK); + } } mSnappingToDismiss = snappingToDismiss; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt index b1c145e08777..2f94d3220dc8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.notification.row import android.annotation.SuppressLint -import android.app.Flags import android.app.Notification import android.app.Notification.EXTRA_SUMMARIZED_CONTENT import android.app.Notification.MessagingStyle @@ -45,7 +44,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.NotifInflation import com.android.systemui.res.R import com.android.systemui.statusbar.InflationTask -import com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_SENSITIVE_CONTENT +import com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_OTP import com.android.systemui.statusbar.NotificationRemoteInputManager import com.android.systemui.statusbar.notification.ConversationNotificationProcessor import com.android.systemui.statusbar.notification.InflationException @@ -758,7 +757,7 @@ constructor( entry.logKey, "inflating public single line view model", ) - if (bindParams.redactionType == REDACTION_TYPE_SENSITIVE_CONTENT) { + if (bindParams.redactionType == REDACTION_TYPE_OTP) { SingleLineViewInflater.inflateSingleLineViewModel( notification = entry.sbn.notification, messagingStyle = messagingStyle, @@ -876,7 +875,7 @@ constructor( logger.logAsyncTaskProgress(row.loggingKey, "creating public remote view") if ( LockscreenOtpRedaction.isEnabled && - bindParams.redactionType == REDACTION_TYPE_SENSITIVE_CONTENT + bindParams.redactionType == REDACTION_TYPE_OTP ) { createSensitiveContentMessageNotification( entry.sbn.notification, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PromotedNotificationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PromotedNotificationInfo.java index 6ff711deeb01..39ffdf29b57c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PromotedNotificationInfo.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PromotedNotificationInfo.java @@ -31,6 +31,7 @@ import com.android.internal.logging.UiEventLogger; import com.android.systemui.res.R; import com.android.systemui.statusbar.notification.AssistantFeedbackController; import com.android.systemui.statusbar.notification.collection.NotificationEntry; +import com.android.systemui.statusbar.notification.promoted.domain.interactor.PackageDemotionInteractor; import com.android.systemui.statusbar.notification.row.icon.AppIconProvider; import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider; @@ -42,6 +43,7 @@ import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyl public class PromotedNotificationInfo extends NotificationInfo { private static final String TAG = "PromotedNotifInfoGuts"; private INotificationManager mNotificationManager; + private PackageDemotionInteractor mPackageDemotionInteractor; private NotificationGuts mGutsContainer; public PromotedNotificationInfo(Context context, AttributeSet attrs) { @@ -56,6 +58,7 @@ public class PromotedNotificationInfo extends NotificationInfo { NotificationIconStyleProvider iconStyleProvider, OnUserInteractionCallback onUserInteractionCallback, ChannelEditorDialogController channelEditorDialogController, + PackageDemotionInteractor packageDemotionInteractor, String pkg, NotificationChannel notificationChannel, NotificationEntry entry, @@ -69,12 +72,14 @@ public class PromotedNotificationInfo extends NotificationInfo { AssistantFeedbackController assistantFeedbackController, MetricsLogger metricsLogger, OnClickListener onCloseClick) throws RemoteException { super.bindNotification(pm, iNotificationManager, appIconProvider, iconStyleProvider, - onUserInteractionCallback, channelEditorDialogController, pkg, notificationChannel, + onUserInteractionCallback, channelEditorDialogController, packageDemotionInteractor, + pkg, notificationChannel, entry, onSettingsClick, onAppSettingsClick, feedbackClickListener, uiEventLogger, isDeviceProvisioned, isNonblockable, wasShownHighPriority, assistantFeedbackController, metricsLogger, onCloseClick); mNotificationManager = iNotificationManager; + mPackageDemotionInteractor = packageDemotionInteractor; bindDemote(entry.getSbn(), pkg); } @@ -94,8 +99,8 @@ public class PromotedNotificationInfo extends NotificationInfo { private OnClickListener getDemoteClickListener(StatusBarNotification sbn, String packageName) { return ((View v) -> { try { - // TODO(b/391661009): Signal AutomaticPromotionCoordinator here mNotificationManager.setCanBePromoted(packageName, sbn.getUid(), false, true); + mPackageDemotionInteractor.onPackageDemoted(packageName, sbn.getUid()); mGutsContainer.closeControls(v, true); } catch (RemoteException e) { Log.e(TAG, "Couldn't revoke live update permission", e); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java index 8176d2a1be44..99db1dba7e65 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationTemplateViewWrapper.java @@ -53,8 +53,8 @@ import com.android.systemui.statusbar.notification.ImageTransformState; import com.android.systemui.statusbar.notification.TransformState; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.HybridNotificationView; -import com.android.systemui.util.DimensionKt; import com.android.systemui.statusbar.notification.shared.NotificationBundleUi; +import com.android.systemui.util.DimensionKt; import java.util.function.Consumer; @@ -411,7 +411,8 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp @Override public int getExtraMeasureHeight() { int extra = 0; - if (mActions != null) { + if (!notificationsRedesignTemplates() && mActions != null) { + // With the redesign, this should always be 0. extra = mActions.getExtraMeasureHeight(); } if (mRemoteInputHistory != null && mRemoteInputHistory.getVisibility() != View.GONE) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java index 1e249520e8b3..abfb86244390 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java @@ -36,13 +36,14 @@ import com.android.systemui.statusbar.NotificationShelf; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.data.repository.HeadsUpRepository; +import com.android.systemui.statusbar.notification.headsup.AvalancheController; +import com.android.systemui.statusbar.notification.headsup.NotificationsHunSharedAnimationValues; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.ExpandableView; import com.android.systemui.statusbar.notification.shared.NotificationBundleUi; import com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm.BypassController; import com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm.SectionProvider; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; -import com.android.systemui.statusbar.notification.headsup.AvalancheController; import java.io.PrintWriter; @@ -424,6 +425,7 @@ public class AmbientState implements Dumpable { /** the bottom-most y position where we can draw pinned HUNs */ public float getHeadsUpBottom() { if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return 0f; + NotificationsHunSharedAnimationValues.assertInLegacyMode(); return mHeadsUpBottom; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManager.kt index aa6951715755..48cff7497e3c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManager.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManager.kt @@ -33,12 +33,12 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow interface MagneticNotificationRowManager { /** - * Set the swipe threshold in pixels. After crossing the threshold, the magnetic target detaches - * and the magnetic neighbors snap back. + * Notifies a change in the device density. The density can be used to compute the values of + * thresholds in pixels. * - * @param[threshold] Swipe threshold in pixels. + * @param[density] The device density. */ - fun setSwipeThresholdPx(thresholdPx: Float) + fun onDensityChange(density: Float) /** * Set the magnetic and roundable targets of a magnetic swipe interaction. @@ -87,6 +87,9 @@ interface MagneticNotificationRowManager { */ fun onMagneticInteractionEnd(row: ExpandableNotificationRow, velocity: Float? = null) + /** Determine if the given [ExpandableNotificationRow] has been magnetically detached. */ + fun isMagneticRowSwipeDetached(row: ExpandableNotificationRow): Boolean + /* Reset any roundness that magnetic targets may have */ fun resetRoundness() @@ -104,12 +107,15 @@ interface MagneticNotificationRowManager { /** Detaching threshold in dp */ const val MAGNETIC_DETACH_THRESHOLD_DP = 56 + /** Re-attaching threshold in dp */ + const val MAGNETIC_ATTACH_THRESHOLD_DP = 40 + /* An empty implementation of a manager */ @JvmStatic val Empty: MagneticNotificationRowManager get() = object : MagneticNotificationRowManager { - override fun setSwipeThresholdPx(thresholdPx: Float) {} + override fun onDensityChange(density: Float) {} override fun setMagneticAndRoundableTargets( swipingRow: ExpandableNotificationRow, @@ -127,6 +133,10 @@ interface MagneticNotificationRowManager { velocity: Float?, ) {} + override fun isMagneticRowSwipeDetached( + row: ExpandableNotificationRow + ): Boolean = false + override fun resetRoundness() {} override fun reset() {} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManagerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManagerImpl.kt index 9bd5a5bd903f..3f05cef6a0c6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManagerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticNotificationRowManagerImpl.kt @@ -47,6 +47,7 @@ constructor( private set private var magneticDetachThreshold = Float.POSITIVE_INFINITY + private var magneticAttachThreshold = 0f // Has the roundable target been set for the magnetic view that is being swiped. val isSwipedViewRoundableSet: Boolean @@ -57,13 +58,18 @@ constructor( SpringForce().setStiffness(DETACH_STIFFNESS).setDampingRatio(DETACH_DAMPING_RATIO) private val snapForce = SpringForce().setStiffness(SNAP_BACK_STIFFNESS).setDampingRatio(SNAP_BACK_DAMPING_RATIO) + private val attachForce = + SpringForce().setStiffness(ATTACH_STIFFNESS).setDampingRatio(ATTACH_DAMPING_RATIO) // Multiplier applied to the translation of a row while swiped val swipedRowMultiplier = MAGNETIC_TRANSLATION_MULTIPLIERS[MAGNETIC_TRANSLATION_MULTIPLIERS.size / 2] - override fun setSwipeThresholdPx(thresholdPx: Float) { - magneticDetachThreshold = thresholdPx + override fun onDensityChange(density: Float) { + magneticDetachThreshold = + density * MagneticNotificationRowManager.MAGNETIC_DETACH_THRESHOLD_DP + magneticAttachThreshold = + density * MagneticNotificationRowManager.MAGNETIC_ATTACH_THRESHOLD_DP } override fun setMagneticAndRoundableTargets( @@ -139,8 +145,7 @@ constructor( } } State.DETACHED -> { - val swiped = currentMagneticListeners.swipedListener() - swiped?.setMagneticTranslation(translation) + translateDetachedRow(translation) } } return true @@ -232,6 +237,41 @@ constructor( ) } + private fun translateDetachedRow(translation: Float) { + val targetTranslation = swipedRowMultiplier * translation + val crossedThreshold = abs(targetTranslation) <= magneticAttachThreshold + if (crossedThreshold) { + attachNeighbors(translation) + updateRoundness(translation) + currentMagneticListeners.swipedListener()?.let { attach(it, translation) } + currentState = State.PULLING + } else { + val swiped = currentMagneticListeners.swipedListener() + swiped?.setMagneticTranslation(translation, trackEagerly = false) + } + } + + private fun attachNeighbors(translation: Float) { + currentMagneticListeners.forEachIndexed { i, target -> + target?.let { + if (i != currentMagneticListeners.size / 2) { + val multiplier = MAGNETIC_TRANSLATION_MULTIPLIERS[i] + target.cancelMagneticAnimations() + target.triggerMagneticForce( + endTranslation = translation * multiplier, + attachForce, + ) + } + } + } + } + + private fun attach(listener: MagneticRowListener, toPosition: Float) { + listener.cancelMagneticAnimations() + listener.triggerMagneticForce(toPosition, attachForce) + msdlPlayer.playToken(MSDLToken.SWIPE_THRESHOLD_INDICATOR) + } + override fun onMagneticInteractionEnd(row: ExpandableNotificationRow, velocity: Float?) { if (row.isSwipedTarget()) { when (currentState) { @@ -254,6 +294,9 @@ constructor( } } + override fun isMagneticRowSwipeDetached(row: ExpandableNotificationRow): Boolean = + row.isSwipedTarget() && currentState == State.DETACHED + override fun resetRoundness() = notificationRoundnessManager.clear() override fun reset() { @@ -300,6 +343,8 @@ constructor( private const val DETACH_DAMPING_RATIO = 0.95f private const val SNAP_BACK_STIFFNESS = 550f private const val SNAP_BACK_DAMPING_RATIO = 0.6f + private const val ATTACH_STIFFNESS = 800f + private const val ATTACH_DAMPING_RATIO = 0.95f // Maximum value of corner roundness that gets applied during the pre-detach dragging private const val MAX_PRE_DETACH_ROUNDNESS = 0.8f diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticRowListener.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticRowListener.kt index 5959ef1e093b..c3b9024ad9b1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticRowListener.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MagneticRowListener.kt @@ -21,8 +21,21 @@ import androidx.dynamicanimation.animation.SpringForce /** A listener that responds to magnetic forces applied to an [ExpandableNotificationRow] */ interface MagneticRowListener { - /** Set a translation due to a magnetic attachment. */ - fun setMagneticTranslation(translation: Float) + /** + * Set a translation due to a magnetic attachment. + * + * The request to set a View's translation may occur while a magnetic animation is running. In + * such a case, the [trackEagerly] argument will determine if we decide to eagerly track the + * incoming translation or not. If true, the ongoing animation will update its target position + * and continue to animate only if the incoming translation produces a delta higher than a touch + * slop threshold. Otherwise, the animation will be cancelled and the View translation will be + * set directly. If [trackEagerly] is false, we respect the animation and only update the + * animated target. + * + * @param[translation] Incoming gesture translation. + * @param[trackEagerly] Whether we eagerly track the incoming translation directly or not. + */ + fun setMagneticTranslation(translation: Float, trackEagerly: Boolean = true) /** * Trigger the magnetic behavior when the row detaches or snaps back from its magnetic diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index e6bb1b9f0273..fbbf84596610 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -3852,8 +3852,6 @@ public class NotificationStackScrollLayout // existing overScroll, we have to scroll the view customOverScrollBy((int) scrollAmount, getOwnScrollY(), range, getHeight() / 2); - // If we're scrolling, leavebehinds should be dismissed - mController.checkSnoozeLeavebehind(); } } break; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index f7f8acf5fda9..e6a25b76443f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -486,15 +486,22 @@ public class NotificationStackScrollLayoutController implements Dumpable { } @Override + public boolean isMagneticViewDetached(View view) { + if (view instanceof ExpandableNotificationRow row) { + return mMagneticNotificationRowManager.isMagneticRowSwipeDetached(row); + } else { + return false; + } + } + + @Override public float getTotalTranslationLength(View animView) { return mView.getTotalTranslationLength(animView); } @Override public void onDensityScaleChange(float density) { - mMagneticNotificationRowManager.setSwipeThresholdPx( - density * MagneticNotificationRowManager.MAGNETIC_DETACH_THRESHOLD_DP - ); + mMagneticNotificationRowManager.onDensityChange(density); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java index c5a846e1da05..33b94783b24a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java @@ -33,6 +33,7 @@ import android.view.ViewConfiguration; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.jank.InteractionJankMonitor; +import com.android.systemui.Flags; import com.android.systemui.SwipeHelper; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; @@ -191,6 +192,11 @@ class NotificationSwipeHelper extends SwipeHelper implements NotificationSwipeAc @Override public boolean handleUpEvent(MotionEvent ev, View animView, float velocity, float translation) { + if (Flags.magneticNotificationSwipes() + && (mCallback.isMagneticViewDetached(animView) || swipedFastEnough())) { + dismiss(animView, velocity); + return true; + } NotificationMenuRowPlugin menuRow = getCurrentMenuRow(); if (menuRow != null) { menuRow.onTouchEnd(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java index d23a4c6307fc..28218227506c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java @@ -967,9 +967,12 @@ public class StackScrollAlgorithm { childState.setZTranslation(baseZ); } if (isTopEntry && row.isAboveShelf()) { + float headsUpBottom = NotificationsHunSharedAnimationValues.isEnabled() + ? mHeadsUpAnimator.getHeadsUpAppearHeightBottom() + : ambientState.getHeadsUpBottom(); clampHunToMaxTranslation( /* headsUpTop = */ headsUpTranslation, - /* headsUpBottom = */ ambientState.getHeadsUpBottom(), + /* headsUpBottom = */ headsUpBottom, /* viewState = */ childState ); updateCornerRoundnessForPinnedHun(row, ambientState.getStackTop()); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogManagerExt.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogManagerExt.kt index fbc6b9524a6d..372e91f88ae5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogManagerExt.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogManagerExt.kt @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.phone import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/data/repository/AirplaneModeRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/data/repository/AirplaneModeRepository.kt index f82e681de76f..e2fd4bdc45a9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/data/repository/AirplaneModeRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/data/repository/AirplaneModeRepository.kt @@ -19,7 +19,7 @@ package com.android.systemui.statusbar.pipeline.airplane.data.repository import android.net.ConnectivityManager import android.os.Handler import android.provider.Settings.Global -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.log.table.TableLogBuffer diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/UnifiedBattery.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/UnifiedBattery.kt index 732ea6ac6790..5127e8a14796 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/UnifiedBattery.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/UnifiedBattery.kt @@ -101,7 +101,13 @@ fun BatteryCanvas( for (glyph in glyphs) { // Move the glyph to the right spot val verticalOffset = (BatteryFrame.innerHeight - glyph.height) / 2 - inset(horizontalOffset, verticalOffset) { glyph.draw(this, colors) } + inset( + // Never try and inset more than half of the available size - see b/400246091. + minOf(horizontalOffset, size.width / 2), + minOf(verticalOffset, size.height / 2), + ) { + glyph.draw(this, colors) + } horizontalOffset += glyph.width + INTER_GLYPH_PADDING_PX } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcherKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcherKairos.kt index 1f5b849c56cc..f4076ae34a4f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcherKairos.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcherKairos.kt @@ -24,7 +24,7 @@ import com.android.systemui.Flags import com.android.systemui.KairosActivatable import com.android.systemui.KairosBuilder import com.android.systemui.activated -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.demomode.DemoMode import com.android.systemui.demomode.DemoModeController diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImpl.kt index 982f6ec36150..2a6ff3b98ae2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImpl.kt @@ -28,7 +28,7 @@ import android.telephony.satellite.SatelliteModemStateCallback import android.telephony.satellite.SatelliteProvisionStateCallback import androidx.annotation.VisibleForTesting import com.android.app.tracing.coroutines.launchTraced as launch -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt index c91ea9a50028..ba666512af5a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt @@ -255,7 +255,7 @@ fun StatusBarRoot( expandedMatchesParentHeight = true showsOnlyActiveMedia = true falsingProtectionNeeded = false - disablePagination = true + disableScrolling = true init(MediaHierarchyManager.LOCATION_STATUS_BAR_POPUP) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModel.kt index 3bae91a0ebe3..c717b180575c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModel.kt @@ -262,6 +262,12 @@ constructor( override val popupChips get() = statusBarPopupChips.shownPopupChips + private val isShadeExpandedEnough = + // Keep the status bar visible while the shade is just starting to open, but otherwise + // hide it so that the status bar doesn't draw while it can't be seen. + // See b/394257529#comment24. + shadeInteractor.anyExpansion.map { it >= 0.2 }.distinctUntilChanged() + /** * Whether the display of this statusbar has the shade window (that is hosting shade container * and lockscreen, among other things). @@ -283,7 +289,7 @@ constructor( Overlays.QuickSettingsShade in currentOverlays) } } else { - shadeInteractor.isAnyFullyExpanded + isShadeExpandedEnough } private val isShadeVisibleOnThisDisplay: Flow<Boolean> = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt index f9bba9d624f1..eaceb5e22535 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt @@ -26,7 +26,7 @@ import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry import com.android.internal.annotations.VisibleForTesting import com.android.systemui.Flags.multiuserWifiPickerTrackerSupport -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationControllerExt.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationControllerExt.kt index 0a2bbe580b99..14cadd90db4e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationControllerExt.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationControllerExt.kt @@ -14,7 +14,7 @@ package com.android.systemui.statusbar.policy import android.content.res.Configuration -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/PolicyModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/PolicyModule.kt index 3cb7090ea6d4..a352982f58f2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/PolicyModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/PolicyModule.kt @@ -32,6 +32,7 @@ import com.android.systemui.qs.tiles.DndTile import com.android.systemui.qs.tiles.FlashlightTile import com.android.systemui.qs.tiles.LocationTile import com.android.systemui.qs.tiles.MicrophoneToggleTile +import com.android.systemui.qs.tiles.ModesDndTile import com.android.systemui.qs.tiles.ModesTile import com.android.systemui.qs.tiles.UiModeNightTile import com.android.systemui.qs.tiles.WorkModeTile @@ -49,9 +50,13 @@ import com.android.systemui.qs.tiles.impl.location.domain.LocationTileMapper import com.android.systemui.qs.tiles.impl.location.domain.interactor.LocationTileDataInteractor import com.android.systemui.qs.tiles.impl.location.domain.interactor.LocationTileUserActionInteractor import com.android.systemui.qs.tiles.impl.location.domain.model.LocationTileModel +import com.android.systemui.qs.tiles.impl.modes.domain.interactor.ModesDndTileDataInteractor +import com.android.systemui.qs.tiles.impl.modes.domain.interactor.ModesDndTileUserActionInteractor import com.android.systemui.qs.tiles.impl.modes.domain.interactor.ModesTileDataInteractor import com.android.systemui.qs.tiles.impl.modes.domain.interactor.ModesTileUserActionInteractor +import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesDndTileModel import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesTileModel +import com.android.systemui.qs.tiles.impl.modes.ui.ModesDndTileMapper import com.android.systemui.qs.tiles.impl.modes.ui.ModesTileMapper import com.android.systemui.qs.tiles.impl.sensorprivacy.SensorPrivacyToggleTileDataInteractor import com.android.systemui.qs.tiles.impl.sensorprivacy.domain.SensorPrivacyToggleTileUserActionInteractor @@ -132,6 +137,7 @@ interface PolicyModule { const val CAMERA_TOGGLE_TILE_SPEC = "cameratoggle" const val MIC_TOGGLE_TILE_SPEC = "mictoggle" const val DND_TILE_SPEC = "dnd" + const val MODES_DND_TILE_SPEC = "modes_dnd" /** Inject DndTile or ModesTile into tileMap in QSModule based on feature flag */ @Provides @@ -146,6 +152,12 @@ interface PolicyModule { return if (ModesUi.isEnabled) modesTile.get() else dndTile.get() } + /** Inject ModesDndTile into tileViewModelMap in QSModule */ + @Provides + @IntoMap + @StringKey(MODES_DND_TILE_SPEC) + fun bindDndModeTile(tile: ModesDndTile): QSTileImpl<*> = tile + /** Inject flashlight config */ @Provides @IntoMap @@ -449,6 +461,37 @@ interface PolicyModule { mapper, ) else StubQSTileViewModel + + @Provides + @IntoMap + @StringKey(MODES_DND_TILE_SPEC) + fun provideDndModeTileConfig(uiEventLogger: QsEventLogger): QSTileConfig = + QSTileConfig( + tileSpec = TileSpec.create(MODES_DND_TILE_SPEC), + uiConfig = + QSTileUIConfig.Resource( + iconRes = R.drawable.qs_dnd_icon_off, + labelRes = R.string.quick_settings_dnd_label, + ), + instanceId = uiEventLogger.getNewInstanceId(), + category = TileCategory.CONNECTIVITY, + ) + + @Provides + @IntoMap + @StringKey(MODES_DND_TILE_SPEC) + fun provideDndModeTileViewModel( + factory: QSTileViewModelFactory.Static<ModesDndTileModel>, + mapper: ModesDndTileMapper, + stateInteractor: ModesDndTileDataInteractor, + userActionInteractor: ModesDndTileUserActionInteractor, + ): QSTileViewModel = + factory.create( + TileSpec.create(MODES_DND_TILE_SPEC), + userActionInteractor, + stateInteractor, + mapper, + ) } /** Inject FlashlightTile into tileMap in QSModule */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/data/repository/DeviceProvisioningRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/data/repository/DeviceProvisioningRepository.kt index 07bbca74e12e..2b9d39a54c44 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/data/repository/DeviceProvisioningRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/data/repository/DeviceProvisioningRepository.kt @@ -15,7 +15,7 @@ */ package com.android.systemui.statusbar.policy.data.repository -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.statusbar.policy.DeviceProvisionedController import dagger.Binds import dagger.Module diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/domain/interactor/ZenModeInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/domain/interactor/ZenModeInteractor.kt index e8347df5653f..ed814c6b3785 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/domain/interactor/ZenModeInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/domain/interactor/ZenModeInteractor.kt @@ -58,7 +58,7 @@ import kotlinx.coroutines.flow.stateIn * An interactor that performs business logic related to the status and configuration of Zen Mode * (or Do Not Disturb/DND Mode). */ - @SysUISingleton +@SysUISingleton class ZenModeInteractor @Inject constructor( @@ -141,6 +141,18 @@ constructor( return field } + /** + * Returns the current state of the special "manual DND" mode. + * + * This should only be used when there is a strong reason to handle DND specifically (such as + * legacy UI pieces that haven't been updated to use modes more generally, or if the user + * explicitly wants a shortcut to DND). Please prefer using [modes] or [activeModes] in all + * other scenarios. + */ + fun getDndMode(): ZenMode { + return zenModeRepository.getModes().single { it.isManualDnd } + } + /** Flow returning the currently active mode(s), if any. */ val activeModes: Flow<ActiveZenModes> = modes diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ui/viewmodel/KeyguardStatusBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/ui/viewmodel/KeyguardStatusBarViewModel.kt index 2dc17f40a380..c86e00de4246 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ui/viewmodel/KeyguardStatusBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ui/viewmodel/KeyguardStatusBarViewModel.kt @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.ui.viewmodel -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor diff --git a/packages/SystemUI/src/com/android/systemui/telephony/data/repository/TelephonyRepository.kt b/packages/SystemUI/src/com/android/systemui/telephony/data/repository/TelephonyRepository.kt index b1b6014bfbde..9b88d439f2db 100644 --- a/packages/SystemUI/src/com/android/systemui/telephony/data/repository/TelephonyRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/telephony/data/repository/TelephonyRepository.kt @@ -23,7 +23,7 @@ import android.content.pm.PackageManager import android.telecom.TelecomManager import android.telephony.Annotation import android.telephony.TelephonyCallback -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java index 9f60fe212567..48d7747d2dc2 100644 --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java @@ -28,6 +28,7 @@ import static com.android.systemui.theme.ThemeOverlayApplier.COLOR_SOURCE_PRESET import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_ACCENT_COLOR; import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_DYNAMIC_COLOR; import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_SYSTEM_PALETTE; +import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_CATEGORY_THEME_STYLE; import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_COLOR_BOTH; import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_COLOR_INDEX; import static com.android.systemui.theme.ThemeOverlayApplier.OVERLAY_COLOR_SOURCE; @@ -106,6 +107,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.Executor; import java.util.stream.Collectors; @@ -507,18 +509,52 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor); mDeviceProvisionedController.addCallback(mDeviceProvisionedListener); + + // Condition only applies when booting to Setup Wizard. + // We should check if the device has specific hardware color styles, load the relative + // color palette and more also save the setting in our shared setting with ThemePicker. WallpaperColors systemColor; if (hardwareColorStyles() && !mDeviceProvisionedController.isCurrentUserSetup()) { - Pair<Integer, Color> defaultSettings = getThemeSettingsDefaults(); - mThemeStyle = defaultSettings.first; - Color seedColor = defaultSettings.second; + HardwareDefaultSetting defaultSettings = getThemeSettingsDefaults(); + mThemeStyle = defaultSettings.style; // we only use the first color anyway, so we can pass only the single color we have systemColor = new WallpaperColors( - /*primaryColor*/ seedColor, - /*secondaryColor*/ seedColor, - /*tertiaryColor*/ seedColor + /*primaryColor*/ defaultSettings.seedColor, + /*secondaryColor*/ defaultSettings.seedColor, + /*tertiaryColor*/ defaultSettings.seedColor + ); + + /* We update the json in THEME_CUSTOMIZATION_OVERLAY_PACKAGES to reflect the preset. */ + final int currentUser = mUserTracker.getUserId(); + final String overlayPackageJson = Objects.requireNonNullElse( + mSecureSettings.getStringForUser( + Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES, + currentUser), + "{}" ); + + try { + JSONObject object = new JSONObject(overlayPackageJson); + String seedColorStr = Integer.toHexString(defaultSettings.seedColor.toArgb()); + object.put(OVERLAY_CATEGORY_SYSTEM_PALETTE, seedColorStr); + object.put(OVERLAY_CATEGORY_ACCENT_COLOR, seedColorStr); + object.put(OVERLAY_COLOR_SOURCE, defaultSettings.colorSource); + object.put(OVERLAY_CATEGORY_THEME_STYLE, Style.toString(mThemeStyle)); + + mSecureSettings.putStringForUser( + Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES, object.toString(), + UserHandle.USER_CURRENT); + + Log.d(TAG, "Hardware Color Defaults loaded: " + object.toString()); + + } catch (JSONException e) { + Log.d(TAG, "Failed to store hardware color defaults in " + + "THEME_CUSTOMIZATION_OVERLAY_PACKAGES.", e); + } + + // now we have to update + } else { systemColor = mWallpaperManager.getWallpaperColors( getDefaultWallpaperColorsSource(mUserTracker.getUserId())); @@ -863,7 +899,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { try { JSONObject object = new JSONObject(overlayPackageJson); style = Style.valueOf( - object.getString(ThemeOverlayApplier.OVERLAY_CATEGORY_THEME_STYLE)); + object.getString(OVERLAY_CATEGORY_THEME_STYLE)); if (!validStyles.contains(style)) { style = Style.TONAL_SPOT; } @@ -899,26 +935,29 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { } String deviceColorPropertyValue = mSystemPropertiesHelper.get(deviceColorProperty); - Pair<Integer, String> selectedTheme = themeMap.get(deviceColorPropertyValue); - if (selectedTheme == null) { + Pair<Integer, String> styleAndSource = themeMap.get(deviceColorPropertyValue); + if (styleAndSource == null) { Log.d(TAG, "Sysprop `" + deviceColorProperty + "` of value '" + deviceColorPropertyValue + "' not found in theming_defaults: " + Arrays.toString(themeData)); - selectedTheme = fallbackTheme; + styleAndSource = fallbackTheme; } - return selectedTheme; + return styleAndSource; + } + + record HardwareDefaultSetting(Color seedColor, @Style.Type int style, String colorSource) { } @VisibleForTesting - protected Pair<Integer, Color> getThemeSettingsDefaults() { + protected HardwareDefaultSetting getThemeSettingsDefaults() { - Pair<Integer, String> selectedTheme = getHardwareColorSetting(); + Pair<Integer, String> styleAndSource = getHardwareColorSetting(); // Last fallback color Color defaultSeedColor = Color.valueOf(GOOGLE_BLUE); // defaultColor will come from wallpaper or be parsed from a string - boolean isWallpaper = selectedTheme.second.equals(COLOR_SOURCE_HOME); + boolean isWallpaper = styleAndSource.second.equals(COLOR_SOURCE_HOME); if (isWallpaper) { WallpaperColors wallpaperColors = mWallpaperManager.getWallpaperColors( @@ -932,16 +971,17 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { defaultSeedColor.toArgb())); } else { try { - defaultSeedColor = Color.valueOf(Color.parseColor(selectedTheme.second)); + defaultSeedColor = Color.valueOf(Color.parseColor(styleAndSource.second)); Log.d(TAG, "Default seed color read from resource: " + Integer.toHexString( defaultSeedColor.toArgb())); } catch (IllegalArgumentException e) { - Log.e(TAG, "Error parsing color: " + selectedTheme.second, e); + Log.e(TAG, "Error parsing color: " + styleAndSource.second, e); // defaultSeedColor remains unchanged in this case } } - return new Pair<>(selectedTheme.first, defaultSeedColor); + return new HardwareDefaultSetting(defaultSeedColor, styleAndSource.first, + isWallpaper ? COLOR_SOURCE_HOME : COLOR_SOURCE_PRESET); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/unfold/data/repository/UnfoldTransitionRepository.kt b/packages/SystemUI/src/com/android/systemui/unfold/data/repository/UnfoldTransitionRepository.kt index fbbd2b9c5de8..e47d74ec9412 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/data/repository/UnfoldTransitionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/data/repository/UnfoldTransitionRepository.kt @@ -16,7 +16,7 @@ package com.android.systemui.unfold.data.repository import androidx.annotation.FloatRange -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.unfold.UnfoldTransitionProgressProvider import com.android.systemui.unfold.data.repository.UnfoldTransitionStatus.TransitionFinished import com.android.systemui.unfold.data.repository.UnfoldTransitionStatus.TransitionInProgress diff --git a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt index c960b5525d96..05b2e0d1423e 100644 --- a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserRepository.kt @@ -33,7 +33,7 @@ import com.android.app.tracing.coroutines.launchTraced as launch import com.android.internal.statusbar.IStatusBarService import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserSwitcherRepository.kt b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserSwitcherRepository.kt index bcbd679b35eb..412161cf98bc 100644 --- a/packages/SystemUI/src/com/android/systemui/user/data/repository/UserSwitcherRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/user/data/repository/UserSwitcherRepository.kt @@ -23,7 +23,7 @@ import android.os.UserManager import android.provider.Settings.Global.USER_SWITCHER_ENABLED import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background diff --git a/packages/SystemUI/src/com/android/systemui/util/animation/data/repository/AnimationStatusRepository.kt b/packages/SystemUI/src/com/android/systemui/util/animation/data/repository/AnimationStatusRepository.kt index 31a8d864de95..9937eeb29151 100644 --- a/packages/SystemUI/src/com/android/systemui/util/animation/data/repository/AnimationStatusRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/util/animation/data/repository/AnimationStatusRepository.kt @@ -19,7 +19,7 @@ import android.content.ContentResolver import android.database.ContentObserver import android.os.Handler import android.provider.Settings -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.unfold.util.ScaleAwareTransitionProgressProvider.Companion.areAnimationsEnabled import javax.inject.Inject diff --git a/packages/SystemUI/src/com/android/systemui/util/kotlin/BatteryControllerExt.kt b/packages/SystemUI/src/com/android/systemui/util/kotlin/BatteryControllerExt.kt index 80ccd646f6be..d4eabb9264e6 100644 --- a/packages/SystemUI/src/com/android/systemui/util/kotlin/BatteryControllerExt.kt +++ b/packages/SystemUI/src/com/android/systemui/util/kotlin/BatteryControllerExt.kt @@ -16,7 +16,7 @@ package com.android.systemui.util.kotlin -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.statusbar.policy.BatteryController import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/util/kotlin/ManagedProfileControllerExt.kt b/packages/SystemUI/src/com/android/systemui/util/kotlin/ManagedProfileControllerExt.kt index 7a2f9b24700f..837bbea9cc3c 100644 --- a/packages/SystemUI/src/com/android/systemui/util/kotlin/ManagedProfileControllerExt.kt +++ b/packages/SystemUI/src/com/android/systemui/util/kotlin/ManagedProfileControllerExt.kt @@ -16,7 +16,7 @@ package com.android.systemui.util.kotlin -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.statusbar.phone.ManagedProfileController import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/util/kotlin/ReduceBrightColorsControllerExt.kt b/packages/SystemUI/src/com/android/systemui/util/kotlin/ReduceBrightColorsControllerExt.kt index ee00e8b04ef1..02012ede697b 100644 --- a/packages/SystemUI/src/com/android/systemui/util/kotlin/ReduceBrightColorsControllerExt.kt +++ b/packages/SystemUI/src/com/android/systemui/util/kotlin/ReduceBrightColorsControllerExt.kt @@ -16,7 +16,7 @@ package com.android.systemui.util.kotlin -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.qs.ReduceBrightColorsController import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/util/kotlin/RotationLockControllerExt.kt b/packages/SystemUI/src/com/android/systemui/util/kotlin/RotationLockControllerExt.kt index 22cc8dd7745d..a914c86da0e7 100644 --- a/packages/SystemUI/src/com/android/systemui/util/kotlin/RotationLockControllerExt.kt +++ b/packages/SystemUI/src/com/android/systemui/util/kotlin/RotationLockControllerExt.kt @@ -16,7 +16,7 @@ package com.android.systemui.util.kotlin -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.statusbar.policy.RotationLockController import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/packages/SystemUI/src/com/android/systemui/wallet/controller/WalletContextualSuggestionsController.kt b/packages/SystemUI/src/com/android/systemui/wallet/controller/WalletContextualSuggestionsController.kt index 594c5526dca9..7e9ebd218787 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/controller/WalletContextualSuggestionsController.kt +++ b/packages/SystemUI/src/com/android/systemui/wallet/controller/WalletContextualSuggestionsController.kt @@ -24,7 +24,7 @@ import android.service.quickaccesswallet.QuickAccessWalletClient import android.service.quickaccesswallet.WalletCard import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging -import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.flags.FeatureFlags diff --git a/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/NoopWallpaperRepository.kt b/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/NoopWallpaperRepository.kt index 300a7e070b6c..72bc9f690364 100644 --- a/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/NoopWallpaperRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/NoopWallpaperRepository.kt @@ -36,6 +36,8 @@ import kotlinx.coroutines.flow.flowOf @SysUISingleton class NoopWallpaperRepository @Inject constructor() : WallpaperRepository { override val wallpaperInfo: StateFlow<WallpaperInfo?> = MutableStateFlow(null).asStateFlow() + override val lockscreenWallpaperInfo: StateFlow<WallpaperInfo?> = + MutableStateFlow(null).asStateFlow() override val wallpaperSupportsAmbientMode = flowOf(false) override var rootView: View? = null override val shouldSendFocalArea: StateFlow<Boolean> = MutableStateFlow(false).asStateFlow() diff --git a/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt b/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt index b07342c4c76d..d314f7669421 100644 --- a/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt @@ -18,6 +18,8 @@ package com.android.systemui.wallpapers.data.repository import android.app.WallpaperInfo import android.app.WallpaperManager +import android.app.WallpaperManager.FLAG_LOCK +import android.app.WallpaperManager.FLAG_SYSTEM import android.content.Context import android.content.Intent import android.content.IntentFilter @@ -30,9 +32,11 @@ import android.util.Log import android.view.View import com.android.internal.R import com.android.systemui.broadcast.BroadcastDispatcher +import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.res.R as SysUIR +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shared.Flags.ambientAod import com.android.systemui.shared.Flags.extendedWallpaperEffects import com.android.systemui.user.data.model.SelectedUserModel @@ -63,6 +67,12 @@ interface WallpaperRepository { /** Emits the current user's current wallpaper. */ val wallpaperInfo: StateFlow<WallpaperInfo?> + /** + * Emits the current user's lockscreen wallpaper. This will emit the same value as + * [wallpaperInfo] if the wallpaper is shared between home and lock screen. + */ + val lockscreenWallpaperInfo: StateFlow<WallpaperInfo?> + /** Emits true if the current user's current wallpaper supports ambient mode. */ val wallpaperSupportsAmbientMode: Flow<Boolean> @@ -81,13 +91,14 @@ interface WallpaperRepository { class WallpaperRepositoryImpl @Inject constructor( - @Background scope: CoroutineScope, + @Background private val scope: CoroutineScope, @Background private val bgDispatcher: CoroutineDispatcher, broadcastDispatcher: BroadcastDispatcher, userRepository: UserRepository, private val wallpaperManager: WallpaperManager, private val context: Context, private val secureSettings: SecureSettings, + @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, ) : WallpaperRepository { private val wallpaperChanged: Flow<Unit> = broadcastDispatcher @@ -106,26 +117,19 @@ constructor( // Only update the wallpaper status once the user selection has finished. .filter { it.selectionStatus == SelectionStatus.SELECTION_COMPLETE } - override val wallpaperInfo: StateFlow<WallpaperInfo?> = - if (!wallpaperManager.isWallpaperSupported) { - MutableStateFlow(null).asStateFlow() - } else { - combine(wallpaperChanged, selectedUser, ::Pair) - .mapLatestConflated { (_, selectedUser) -> getWallpaper(selectedUser) } - .stateIn( - scope, - // Always be listening for wallpaper changes. - SharingStarted.Eagerly, - // The initial value is null, but it should get updated pretty quickly because - // the `combine` should immediately kick off a fetch. - initialValue = null, - ) - } - + override val wallpaperInfo: StateFlow<WallpaperInfo?> = getWallpaperInfo(FLAG_SYSTEM) + override val lockscreenWallpaperInfo: StateFlow<WallpaperInfo?> = getWallpaperInfo(FLAG_LOCK) override val wallpaperSupportsAmbientMode: Flow<Boolean> = - secureSettings - .observerFlow(UserHandle.USER_ALL, Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED) - .onStart { emit(Unit) } + combine( + secureSettings + .observerFlow( + UserHandle.USER_ALL, + Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, + ) + .onStart { emit(Unit) }, + configurationInteractor.onAnyConfigurationChange, + ::Pair, + ) .map { val userEnabled = secureSettings.getInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 1) == 1 @@ -172,7 +176,7 @@ constructor( } override val shouldSendFocalArea = - wallpaperInfo + lockscreenWallpaperInfo .map { val focalAreaTarget = context.resources.getString(SysUIR.string.focal_area_target) val shouldSendNotificationLayout = it?.component?.className == focalAreaTarget @@ -184,12 +188,35 @@ constructor( initialValue = extendedWallpaperEffects(), ) - private suspend fun getWallpaper(selectedUser: SelectedUserModel): WallpaperInfo? { + private suspend fun getWallpaper( + selectedUser: SelectedUserModel, + which: Int = FLAG_SYSTEM, + ): WallpaperInfo? { return withContext(bgDispatcher) { - wallpaperManager.getWallpaperInfoForUser(selectedUser.userInfo.id) + if (which == FLAG_LOCK && wallpaperManager.lockScreenWallpaperExists()) { + wallpaperManager.getWallpaperInfo(FLAG_LOCK, selectedUser.userInfo.id) + } else { + wallpaperManager.getWallpaperInfoForUser(selectedUser.userInfo.id) + } } } + private fun getWallpaperInfo(which: Int): StateFlow<WallpaperInfo?> = + if (!wallpaperManager.isWallpaperSupported) { + MutableStateFlow(null).asStateFlow() + } else { + combine(wallpaperChanged, selectedUser, ::Pair) + .mapLatestConflated { (_, selectedUser) -> getWallpaper(selectedUser, which) } + .stateIn( + scope, + // Always be listening for wallpaper changes. + SharingStarted.Eagerly, + // The initial value is null, but it should get updated pretty quickly because + // the `combine` should immediately kick off a fetch. + initialValue = null, + ) + } + companion object { private val TAG = WallpaperRepositoryImpl::class.simpleName private val DEBUG = true diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index a42f5d3f67ea..9475bdbd043b 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -50,7 +50,6 @@ import static kotlinx.coroutines.flow.StateFlowKt.MutableStateFlow; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; @@ -1878,7 +1877,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { verify(callback, never()).onTrustGrantedForCurrentUser( anyBoolean() /* dismissKeyguard */, eq(true) /* newlyUnlocked */, - anyObject() /* flags */, + any() /* flags */, anyString() /* message */ ); } @@ -2747,7 +2746,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { () -> mJavaAdapter, () -> mSceneInteractor, () -> mCommunalSceneInteractor, - mKeyguardServiceShowLockscreenInteractor); + () -> mKeyguardServiceShowLockscreenInteractor); setAlternateBouncerVisibility(false); setPrimaryBouncerVisibility(false); setStrongAuthTracker(KeyguardUpdateMonitorTest.this.mStrongAuthTracker); diff --git a/packages/SystemUI/tests/src/com/android/systemui/SystemUIApplicationTest.kt b/packages/SystemUI/tests/src/com/android/systemui/SystemUIApplicationTest.kt index 4f7610ab7d72..f98c1309b24f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/SystemUIApplicationTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/SystemUIApplicationTest.kt @@ -25,7 +25,6 @@ import com.android.systemui.dagger.GlobalRootComponent import com.android.systemui.dagger.SysUIComponent import com.android.systemui.dump.dumpManager import com.android.systemui.flags.systemPropertiesHelper -import com.android.systemui.kosmos.Kosmos import com.android.systemui.process.processWrapper import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat @@ -48,7 +47,7 @@ class SystemUIApplicationTest : SysuiTestCase() { @get:Rule val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT) - val kosmos = Kosmos() + val kosmos = testKosmos() @Mock private lateinit var initializer: SystemUIInitializer @Mock private lateinit var rootComponent: GlobalRootComponent @Mock private lateinit var sysuiComponent: SysUIComponent @@ -56,9 +55,13 @@ class SystemUIApplicationTest : SysuiTestCase() { @Mock private lateinit var initController: InitController class StartableA : TestableStartable() + class StartableB : TestableStartable() + class StartableC : TestableStartable() + class StartableD : TestableStartable() + class StartableE : TestableStartable() val dependencyMap: Map<Class<*>, Set<Class<out CoreStartable>>> = @@ -114,7 +117,7 @@ class SystemUIApplicationTest : SysuiTestCase() { .thenReturn( mutableMapOf( StartableA::class.java to Provider { startableA }, - StartableB::class.java to Provider { startableB } + StartableB::class.java to Provider { startableB }, ) ) app.onCreate() @@ -130,7 +133,7 @@ class SystemUIApplicationTest : SysuiTestCase() { mutableMapOf( StartableC::class.java to Provider { startableC }, StartableA::class.java to Provider { startableA }, - StartableB::class.java to Provider { startableB } + StartableB::class.java to Provider { startableB }, ) ) app.onCreate() @@ -150,7 +153,7 @@ class SystemUIApplicationTest : SysuiTestCase() { StartableC::class.java to Provider { startableC }, StartableD::class.java to Provider { startableD }, StartableA::class.java to Provider { startableA }, - StartableB::class.java to Provider { startableB } + StartableB::class.java to Provider { startableB }, ) ) app.onCreate() diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/TransitionAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/TransitionAnimatorTest.kt index 1268de0f4141..4cfe106780f9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/TransitionAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/TransitionAnimatorTest.kt @@ -34,9 +34,9 @@ import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.activity.EmptyTestActivity import com.android.systemui.concurrency.fakeExecutor -import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testScope import com.android.systemui.runOnMainThreadAndWaitForIdleSync +import com.android.systemui.testKosmos import kotlin.test.assertTrue import org.junit.Rule import org.junit.Test @@ -77,7 +77,7 @@ class TransitionAnimatorTest( } } - private val kosmos = Kosmos() + private val kosmos = testKosmos() private val pathManager = GoldenPathManager( context, diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt index 0e68fce679b0..2c70249bcb06 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt @@ -73,9 +73,9 @@ import com.android.systemui.coroutines.collectLastValue import com.android.systemui.coroutines.collectValues import com.android.systemui.display.data.repository.displayStateRepository import com.android.systemui.keyguard.shared.model.AcquiredFingerprintAuthenticationStatus -import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testScope import com.android.systemui.res.R +import com.android.systemui.testKosmos import com.android.systemui.util.mockito.withArgCaptor import com.google.android.msdl.data.model.MSDLToken import com.google.common.truth.Truth.assertThat @@ -189,7 +189,7 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa private lateinit var promptContentViewWithMoreOptionsButton: PromptContentViewWithMoreOptionsButton - private val kosmos = Kosmos() + private val kosmos = testKosmos() @Before fun setup() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/brightness/ui/compose/BrightnessSliderMotionTest.kt b/packages/SystemUI/tests/src/com/android/systemui/brightness/ui/compose/BrightnessSliderMotionTest.kt index 9dab9d735603..b134dff89651 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/brightness/ui/compose/BrightnessSliderMotionTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/brightness/ui/compose/BrightnessSliderMotionTest.kt @@ -31,8 +31,8 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.brightness.ui.viewmodel.BrightnessSliderViewModel import com.android.systemui.common.shared.model.asIcon import com.android.systemui.haptics.slider.sliderHapticsViewModelFactory -import com.android.systemui.kosmos.Kosmos import com.android.systemui.motion.createSysUiComposeMotionTestRule +import com.android.systemui.testKosmos import com.android.systemui.utils.PolicyRestriction import kotlin.test.Test import kotlin.time.Duration.Companion.seconds @@ -61,7 +61,7 @@ import platform.test.screenshot.Displays.Phone class BrightnessSliderMotionTest : SysuiTestCase() { private val deviceSpec = DeviceEmulationSpec(Phone) - private val kosmos = Kosmos() + private val kosmos = testKosmos() @get:Rule val motionTestRule = createSysUiComposeMotionTestRule(kosmos, deviceSpec) diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java index 5c26dac5eb30..798aa428e73e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java @@ -60,13 +60,13 @@ import android.os.RemoteException; import android.os.UserHandle; import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.FlagsParameterization; import android.service.notification.StatusBarNotification; import android.testing.TestableLooper; import android.text.TextUtils; import android.view.View; import androidx.core.graphics.drawable.IconCompat; -import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.media.flags.Flags; @@ -101,6 +101,9 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import platform.test.runner.parameterized.ParameterizedAndroidJunit4; +import platform.test.runner.parameterized.Parameters; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -108,7 +111,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(ParameterizedAndroidJunit4.class) @TestableLooper.RunWithLooper(setAsMainLooper = true) public class MediaSwitchingControllerTest extends SysuiTestCase { private static final String TEST_DEVICE_1_ID = "test_device_1_id"; @@ -201,6 +204,17 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { private MediaDescription mMediaDescription; private List<RoutingSessionInfo> mRoutingSessionInfos = new ArrayList<>(); + @Parameters(name = "{0}") + public static List<FlagsParameterization> getParams() { + return FlagsParameterization.allCombinationsOf( + Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION, + Flags.FLAG_ENABLE_OUTPUT_SWITCHER_DEVICE_GROUPING); + } + + public MediaSwitchingControllerTest(FlagsParameterization flags) { + mSetFlagsRule.setFlagsParameterization(flags); + } + @Before public void setUp() { mPackageName = mContext.getPackageName(); @@ -260,7 +274,6 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { mMediaDevices.add(mMediaDevice1); mMediaDevices.add(mMediaDevice2); - when(mNearbyDevice1.getMediaRoute2Id()).thenReturn(TEST_DEVICE_1_ID); when(mNearbyDevice1.getRangeZone()).thenReturn(NearbyDevice.RANGE_FAR); when(mNearbyDevice2.getMediaRoute2Id()).thenReturn(TEST_DEVICE_2_ID); @@ -689,7 +702,7 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { mMediaSwitchingController.start(mCb); reset(mCb); - mMediaSwitchingController.getMediaItemList().clear(); + mMediaSwitchingController.clearMediaItemList(); mMediaSwitchingController.onDeviceListUpdate(mMediaDevices); final List<MediaDevice> devices = new ArrayList<>(); int dividerSize = 0; @@ -1528,7 +1541,7 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { .getSelectedMediaDevice(); mMediaSwitchingController.start(mCb); reset(mCb); - mMediaSwitchingController.getMediaItemList().clear(); + mMediaSwitchingController.clearMediaItemList(); mMediaSwitchingController.onDeviceListUpdate(mMediaDevices); @@ -1546,7 +1559,7 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { .getSelectedMediaDevice(); mMediaSwitchingController.start(mCb); reset(mCb); - mMediaSwitchingController.getMediaItemList().clear(); + mMediaSwitchingController.clearMediaItemList(); mMediaSwitchingController.onDeviceListUpdate(mMediaDevices); @@ -1564,7 +1577,7 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { .getSelectedMediaDevice(); mMediaSwitchingController.start(mCb); reset(mCb); - mMediaSwitchingController.getMediaItemList().clear(); + mMediaSwitchingController.clearMediaItemList(); mMediaSwitchingController.onDeviceListUpdate(mMediaDevices); @@ -1582,7 +1595,7 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { .getSelectedMediaDevice(); mMediaSwitchingController.start(mCb); reset(mCb); - mMediaSwitchingController.getMediaItemList().clear(); + mMediaSwitchingController.clearMediaItemList(); mMediaSwitchingController.onDeviceListUpdate(mMediaDevices); mMediaDevices.clear(); mMediaDevices.add(mMediaDevice2); diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/OutputMediaItemListProxyTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/OutputMediaItemListProxyTest.java new file mode 100644 index 000000000000..f6edd49f142f --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/OutputMediaItemListProxyTest.java @@ -0,0 +1,383 @@ +/* + * Copyright (C) 2025 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.dialog; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.when; + +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.FlagsParameterization; +import android.testing.TestableLooper; + +import androidx.test.filters.SmallTest; + +import com.android.media.flags.Flags; +import com.android.settingslib.media.MediaDevice; +import com.android.systemui.SysuiTestCase; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import platform.test.runner.parameterized.ParameterizedAndroidJunit4; +import platform.test.runner.parameterized.Parameters; + +import java.util.List; +import java.util.stream.Collectors; + +@SmallTest +@RunWith(ParameterizedAndroidJunit4.class) +@TestableLooper.RunWithLooper +public class OutputMediaItemListProxyTest extends SysuiTestCase { + private static final String DEVICE_ID_1 = "device_id_1"; + private static final String DEVICE_ID_2 = "device_id_2"; + private static final String DEVICE_ID_3 = "device_id_3"; + private static final String DEVICE_ID_4 = "device_id_4"; + @Mock private MediaDevice mMediaDevice1; + @Mock private MediaDevice mMediaDevice2; + @Mock private MediaDevice mMediaDevice3; + @Mock private MediaDevice mMediaDevice4; + + private MediaItem mMediaItem1; + private MediaItem mMediaItem2; + private MediaItem mConnectNewDeviceMediaItem; + private OutputMediaItemListProxy mOutputMediaItemListProxy; + + @Parameters(name = "{0}") + public static List<FlagsParameterization> getParams() { + return FlagsParameterization.allCombinationsOf( + Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION, + Flags.FLAG_ENABLE_OUTPUT_SWITCHER_DEVICE_GROUPING); + } + + public OutputMediaItemListProxyTest(FlagsParameterization flags) { + mSetFlagsRule.setFlagsParameterization(flags); + } + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + when(mMediaDevice1.getId()).thenReturn(DEVICE_ID_1); + when(mMediaDevice2.getId()).thenReturn(DEVICE_ID_2); + when(mMediaDevice2.isSuggestedDevice()).thenReturn(true); + when(mMediaDevice3.getId()).thenReturn(DEVICE_ID_3); + when(mMediaDevice4.getId()).thenReturn(DEVICE_ID_4); + mMediaItem1 = MediaItem.createDeviceMediaItem(mMediaDevice1); + mMediaItem2 = MediaItem.createDeviceMediaItem(mMediaDevice2); + mConnectNewDeviceMediaItem = MediaItem.createPairNewDeviceMediaItem(); + + mOutputMediaItemListProxy = new OutputMediaItemListProxy(mContext); + } + + @EnableFlags(Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION) + @Test + public void updateMediaDevices_shouldUpdateMediaItemList() { + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + + // Create the initial output media item list with mMediaDevice2 and mMediaDevice3. + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice2, mMediaDevice3), + /* selectedDevices */ List.of(mMediaDevice3), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + /* connectNewDeviceMediaItem= */ null); + + // Check the output media items to be + // * a media item with the selected mMediaDevice3 + // * a group divider for suggested devices + // * a media item with the mMediaDevice2 + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly(mMediaDevice3, null, mMediaDevice2); + assertThat(mOutputMediaItemListProxy.getOutputMediaItemList().get(0).isFirstDeviceInGroup()) + .isEqualTo(Flags.enableOutputSwitcherDeviceGrouping()); + + // Update the output media item list with more media devices. + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice4, mMediaDevice1, mMediaDevice3, mMediaDevice2), + /* selectedDevices */ List.of(mMediaDevice3), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + /* connectNewDeviceMediaItem= */ null); + + // Check the output media items to be + // * a media item with the selected route mMediaDevice3 + // * a group divider for suggested devices + // * a media item with the route mMediaDevice2 + // * a group divider for speakers and displays + // * a media item with the route mMediaDevice4 + // * a media item with the route mMediaDevice1 + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly( + mMediaDevice3, null, mMediaDevice2, null, mMediaDevice4, mMediaDevice1); + assertThat(mOutputMediaItemListProxy.getOutputMediaItemList().get(0).isFirstDeviceInGroup()) + .isEqualTo(Flags.enableOutputSwitcherDeviceGrouping()); + + // Update the output media item list where mMediaDevice4 is offline and new selected device. + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice1, mMediaDevice3, mMediaDevice2), + /* selectedDevices */ List.of(mMediaDevice1, mMediaDevice3), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + /* connectNewDeviceMediaItem= */ null); + + // Check the output media items to be + // * a media item with the selected route mMediaDevice3 + // * a group divider for suggested devices + // * a media item with the route mMediaDevice2 + // * a group divider for speakers and displays + // * a media item with the route mMediaDevice1 + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly(mMediaDevice3, null, mMediaDevice2, null, mMediaDevice1); + assertThat(mOutputMediaItemListProxy.getOutputMediaItemList().get(0).isFirstDeviceInGroup()) + .isEqualTo(Flags.enableOutputSwitcherDeviceGrouping()); + } + + @EnableFlags(Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION) + @Test + public void updateMediaDevices_multipleSelectedDevices_shouldHaveCorrectDeviceOrdering() { + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + + // Create the initial output media item list with mMediaDevice2 and mMediaDevice3. + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice2, mMediaDevice4, mMediaDevice3, mMediaDevice1), + /* selectedDevices */ List.of(mMediaDevice1, mMediaDevice2, mMediaDevice3), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + /* connectNewDeviceMediaItem= */ null); + + if (Flags.enableOutputSwitcherDeviceGrouping()) { + // When the device grouping is enabled, the order of selected devices are preserved: + // * a media item with the selected mMediaDevice2 + // * a media item with the selected mMediaDevice3 + // * a media item with the selected mMediaDevice1 + // * a group divider for speakers and displays + // * a media item with the mMediaDevice4 + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly( + mMediaDevice2, mMediaDevice3, mMediaDevice1, null, mMediaDevice4); + assertThat( + mOutputMediaItemListProxy + .getOutputMediaItemList() + .get(0) + .isFirstDeviceInGroup()) + .isTrue(); + } else { + // When the device grouping is disabled, the order of selected devices are reverted: + // * a media item with the selected mMediaDevice1 + // * a media item with the selected mMediaDevice3 + // * a media item with the selected mMediaDevice2 + // * a group divider for speakers and displays + // * a media item with the mMediaDevice4 + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly( + mMediaDevice1, mMediaDevice3, mMediaDevice2, null, mMediaDevice4); + } + + // Update the output media item list with a selected device being deselected. + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice4, mMediaDevice1, mMediaDevice3, mMediaDevice2), + /* selectedDevices */ List.of(mMediaDevice2, mMediaDevice3), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + /* connectNewDeviceMediaItem= */ null); + + if (Flags.enableOutputSwitcherDeviceGrouping()) { + // When the device grouping is enabled, the order of selected devices are preserved: + // * a media item with the selected mMediaDevice2 + // * a media item with the selected mMediaDevice3 + // * a media item with the selected mMediaDevice1 + // * a group divider for speakers and displays + // * a media item with the mMediaDevice4 + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly( + mMediaDevice2, mMediaDevice3, mMediaDevice1, null, mMediaDevice4); + assertThat( + mOutputMediaItemListProxy + .getOutputMediaItemList() + .get(0) + .isFirstDeviceInGroup()) + .isTrue(); + } else { + // When the device grouping is disabled, the order of selected devices are reverted: + // * a media item with the selected mMediaDevice1 + // * a media item with the selected mMediaDevice3 + // * a media item with the selected mMediaDevice2 + // * a group divider for speakers and displays + // * a media item with the mMediaDevice4 + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly( + mMediaDevice1, mMediaDevice3, mMediaDevice2, null, mMediaDevice4); + } + + // Update the output media item list with a selected device is missing. + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice1, mMediaDevice3, mMediaDevice4), + /* selectedDevices */ List.of(mMediaDevice3), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + /* connectNewDeviceMediaItem= */ null); + + if (Flags.enableOutputSwitcherDeviceGrouping()) { + // When the device grouping is enabled, the order of selected devices are preserved: + // * a media item with the selected mMediaDevice3 + // * a media item with the selected mMediaDevice1 + // * a group divider for speakers and displays + // * a media item with the mMediaDevice4 + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly(mMediaDevice3, mMediaDevice1, null, mMediaDevice4); + assertThat( + mOutputMediaItemListProxy + .getOutputMediaItemList() + .get(0) + .isFirstDeviceInGroup()) + .isTrue(); + } else { + // When the device grouping is disabled, the order of selected devices are reverted: + // * a media item with the selected mMediaDevice1 + // * a media item with the selected mMediaDevice3 + // * a group divider for speakers and displays + // * a media item with the mMediaDevice4 + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly(mMediaDevice1, mMediaDevice3, null, mMediaDevice4); + } + } + + @EnableFlags(Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION) + @Test + public void updateMediaDevices_withConnectNewDeviceMediaItem_shouldUpdateMediaItemList() { + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + + // Create the initial output media item list with a connect new device media item. + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice2, mMediaDevice3), + /* selectedDevices */ List.of(mMediaDevice3), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + mConnectNewDeviceMediaItem); + + // Check the output media items to be + // * a media item with the selected mMediaDevice3 + // * a group divider for suggested devices + // * a media item with the mMediaDevice2 + // * a connect new device media item + assertThat(mOutputMediaItemListProxy.getOutputMediaItemList()) + .contains(mConnectNewDeviceMediaItem); + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly(mMediaDevice3, null, mMediaDevice2, null); + + // Update the output media item list without a connect new device media item. + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice2, mMediaDevice3), + /* selectedDevices */ List.of(mMediaDevice3), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + /* connectNewDeviceMediaItem= */ null); + + // Check the output media items to be + // * a media item with the selected mMediaDevice3 + // * a group divider for suggested devices + // * a media item with the mMediaDevice2 + assertThat(mOutputMediaItemListProxy.getOutputMediaItemList()) + .doesNotContain(mConnectNewDeviceMediaItem); + assertThat(getMediaDevices(mOutputMediaItemListProxy.getOutputMediaItemList())) + .containsExactly(mMediaDevice3, null, mMediaDevice2); + } + + @DisableFlags(Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION) + @Test + public void clearAndAddAll_shouldUpdateMediaItemList() { + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + + mOutputMediaItemListProxy.clearAndAddAll(List.of(mMediaItem1)); + assertThat(mOutputMediaItemListProxy.getOutputMediaItemList()).containsExactly(mMediaItem1); + assertThat(mOutputMediaItemListProxy.isEmpty()).isFalse(); + + mOutputMediaItemListProxy.clearAndAddAll(List.of(mMediaItem2)); + assertThat(mOutputMediaItemListProxy.getOutputMediaItemList()).containsExactly(mMediaItem2); + assertThat(mOutputMediaItemListProxy.isEmpty()).isFalse(); + } + + @EnableFlags(Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION) + @Test + public void clear_flagOn_shouldClearMediaItemList() { + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice1), + /* selectedDevices */ List.of(), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + /* connectNewDeviceMediaItem= */ null); + assertThat(mOutputMediaItemListProxy.isEmpty()).isFalse(); + + mOutputMediaItemListProxy.clear(); + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + } + + @DisableFlags(Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION) + @Test + public void clear_flagOff_shouldClearMediaItemList() { + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + + mOutputMediaItemListProxy.clearAndAddAll(List.of(mMediaItem1)); + assertThat(mOutputMediaItemListProxy.isEmpty()).isFalse(); + + mOutputMediaItemListProxy.clear(); + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + } + + @EnableFlags(Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION) + @Test + public void removeMutingExpectedDevices_flagOn_shouldClearMediaItemList() { + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + + mOutputMediaItemListProxy.updateMediaDevices( + /* devices= */ List.of(mMediaDevice1), + /* selectedDevices */ List.of(), + /* connectedMediaDevice= */ null, + /* needToHandleMutingExpectedDevice= */ false, + /* connectNewDeviceMediaItem= */ null); + assertThat(mOutputMediaItemListProxy.isEmpty()).isFalse(); + + mOutputMediaItemListProxy.removeMutingExpectedDevices(); + assertThat(mOutputMediaItemListProxy.isEmpty()).isFalse(); + } + + @DisableFlags(Flags.FLAG_FIX_OUTPUT_MEDIA_ITEM_LIST_INDEX_OUT_OF_BOUNDS_EXCEPTION) + @Test + public void removeMutingExpectedDevices_flagOff_shouldClearMediaItemList() { + assertThat(mOutputMediaItemListProxy.isEmpty()).isTrue(); + + mOutputMediaItemListProxy.clearAndAddAll(List.of(mMediaItem1)); + assertThat(mOutputMediaItemListProxy.isEmpty()).isFalse(); + + mOutputMediaItemListProxy.removeMutingExpectedDevices(); + assertThat(mOutputMediaItemListProxy.getOutputMediaItemList()).containsExactly(mMediaItem1); + assertThat(mOutputMediaItemListProxy.isEmpty()).isFalse(); + } + + private List<MediaDevice> getMediaDevices(List<MediaItem> mediaItems) { + return mediaItems.stream() + .map(item -> item.getMediaDevice().orElse(null)) + .collect(Collectors.toList()); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt index 6f71df5958d9..1b5f032652b4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt @@ -1,5 +1,6 @@ package com.android.systemui.qs.tiles +import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothDevice import android.os.Handler import android.os.Looper @@ -8,11 +9,11 @@ import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags import android.platform.test.flag.junit.FlagsParameterization import android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf +import android.service.quicksettings.Tile import android.testing.TestableLooper import android.testing.TestableLooper.RunWithLooper import androidx.test.filters.SmallTest import com.android.internal.logging.MetricsLogger -import com.android.internal.telephony.flags.Flags import com.android.settingslib.Utils import com.android.settingslib.bluetooth.CachedBluetoothDevice import com.android.systemui.SysuiTestCase @@ -82,6 +83,7 @@ class BluetoothTileTest(flags: FlagsParameterization) : SysuiTestCase() { testableLooper = TestableLooper.get(this) whenever(qsHost.context).thenReturn(mContext) + whenever(bluetoothController.canConfigBluetooth()).thenReturn(true) tile = FakeBluetoothTile( @@ -257,6 +259,38 @@ class BluetoothTileTest(flags: FlagsParameterization) : SysuiTestCase() { .removeOnMetadataChangedListener(eq(cachedDevice), any()) } + @Test + @EnableFlags(QSComposeFragment.FLAG_NAME) + fun disableBluetooth_transientTurningOff() { + enableBluetooth() + tile.refreshState() + testableLooper.processAllMessages() + + tile.handleSecondaryClick(null) + testableLooper.processAllMessages() + + val state = tile.state + + assertThat(state.state).isEqualTo(Tile.STATE_INACTIVE) + assertThat(state.isTransient).isTrue() + assertThat(state.icon).isEqualTo(createExpectedIcon(R.drawable.qs_bluetooth_icon_off)) + } + + @Test + @EnableFlags(QSComposeFragment.FLAG_NAME) + fun turningOffState() { + setBluetoothTurningOff() + + tile.refreshState() + testableLooper.processAllMessages() + + val state = tile.state + + assertThat(state.state).isEqualTo(Tile.STATE_INACTIVE) + assertThat(state.isTransient).isTrue() + assertThat(state.icon).isEqualTo(createExpectedIcon(R.drawable.qs_bluetooth_icon_off)) + } + private class FakeBluetoothTile( qsHost: QSHost, uiEventLogger: QsEventLogger, @@ -318,6 +352,13 @@ class BluetoothTileTest(flags: FlagsParameterization) : SysuiTestCase() { whenever(bluetoothController.isBluetoothConnecting).thenReturn(true) } + fun setBluetoothTurningOff() { + whenever(bluetoothController.isBluetoothConnected).thenReturn(false) + whenever(bluetoothController.isBluetoothConnecting).thenReturn(false) + whenever(bluetoothController.isBluetoothEnabled).thenReturn(false) + whenever(bluetoothController.bluetoothState).thenReturn(BluetoothAdapter.STATE_TURNING_OFF) + } + fun addConnectedDevice(device: CachedBluetoothDevice) { whenever(bluetoothController.connectedDevices).thenReturn(listOf(device)) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt index a8bfbd18d0c5..356d445ab4d9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt @@ -40,9 +40,9 @@ import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.flags.EnableSceneContainer -import com.android.systemui.kosmos.Kosmos import com.android.systemui.res.R import com.android.systemui.statusbar.policy.KeyguardStateController +import com.android.systemui.testKosmos import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.time.FakeSystemClock import com.android.wifitrackerlib.WifiEntry @@ -66,7 +66,7 @@ import org.mockito.kotlin.whenever @EnableFlags(Flags.FLAG_QS_TILE_DETAILED_VIEW) @UiThreadTest class InternetDetailsContentManagerTest : SysuiTestCase() { - private val kosmos = Kosmos() + private val kosmos = testKosmos() private val handler: Handler = kosmos.fakeExecutorHandler private val scope: CoroutineScope = mock<CoroutineScope>() private val telephonyManager: TelephonyManager = kosmos.telephonyManager diff --git a/packages/SystemUI/tests/src/com/android/systemui/ringtone/RingtonePlayerTest.java b/packages/SystemUI/tests/src/com/android/systemui/ringtone/RingtonePlayerTest.java index c231be181977..826c54787662 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ringtone/RingtonePlayerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/ringtone/RingtonePlayerTest.java @@ -23,6 +23,7 @@ import android.media.AudioManager; import android.net.Uri; import android.os.Binder; import android.os.UserHandle; +import android.util.Log; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; @@ -37,36 +38,34 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class RingtonePlayerTest extends SysuiTestCase { - private AudioManager mAudioManager; - private static final String TAG = "RingtonePlayerTest"; - @Before - public void setup() throws Exception { - mAudioManager = getContext().getSystemService(AudioManager.class); - } - @Test public void testRingtonePlayerUriUserCheck() { - android.media.IRingtonePlayer irp = mAudioManager.getRingtonePlayer(); - final AudioAttributes aa = new AudioAttributes.Builder() - .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE).build(); - // get a UserId that doesn't belong to mine - final int otherUserId = UserHandle.myUserId() == 0 ? 10 : 0; - // build a URI that I shouldn't have access to - final Uri uri = new Uri.Builder() - .scheme("content").authority(otherUserId + "@media") - .appendPath("external").appendPath("downloads") - .appendPath("bogusPathThatDoesNotMatter.mp3") - .build(); - if (android.media.audio.Flags.ringtoneUserUriCheck()) { - assertThrows(SecurityException.class, () -> - irp.play(new Binder(), uri, aa, 1.0f /*volume*/, false /*looping*/) - ); + // temporarily skipping this test + Log.i(TAG, "skipping testRingtonePlayerUriUserCheck"); + return; - assertThrows(SecurityException.class, () -> - irp.getTitle(uri)); - } + // TODO change how IRingtonePlayer is created +// android.media.IRingtonePlayer irp = mAudioManager.getRingtonePlayer(); +// final AudioAttributes aa = new AudioAttributes.Builder() +// .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE).build(); +// // get a UserId that doesn't belong to mine +// final int otherUserId = UserHandle.myUserId() == 0 ? 10 : 0; +// // build a URI that I shouldn't have access to +// final Uri uri = new Uri.Builder() +// .scheme("content").authority(otherUserId + "@media") +// .appendPath("external").appendPath("downloads") +// .appendPath("bogusPathThatDoesNotMatter.mp3") +// .build(); +// if (android.media.audio.Flags.ringtoneUserUriCheck()) { +// assertThrows(SecurityException.class, () -> +// irp.play(new Binder(), uri, aa, 1.0f /*volume*/, false /*looping*/) +// ); +// +// assertThrows(SecurityException.class, () -> +// irp.getTitle(uri)); +// } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt index b7040ee2a11e..020b5dd054b8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt @@ -35,6 +35,7 @@ import com.android.systemui.testKosmos import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.mock +import com.android.systemui.util.mockito.nullable import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.After @@ -61,10 +62,6 @@ import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.junit.MockitoJUnit -private fun <T> anyObject(): T { - return Mockito.anyObject<T>() -} - @SmallTest @RunWithLooper(setAsMainLooper = true) @RunWith(AndroidJUnit4::class) @@ -265,7 +262,7 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() { verify(statusbarStateController, never()).setState(anyInt()) verify(statusbarStateController).setLeaveOpenOnKeyguardHide(true) verify(centralSurfaces) - .showBouncerWithDimissAndCancelIfKeyguard(anyObject(), anyObject()) + .showBouncerWithDimissAndCancelIfKeyguard(nullable(), nullable()) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt index 0c0ef9d5edfe..ee9a5f3befe0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerWithScenesTest.kt @@ -67,6 +67,7 @@ import com.android.systemui.statusbar.notification.collection.provider.HighPrior import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor import com.android.systemui.statusbar.notification.headsup.mockHeadsUpManager import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier +import com.android.systemui.statusbar.notification.promoted.domain.interactor.PackageDemotionInteractor import com.android.systemui.statusbar.notification.row.icon.appIconProvider import com.android.systemui.statusbar.notification.row.icon.notificationIconStyleProvider import com.android.systemui.statusbar.notification.stack.NotificationListContainer @@ -146,6 +147,7 @@ class NotificationGutsManagerWithScenesTest : SysuiTestCase() { @Mock private lateinit var notificationManager: INotificationManager @Mock private lateinit var shortcutManager: ShortcutManager @Mock private lateinit var channelEditorDialogController: ChannelEditorDialogController + @Mock private lateinit var packageDemotionInteractor: PackageDemotionInteractor @Mock private lateinit var peopleNotificationIdentifier: PeopleNotificationIdentifier @Mock private lateinit var contextTracker: UserContextProvider @Mock private lateinit var bubblesManager: BubblesManager @@ -185,6 +187,7 @@ class NotificationGutsManagerWithScenesTest : SysuiTestCase() { launcherApps, shortcutManager, channelEditorDialogController, + packageDemotionInteractor, contextTracker, assistantFeedbackController, Optional.of(bubblesManager), @@ -438,6 +441,7 @@ class NotificationGutsManagerWithScenesTest : SysuiTestCase() { eq(iconStyleProvider), eq(onUserInteractionCallback), eq(channelEditorDialogController), + eq(packageDemotionInteractor), eq(statusBarNotification.packageName), any<NotificationChannel>(), eq(entry), @@ -473,6 +477,7 @@ class NotificationGutsManagerWithScenesTest : SysuiTestCase() { eq(iconStyleProvider), eq(onUserInteractionCallback), eq(channelEditorDialogController), + eq(packageDemotionInteractor), eq(statusBarNotification.packageName), any<NotificationChannel>(), eq(entry), @@ -508,6 +513,7 @@ class NotificationGutsManagerWithScenesTest : SysuiTestCase() { eq(iconStyleProvider), eq(onUserInteractionCallback), eq(channelEditorDialogController), + eq(packageDemotionInteractor), eq(statusBarNotification.packageName), any<NotificationChannel>(), eq(entry), diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/FoldStateListenerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/FoldStateListenerTest.kt index 2e65478714af..12f7af106d10 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/FoldStateListenerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/FoldStateListenerTest.kt @@ -108,7 +108,7 @@ class FoldStateListenerTest : SysuiTestCase() { private fun setGoToSleepStates(vararg states: Int) { mContext.orCreateTestableResources.addOverride( R.array.config_deviceStatesOnWhichToSleep, - states + states, ) } @@ -117,9 +117,10 @@ class FoldStateListenerTest : SysuiTestCase() { } companion object { - private val DEVICE_STATE_FOLDED = Kosmos().foldedDeviceStateList.first() - private val DEVICE_STATE_HALF_FOLDED = Kosmos().halfFoldedDeviceState - private val DEVICE_STATE_UNFOLDED = Kosmos().unfoldedDeviceState + private val kosmos = Kosmos() + private val DEVICE_STATE_FOLDED = kosmos.foldedDeviceStateList.first() + private val DEVICE_STATE_HALF_FOLDED = kosmos.halfFoldedDeviceState + private val DEVICE_STATE_UNFOLDED = kosmos.unfoldedDeviceState private const val FOLDED = true private const val NOT_FOLDED = false diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt index c22c62825d04..293e1fdd6d46 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt @@ -57,7 +57,7 @@ import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.Mockito.`when` import org.mockito.ArgumentMatchers.anyInt -import org.mockito.ArgumentMatchers.anyObject +import org.mockito.ArgumentMatchers.any @SmallTest @RunWith(AndroidJUnit4::class) @@ -138,7 +138,7 @@ class DeviceControlsControllerImplTest : SysuiTestCase() { `when`(secureSettings.getInt(Settings.Secure.CONTROLS_ENABLED, 1)).thenReturn(0) controller.setCallback(callback) - verify(controlsListingController, never()).addCallback(anyObject()) + verify(controlsListingController, never()).addCallback(any()) verify(callback).onControlsUpdate(null) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt index a553b176c34a..6618843ab46d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt @@ -26,9 +26,8 @@ import com.android.internal.util.LatencyTracker import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.foldedDeviceStateList -import com.android.systemui.halfFoldedDeviceState import com.android.systemui.keyguard.ScreenLifecycle -import com.android.systemui.kosmos.Kosmos +import com.android.systemui.testKosmos import com.android.systemui.unfold.util.FoldableDeviceStates import com.android.systemui.unfold.util.FoldableTestUtils import com.android.systemui.unfoldedDeviceState @@ -70,12 +69,10 @@ class UnfoldLatencyTrackerTest : SysuiTestCase() { @Before fun setUp() { MockitoAnnotations.initMocks(this) - whenever(deviceStateManager.supportedDeviceStates).thenReturn( - listOf( - Kosmos().foldedDeviceStateList[0], - Kosmos().unfoldedDeviceState + whenever(deviceStateManager.supportedDeviceStates) + .thenReturn( + listOf(testKosmos().foldedDeviceStateList[0], testKosmos().unfoldedDeviceState) ) - ) unfoldLatencyTracker = UnfoldLatencyTracker( @@ -85,7 +82,7 @@ class UnfoldLatencyTrackerTest : SysuiTestCase() { context.mainExecutor, context, context.contentResolver, - screenLifecycle + screenLifecycle, ) .apply { init() } @@ -206,7 +203,7 @@ class UnfoldLatencyTrackerTest : SysuiTestCase() { Settings.Global.putString( context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, - durationScale.toString() + durationScale.toString(), ) } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractor.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/KeyguardServiceShowLockscreenRepositoryKosmos.kt index 3cec5a9cd822..361d21dc134d 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractor.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/KeyguardServiceShowLockscreenRepositoryKosmos.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 The Android Open Source Project + * Copyright (C) 2025 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. @@ -14,10 +14,9 @@ * limitations under the License. */ -package com.android.systemui.keyguard.domain.interactor +package com.android.systemui.keyguard.data.repository import com.android.systemui.kosmos.Kosmos -import com.android.systemui.kosmos.testScope -val Kosmos.keyguardServiceShowLockscreenInteractor by - Kosmos.Fixture { KeyguardServiceShowLockscreenInteractor(backgroundScope = testScope) } +val Kosmos.keyguardServiceShowLockscreenRepository by + Kosmos.Fixture { KeyguardServiceShowLockscreenRepository() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractorKosmos.kt new file mode 100644 index 000000000000..447aa1255463 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractorKosmos.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.domain.interactor + +import com.android.systemui.keyguard.data.repository.keyguardServiceShowLockscreenRepository +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope +import com.android.systemui.settings.userTracker +import com.android.systemui.user.domain.interactor.selectedUserInteractor + +val Kosmos.keyguardServiceShowLockscreenInteractor by + Kosmos.Fixture { + KeyguardServiceShowLockscreenInteractor( + backgroundScope = testScope, + selectedUserInteractor = selectedUserInteractor, + repository = keyguardServiceShowLockscreenRepository, + userTracker = userTracker, + wmLockscreenVisibilityInteractor = { windowManagerLockscreenVisibilityInteractor }, + keyguardEnabledInteractor = keyguardEnabledInteractor, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractorKosmos.kt index f7caeb69f17e..dd868e767d9b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractorKosmos.kt @@ -18,10 +18,12 @@ package com.android.systemui.keyguard.domain.interactor import com.android.systemui.keyguard.data.repository.biometricSettingsRepository import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope val Kosmos.keyguardShowWhileAwakeInteractor by Kosmos.Fixture { KeyguardShowWhileAwakeInteractor( + backgroundScope = testScope, biometricSettingsRepository = biometricSettingsRepository, keyguardEnabledInteractor = keyguardEnabledInteractor, keyguardServiceShowLockscreenInteractor = keyguardServiceShowLockscreenInteractor, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorKosmos.kt index 43fa718cff9a..c89fb705f417 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorKosmos.kt @@ -27,7 +27,7 @@ import com.android.systemui.user.domain.interactor.selectedUserInteractor import com.android.systemui.util.settings.fakeSettings import com.android.systemui.util.time.systemClock -val Kosmos.keyguardWakeDirectlyToGoneInteractor by +val Kosmos.keyguardWakeDirectlyToGoneInteractor: KeyguardWakeDirectlyToGoneInteractor by Kosmos.Fixture { KeyguardWakeDirectlyToGoneInteractor( applicationCoroutineScope, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/promoted/domain/interactor/PackageDemotionInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/promoted/domain/interactor/PackageDemotionInteractorKosmos.kt new file mode 100644 index 000000000000..38b59945ab7d --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/promoted/domain/interactor/PackageDemotionInteractorKosmos.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2025 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.promoted.domain.interactor + +import com.android.systemui.kosmos.Kosmos + +val Kosmos.packageDemotionInteractor by Kosmos.Fixture { PackageDemotionInteractor() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/wallpapers/data/repository/FakeWallpaperRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/wallpapers/data/repository/FakeWallpaperRepository.kt index 66bb803c182d..fd90d179debc 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/wallpapers/data/repository/FakeWallpaperRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/wallpapers/data/repository/FakeWallpaperRepository.kt @@ -29,6 +29,9 @@ import kotlinx.coroutines.flow.asStateFlow class FakeWallpaperRepository : WallpaperRepository { private val _wallpaperInfo: MutableStateFlow<WallpaperInfo?> = MutableStateFlow(null) override val wallpaperInfo: StateFlow<WallpaperInfo?> = _wallpaperInfo.asStateFlow() + private val _lockscreenWallpaperInfo: MutableStateFlow<WallpaperInfo?> = MutableStateFlow(null) + override val lockscreenWallpaperInfo: StateFlow<WallpaperInfo?> = + _lockscreenWallpaperInfo.asStateFlow() private val _wallpaperSupportsAmbientMode = MutableStateFlow(false) override val wallpaperSupportsAmbientMode: Flow<Boolean> = _wallpaperSupportsAmbientMode.asStateFlow() diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryKosmos.kt index 1761503b2cc9..b4a44751c43b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryKosmos.kt @@ -19,6 +19,7 @@ package com.android.systemui.wallpapers.data.repository import android.content.applicationContext import com.android.app.wallpaperManager import com.android.systemui.broadcast.broadcastDispatcher +import com.android.systemui.common.ui.domain.interactor.configurationInteractor import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture import com.android.systemui.kosmos.testDispatcher @@ -35,5 +36,6 @@ val Kosmos.wallpaperRepository by Fixture { userRepository = userRepository, wallpaperManager = wallpaperManager, secureSettings = fakeSettings, + configurationInteractor = configurationInteractor, ) } diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java index d935626c34df..d8741975c71a 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java @@ -23,7 +23,9 @@ import static android.platform.test.ravenwood.RavenwoodSystemServer.ANDROID_PACK import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_EMPTY_RESOURCES_APK; import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_INST_RESOURCE_APK; import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_RESOURCE_APK; +import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_RUNTIME_PATH_JAVA_SYSPROP; import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_VERSION_JAVA_SYSPROP; +import static com.android.ravenwood.common.RavenwoodCommonUtils.getRavenwoodRuntimePath; import static com.android.ravenwood.common.RavenwoodCommonUtils.parseNullableInt; import static com.android.ravenwood.common.RavenwoodCommonUtils.withDefault; @@ -271,6 +273,13 @@ public class RavenwoodRuntimeEnvironmentController { dumpJavaProperties(); dumpOtherInfo(); + System.setProperty(RAVENWOOD_VERSION_JAVA_SYSPROP, "1"); + var runtimePath = getRavenwoodRuntimePath(); + System.setProperty(RAVENWOOD_RUNTIME_PATH_JAVA_SYSPROP, runtimePath); + + Log.i(TAG, "PWD=" + System.getProperty("user.dir")); + Log.i(TAG, "RuntimePath=" + runtimePath); + // Make sure libravenwood_runtime is loaded. System.load(RavenwoodCommonUtils.getJniLibraryPath(RAVENWOOD_NATIVE_RUNTIME_NAME)); @@ -314,7 +323,6 @@ public class RavenwoodRuntimeEnvironmentController { Typeface.loadPreinstalledSystemFontMap(); Typeface.loadNativeSystemFonts(); - System.setProperty(RAVENWOOD_VERSION_JAVA_SYSPROP, "1"); // This will let AndroidJUnit4 use the original runner. System.setProperty("android.junit.runner", "androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner"); diff --git a/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java b/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java index 893b354d4645..e1b537e11842 100644 --- a/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java +++ b/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java @@ -68,6 +68,8 @@ public class RavenwoodCommonUtils { RAVENWOOD_RUNTIME_PATH + "ravenwood-data/ravenwood-empty-res.apk"; public static final String RAVENWOOD_VERSION_JAVA_SYSPROP = "android.ravenwood.version"; + public static final String RAVENWOOD_RUNTIME_PATH_JAVA_SYSPROP = + "android.ravenwood.runtime_path"; /** * @return if we're running on Ravenwood. diff --git a/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/aconfig/RavenwoodAconfigFlagTest.kt b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/aconfig/RavenwoodAconfigFlagTest.kt index fd6d6fb66465..b3af8753ee83 100644 --- a/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/aconfig/RavenwoodAconfigFlagTest.kt +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/aconfig/RavenwoodAconfigFlagTest.kt @@ -25,7 +25,6 @@ import com.android.internal.os.Flags import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Assert.fail -import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -40,7 +39,6 @@ class RavenwoodAconfigSimpleReadTests { } @Test - @Ignore // TODO: Enable this test after rolling out the "2" flags. fun testTrueFlags() { assertTrue(Flags.ravenwoodFlagRo2()) assertTrue(Flags.ravenwoodFlagRw2()) @@ -67,14 +65,12 @@ class RavenwoodAconfigCheckFlagsRuleTests { @Test @RequiresFlagsDisabled(Flags.FLAG_RAVENWOOD_FLAG_RO_2) - @Ignore // TODO: Enable this test after rolling out the "2" flags. fun testRequireFlagsDisabledRo() { fail("This test shouldn't be executed") } @Test @RequiresFlagsDisabled(Flags.FLAG_RAVENWOOD_FLAG_RW_2) - @Ignore // TODO: Enable this test after rolling out the "2" flags. fun testRequireFlagsDisabledRw() { fail("This test shouldn't be executed") } diff --git a/ravenwood/tests/resapk_test/Android.bp b/ravenwood/tests/resapk_test/Android.bp index c14576550f78..960b3ed0013a 100644 --- a/ravenwood/tests/resapk_test/Android.bp +++ b/ravenwood/tests/resapk_test/Android.bp @@ -10,7 +10,7 @@ package { android_ravenwood_test { name: "RavenwoodResApkTest", - resource_apk: "RavenwoodResApkTest-apk", + resource_apk: "RavenwoodResApkTest-res", libs: [ // Normally, tests shouldn't directly access it, but we need to access RavenwoodCommonUtils @@ -24,6 +24,7 @@ android_ravenwood_test { ], srcs: [ "test/**/*.java", + ":RavenwoodResApkTest-res{.aapt.srcjar}", ], sdk_version: "test_current", auto_gen_config: true, diff --git a/ravenwood/tests/resapk_test/apk/Android.bp b/ravenwood/tests/resapk_test/apk/Android.bp index 10ed5e2f8410..fd8976df4316 100644 --- a/ravenwood/tests/resapk_test/apk/Android.bp +++ b/ravenwood/tests/resapk_test/apk/Android.bp @@ -8,7 +8,13 @@ package { } android_app { - name: "RavenwoodResApkTest-apk", + name: "RavenwoodResApkTest-res", sdk_version: "current", + + use_resource_processor: false, + + flags_packages: [ + "com.android.internal.os.flags-aconfig", + ], } diff --git a/ravenwood/tests/resapk_test/apk/res/layout/testlayout.xml b/ravenwood/tests/resapk_test/apk/res/layout/testlayout.xml new file mode 100644 index 000000000000..17cdb868fc6b --- /dev/null +++ b/ravenwood/tests/resapk_test/apk/res/layout/testlayout.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"> + <View android:id="@+id/view1" text="no-flags" /> + <View android:id="@+id/view2" text="ro-enabled" android:featureFlag="com.android.internal.os.ravenwood_flag_ro_2"/> + <View android:id="@+id/view3" text="ro-disabled" android:featureFlag="com.android.internal.os.ravenwood_flag_ro_1"/> + <View android:id="@+id/view2" text="rw-enabled" android:featureFlag="com.android.internal.os.ravenwood_flag_rw_2"/> + <View android:id="@+id/view3" text="rw-disabled" android:featureFlag="com.android.internal.os.ravenwood_flag_rw_1"/> +</LinearLayout> diff --git a/ravenwood/tests/resapk_test/apk/res/values/strings.xml b/ravenwood/tests/resapk_test/apk/res/values/strings.xml index 23d4c0f21007..5abf7475caa7 100644 --- a/ravenwood/tests/resapk_test/apk/res/values/strings.xml +++ b/ravenwood/tests/resapk_test/apk/res/values/strings.xml @@ -13,7 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> <!-- Test string 1 --> <string name="test_string_1" translatable="false" >Test String 1</string> + <!-- values can only use readonly flags --> + <string name="test_string_enabled" translatable="false" android:featureFlag="com.android.internal.os.ravenwood_flag_ro_2">Enabled</string> + <string name="test_string_disabled" translatable="false" android:featureFlag="com.android.internal.os.ravenwood_flag_ro_1">Disabled</string> </resources> diff --git a/ravenwood/tests/resapk_test/test/com/android/ravenwoodtest/resapk_test/RavenwoodResApkTest.java b/ravenwood/tests/resapk_test/test/com/android/ravenwoodtest/resapk_test/RavenwoodResApkTest.java index e547114bbe40..89f8d40da7d4 100644 --- a/ravenwood/tests/resapk_test/test/com/android/ravenwoodtest/resapk_test/RavenwoodResApkTest.java +++ b/ravenwood/tests/resapk_test/test/com/android/ravenwoodtest/resapk_test/RavenwoodResApkTest.java @@ -16,23 +16,41 @@ package com.android.ravenwoodtest.resapk_test; +import static com.google.common.truth.Truth.assertThat; + import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; + +import android.content.Context; +import android.content.res.XmlResourceParser; +import android.platform.test.annotations.DisabledOnRavenwood; +import android.util.Log; + import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import com.android.ravenwood.common.RavenwoodCommonUtils; +import com.android.ravenwood.restest_apk.R; import org.junit.Test; import org.junit.runner.RunWith; +import org.xmlpull.v1.XmlPullParser; import java.io.File; +import java.util.ArrayList; +import java.util.List; @RunWith(AndroidJUnit4.class) public class RavenwoodResApkTest { + private static final String TAG = "RavenwoodResApkTest"; + + private static final Context sContext = + InstrumentationRegistry.getInstrumentation().getContext(); + /** * Ensure the file "ravenwood-res.apk" exists. - * TODO Check the content of it, once Ravenwood supports resources. The file should - * be a copy of RavenwoodResApkTest-apk.apk */ @Test public void testResApkExists() { @@ -48,4 +66,73 @@ public class RavenwoodResApkTest { assertTrue(new File( RavenwoodCommonUtils.getRavenwoodRuntimePath() + "/" + file).exists()); } + + @Test + public void testReadStringNoFlag() { + assertThat(sContext.getString(R.string.test_string_1)).isEqualTo("Test String 1"); + } + + @Test + public void testReadStringRoFlagEnabled() { + assertThat(sContext.getString(R.string.test_string_enabled)).isEqualTo("Enabled"); + } + + @Test + public void testReadStringRoFlagDisabled() { + assertThrows(android.content.res.Resources.NotFoundException.class, () -> { + sContext.getString(R.string.test_string_disabled); + }); + } + + /** + * Look into the layout and collect the "text" attribute. + * + * It _should_ respect android:featureFlag, but until b/396458006 gets fixed, this returns + * even disabled elements. + */ + private List<String> getTextsFromEnabledChildren() throws Exception { + try (XmlResourceParser parser = sContext.getResources().getLayout(R.layout.testlayout)) { + assertNotNull(parser); + + var ret = new ArrayList<String>(); + + while (parser.next() != XmlPullParser.END_DOCUMENT) { + var text = parser.getAttributeValue(null, "text"); + if (text == null) { + continue; + } + + Log.d(TAG, "Found tag: " + parser.getName() + " text='" + text + "'"); + ret.add(text); + } + return ret; + } + } + + @Test + public void testElementNoFlag() throws Exception { + assertThat(getTextsFromEnabledChildren()).contains("no-flags"); + } + + @Test + public void testElementWithRoFlagEnabled() throws Exception { + assertThat(getTextsFromEnabledChildren()).contains("ro-enabled"); + } + + @Test + public void testElementWithRoFlagDisabled() throws Exception { + assertThat(getTextsFromEnabledChildren()).doesNotContain("ro-disabled"); + } + + @Test + public void testElementWithRwFlagEnabled() throws Exception { + assertThat(getTextsFromEnabledChildren()).contains("rw-enabled"); + } + + @Test + @DisabledOnRavenwood(bug = 396458006, + reason = "RW flags in XML are all handled as enabled for now") + public void testElementWithRwFlagDisabled() throws Exception { + assertThat(getTextsFromEnabledChildren()).doesNotContain("rw-disabled"); + } } diff --git a/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java b/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java index a71224a68125..23166a800245 100644 --- a/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java +++ b/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java @@ -21,6 +21,7 @@ import static android.view.MotionEvent.BUTTON_SECONDARY; import static android.view.accessibility.AccessibilityManager.AUTOCLICK_CURSOR_AREA_SIZE_DEFAULT; import static android.view.accessibility.AccessibilityManager.AUTOCLICK_DELAY_DEFAULT; import static android.view.accessibility.AccessibilityManager.AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT_DEFAULT; +import static android.view.accessibility.AccessibilityManager.AUTOCLICK_REVERT_TO_LEFT_CLICK_DEFAULT; import static com.android.server.accessibility.autoclick.AutoclickIndicatorView.SHOW_INDICATOR_DELAY_TIME; import static com.android.server.accessibility.autoclick.AutoclickTypePanel.AUTOCLICK_TYPE_LEFT_CLICK; @@ -159,7 +160,8 @@ public class AutoclickController extends BaseEventStreamTransformation { initiateAutoclickIndicator(handler); } - mClickScheduler = new ClickScheduler(handler, AUTOCLICK_DELAY_DEFAULT); + mClickScheduler = new ClickScheduler( + handler, AUTOCLICK_DELAY_DEFAULT); mAutoclickSettingsObserver = new AutoclickSettingsObserver(mUserId, handler); mAutoclickSettingsObserver.start( mContext.getContentResolver(), @@ -304,6 +306,10 @@ public class AutoclickController extends BaseEventStreamTransformation { Settings.Secure.getUriFor( Settings.Secure.ACCESSIBILITY_AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT); + private final Uri mAutoclickRevertToLeftClickSettingUri = + Settings.Secure.getUriFor( + Settings.Secure.ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK); + private ContentResolver mContentResolver; private ClickScheduler mClickScheduler; private AutoclickIndicatorScheduler mAutoclickIndicatorScheduler; @@ -368,6 +374,13 @@ public class AutoclickController extends BaseEventStreamTransformation { /* observer= */ this, mUserId); onChange(/* selfChange= */ true, mAutoclickIgnoreMinorCursorMovementSettingUri); + + mContentResolver.registerContentObserver( + mAutoclickRevertToLeftClickSettingUri, + /* notifyForDescendants= */ false, + /* observer= */ this, + mUserId); + onChange(/* selfChange= */ true, mAutoclickRevertToLeftClickSettingUri); } } @@ -424,6 +437,20 @@ public class AutoclickController extends BaseEventStreamTransformation { == AccessibilityUtils.State.ON; mClickScheduler.setIgnoreMinorCursorMovement(ignoreMinorCursorMovement); } + + if (mAutoclickRevertToLeftClickSettingUri.equals(uri)) { + boolean revertToLeftClick = + Settings.Secure.getIntForUser( + mContentResolver, + Settings.Secure + .ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK, + AUTOCLICK_REVERT_TO_LEFT_CLICK_DEFAULT + ? AccessibilityUtils.State.ON + : AccessibilityUtils.State.OFF, + mUserId) + == AccessibilityUtils.State.ON; + mClickScheduler.setRevertToLeftClick(revertToLeftClick); + } } } } @@ -505,6 +532,9 @@ public class AutoclickController extends BaseEventStreamTransformation { /** Whether the minor cursor movement should be ignored. */ private boolean mIgnoreMinorCursorMovement = AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT_DEFAULT; + /** Whether the autoclick type reverts to left click once performing an action. */ + private boolean mRevertToLeftClick = AUTOCLICK_REVERT_TO_LEFT_CLICK_DEFAULT; + /** Whether there is pending click. */ private boolean mActive; /** If active, time at which pending click is scheduled. */ @@ -555,6 +585,7 @@ public class AutoclickController extends BaseEventStreamTransformation { sendClick(); resetInternalState(); + resetSelectedClickTypeIfNecessary(); } /** @@ -633,6 +664,11 @@ public class AutoclickController extends BaseEventStreamTransformation { return mDelay; } + @VisibleForTesting + boolean getRevertToLeftClickForTesting() { + return mRevertToLeftClick; + } + /** * Updates the time at which click sequence should occur. * @@ -692,6 +728,12 @@ public class AutoclickController extends BaseEventStreamTransformation { } } + private void resetSelectedClickTypeIfNecessary() { + if (mRevertToLeftClick && mActiveClickType != AUTOCLICK_TYPE_LEFT_CLICK) { + mAutoclickTypePanel.resetSelectedClickType(); + } + } + /** * @param event Observed motion event. * @return Whether the event coords are far enough from the anchor for the event not to be @@ -716,6 +758,10 @@ public class AutoclickController extends BaseEventStreamTransformation { mIgnoreMinorCursorMovement = ignoreMinorCursorMovement; } + public void setRevertToLeftClick(boolean revertToLeftClick) { + mRevertToLeftClick = revertToLeftClick; + } + private void updateMovementSlop(double slop) { mMovementSlop = slop; } diff --git a/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickTypePanel.java b/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickTypePanel.java index 90ddc43ae3ed..5a484d42eb96 100644 --- a/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickTypePanel.java +++ b/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickTypePanel.java @@ -266,16 +266,28 @@ public class AutoclickTypePanel { } private void initializeButtonState() { - mLeftClickButton.setOnClickListener(v -> togglePanelExpansion(AUTOCLICK_TYPE_LEFT_CLICK)); - mRightClickButton.setOnClickListener(v -> togglePanelExpansion(AUTOCLICK_TYPE_RIGHT_CLICK)); + // Use `createButtonListener()` to append extra pause logic to each button's click. + mLeftClickButton.setOnClickListener( + wrapWithTogglePauseListener(v -> togglePanelExpansion(AUTOCLICK_TYPE_LEFT_CLICK))); + mRightClickButton.setOnClickListener( + wrapWithTogglePauseListener(v -> togglePanelExpansion(AUTOCLICK_TYPE_RIGHT_CLICK))); mDoubleClickButton.setOnClickListener( - v -> togglePanelExpansion(AUTOCLICK_TYPE_DOUBLE_CLICK)); - mScrollButton.setOnClickListener(v -> togglePanelExpansion(AUTOCLICK_TYPE_SCROLL)); - mDragButton.setOnClickListener(v -> togglePanelExpansion(AUTOCLICK_TYPE_DRAG)); - mPositionButton.setOnClickListener(v -> moveToNextCorner()); + wrapWithTogglePauseListener( + v -> togglePanelExpansion(AUTOCLICK_TYPE_DOUBLE_CLICK))); + mScrollButton.setOnClickListener( + wrapWithTogglePauseListener(v -> togglePanelExpansion(AUTOCLICK_TYPE_SCROLL))); + mDragButton.setOnClickListener( + wrapWithTogglePauseListener(v -> togglePanelExpansion(AUTOCLICK_TYPE_DRAG))); + mPositionButton.setOnClickListener(wrapWithTogglePauseListener(v -> moveToNextCorner())); + + // The pause button calls `togglePause()` directly so it does not need extra logic. mPauseButton.setOnClickListener(v -> togglePause()); - // Initializes panel as collapsed state and only displays the left click button. + resetSelectedClickType(); + } + + /** Reset panel as collapsed state and only displays the left click button. */ + public void resetSelectedClickType() { hideAllClickTypeButtons(); mLeftClickButton.setVisibility(View.VISIBLE); setSelectedClickType(AUTOCLICK_TYPE_LEFT_CLICK); @@ -517,6 +529,18 @@ public class AutoclickTypePanel { return true; } + /* Appends a check of the pause state to the button's listener. */ + private View.OnClickListener wrapWithTogglePauseListener(View.OnClickListener listener) { + return v -> { + listener.onClick(v); + + // Resumes autoclick if the button is clicked while in a paused state. + if (mPaused) { + togglePause(); + } + }; + } + @VisibleForTesting boolean getExpansionStateForTesting() { return mExpanded; diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java index 48d21c3a222f..fa67ef5156c1 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java @@ -981,13 +981,18 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba @Override public void handleCancel(@CancellationReason int cancellationReason) { - Slog.w(TAG, "Full backup cancel of " + mTarget.packageName); + Slog.w( + TAG, + "Cancelled backup: " + mTarget.packageName + " reason:" + cancellationReason); mBackupManagerMonitorEventSender.monitorEvent( BackupManagerMonitor.LOG_EVENT_ID_FULL_BACKUP_CANCEL, mTarget, BackupManagerMonitor.LOG_EVENT_CATEGORY_AGENT, - /* extras= */ null); + BackupManagerMonitorEventSender.putMonitoringExtra( + /* extras= */ null, + BackupManagerMonitor.EXTRA_LOG_CANCELLATION_REASON, + cancellationReason)); mIsCancelled = true; // Cancel tasks spun off by this task. mUserBackupManagerService.handleCancel(mEphemeralToken, cancellationReason); diff --git a/services/core/java/com/android/server/adb/AdbService.java b/services/core/java/com/android/server/adb/AdbService.java index aae48daa5dde..40f7c873eae8 100644 --- a/services/core/java/com/android/server/adb/AdbService.java +++ b/services/core/java/com/android/server/adb/AdbService.java @@ -143,19 +143,16 @@ public class AdbService extends IAdbManager.Stub { @Override public File getAdbKeysFile() { - return mDebuggingManager == null ? null : mDebuggingManager.getUserKeyFile(); + return mDebuggingManager.getUserKeyFile(); } @Override public File getAdbTempKeysFile() { - return mDebuggingManager == null ? null : mDebuggingManager.getAdbTempKeysFile(); + return mDebuggingManager.getAdbTempKeysFile(); } @Override public void notifyKeyFilesUpdated() { - if (mDebuggingManager == null) { - return; - } mDebuggingManager.notifyKeyFilesUpdated(); } @@ -237,7 +234,7 @@ public class AdbService extends IAdbManager.Stub { private boolean mIsAdbUsbEnabled; private boolean mIsAdbWifiEnabled; - private AdbDebuggingManager mDebuggingManager; + private final AdbDebuggingManager mDebuggingManager; private ContentObserver mObserver; @@ -287,38 +284,27 @@ public class AdbService extends IAdbManager.Stub { */ public void bootCompleted() { Slog.d(TAG, "boot completed"); - if (mDebuggingManager != null) { - mDebuggingManager.setAdbEnabled(mIsAdbUsbEnabled, AdbTransportType.USB); - mDebuggingManager.setAdbEnabled(mIsAdbWifiEnabled, AdbTransportType.WIFI); - } + mDebuggingManager.setAdbEnabled(mIsAdbUsbEnabled, AdbTransportType.USB); + mDebuggingManager.setAdbEnabled(mIsAdbWifiEnabled, AdbTransportType.WIFI); } @Override public void allowDebugging(boolean alwaysAllow, @NonNull String publicKey) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); Preconditions.checkStringNotEmpty(publicKey); - if (mDebuggingManager != null) { - mDebuggingManager.allowDebugging(alwaysAllow, publicKey); - } + mDebuggingManager.allowDebugging(alwaysAllow, publicKey); } @Override public void denyDebugging() { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); - if (mDebuggingManager != null) { - mDebuggingManager.denyDebugging(); - } + mDebuggingManager.denyDebugging(); } @Override public void clearDebuggingKeys() { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); - if (mDebuggingManager != null) { - mDebuggingManager.clearDebuggingKeys(); - } else { - throw new RuntimeException("Cannot clear ADB debugging keys, " - + "AdbDebuggingManager not enabled"); - } + mDebuggingManager.clearDebuggingKeys(); } /** @@ -350,25 +336,18 @@ public class AdbService extends IAdbManager.Stub { public void allowWirelessDebugging(boolean alwaysAllow, @NonNull String bssid) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); Preconditions.checkStringNotEmpty(bssid); - if (mDebuggingManager != null) { - mDebuggingManager.allowWirelessDebugging(alwaysAllow, bssid); - } + mDebuggingManager.allowWirelessDebugging(alwaysAllow, bssid); } @Override public void denyWirelessDebugging() { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); - if (mDebuggingManager != null) { - mDebuggingManager.denyWirelessDebugging(); - } + mDebuggingManager.denyWirelessDebugging(); } @Override public FingerprintAndPairDevice[] getPairedDevices() { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); - if (mDebuggingManager == null) { - return null; - } Map<String, PairDevice> map = mDebuggingManager.getPairedDevices(); FingerprintAndPairDevice[] ret = new FingerprintAndPairDevice[map.size()]; int i = 0; @@ -385,17 +364,13 @@ public class AdbService extends IAdbManager.Stub { public void unpairDevice(@NonNull String fingerprint) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); Preconditions.checkStringNotEmpty(fingerprint); - if (mDebuggingManager != null) { - mDebuggingManager.unpairDevice(fingerprint); - } + mDebuggingManager.unpairDevice(fingerprint); } @Override public void enablePairingByPairingCode() { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); - if (mDebuggingManager != null) { - mDebuggingManager.enablePairingByPairingCode(); - } + mDebuggingManager.enablePairingByPairingCode(); } @Override @@ -403,27 +378,19 @@ public class AdbService extends IAdbManager.Stub { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); Preconditions.checkStringNotEmpty(serviceName); Preconditions.checkStringNotEmpty(password); - if (mDebuggingManager != null) { - mDebuggingManager.enablePairingByQrCode(serviceName, password); - } + mDebuggingManager.enablePairingByQrCode(serviceName, password); } @Override public void disablePairing() { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); - if (mDebuggingManager != null) { - mDebuggingManager.disablePairing(); - } + mDebuggingManager.disablePairing(); } @Override public int getAdbWirelessPort() { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_DEBUGGING, null); - if (mDebuggingManager != null) { - return mDebuggingManager.getAdbWirelessPort(); - } - // If ro.adb.secure=0 - return mConnectionPort.get(); + return mDebuggingManager.getAdbWirelessPort(); } @Override @@ -503,7 +470,7 @@ public class AdbService extends IAdbManager.Stub { } else if (transportType == AdbTransportType.WIFI && enable != mIsAdbWifiEnabled) { mIsAdbWifiEnabled = enable; if (mIsAdbWifiEnabled) { - if (!AdbProperties.secure().orElse(false) && mDebuggingManager == null) { + if (!AdbProperties.secure().orElse(false)) { // Start adbd. If this is secure adb, then we defer enabling adb over WiFi. SystemProperties.set(WIFI_PERSISTENT_CONFIG_PROPERTY, "1"); mConnectionPortPoller = @@ -537,9 +504,7 @@ public class AdbService extends IAdbManager.Stub { } } - if (mDebuggingManager != null) { - mDebuggingManager.setAdbEnabled(enable, transportType); - } + mDebuggingManager.setAdbEnabled(enable, transportType); Slog.d(TAG, "Broadcasting enable = " + enable + ", type = " + transportType); mCallbacks.broadcast((callback) -> { @@ -586,11 +551,8 @@ public class AdbService extends IAdbManager.Stub { dump = new DualDumpOutputStream(new IndentingPrintWriter(pw, " ")); } - if (mDebuggingManager != null) { - mDebuggingManager.dump(dump, "debugging_manager", - AdbServiceDumpProto.DEBUGGING_MANAGER); - } - + mDebuggingManager.dump(dump, "debugging_manager", + AdbServiceDumpProto.DEBUGGING_MANAGER); dump.flush(); } else { pw.println("Dump current ADB state"); diff --git a/services/core/java/com/android/server/am/BroadcastConstants.java b/services/core/java/com/android/server/am/BroadcastConstants.java index 81d34f67dee9..fe4fa1068bb3 100644 --- a/services/core/java/com/android/server/am/BroadcastConstants.java +++ b/services/core/java/com/android/server/am/BroadcastConstants.java @@ -41,6 +41,7 @@ import dalvik.annotation.optimization.NeverCompile; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.concurrent.TimeUnit; /** * Tunable parameters for broadcast dispatch policy @@ -286,6 +287,17 @@ public class BroadcastConstants { "max_frozen_outgoing_broadcasts"; private static final int DEFAULT_MAX_FROZEN_OUTGOING_BROADCASTS = 32; + /** + * For {@link BroadcastQueueImpl}: Indicates how long after a process start was initiated, + * it should be considered abandoned and discarded. + */ + public long PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS = + DEFAULT_PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS * Build.HW_TIMEOUT_MULTIPLIER; + private static final String KEY_PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS = + "pending_cold_start_abandon_timeout_millis"; + private static final long DEFAULT_PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS = + TimeUnit.MINUTES.toMillis(5); + // Settings override tracking for this instance private String mSettingsKey; private SettingsObserver mSettingsObserver; @@ -434,6 +446,10 @@ public class BroadcastConstants { MAX_FROZEN_OUTGOING_BROADCASTS = getDeviceConfigInt( KEY_MAX_FROZEN_OUTGOING_BROADCASTS, DEFAULT_MAX_FROZEN_OUTGOING_BROADCASTS); + PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS = getDeviceConfigLong( + KEY_PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS, + DEFAULT_PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS) + * Build.HW_TIMEOUT_MULTIPLIER; } // TODO: migrate BroadcastRecord to accept a BroadcastConstants @@ -491,6 +507,8 @@ public class BroadcastConstants { PENDING_COLD_START_CHECK_INTERVAL_MILLIS).println(); pw.print(KEY_MAX_FROZEN_OUTGOING_BROADCASTS, MAX_FROZEN_OUTGOING_BROADCASTS).println(); + pw.print(KEY_PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS, + PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS).println(); pw.decreaseIndent(); pw.println(); } diff --git a/services/core/java/com/android/server/am/BroadcastProcessQueue.java b/services/core/java/com/android/server/am/BroadcastProcessQueue.java index 508c01802156..c0fe73877c01 100644 --- a/services/core/java/com/android/server/am/BroadcastProcessQueue.java +++ b/services/core/java/com/android/server/am/BroadcastProcessQueue.java @@ -245,6 +245,24 @@ class BroadcastProcessQueue { */ private final ArrayList<BroadcastRecord> mOutgoingBroadcasts = new ArrayList<>(); + /** + * The timestamp, in {@link SystemClock#uptimeMillis()}, at which a cold start was initiated + * for the process associated with this queue. + * + * Note: We could use the already existing {@link ProcessRecord#getStartUptime()} instead + * of this, but the need for this timestamp is to identify an issue (b/393898613) where the + * suspicion is that process is not attached or getting changed. So, we don't want to rely on + * ProcessRecord directly for this purpose. + */ + private long mProcessStartInitiatedTimestampMillis; + + /** + * Indicates whether the number of current receivers has been incremented using + * {@link ProcessReceiverRecord#incrementCurReceivers()}. This allows to skip decrementing + * the receivers when it is not required. + */ + private boolean mCurReceiversIncremented; + public BroadcastProcessQueue(@NonNull BroadcastConstants constants, @NonNull String processName, int uid) { this.constants = Objects.requireNonNull(constants); @@ -652,6 +670,52 @@ class BroadcastProcessQueue { return mActiveFirstLaunch; } + public void incrementCurAppReceivers() { + app.mReceivers.incrementCurReceivers(); + mCurReceiversIncremented = true; + } + + public void decrementCurAppReceivers() { + if (mCurReceiversIncremented) { + app.mReceivers.decrementCurReceivers(); + mCurReceiversIncremented = false; + } + } + + public void setProcessStartInitiatedTimestampMillis(@UptimeMillisLong long timestampMillis) { + mProcessStartInitiatedTimestampMillis = timestampMillis; + } + + @UptimeMillisLong + public long getProcessStartInitiatedTimestampMillis() { + return mProcessStartInitiatedTimestampMillis; + } + + public boolean hasProcessStartInitiationTimedout() { + if (mProcessStartInitiatedTimestampMillis <= 0) { + return false; + } + return (SystemClock.uptimeMillis() - mProcessStartInitiatedTimestampMillis) + > constants.PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS; + } + + /** + * Returns if the process start initiation is expected to be timed out at this point. This + * allows us to dump necessary state for debugging before the process start is timed out + * and discarded. + */ + public boolean isProcessStartInitiationTimeoutExpected() { + if (mProcessStartInitiatedTimestampMillis <= 0) { + return false; + } + return (SystemClock.uptimeMillis() - mProcessStartInitiatedTimestampMillis) + > constants.PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS / 2; + } + + public void clearProcessStartInitiatedTimestampMillis() { + mProcessStartInitiatedTimestampMillis = 0; + } + /** * Get package name of the first application loaded into this process. */ @@ -1558,6 +1622,10 @@ class BroadcastProcessQueue { if (mActiveReEnqueued) { pw.print("activeReEnqueued:"); pw.println(mActiveReEnqueued); } + if (mProcessStartInitiatedTimestampMillis > 0) { + pw.print("processStartInitiatedTimestamp:"); pw.println( + TimeUtils.formatUptime(mProcessStartInitiatedTimestampMillis)); + } } @NeverCompile diff --git a/services/core/java/com/android/server/am/BroadcastQueueImpl.java b/services/core/java/com/android/server/am/BroadcastQueueImpl.java index d276b9a94791..6e893ad0a425 100644 --- a/services/core/java/com/android/server/am/BroadcastQueueImpl.java +++ b/services/core/java/com/android/server/am/BroadcastQueueImpl.java @@ -534,6 +534,7 @@ class BroadcastQueueImpl extends BroadcastQueue { // skip to look for another warm process if (mRunningColdStart == null) { mRunningColdStart = queue; + mRunningColdStart.clearProcessStartInitiatedTimestampMillis(); } else if (isPendingColdStartValid()) { // Move to considering next runnable queue queue = nextQueue; @@ -542,6 +543,7 @@ class BroadcastQueueImpl extends BroadcastQueue { // Pending cold start is not valid, so clear it and move on. clearInvalidPendingColdStart(); mRunningColdStart = queue; + mRunningColdStart.clearProcessStartInitiatedTimestampMillis(); } } @@ -588,7 +590,9 @@ class BroadcastQueueImpl extends BroadcastQueue { @GuardedBy("mService") private boolean isPendingColdStartValid() { - if (mRunningColdStart.app.getPid() > 0) { + if (mRunningColdStart.hasProcessStartInitiationTimedout()) { + return false; + } else if (mRunningColdStart.app.getPid() > 0) { // If the process has already started, check if it wasn't killed. return !mRunningColdStart.app.isKilled(); } else { @@ -673,6 +677,7 @@ class BroadcastQueueImpl extends BroadcastQueue { if ((mRunningColdStart != null) && (mRunningColdStart == queue)) { // We've been waiting for this app to cold start, and it's ready // now; dispatch its next broadcast and clear the slot + mRunningColdStart.clearProcessStartInitiatedTimestampMillis(); mRunningColdStart = null; // Now that we're running warm, we can finally request that OOM @@ -756,6 +761,7 @@ class BroadcastQueueImpl extends BroadcastQueue { // We've been waiting for this app to cold start, and it had // trouble; clear the slot and fail delivery below + mRunningColdStart.clearProcessStartInitiatedTimestampMillis(); mRunningColdStart = null; // We might be willing to kick off another cold start @@ -1036,6 +1042,7 @@ class BroadcastQueueImpl extends BroadcastQueue { "startProcessLocked failed"); return true; } + queue.setProcessStartInitiatedTimestampMillis(SystemClock.uptimeMillis()); // TODO: b/335420031 - cache receiver intent to avoid multiple calls to getReceiverIntent. mService.mProcessList.getAppStartInfoTracker().handleProcessBroadcastStart( startTimeNs, queue.app, r.getReceiverIntent(receiver), r.alarm /* isAlarm */); @@ -1991,6 +1998,32 @@ class BroadcastQueueImpl extends BroadcastQueue { if (mRunningColdStart != null) { checkState(getRunningIndexOf(mRunningColdStart) >= 0, "isOrphaned " + mRunningColdStart); + + final BroadcastProcessQueue queue = getProcessQueue(mRunningColdStart.processName, + mRunningColdStart.uid); + checkState(queue == mRunningColdStart, "Conflicting " + mRunningColdStart + + " with queue " + queue + + ";\n mRunningColdStart.app: " + mRunningColdStart.app.toDetailedString() + + ";\n queue.app: " + queue.app.toDetailedString()); + + checkState(mRunningColdStart.app != null, "Empty cold start queue " + + mRunningColdStart); + + if (mRunningColdStart.isProcessStartInitiationTimeoutExpected()) { + final StringBuilder sb = new StringBuilder(); + sb.append("Process start timeout expected for app "); + sb.append(mRunningColdStart.app); + sb.append(" in queue "); + sb.append(mRunningColdStart); + sb.append("; startUpTime: "); + final long startupTimeMs = + mRunningColdStart.getProcessStartInitiatedTimestampMillis(); + sb.append(startupTimeMs == 0 ? "<none>" + : TimeUtils.formatDuration(startupTimeMs - SystemClock.uptimeMillis())); + sb.append(";\n app: "); + sb.append(mRunningColdStart.app.toDetailedString()); + checkState(false, sb.toString()); + } } // Verify health of all known process queues @@ -2090,7 +2123,7 @@ class BroadcastQueueImpl extends BroadcastQueue { @GuardedBy("mService") private void notifyStartedRunning(@NonNull BroadcastProcessQueue queue) { if (queue.app != null) { - queue.app.mReceivers.incrementCurReceivers(); + queue.incrementCurAppReceivers(); // Don't bump its LRU position if it's in the background restricted. if (mService.mInternal.getRestrictionLevel( @@ -2115,7 +2148,7 @@ class BroadcastQueueImpl extends BroadcastQueue { @GuardedBy("mService") private void notifyStoppedRunning(@NonNull BroadcastProcessQueue queue) { if (queue.app != null) { - queue.app.mReceivers.decrementCurReceivers(); + queue.decrementCurAppReceivers(); if (queue.runningOomAdjusted) { mService.enqueueOomAdjTargetLocked(queue.app); diff --git a/services/core/java/com/android/server/am/OWNERS b/services/core/java/com/android/server/am/OWNERS index 4b6d6bc955cc..fd2d8352eb4f 100644 --- a/services/core/java/com/android/server/am/OWNERS +++ b/services/core/java/com/android/server/am/OWNERS @@ -61,7 +61,7 @@ per-file *Oom* = file:/OOM_ADJUSTER_OWNERS per-file ProcessStateController.java = file:/OOM_ADJUSTER_OWNERS # Miscellaneous -per-file SettingsToPropertiesMapper.java = omakoto@google.com, yamasani@google.com, dzshen@google.com, zhidou@google.com, tedbauer@google.com +per-file SettingsToPropertiesMapper.java = omakoto@google.com, yamasani@google.com, dzshen@google.com, zhidou@google.com per-file CarUserSwitchingDialog.java = file:platform/packages/services/Car:/OWNERS # Activity Security diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index eea667ef2f39..400c699bf93f 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -70,6 +70,7 @@ import com.android.server.wm.WindowProcessController; import com.android.server.wm.WindowProcessListener; import java.io.PrintWriter; +import java.io.StringWriter; import java.util.Arrays; import java.util.List; import java.util.function.Consumer; @@ -1414,6 +1415,16 @@ class ProcessRecord implements WindowProcessListener { return mStringName = sb.toString(); } + String toDetailedString() { + final StringBuilder sb = new StringBuilder(); + sb.append(this); + final StringWriter sw = new StringWriter(); + final PrintWriter pw = new PrintWriter(sw); + dump(pw, " "); + sb.append(sw); + return sb.toString(); + } + /* * Return true if package has been added false if not */ diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index cfd22fbdeece..cb4342f27bc8 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -253,11 +253,12 @@ public class SettingsToPropertiesMapper { "pixel_state_server", "pixel_system_sw_video", "pixel_video_sw", + "pixel_vpn", "pixel_watch", + "pixel_watch_debug_trace", "pixel_wifi", "platform_compat", "platform_security", - "pixel_watch_debug_trace", "pmw", "power", "preload_safety", diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index f7d7ed541780..fb33cb1ff8c0 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -367,7 +367,7 @@ public class AppOpsService extends IAppOpsService.Stub { private static final Duration RATE_LIMITER_WINDOW = Duration.ofMillis(10); private final RateLimiter mRateLimiter = new RateLimiter(RATE_LIMITER_WINDOW); - volatile @NonNull HistoricalRegistry mHistoricalRegistry; + volatile @NonNull HistoricalRegistryInterface mHistoricalRegistry; /* * These are app op restrictions imposed per user from various parties. @@ -1056,7 +1056,11 @@ public class AppOpsService extends IAppOpsService.Stub { AppOpsManager.invalidateAppOpModeCache(); AppOpsManager.disableAppOpModeCache(); - mHistoricalRegistry = new HistoricalRegistry(this, context); + if (Flags.enableAllSqliteAppopsAccesses()) { + mHistoricalRegistry = new HistoricalRegistrySql(context); + } else { + mHistoricalRegistry = new HistoricalRegistry(this, context); + } } public void publish() { @@ -1424,7 +1428,7 @@ public class AppOpsService extends IAppOpsService.Stub { @GuardedBy("this") private void packageRemovedLocked(int uid, String packageName) { - getIoHandler().post(PooledLambda.obtainRunnable(HistoricalRegistry::clearHistory, + getIoHandler().post(PooledLambda.obtainRunnable(HistoricalRegistryInterface::clearHistory, mHistoricalRegistry, uid, packageName)); UidState uidState = mUidStates.get(uid); @@ -1992,10 +1996,12 @@ public class AppOpsService extends IAppOpsService.Stub { new String[attributionChainExemptPackages.size()]) : null; // Must not hold the appops lock - getIoHandler().post(PooledLambda.obtainRunnable(HistoricalRegistry::getHistoricalOps, + getIoHandler().post(PooledLambda.obtainRunnable( + HistoricalRegistryInterface::getHistoricalOps, mHistoricalRegistry, uid, packageName, attributionTag, opNamesArray, dataType, filter, beginTimeMillis, endTimeMillis, flags, chainExemptPkgArray, - callback).recycleOnUse()); + callback + ).recycleOnUse()); } @Override @@ -2024,7 +2030,7 @@ public class AppOpsService extends IAppOpsService.Stub { // Must not hold the appops lock getIoHandler().post(PooledLambda.obtainRunnable( - HistoricalRegistry::getHistoricalOpsFromDiskRaw, + HistoricalRegistryInterface::getHistoricalOpsFromDiskRaw, mHistoricalRegistry, uid, packageName, attributionTag, opNamesArray, dataType, filter, beginTimeMillis, endTimeMillis, flags, chainExemptPkgArray, callback).recycleOnUse()); @@ -6961,7 +6967,6 @@ public class AppOpsService extends IAppOpsService.Stub { offsetHistory_enforcePermission(); // Must not hold the appops lock mHistoricalRegistry.offsetHistory(offsetMillis); - mHistoricalRegistry.offsetDiscreteHistory(offsetMillis); } @android.annotation.EnforcePermission(android.Manifest.permission.MANAGE_APPOPS) @@ -7002,7 +7007,13 @@ public class AppOpsService extends IAppOpsService.Stub { SystemClock.sleep(offlineDurationMillis); } - mHistoricalRegistry = new HistoricalRegistry(mHistoricalRegistry); + if (Flags.enableAllSqliteAppopsAccesses()) { + mHistoricalRegistry = new HistoricalRegistrySql( + (HistoricalRegistrySql) mHistoricalRegistry); + } else { + mHistoricalRegistry = new HistoricalRegistry((HistoricalRegistry) mHistoricalRegistry); + } + mHistoricalRegistry.systemReady(mContext.getContentResolver()); mHistoricalRegistry.persistPendingHistory(); } diff --git a/services/core/java/com/android/server/appop/AttributedOp.java b/services/core/java/com/android/server/appop/AttributedOp.java index 40085ed89294..b9bc27d9c696 100644 --- a/services/core/java/com/android/server/appop/AttributedOp.java +++ b/services/core/java/com/android/server/appop/AttributedOp.java @@ -163,7 +163,7 @@ final class AttributedOp { public void rejected(@AppOpsManager.UidState int uidState, @AppOpsManager.OpFlags int flags) { rejected(System.currentTimeMillis(), uidState, flags); - mAppOpsService.mHistoricalRegistry.incrementOpRejected(parent.op, parent.uid, + mAppOpsService.mHistoricalRegistry.incrementOpRejectedCount(parent.op, parent.uid, parent.packageName, tag, uidState, flags); } diff --git a/services/core/java/com/android/server/appop/DiscreteOpsSqlRegistry.java b/services/core/java/com/android/server/appop/DiscreteOpsSqlRegistry.java index 0e1fbf3a6d1a..f50f45a182d0 100644 --- a/services/core/java/com/android/server/appop/DiscreteOpsSqlRegistry.java +++ b/services/core/java/com/android/server/appop/DiscreteOpsSqlRegistry.java @@ -118,7 +118,7 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { @Override void shutdown() { mSqliteWriteHandler.removeAllPendingMessages(); - mDiscreteOpsDbHelper.insertDiscreteOps(mDiscreteOpCache.getAllEventsAndClear()); + mDiscreteOpsDbHelper.insertDiscreteOps(mDiscreteOpCache.evictAllAppOpEvents()); } @Override @@ -172,10 +172,14 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { @Nullable String[] opNamesFilter, @Nullable String attributionTagFilter, int opFlagsFilter, Set<String> attributionExemptPkgs) { + IntArray opCodes = getAppOpCodes(filter, opNamesFilter); // flush the cache into database before read. - mDiscreteOpsDbHelper.insertDiscreteOps(mDiscreteOpCache.getAllEventsAndClear()); + if (opCodes != null) { + mDiscreteOpsDbHelper.insertDiscreteOps(mDiscreteOpCache.evictAppOpEvents(opCodes)); + } else { + mDiscreteOpsDbHelper.insertDiscreteOps(mDiscreteOpCache.evictAllAppOpEvents()); + } boolean assembleChains = attributionExemptPkgs != null; - IntArray opCodes = getAppOpCodes(filter, opNamesFilter); beginTimeMillis = Math.max(beginTimeMillis, Instant.now().minus(sDiscreteHistoryCutoff, ChronoUnit.MILLIS).toEpochMilli()); List<DiscreteOp> discreteOps = mDiscreteOpsDbHelper.getDiscreteOps(filter, uidFilter, @@ -214,7 +218,7 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { @NonNull SimpleDateFormat sdf, @NonNull Date date, @NonNull String prefix, int nDiscreteOps) { // flush the cache into database before dump. - mDiscreteOpsDbHelper.insertDiscreteOps(mDiscreteOpCache.getAllEventsAndClear()); + mDiscreteOpsDbHelper.insertDiscreteOps(mDiscreteOpCache.evictAllAppOpEvents()); IntArray opCodes = new IntArray(); if (dumpOp != AppOpsManager.OP_NONE) { opCodes.add(dumpOp); @@ -366,7 +370,7 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { try { List<DiscreteOp> evictedEvents; synchronized (mDiscreteOpCache) { - evictedEvents = mDiscreteOpCache.evict(); + evictedEvents = mDiscreteOpCache.evictOldAppOpEvents(); } mDiscreteOpsDbHelper.insertDiscreteOps(evictedEvents); } finally { @@ -389,7 +393,7 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { try { List<DiscreteOp> evictedEvents; synchronized (mDiscreteOpCache) { - evictedEvents = mDiscreteOpCache.evict(); + evictedEvents = mDiscreteOpCache.evictOldAppOpEvents(); // if nothing to evict, just write the whole cache to database. if (evictedEvents.isEmpty() && mDiscreteOpCache.size() >= mDiscreteOpCache.capacity()) { @@ -451,9 +455,10 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { } /** - * Evict entries older than {@link DiscreteOpsRegistry#sDiscreteHistoryQuantization}. + * Evict entries older than {@link DiscreteOpsRegistry#sDiscreteHistoryQuantization} i.e. + * app op events older than one minute (default quantization) will be evicted. */ - private List<DiscreteOp> evict() { + private List<DiscreteOp> evictOldAppOpEvents() { synchronized (this) { List<DiscreteOp> evictedEvents = new ArrayList<>(); Set<DiscreteOp> snapshot = new ArraySet<>(mCache); @@ -470,11 +475,9 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { } /** - * Remove all the entries from cache. - * - * @return return all removed entries. + * Evict all app op entries from cache, and return the list of removed ops. */ - public List<DiscreteOp> getAllEventsAndClear() { + public List<DiscreteOp> evictAllAppOpEvents() { synchronized (this) { List<DiscreteOp> cachedOps = new ArrayList<>(mCache.size()); if (mCache.isEmpty()) { @@ -486,6 +489,25 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { } } + /** + * Evict specified app ops from cache, and return the list of evicted ops. + */ + public List<DiscreteOp> evictAppOpEvents(IntArray ops) { + synchronized (this) { + List<DiscreteOp> evictedOps = new ArrayList<>(); + if (mCache.isEmpty()) { + return evictedOps; + } + for (DiscreteOp discreteOp: mCache) { + if (ops.contains(discreteOp.getOpCode())) { + evictedOps.add(discreteOp); + } + } + evictedOps.forEach(mCache::remove); + return evictedOps; + } + } + int size() { return mCache.size(); } @@ -646,7 +668,10 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { + ", uidState=" + getUidStateName(mUidState) + ", chainId=" + mChainId + ", accessTime=" + mAccessTime - + ", duration=" + mDuration + '}'; + + ", mDiscretizedAccessTime=" + mDiscretizedAccessTime + + ", duration=" + mDuration + + ", mDiscretizedDuration=" + mDiscretizedDuration + + '}'; } public int getUid() { diff --git a/services/core/java/com/android/server/appop/HistoricalRegistry.java b/services/core/java/com/android/server/appop/HistoricalRegistry.java index 06e43e8ec68d..a8128dd11cfe 100644 --- a/services/core/java/com/android/server/appop/HistoricalRegistry.java +++ b/services/core/java/com/android/server/appop/HistoricalRegistry.java @@ -128,7 +128,7 @@ import java.util.concurrent.TimeUnit; */ // TODO (bug:122218838): Make sure we handle start of epoch time // TODO (bug:122218838): Validate changed time is handled correctly -final class HistoricalRegistry { +final class HistoricalRegistry implements HistoricalRegistryInterface { private static final boolean DEBUG = false; private static final boolean KEEP_WTF_LOG = Build.IS_DEBUGGABLE; @@ -218,7 +218,8 @@ final class HistoricalRegistry { mDiscreteRegistry = other.mDiscreteRegistry; } - void systemReady(@NonNull ContentResolver resolver) { + @Override + public void systemReady(@NonNull ContentResolver resolver) { mDiscreteRegistry.systemReady(); final Uri uri = Settings.Global.getUriFor(Settings.Global.APPOP_HISTORY_PARAMETERS); resolver.registerContentObserver(uri, false, new ContentObserver( @@ -320,8 +321,10 @@ final class HistoricalRegistry { + "=" + setting + " resetting!"); } - void dump(String prefix, PrintWriter pw, int filterUid, @Nullable String filterPackage, - @Nullable String filterAttributionTag, int filterOp, + + @Override + public void dump(String prefix, PrintWriter pw, int filterUid, + @Nullable String filterPackage, @Nullable String filterAttributionTag, int filterOp, @HistoricalOpsRequestFilter int filter) { synchronized (mOnDiskLock) { synchronized (mInMemoryLock) { @@ -366,7 +369,8 @@ final class HistoricalRegistry { } } - void dumpDiscreteData(@NonNull PrintWriter pw, int uidFilter, + @Override + public void dumpDiscreteData(@NonNull PrintWriter pw, int uidFilter, @Nullable String packageNameFilter, @Nullable String attributionTagFilter, @HistoricalOpsRequestFilter int filter, int dumpOp, @NonNull SimpleDateFormat sdf, @NonNull Date date, @NonNull String prefix, @@ -381,7 +385,8 @@ final class HistoricalRegistry { } } - void getHistoricalOpsFromDiskRaw(int uid, @Nullable String packageName, + @Override + public void getHistoricalOpsFromDiskRaw(int uid, @Nullable String packageName, @Nullable String attributionTag, @Nullable String[] opNames, @OpHistoryFlags int historyFlags, @HistoricalOpsRequestFilter int filter, long beginTimeMillis, long endTimeMillis, @OpFlags int flags, @@ -414,11 +419,12 @@ final class HistoricalRegistry { callback.sendResult(payload); } - void getHistoricalOps(int uid, @Nullable String packageName, @Nullable String attributionTag, - @Nullable String[] opNames, @OpHistoryFlags int historyFlags, - @HistoricalOpsRequestFilter int filter, long beginTimeMillis, long endTimeMillis, - @OpFlags int flags, @Nullable String[] attributionExemptPkgs, - @NonNull RemoteCallback callback) { + @Override + public void getHistoricalOps(int uid, @Nullable String packageName, + @Nullable String attributionTag, @Nullable String[] opNames, + @OpHistoryFlags int historyFlags, @HistoricalOpsRequestFilter int filter, + long beginTimeMillis, long endTimeMillis, @OpFlags int flags, + @Nullable String[] attributionExemptPkgs, @NonNull RemoteCallback callback) { final long currentTimeMillis = System.currentTimeMillis(); if (endTimeMillis == Long.MAX_VALUE) { endTimeMillis = currentTimeMillis; @@ -493,7 +499,8 @@ final class HistoricalRegistry { callback.sendResult(payload); } - void incrementOpAccessedCount(int op, int uid, @NonNull String packageName, + @Override + public void incrementOpAccessedCount(int op, int uid, @NonNull String packageName, @NonNull String deviceId, @Nullable String attributionTag, @UidState int uidState, @OpFlags int flags, long accessTime, @AppOpsManager.AttributionFlags int attributionFlags, int attributionChainId, @@ -515,7 +522,8 @@ final class HistoricalRegistry { } } - void incrementOpRejected(int op, int uid, @NonNull String packageName, + @Override + public void incrementOpRejectedCount(int op, int uid, @NonNull String packageName, @Nullable String attributionTag, @UidState int uidState, @OpFlags int flags) { synchronized (mInMemoryLock) { if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) { @@ -530,7 +538,8 @@ final class HistoricalRegistry { } } - void increaseOpAccessDuration(int op, int uid, @NonNull String packageName, + @Override + public void increaseOpAccessDuration(int op, int uid, @NonNull String packageName, @NonNull String deviceId, @Nullable String attributionTag, @UidState int uidState, @OpFlags int flags, long eventStartTime, long increment, @AppOpsManager.AttributionFlags int attributionFlags, int attributionChainId) { @@ -550,7 +559,8 @@ final class HistoricalRegistry { } } - void setHistoryParameters(@HistoricalMode int mode, + @Override + public void setHistoryParameters(@HistoricalMode int mode, long baseSnapshotInterval, long intervalCompressionMultiplier) { synchronized (mOnDiskLock) { synchronized (mInMemoryLock) { @@ -585,7 +595,8 @@ final class HistoricalRegistry { } } - void offsetHistory(long offsetMillis) { + @Override + public void offsetHistory(long offsetMillis) { synchronized (mOnDiskLock) { synchronized (mInMemoryLock) { if (!isPersistenceInitializedMLocked()) { @@ -607,13 +618,11 @@ final class HistoricalRegistry { mPersistence.persistHistoricalOpsDLocked(history); } } - } - - void offsetDiscreteHistory(long offsetMillis) { mDiscreteRegistry.offsetHistory(offsetMillis); } - void addHistoricalOps(HistoricalOps ops) { + @Override + public void addHistoricalOps(HistoricalOps ops) { final List<HistoricalOps> pendingWrites; synchronized (mInMemoryLock) { if (!isPersistenceInitializedMLocked()) { @@ -634,7 +643,8 @@ final class HistoricalRegistry { offsetHistory(offsetMillis); } - void resetHistoryParameters() { + @Override + public void resetHistoryParameters() { if (!isPersistenceInitializedMLocked()) { Slog.d(LOG_TAG, "Interaction before persistence initialized"); return; @@ -644,7 +654,8 @@ final class HistoricalRegistry { mDiscreteRegistry.setDebugMode(false); } - void clearHistory(int uid, String packageName) { + @Override + public void clearHistory(int uid, String packageName) { synchronized (mOnDiskLock) { synchronized (mInMemoryLock) { if (!isPersistenceInitializedMLocked()) { @@ -668,11 +679,13 @@ final class HistoricalRegistry { mDiscreteRegistry.clearHistory(uid, packageName); } - void writeAndClearDiscreteHistory() { + @Override + public void writeAndClearDiscreteHistory() { mDiscreteRegistry.writeAndClearOldAccessHistory(); } - void clearAllHistory() { + @Override + public void clearAllHistory() { clearHistoricalRegistry(); mDiscreteRegistry.clearHistory(); } @@ -741,7 +754,8 @@ final class HistoricalRegistry { return mCurrentHistoricalOps; } - void shutdown() { + @Override + public void shutdown() { synchronized (mInMemoryLock) { if (mMode == AppOpsManager.HISTORICAL_MODE_DISABLED) { return; @@ -752,7 +766,8 @@ final class HistoricalRegistry { mDiscreteRegistry.shutdown(); } - void persistPendingHistory() { + @Override + public void persistPendingHistory() { final List<HistoricalOps> pendingWrites; synchronized (mOnDiskLock) { synchronized (mInMemoryLock) { diff --git a/services/core/java/com/android/server/appop/HistoricalRegistryInterface.java b/services/core/java/com/android/server/appop/HistoricalRegistryInterface.java new file mode 100644 index 000000000000..b6210a727e6d --- /dev/null +++ b/services/core/java/com/android/server/appop/HistoricalRegistryInterface.java @@ -0,0 +1,153 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.appop; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.app.AppOpsManager; +import android.content.ContentResolver; +import android.os.RemoteCallback; + +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * A registry to record app operation access events, which are generated upon an application's + * access to private data or system resources. These events are stored in both aggregated + * and individual/discrete formats. + */ +public interface HistoricalRegistryInterface { + /** + * A callback to inform system components are ready. + */ + void systemReady(@NonNull ContentResolver resolver); + + /** + * Callback for system shutdown. + */ + void shutdown(); + + /** + * Dumps aggregated/historical events to the console based on the filters. + */ + void dump(String prefix, PrintWriter pw, int filterUid, + @Nullable String filterPackage, @Nullable String filterAttributionTag, int filterOp, + @AppOpsManager.HistoricalOpsRequestFilter int filter); + + /** + * Dumps discrete/individual events to the console based on filters. + */ + void dumpDiscreteData(@NonNull PrintWriter pw, int uidFilter, + @Nullable String packageNameFilter, @Nullable String attributionTagFilter, + @AppOpsManager.HistoricalOpsRequestFilter int filter, int dumpOp, + @NonNull SimpleDateFormat sdf, @NonNull Date date, @NonNull String prefix, + int nDiscreteOps); + + /** + * Record duration for given op. + */ + void increaseOpAccessDuration(int op, int uid, @NonNull String packageName, + @NonNull String deviceId, @Nullable String attributionTag, + @AppOpsManager.UidState int uidState, + @AppOpsManager.OpFlags int flags, long eventStartTime, long increment, + @AppOpsManager.AttributionFlags int attributionFlags, int attributionChainId); + + /** + * Record access counts for given op. + */ + void incrementOpAccessedCount(int op, int uid, @NonNull String packageName, + @NonNull String deviceId, @Nullable String attributionTag, + @AppOpsManager.UidState int uidState, + @AppOpsManager.OpFlags int flags, long accessTime, + @AppOpsManager.AttributionFlags int attributionFlags, int attributionChainId, + int accessCount); + + /** + * Record rejected counts for given op. + */ + void incrementOpRejectedCount(int op, int uid, @NonNull String packageName, + @Nullable String attributionTag, @AppOpsManager.UidState int uidState, + @AppOpsManager.OpFlags int flags); + + /** + * Read historical ops from both aggregated and discrete events based on input filter. + */ + void getHistoricalOps(int uid, @Nullable String packageName, @Nullable String attributionTag, + @Nullable String[] opNames, @AppOpsManager.OpHistoryFlags int historyFlags, + @AppOpsManager.HistoricalOpsRequestFilter int filter, long beginTimeMillis, + long endTimeMillis, + @AppOpsManager.OpFlags int flags, @Nullable String[] attributionExemptPkgs, + @NonNull RemoteCallback callback); + + /** + * Remove app op events for a given UID and package. + */ + void clearHistory(int uid, String packageName); + + /** + * A periodic callback from {@link AppOpsService} to flush the in memory discrete + * app op events to disk/database. + */ + void writeAndClearDiscreteHistory(); + + /** + * A callback flush the in memory app op events to disk/database. + */ + void persistPendingHistory(); + + /** + * Set history parameters. + * + * @param mode - Whether historical registry is Active, Passive or Disabled. + * @param baseSnapshotInterval - Interval between 2 snapshots, default 15 minutes. + * @param intervalCompressionMultiplier - Interval compression multiplier, default is 10. + */ + void setHistoryParameters(@AppOpsManager.HistoricalMode int mode, + long baseSnapshotInterval, long intervalCompressionMultiplier); + + /** + * Reset history parameters to defaults. + */ + void resetHistoryParameters(); + + /** + * Remove all app op accesses from both aggregated and individual event's storage. + */ + void clearAllHistory(); + + /** + * Offsets the history by the given duration. + */ + void offsetHistory(long offsetMillis); + + /** + * Retrieve historical app op stats for a period form disk. + */ + void getHistoricalOpsFromDiskRaw(int uid, @Nullable String packageName, + @Nullable String attributionTag, @Nullable String[] opNames, + @AppOpsManager.OpHistoryFlags int historyFlags, + @AppOpsManager.HistoricalOpsRequestFilter int filter, + long beginTimeMillis, long endTimeMillis, @AppOpsManager.OpFlags int flags, + String[] attributionExemptedPackages, @NonNull RemoteCallback callback); + + /** + * Adds ops to the history directly. This could be useful for testing especially + * when the historical registry operates in passive mode. + */ + void addHistoricalOps(AppOpsManager.HistoricalOps ops); +} diff --git a/services/core/java/com/android/server/appop/HistoricalRegistrySql.java b/services/core/java/com/android/server/appop/HistoricalRegistrySql.java new file mode 100644 index 000000000000..cf5b941c7b33 --- /dev/null +++ b/services/core/java/com/android/server/appop/HistoricalRegistrySql.java @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.appop; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.app.AppOpsManager; +import android.content.ContentResolver; +import android.content.Context; +import android.os.RemoteCallback; + +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.Date; + +// TODO add more documentation later + +/** + * This historical registry implementation store app events in sqlite. The data is stored in 2 + * tables 1) discrete events 2) aggregated events. + */ +public class HistoricalRegistrySql implements HistoricalRegistryInterface { + // TODO impl will be added in a separate CL + HistoricalRegistrySql(Context context) { + } + + HistoricalRegistrySql(HistoricalRegistrySql other) { + } + + @Override + public void systemReady(@NonNull ContentResolver resolver) { + + } + + @Override + public void shutdown() { + + } + + @Override + public void dump(String prefix, PrintWriter pw, int filterUid, + @Nullable String filterPackage, @Nullable String filterAttributionTag, int filterOp, + int filter) { + + } + + @Override + public void dumpDiscreteData(@NonNull PrintWriter pw, int uidFilter, + @Nullable String packageNameFilter, @Nullable String attributionTagFilter, int filter, + int dumpOp, @NonNull SimpleDateFormat sdf, @NonNull Date date, @NonNull String prefix, + int nDiscreteOps) { + + } + + @Override + public void increaseOpAccessDuration(int op, int uid, @NonNull String packageName, + @NonNull String deviceId, @Nullable String attributionTag, int uidState, int flags, + long eventStartTime, long increment, int attributionFlags, int attributionChainId) { + + } + + @Override + public void incrementOpAccessedCount(int op, int uid, @NonNull String packageName, + @NonNull String deviceId, @Nullable String attributionTag, int uidState, int flags, + long accessTime, int attributionFlags, int attributionChainId, int accessCount) { + + } + + @Override + public void incrementOpRejectedCount(int op, int uid, @NonNull String packageName, + @Nullable String attributionTag, int uidState, int flags) { + + } + + @Override + public void getHistoricalOps(int uid, @Nullable String packageName, + @Nullable String attributionTag, @Nullable String[] opNames, int historyFlags, + int filter, long beginTimeMillis, long endTimeMillis, int flags, + @Nullable String[] attributionExemptPkgs, @NonNull RemoteCallback callback) { + + } + + @Override + public void clearHistory(int uid, String packageName) { + + } + + @Override + public void writeAndClearDiscreteHistory() { + + } + + @Override + public void persistPendingHistory() { + + } + + @Override + public void setHistoryParameters(int mode, long baseSnapshotInterval, + long intervalCompressionMultiplier) { + + } + + @Override + public void resetHistoryParameters() { + + } + + @Override + public void clearAllHistory() { + + } + + @Override + public void offsetHistory(long offsetMillis) { + + } + + @Override + public void getHistoricalOpsFromDiskRaw(int uid, @Nullable String packageName, + @Nullable String attributionTag, @Nullable String[] opNames, int historyFlags, + int filter, long beginTimeMillis, long endTimeMillis, int flags, + String[] attributionExemptedPackages, @NonNull RemoteCallback callback) { + + } + + @Override + public void addHistoricalOps(AppOpsManager.HistoricalOps ops) { + + } +} diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index 8ef79a916530..4b5f06b13885 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -1472,8 +1472,8 @@ public class AudioDeviceBroker { mAudioService.postAccessoryPlugMediaUnmute(device); } - /*package*/ int getVssVolumeForDevice(int streamType, int device) { - return mAudioService.getVssVolumeForDevice(streamType, device); + /*package*/ int getVolumeForDeviceIgnoreMute(int streamType, int device) { + return mAudioService.getVolumeForDeviceIgnoreMute(streamType, device); } /*package*/ int getMaxVssVolumeForStream(int streamType) { diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index 829d9ea7495f..2e6d98485e85 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -2482,7 +2482,7 @@ public class AudioDeviceInventory { @GuardedBy("mDevicesLock") private void makeHearingAidDeviceAvailable( String address, String name, int streamType, String eventSource) { - final int hearingAidVolIndex = mDeviceBroker.getVssVolumeForDevice(streamType, + final int hearingAidVolIndex = mDeviceBroker.getVolumeForDeviceIgnoreMute(streamType, DEVICE_OUT_HEARING_AID); mDeviceBroker.postSetHearingAidVolumeIndex(hearingAidVolIndex, streamType); @@ -2672,7 +2672,7 @@ public class AudioDeviceInventory { } final int leAudioVolIndex = (volumeIndex == -1) - ? mDeviceBroker.getVssVolumeForDevice(streamType, device) + ? mDeviceBroker.getVolumeForDeviceIgnoreMute(streamType, device) : volumeIndex; final int maxIndex = mDeviceBroker.getMaxVssVolumeForStream(streamType); mDeviceBroker.postSetLeAudioVolumeIndex(leAudioVolIndex, maxIndex, streamType); diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 766456134b20..d917bffa06e9 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -529,7 +529,7 @@ public class AudioService extends IAudioService.Stub */ private InputDeviceVolumeHelper mInputDeviceVolumeHelper; - /*package*/ int getVssVolumeForDevice(int stream, int device) { + /*package*/ int getVolumeForDeviceIgnoreMute(int stream, int device) { final VolumeStreamState streamState = mStreamStates.get(stream); return streamState != null ? streamState.getIndex(device) : -1; } @@ -5100,7 +5100,7 @@ public class AudioService extends IAudioService.Stub } final int device = absVolumeDevices.toArray(new Integer[0])[0].intValue(); - final int index = getStreamVolume(streamType, device); + final int index = (getVolumeForDeviceIgnoreMute(streamType, device) + 5) / 10; if (DEBUG_VOL) { Slog.i(TAG, "onUpdateContextualVolumes streamType: " + streamType @@ -15109,6 +15109,61 @@ public class AudioService extends IAudioService.Stub /** * @hide + * Returns the current audio output device delay value of key in milliseconds. + * + * In aidl implementation, the param of getParameters is "key" and reply delay of all supported + * devices which be composited as "key=device,address,delay|device,address,delay|...". + * e.g. + * param: additional_output_device_delay= + * reply: additional_output_device_delay=2,,0|4,,0|8,,0|128,,0|256,,0|512,,0|1024,,0|8192,,0| + * 16384,,0|262144,,0|262145,,0|524288,,0|67108864,,0|134217728,,0|536870912,,0|536870913,,0| + * 536870914,,0 + * + * In hidl implementation, the param of getParameters is "key=device,address" and reply a + * specific device delay which be composited as "key=device,address,delay". + * e.g. + * param: additional_output_device_delay=2, + * reply: additional_output_device_delay=2,,0 + * + * @param key + * @param deviceType + * @param address + * @return the delay value of key. This is a non-negative number. + * {@code 0} is returned if unsupported. + */ + private long getDelayByKeyDevice(@NonNull String key, @NonNull AudioDeviceAttributes device) { + long delayMillis = 0; + + try { + if (AudioHalVersionInfo.AUDIO_HAL_TYPE_AIDL == getHalVersion().getHalType()) { + final String reply = AudioSystem.getParameters(key); + final String keyDeviceAddressPrefix = + Integer.toUnsignedString(device.getInternalType()) + "," + device.getAddress() + + ","; + int start = reply.indexOf(keyDeviceAddressPrefix); + int end = -1; + if (start != -1) { + start += keyDeviceAddressPrefix.length(); + end = reply.indexOf("|", start); + delayMillis = Long.parseLong( + end == -1 ? reply.substring(start) : reply.substring(start, end)); + } + } else { + final String reply = AudioSystem.getParameters( + key + "=" + device.getInternalType() + "," + device.getAddress()); + if (reply.contains(key)) { + delayMillis = Long.parseLong(reply.substring(key.length() + 1)); + } + } + } catch (NullPointerException e) { + Log.w(TAG, "NullPointerException when getting delay for device " + device, e); + } + + return delayMillis; + } + + /** + * @hide * Returns the current additional audio output device delay in milliseconds. * * @param deviceType @@ -15124,17 +15179,8 @@ public class AudioService extends IAudioService.Stub device = retrieveBluetoothAddress(device); final String key = "additional_output_device_delay"; - final String reply = AudioSystem.getParameters( - key + "=" + device.getInternalType() + "," + device.getAddress()); - long delayMillis = 0; - if (reply.contains(key)) { - try { - delayMillis = Long.parseLong(reply.substring(key.length() + 1)); - } catch (NullPointerException e) { - delayMillis = 0; - } - } - return delayMillis; + + return getDelayByKeyDevice(key, device); } /** @@ -15156,17 +15202,8 @@ public class AudioService extends IAudioService.Stub device = retrieveBluetoothAddress(device); final String key = "max_additional_output_device_delay"; - final String reply = AudioSystem.getParameters( - key + "=" + device.getInternalType() + "," + device.getAddress()); - long delayMillis = 0; - if (reply.contains(key)) { - try { - delayMillis = Long.parseLong(reply.substring(key.length() + 1)); - } catch (NullPointerException e) { - delayMillis = 0; - } - } - return delayMillis; + + return getDelayByKeyDevice(key, device); } @android.annotation.EnforcePermission(MODIFY_AUDIO_ROUTING) diff --git a/services/core/java/com/android/server/audio/SoundDoseHelper.java b/services/core/java/com/android/server/audio/SoundDoseHelper.java index 643f3308d8f5..67afff79dffd 100644 --- a/services/core/java/com/android/server/audio/SoundDoseHelper.java +++ b/services/core/java/com/android/server/audio/SoundDoseHelper.java @@ -724,7 +724,7 @@ public class SoundDoseHelper { int device = mAudioService.getDeviceForStream(AudioSystem.STREAM_MUSIC); if (safeDevicesContains(device) && isStreamActive) { scheduleMusicActiveCheck(); - int index = mAudioService.getVssVolumeForDevice(AudioSystem.STREAM_MUSIC, + int index = mAudioService.getVolumeForDeviceIgnoreMute(AudioSystem.STREAM_MUSIC, device); if (index > safeMediaVolumeIndex(device)) { // Approximate cumulative active music time diff --git a/services/core/java/com/android/server/display/mode/ModeChangeObserver.java b/services/core/java/com/android/server/display/mode/ModeChangeObserver.java index 2751835f9958..50782a2f22c8 100644 --- a/services/core/java/com/android/server/display/mode/ModeChangeObserver.java +++ b/services/core/java/com/android/server/display/mode/ModeChangeObserver.java @@ -16,9 +16,11 @@ package com.android.server.display.mode; +import android.hardware.display.DisplayManager; +import android.os.Handler; import android.os.Looper; +import android.util.LongSparseArray; import android.util.Slog; -import android.util.SparseArray; import android.view.Display; import android.view.DisplayAddress; import android.view.DisplayEventReceiver; @@ -34,72 +36,128 @@ final class ModeChangeObserver { @SuppressWarnings("unused") private DisplayEventReceiver mModeChangeListener; - private final SparseArray<Set<Integer>> mRejectedModesByDisplay = new SparseArray<>(); - private Looper mLooper; + private DisplayManager.DisplayListener mDisplayListener; + private final LongSparseArray<Set<Integer>> mRejectedModesMap = + new LongSparseArray<>(); + private final LongSparseArray<Integer> mPhysicalIdToLogicalIdMap = new LongSparseArray<>(); + private final Looper mLooper; + private final Handler mHandler; + /** + * Observer for display mode changes. + * This class observes display mode rejections and updates the vote storage + * for rejected modes vote accordingly. + */ ModeChangeObserver(VotesStorage votesStorage, DisplayModeDirector.Injector injector, Looper looper) { mVotesStorage = votesStorage; mInjector = injector; mLooper = looper; + mHandler = new Handler(mLooper); } + /** + * Start observing display mode changes. + */ void observe() { - mModeChangeListener = new DisplayEventReceiver(mLooper) { + updatePhysicalIdToLogicalIdMap(); + mDisplayListener = new DisplayManager.DisplayListener() { @Override - public void onModeRejected(long physicalDisplayId, int modeId) { - Slog.d(TAG, "Mode Rejected event received"); - int displayId = getLogicalDisplayId(physicalDisplayId); - if (displayId < 0) { - Slog.e(TAG, "Logical Display Id not found"); + public void onDisplayAdded(int displayId) { + updateVoteForDisplay(displayId); + } + + @Override + public void onDisplayRemoved(int displayId) { + int oldPhysicalDisplayIdIndex = mPhysicalIdToLogicalIdMap.indexOfValue(displayId); + if (oldPhysicalDisplayIdIndex < 0) { + Slog.e(TAG, "Removed display not found"); return; } - populateRejectedModesListByDisplay(displayId, modeId); + long oldPhysicalDisplayId = + mPhysicalIdToLogicalIdMap.keyAt(oldPhysicalDisplayIdIndex); + mPhysicalIdToLogicalIdMap.delete(oldPhysicalDisplayId); + mRejectedModesMap.delete(oldPhysicalDisplayId); + mVotesStorage.updateVote(displayId, Vote.PRIORITY_REJECTED_MODES, null); } @Override - public void onHotplug(long timestampNanos, long physicalDisplayId, boolean connected) { - Slog.d(TAG, "Hotplug event received"); - if (!connected) { - int displayId = getLogicalDisplayId(physicalDisplayId); - if (displayId < 0) { - Slog.e(TAG, "Logical Display Id not found"); - return; - } - clearRejectedModesListByDisplay(displayId); + public void onDisplayChanged(int displayId) { + int oldPhysicalDisplayIdIndex = mPhysicalIdToLogicalIdMap.indexOfValue(displayId); + if (oldPhysicalDisplayIdIndex < 0) { + Slog.e(TAG, "Changed display not found"); + return; + } + long oldPhysicalDisplayId = + mPhysicalIdToLogicalIdMap.keyAt(oldPhysicalDisplayIdIndex); + mPhysicalIdToLogicalIdMap.delete(oldPhysicalDisplayId); + + updateVoteForDisplay(displayId); + } + }; + mInjector.registerDisplayListener(mDisplayListener, mHandler, + DisplayManager.EVENT_TYPE_DISPLAY_ADDED + | DisplayManager.EVENT_TYPE_DISPLAY_CHANGED + | DisplayManager.EVENT_TYPE_DISPLAY_REMOVED); + mModeChangeListener = new DisplayEventReceiver(mLooper) { + @Override + public void onModeRejected(long physicalDisplayId, int modeId) { + Slog.d(TAG, "Mode Rejected event received"); + updateRejectedModesListByDisplay(physicalDisplayId, modeId); + if (mPhysicalIdToLogicalIdMap.indexOfKey(physicalDisplayId) < 0) { + Slog.d(TAG, "Rejected Modes Vote will be updated after display is added"); + return; } + mVotesStorage.updateVote(mPhysicalIdToLogicalIdMap.get(physicalDisplayId), + Vote.PRIORITY_REJECTED_MODES, + Vote.forRejectedModes(mRejectedModesMap.get(physicalDisplayId))); } }; } - private int getLogicalDisplayId(long rejectedModePhysicalDisplayId) { + private void updateVoteForDisplay(int displayId) { + Display display = mInjector.getDisplay(displayId); + if (display == null) { + // We can occasionally get a display added or changed event for a display that was + // subsequently removed, which means this returns null. Check this case and bail + // out early; if it gets re-attached we will eventually get another call back for it. + Slog.e(TAG, "Added or Changed display has disappeared"); + return; + } + DisplayAddress address = display.getAddress(); + if (address instanceof DisplayAddress.Physical physical) { + long physicalDisplayId = physical.getPhysicalDisplayId(); + mPhysicalIdToLogicalIdMap.put(physicalDisplayId, displayId); + Set<Integer> modes = mRejectedModesMap.get(physicalDisplayId); + mVotesStorage.updateVote(displayId, Vote.PRIORITY_REJECTED_MODES, + modes != null ? Vote.forRejectedModes(modes) : null); + } + } + + private void updatePhysicalIdToLogicalIdMap() { Display[] displays = mInjector.getDisplays(); for (Display display : displays) { + if (display == null) { + continue; + } DisplayAddress address = display.getAddress(); if (address instanceof DisplayAddress.Physical physical) { - long physicalDisplayId = physical.getPhysicalDisplayId(); - if (physicalDisplayId == rejectedModePhysicalDisplayId) { - return display.getDisplayId(); - } + mPhysicalIdToLogicalIdMap.put(physical.getPhysicalDisplayId(), + display.getDisplayId()); } } - return -1; } - private void populateRejectedModesListByDisplay(int displayId, int rejectedModeId) { - Set<Integer> alreadyRejectedModes = mRejectedModesByDisplay.get(displayId); + private void updateRejectedModesListByDisplay(long rejectedModePhysicalDisplayId, + int rejectedModeId) { + Set<Integer> alreadyRejectedModes = + mRejectedModesMap.get(rejectedModePhysicalDisplayId); if (alreadyRejectedModes == null) { alreadyRejectedModes = new HashSet<>(); - mRejectedModesByDisplay.put(displayId, alreadyRejectedModes); + mRejectedModesMap.put(rejectedModePhysicalDisplayId, + alreadyRejectedModes); } alreadyRejectedModes.add(rejectedModeId); - mVotesStorage.updateVote(displayId, Vote.PRIORITY_REJECTED_MODES, - Vote.forRejectedModes(alreadyRejectedModes)); - } - - private void clearRejectedModesListByDisplay(int displayId) { - mRejectedModesByDisplay.remove(displayId); - mVotesStorage.updateVote(displayId, Vote.PRIORITY_REJECTED_MODES, null); } } diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubEndpointBroker.java b/services/core/java/com/android/server/location/contexthub/ContextHubEndpointBroker.java index 2d937bdcc683..6db62c8397f3 100644 --- a/services/core/java/com/android/server/location/contexthub/ContextHubEndpointBroker.java +++ b/services/core/java/com/android/server/location/contexthub/ContextHubEndpointBroker.java @@ -171,7 +171,8 @@ public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub } } - public boolean isInMessageHistory(HubMessage message) { + public boolean isInReliableMessageHistory(HubMessage message) { + if (!message.isResponseRequired()) return false; // Clean up the history Iterator<Map.Entry<Integer, Long>> iterator = mRxMessageHistoryMap.entrySet().iterator(); @@ -188,7 +189,8 @@ public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub return mRxMessageHistoryMap.containsKey(message.getMessageSequenceNumber()); } - public void addMessageToHistory(HubMessage message) { + public void addReliableMessageToHistory(HubMessage message) { + if (!message.isResponseRequired()) return; if (mRxMessageHistoryMap.containsKey(message.getMessageSequenceNumber())) { long value = mRxMessageHistoryMap.get(message.getMessageSequenceNumber()); Log.w( @@ -623,7 +625,7 @@ public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub return ErrorCode.PERMANENT_ERROR; } HubEndpointInfo remote = mSessionMap.get(sessionId).getRemoteEndpointInfo(); - if (mSessionMap.get(sessionId).isInMessageHistory(message)) { + if (mSessionMap.get(sessionId).isInReliableMessageHistory(message)) { Log.e(TAG, "Dropping duplicate message: " + message); return ErrorCode.TRANSIENT_ERROR; } @@ -648,7 +650,7 @@ public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub boolean success = invokeCallback((consumer) -> consumer.onMessageReceived(sessionId, message)); if (success) { - mSessionMap.get(sessionId).addMessageToHistory(message); + mSessionMap.get(sessionId).addReliableMessageToHistory(message); } return success ? ErrorCode.OK : ErrorCode.TRANSIENT_ERROR; } diff --git a/services/core/java/com/android/server/os/instrumentation/DynamicInstrumentationManagerService.java b/services/core/java/com/android/server/os/instrumentation/DynamicInstrumentationManagerService.java index 871d12ee6394..7791f5180e57 100644 --- a/services/core/java/com/android/server/os/instrumentation/DynamicInstrumentationManagerService.java +++ b/services/core/java/com/android/server/os/instrumentation/DynamicInstrumentationManagerService.java @@ -38,6 +38,7 @@ import com.android.server.SystemService; import dalvik.system.VMDebug; +import java.lang.reflect.Executable; import java.lang.reflect.Method; import java.util.NoSuchElementException; import java.util.Objects; @@ -95,10 +96,16 @@ public class DynamicInstrumentationManagerService extends SystemService { } } - Method method = MethodDescriptorParser.parseMethodDescriptor( + Executable executable = MethodDescriptorParser.parseMethodDescriptor( getClass().getClassLoader(), methodDescriptor); - VMDebug.ExecutableMethodFileOffsets location = - VMDebug.getExecutableMethodFileOffsets(method); + VMDebug.ExecutableMethodFileOffsets location; + if (com.android.art.flags.Flags.executableMethodFileOffsetsV2()) { + location = VMDebug.getExecutableMethodFileOffsets(executable); + } else if (executable instanceof Method) { + location = VMDebug.getExecutableMethodFileOffsets((Method) executable); + } else { + throw new UnsupportedOperationException(); + } try { if (location == null) { diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index cf598e89c988..62264dd73795 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -96,6 +96,7 @@ import android.os.ServiceManager; import android.os.ServiceSpecificException; import android.os.ShellCommand; import android.os.SystemClock; +import android.os.SystemProperties; import android.os.Trace; import android.os.UserHandle; import android.os.UserManager; @@ -1564,6 +1565,12 @@ class PackageManagerShellCommand extends ShellCommand { private int doRunInstall(final InstallParams params) throws RemoteException { final PrintWriter pw = getOutPrintWriter(); + // Do not allow app installation if boot has not completed already + if (!SystemProperties.getBoolean("sys.boot_completed", false)) { + pw.println("Error: device is still booting."); + return 1; + } + int requestUserId = params.userId; if (requestUserId != UserHandle.USER_ALL && requestUserId != UserHandle.USER_CURRENT) { UserManagerInternal umi = @@ -2174,6 +2181,13 @@ class PackageManagerShellCommand extends ShellCommand { private int runUninstall() throws RemoteException { final PrintWriter pw = getOutPrintWriter(); + + // Do not allow app uninstallation if boot has not completed already + if (!SystemProperties.getBoolean("sys.boot_completed", false)) { + pw.println("Error: device is still booting."); + return 1; + } + int flags = 0; int userId = UserHandle.USER_ALL; long versionCode = PackageManager.VERSION_CODE_HIGHEST; diff --git a/services/core/java/com/android/server/security/CertificateRevocationStatusManager.java b/services/core/java/com/android/server/security/CertificateRevocationStatusManager.java index 799157520ca5..800fc7c25de5 100644 --- a/services/core/java/com/android/server/security/CertificateRevocationStatusManager.java +++ b/services/core/java/com/android/server/security/CertificateRevocationStatusManager.java @@ -23,6 +23,7 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkCapabilities; import android.net.NetworkRequest; +import android.os.Binder; import android.os.Environment; import android.util.AtomicFile; import android.util.Slog; @@ -119,7 +120,7 @@ class CertificateRevocationStatusManager { } catch (IOException | JSONException ex) { Slog.d(TAG, "Fallback to check stored revocation status", ex); if (ex instanceof IOException && mShouldScheduleJob) { - scheduleJobToFetchRemoteRevocationJob(); + Binder.withCleanCallingIdentity(this::scheduleJobToFetchRemoteRevocationJob); } try { revocationList = getStoredRevocationList(); @@ -210,7 +211,7 @@ class CertificateRevocationStatusManager { return; } Slog.d(TAG, "Scheduling job to fetch remote CRL."); - jobScheduler.schedule( + jobScheduler.forNamespace(TAG).schedule( new JobInfo.Builder( JOB_ID, new ComponentName( diff --git a/services/core/java/com/android/server/security/advancedprotection/features/UsbDataAdvancedProtectionHook.java b/services/core/java/com/android/server/security/advancedprotection/features/UsbDataAdvancedProtectionHook.java index 9a9c56f7bd17..55a8f7e6ea54 100644 --- a/services/core/java/com/android/server/security/advancedprotection/features/UsbDataAdvancedProtectionHook.java +++ b/services/core/java/com/android/server/security/advancedprotection/features/UsbDataAdvancedProtectionHook.java @@ -20,6 +20,8 @@ import static android.content.Intent.ACTION_SCREEN_OFF; import static android.content.Intent.ACTION_USER_PRESENT; import static android.hardware.usb.UsbManager.ACTION_USB_PORT_CHANGED; import static android.security.advancedprotection.AdvancedProtectionManager.FEATURE_ID_DISALLOW_USB; +import static android.hardware.usb.UsbPortStatus.DATA_ROLE_NONE; +import static android.hardware.usb.UsbPortStatus.DATA_STATUS_DISABLED_FORCE; import android.app.KeyguardManager; import android.app.Notification; @@ -33,15 +35,18 @@ import android.hardware.usb.ParcelableUsbPort; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbAccessory; import android.hardware.usb.UsbManager; +import android.hardware.usb.IUsbManagerInternal; import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPortStatus; import android.os.Binder; import android.os.Build; import android.os.Handler; import android.os.Looper; +import android.os.RemoteException; import android.os.UserHandle; import android.util.Slog; +import com.android.server.LocalServices; import java.lang.Runnable; import java.util.function.Consumer; @@ -52,6 +57,7 @@ import android.security.advancedprotection.AdvancedProtectionFeature; import com.android.internal.R; import java.util.Map; +import java.util.Objects; /** * AAPM Feature for managing and protecting USB data signal from attacks. @@ -65,11 +71,13 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { private static final String CHANNEL_NAME = "BackgroundInstallUiNotificationChannel"; private static final int APM_USB_FEATURE_CHANNEL_ID = 1; private static final int DELAY_DISABLE_MS = 1000; + private static final int OS_USB_DISABLE_REASON_LOCKDOWN_MODE = 1; private final Context mContext; private final Handler mDelayedDisableHandler = new Handler(Looper.getMainLooper()); private UsbManager mUsbManager; + private IUsbManagerInternal mUsbManagerInternal; private BroadcastReceiver mUsbProtectionBroadcastReceiver; private KeyguardManager mKeyguardManager; private NotificationManager mNotificationManager; @@ -85,6 +93,8 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { super(context, enabled); mContext = context; mUsbManager = mContext.getSystemService(UsbManager.class); + mUsbManagerInternal = Objects.requireNonNull( + LocalServices.getService(IUsbManagerInternal.class)); onAdvancedProtectionChanged(enabled); } @@ -117,9 +127,7 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { if (mBroadcastReceiverIsRegistered) { unregisterReceiver(); } - if (!mUsbManager.enableUsbDataSignal(true)) { - Slog.e(TAG, "USB Data protection toggle failed"); - } + setUsbDataSignalIfPossible(true); } } @@ -134,23 +142,41 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { if (ACTION_USER_PRESENT.equals(intent.getAction()) && !mKeyguardManager.isKeyguardLocked()) { mDelayedDisableHandler.removeCallbacksAndMessages(null); - setUsbDataSignalIfNoConnectedDevices(true); + setUsbDataSignalIfPossible(true); + } else if (ACTION_SCREEN_OFF.equals(intent.getAction()) && mKeyguardManager.isKeyguardLocked()) { - setUsbDataSignalIfNoConnectedDevices(false); + setUsbDataSignalIfPossible(false); + } else if (ACTION_USB_PORT_CHANGED.equals(intent.getAction())) { if (Build.IS_DEBUGGABLE) { dumpUsbDevices(); } - setDelayedDisableTaskIfDisconnectedAndLocked(intent); + if(mKeyguardManager.isKeyguardLocked()) { + updateDelayedDisableTask(intent); + } sendNotificationIfDeviceLocked(intent); + } } catch (Exception e) { Slog.e(TAG, "USB Data protection failed with: " + e.getMessage()); } } - private boolean getUsbPortStatusIsConnectedAndDataEnabled(Intent intent) { + private void updateDelayedDisableTask(Intent intent) { + // For recovered intermittent/unreliable USB connections + if(usbPortIsConnectedAndDataEnabled(intent)) { + mDelayedDisableHandler.removeCallbacksAndMessages(null); + } else if(!mDelayedDisableHandler.hasMessagesOrCallbacks()) { + mDelayedDisableHandler.postDelayed(() -> { + if (mKeyguardManager.isKeyguardLocked()) { + setUsbDataSignalIfPossible(false); + } + }, DELAY_DISABLE_MS); + } + } + + private boolean usbPortIsConnectedAndDataEnabled(Intent intent) { UsbPortStatus portStatus = intent.getParcelableExtra( UsbManager.EXTRA_PORT_STATUS, UsbPortStatus.class); @@ -160,40 +186,7 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { != UsbPortStatus.DATA_STATUS_DISABLED_FORCE; } - private void setDelayedDisableTaskIfDisconnectedAndLocked(Intent intent) { - if(mKeyguardManager.isKeyguardLocked()) { - if(getUsbPortStatusIsConnectedAndDataEnabled(intent)) { - mDelayedDisableHandler.removeCallbacksAndMessages(null); - } else if(!mDelayedDisableHandler.hasMessagesOrCallbacks()) { - mDelayedDisableHandler.postDelayed(() -> { - disableChangedUsbPortIfDisconnected(intent); - }, DELAY_DISABLE_MS); - } - } - } - - private void disableChangedUsbPortIfDisconnected(Intent intent) { - UsbPortStatus portStatus = - intent.getParcelableExtra( - UsbManager.EXTRA_PORT_STATUS, UsbPortStatus.class); - if (Build.IS_DEBUGGABLE) { - Slog.i( - TAG, - "disableChangedUsbPortIfDisconnected: " + portStatus == null - ? "null" - : portStatus.toString()); - } - - if (mKeyguardManager.isKeyguardLocked() - && portStatus != null && !portStatus.isConnected() - ) { - intent.getParcelableExtra( - UsbManager.EXTRA_PORT, ParcelableUsbPort.class) - .getUsbPort(mUsbManager) - .enableUsbData(false); - } - } - + // TODO: b/401540215 Remove this as part of pre-release cleanup private void dumpUsbDevices() { Slog.d(TAG, "dumpUsbDevices: "); Map<String, UsbDevice> portStatusMap = mUsbManager.getDeviceList(); @@ -238,9 +231,7 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { UsbPortStatus portStatus = intent.getParcelableExtra(UsbManager.EXTRA_PORT_STATUS, UsbPortStatus.class); if (mKeyguardManager.isKeyguardLocked() - && portStatus != null - && portStatus.isConnected() - && portStatus.getUsbDataStatus() == UsbPortStatus.DATA_STATUS_DISABLED_FORCE) { + && usbPortIsConnectedWithDataDisabled(portStatus)) { sendNotification( mContext.getString( R.string.usb_apm_usb_plugged_in_when_locked_notification_title), @@ -251,39 +242,46 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { } } - private void setUsbDataSignalIfNoConnectedDevices(boolean status) { - // disable all ports that don't have an active data connection - if (!status) { - for (UsbPort usbPort : mUsbManager.getPorts()) { - if (Build.IS_DEBUGGABLE) { - Slog.i( - TAG, - "setUsbDataSignal: false " + usbPort.getStatus() == null - ? "null" - : usbPort.getStatus().toString()); - } - if (usbPort.getStatus() == null - || !usbPort.getStatus().isConnected() - || usbPort.getStatus().getCurrentDataRole() - == UsbPortStatus.DATA_ROLE_NONE) { - usbPort.enableUsbData(false); - } - } + private boolean usbPortIsConnectedWithDataDisabled(UsbPortStatus portStatus) { + return portStatus != null + && portStatus.isConnected() + && portStatus.getUsbDataStatus() == DATA_STATUS_DISABLED_FORCE; + } + + private void setUsbDataSignalIfPossible(boolean status) { + if (!status && deviceHaveUsbDataConnection()) { + return; } - // Always re-enable all if true - else { - if (!mUsbManager.enableUsbDataSignal(status)) { + try { + if (!mUsbManagerInternal.enableUsbDataSignal(status, + OS_USB_DISABLE_REASON_LOCKDOWN_MODE)) { Slog.e(TAG, "USB Data protection toggle failed"); } - for (UsbPort usbPort : mUsbManager.getPorts()) { - usbPort.resetUsbPort(mContext.getMainExecutor(), - new Consumer<Integer>() { - public void accept(Integer status) { - Slog.i(TAG, "Consumer status: " + status); - } - }); + } catch (RemoteException e) { + Slog.e(TAG, "RemoteException thrown when calling enableUsbDataSignal", e); + } + } + + private boolean deviceHaveUsbDataConnection() { + for (UsbPort usbPort : mUsbManager.getPorts()) { + if (Build.IS_DEBUGGABLE) { + Slog.i( + TAG, + "setUsbDataSignal: false, Port status: " + usbPort.getStatus() == null + ? "null" + : usbPort.getStatus().toString()); + } + if (usbPortIsConnectedWithDataEnabled(usbPort)) { + return true; } } + return false; + } + + private boolean usbPortIsConnectedWithDataEnabled(UsbPort usbPort) { + return usbPort.getStatus() != null + && usbPort.getStatus().isConnected() + && usbPort.getStatus().getCurrentDataRole() != DATA_ROLE_NONE; } private void registerReceiver() { diff --git a/services/core/java/com/android/server/storage/StorageUserConnection.java b/services/core/java/com/android/server/storage/StorageUserConnection.java index 27ca83addec8..126b3a7c721f 100644 --- a/services/core/java/com/android/server/storage/StorageUserConnection.java +++ b/services/core/java/com/android/server/storage/StorageUserConnection.java @@ -351,18 +351,38 @@ public final class StorageUserConnection { } } + private void waitForAsyncVoid(AsyncStorageServiceCall asyncCall) throws Exception { + waitForAsyncVoid(asyncCall, /*bindIfNotConnected*/ true, + DEFAULT_REMOTE_TIMEOUT_SECONDS); + } + + private void waitForAsyncVoid(AsyncStorageServiceCall asyncCall, + boolean bindIfNotConnected, int timeoutSeconds) throws Exception { CompletableFuture<Void> opFuture = new CompletableFuture<>(); RemoteCallback callback = new RemoteCallback(result -> setResult(result, opFuture)); - waitForAsync(asyncCall, callback, opFuture, mOutstandingOps, - DEFAULT_REMOTE_TIMEOUT_SECONDS); + waitForAsync(asyncCall, callback, opFuture, mOutstandingOps, bindIfNotConnected, + timeoutSeconds); } private <T> T waitForAsync(AsyncStorageServiceCall asyncCall, RemoteCallback callback, CompletableFuture<T> opFuture, ArrayList<CompletableFuture<T>> outstandingOps, - long timeoutSeconds) throws Exception { - CompletableFuture<IExternalStorageService> serviceFuture = connectIfNeeded(); + boolean bindIfNotConnected, long timeoutSeconds) throws Exception { + + CompletableFuture<IExternalStorageService> serviceFuture; + if (bindIfNotConnected) { + serviceFuture = connectIfNeeded(); + } else { + synchronized (mLock) { + if (mRemoteFuture == null || mRemoteFuture.getNow(null) == null) { + Slog.w(TAG, "Dropping async request as service is not connected" + + "and request doesn't require connecting"); + return null; + } + serviceFuture = mRemoteFuture; + } + } try { synchronized (mLock) { @@ -404,7 +424,11 @@ public final class StorageUserConnection { public void endSession(Session session) throws ExternalStorageServiceException { try { waitForAsyncVoid((service, callback) -> - service.endSession(session.sessionId, callback)); + service.endSession(session.sessionId, callback), + // endSession shouldn't be trying to bind to remote service if the service + // isn't connected already as this means that no previous mounting has been + // completed. + /*bindIfNotConnected*/ false, /*timeoutSeconds*/ 10); } catch (Exception e) { throw new ExternalStorageServiceException("Failed to end session: " + session, e); } @@ -415,7 +439,11 @@ public final class StorageUserConnection { ExternalStorageServiceException { try { waitForAsyncVoid((service, callback) -> - service.notifyVolumeStateChanged(sessionId, vol, callback)); + service.notifyVolumeStateChanged(sessionId, vol, callback), + // notifyVolumeStateChanged shouldn't be trying to bind to remote service + // if the service isn't connected already as this means that + // no previous mounting has been completed + /*bindIfNotConnected*/ false, /*timeoutSeconds*/ 10); } catch (Exception e) { throw new ExternalStorageServiceException("Failed to notify volume state changed " + "for vol : " + vol, e); diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index e91d88901751..df00fa195f03 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -625,7 +625,7 @@ final class ActivityRecord extends WindowToken { @VisibleForTesting final TaskFragment.ConfigOverrideHint mResolveConfigHint; - private final boolean mOptOutEdgeToEdge; + final boolean mOptOutEdgeToEdge; private static ConstrainDisplayApisConfig sConstrainDisplayApisConfig; @@ -5590,6 +5590,14 @@ final class ActivityRecord extends WindowToken { commitVisibility(visible, performLayout, false /* fromTransition */); } + /** + * Sets whether safe region bounds are needed for the Activity. This is called from + * {@link ActivityStarter} after the source record is created. + */ + void setNeedsSafeRegionBounds(boolean needsSafeRegionBounds) { + mAppCompatController.getSafeRegionPolicy().setNeedsSafeRegionBounds(needsSafeRegionBounds); + } + /** Updates draw state and shows drawn windows. */ void commitFinishDrawing(SurfaceControl.Transaction t) { boolean committed = false; @@ -7753,9 +7761,11 @@ final class ActivityRecord extends WindowToken { final AppCompatAspectRatioPolicy aspectRatioPolicy = mAppCompatController.getAspectRatioPolicy(); aspectRatioPolicy.reset(); + final AppCompatSafeRegionPolicy safeRegionPolicy = + mAppCompatController.getSafeRegionPolicy(); mAppCompatController.getLetterboxPolicy().resetFixedOrientationLetterboxEligibility(); mResolveConfigHint.resolveTmpOverrides(mDisplayContent, newParentConfiguration, - isFixedRotationTransforming()); + isFixedRotationTransforming(), safeRegionPolicy.getLatestSafeRegionBounds()); // Can't use resolvedConfig.windowConfiguration.getWindowingMode() because it can be // different from windowing mode of the task (PiP) during transition from fullscreen to PiP @@ -7801,6 +7811,13 @@ final class ActivityRecord extends WindowToken { } } + // If activity can be letterboxed due to a safe region only, use the safe region bounds + // as the resolved bounds. We ignore cases where the letterboxing can happen due to other + // app compat conditions and a safe region since the safe region app compat is sandboxed + // earlier in TaskFragment.ConfigOverrideHint.resolveTmpOverrides. + mAppCompatController.getSafeRegionPolicy().resolveSafeRegionBoundsConfigurationIfNeeded( + resolvedConfig, newParentConfiguration); + if (isFixedOrientationLetterboxAllowed || scmPolicy.hasAppCompatDisplayInsetsWithoutInheritance() // In fullscreen, can be letterboxed for aspect ratio. @@ -7980,7 +7997,7 @@ final class ActivityRecord extends WindowToken { mAppCompatController.getSizeCompatModePolicy(); final Rect screenResolvedBounds = scmPolicy.replaceResolvedBoundsIfNeeded(resolvedBounds); final Rect parentAppBounds = mResolveConfigHint.mParentAppBoundsOverride; - final Rect parentBounds = newParentConfiguration.windowConfiguration.getBounds(); + final Rect parentBounds = mResolveConfigHint.mParentBoundsOverride; final float screenResolvedBoundsWidth = screenResolvedBounds.width(); final float parentAppBoundsWidth = parentAppBounds.width(); final boolean isImmersiveMode = isImmersiveMode(parentBounds); @@ -8167,7 +8184,7 @@ final class ActivityRecord extends WindowToken { * in this method. */ private void resolveFixedOrientationConfiguration(@NonNull Configuration newParentConfig) { - final Rect parentBounds = newParentConfig.windowConfiguration.getBounds(); + final Rect parentBounds = mResolveConfigHint.mParentBoundsOverride; final Rect stableBounds = new Rect(); final Rect outNonDecorBounds = mTmpBounds; // If orientation is respected when insets are applied, then stableBounds will be empty. diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index a84a008f66eb..92f51bed419f 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -2203,6 +2203,9 @@ class ActivityStarter { ? mLaunchParams.mPreferredTaskDisplayArea : mRootWindowContainer.getDefaultTaskDisplayArea(); mPreferredWindowingMode = mLaunchParams.mWindowingMode; + if (mLaunchParams.mNeedsSafeRegionBounds != null) { + r.setNeedsSafeRegionBounds(mLaunchParams.mNeedsSafeRegionBounds); + } } private TaskDisplayArea computeSuggestedLaunchDisplayArea( diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java index b0563128870a..b7ef1057388c 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java @@ -36,6 +36,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.content.Intent.ACTION_VIEW; @@ -1634,16 +1635,19 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { } } - private void moveHomeRootTaskToFrontIfNeeded(int flags, TaskDisplayArea taskDisplayArea, + @VisibleForTesting + void moveHomeRootTaskToFrontIfNeeded(int flags, TaskDisplayArea taskDisplayArea, String reason) { final Task focusedRootTask = taskDisplayArea.getFocusedRootTask(); if ((taskDisplayArea.getWindowingMode() == WINDOWING_MODE_FULLSCREEN && (flags & ActivityManager.MOVE_TASK_WITH_HOME) != 0) - || (focusedRootTask != null && focusedRootTask.isActivityTypeRecents())) { + || (focusedRootTask != null && focusedRootTask.isActivityTypeRecents() + && focusedRootTask.getWindowingMode() != WINDOWING_MODE_MULTI_WINDOW)) { // We move root home task to front when we are on a fullscreen display area and // caller has requested the home activity to move with it. Or the previous root task - // is recents. + // is recents and we are not on multi-window mode. + taskDisplayArea.moveHomeRootTaskToFront(reason); } } @@ -2830,6 +2834,13 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { "startActivityFromRecents: Task " + taskId + " not found."); } + + if (task.getRootTask() != null + && task.getRootTask().getWindowingMode() == WINDOWING_MODE_MULTI_WINDOW) { + // Don't move home forward if task is in multi window mode + moveHomeTaskForward = false; + } + if (moveHomeTaskForward) { // We always want to return to the home activity instead of the recents // activity from whatever is started from the recents activity, so move diff --git a/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java b/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java index 3535a96d9c45..d6f058a34367 100644 --- a/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java +++ b/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java @@ -240,7 +240,7 @@ class AppCompatAspectRatioPolicy { final Configuration resolvedConfig = mActivityRecord.getResolvedOverrideConfiguration(); final Rect parentAppBounds = mActivityRecord.mResolveConfigHint.mParentAppBoundsOverride; - final Rect parentBounds = newParentConfiguration.windowConfiguration.getBounds(); + final Rect parentBounds = mActivityRecord.mResolveConfigHint.mParentBoundsOverride; final Rect resolvedBounds = resolvedConfig.windowConfiguration.getBounds(); // Use tmp bounds to calculate aspect ratio so we can know whether the activity should // use restricted size (resolved bounds may be the requested override bounds). diff --git a/services/core/java/com/android/server/wm/AppCompatController.java b/services/core/java/com/android/server/wm/AppCompatController.java index c479591a5e0d..28f9a33d65d3 100644 --- a/services/core/java/com/android/server/wm/AppCompatController.java +++ b/services/core/java/com/android/server/wm/AppCompatController.java @@ -33,6 +33,8 @@ class AppCompatController { @NonNull private final AppCompatAspectRatioPolicy mAspectRatioPolicy; @NonNull + private final AppCompatSafeRegionPolicy mSafeRegionPolicy; + @NonNull private final AppCompatReachabilityPolicy mReachabilityPolicy; @NonNull private final DesktopAppCompatAspectRatioPolicy mDesktopAspectRatioPolicy; @@ -62,6 +64,7 @@ class AppCompatController { mOrientationPolicy = new AppCompatOrientationPolicy(activityRecord, mAppCompatOverrides); mAspectRatioPolicy = new AppCompatAspectRatioPolicy(activityRecord, mTransparentPolicy, mAppCompatOverrides); + mSafeRegionPolicy = new AppCompatSafeRegionPolicy(activityRecord, packageManager); mReachabilityPolicy = new AppCompatReachabilityPolicy(activityRecord, wmService.mAppCompatConfiguration); mLetterboxPolicy = new AppCompatLetterboxPolicy(activityRecord, @@ -90,6 +93,11 @@ class AppCompatController { } @NonNull + AppCompatSafeRegionPolicy getSafeRegionPolicy() { + return mSafeRegionPolicy; + } + + @NonNull DesktopAppCompatAspectRatioPolicy getDesktopAspectRatioPolicy() { return mDesktopAspectRatioPolicy; } @@ -163,6 +171,6 @@ class AppCompatController { getTransparentPolicy().dump(pw, prefix); getLetterboxPolicy().dump(pw, prefix); getSizeCompatModePolicy().dump(pw, prefix); + getSafeRegionPolicy().dump(pw, prefix); } - } diff --git a/services/core/java/com/android/server/wm/AppCompatSafeRegionPolicy.java b/services/core/java/com/android/server/wm/AppCompatSafeRegionPolicy.java new file mode 100644 index 000000000000..959609309da1 --- /dev/null +++ b/services/core/java/com/android/server/wm/AppCompatSafeRegionPolicy.java @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm; + +import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING; + +import android.annotation.NonNull; +import android.content.pm.PackageManager; +import android.content.res.Configuration; +import android.graphics.Rect; + +import java.io.PrintWriter; +import java.util.function.BooleanSupplier; + +/** + * Encapsulate app compat policy logic related to a safe region. + */ +class AppCompatSafeRegionPolicy { + @NonNull + private final ActivityRecord mActivityRecord; + @NonNull + final PackageManager mPackageManager; + // Whether the Activity needs to be in the safe region bounds. + private boolean mNeedsSafeRegionBounds = false; + // Denotes the latest safe region bounds. Can be empty if the activity or the ancestors do + // not have any safe region bounds. + @NonNull + private final Rect mLatestSafeRegionBounds = new Rect(); + // Whether the activity has allowed safe region letterboxing. This can be set through the + // manifest and the default value is true. + @NonNull + private final BooleanSupplier mAllowSafeRegionLetterboxing; + + AppCompatSafeRegionPolicy(@NonNull ActivityRecord activityRecord, + @NonNull PackageManager packageManager) { + mActivityRecord = activityRecord; + mPackageManager = packageManager; + mAllowSafeRegionLetterboxing = AppCompatUtils.asLazy(() -> { + // Application level property. + if (allowSafeRegionLetterboxing(packageManager)) { + return true; + } + // Activity level property. + try { + return packageManager.getPropertyAsUser( + PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING, + mActivityRecord.mActivityComponent.getPackageName(), + mActivityRecord.mActivityComponent.getClassName(), + mActivityRecord.mUserId).getBoolean(); + } catch (PackageManager.NameNotFoundException e) { + return true; + } + }); + } + + private boolean allowSafeRegionLetterboxing(PackageManager pm) { + try { + return pm.getPropertyAsUser( + PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING, + mActivityRecord.packageName, + /* className */ null, + mActivityRecord.mUserId).getBoolean(); + } catch (PackageManager.NameNotFoundException e) { + return true; + } + } + + /** + * Computes the latest safe region bounds in + * {@link ActivityRecord#resolveOverrideConfiguration(Configuration)} since the activity has not + * been attached to the parent container when the ActivityRecord is instantiated. Note that the + * latest safe region bounds will be empty if activity has not allowed safe region letterboxing. + * + * @return latest safe region bounds as set on an ancestor window container. + */ + public Rect getLatestSafeRegionBounds() { + if (!allowSafeRegionLetterboxing()) { + mLatestSafeRegionBounds.setEmpty(); + return null; + } + // Get the latest safe region bounds since the bounds could have changed + final Rect latestSafeRegionBounds = mActivityRecord.getSafeRegionBounds(); + if (latestSafeRegionBounds != null) { + mLatestSafeRegionBounds.set(latestSafeRegionBounds); + } else { + mLatestSafeRegionBounds.setEmpty(); + } + return latestSafeRegionBounds; + } + + /** + * Computes bounds when letterboxing is required only for the safe region bounds if needed. + */ + public void resolveSafeRegionBoundsConfigurationIfNeeded(@NonNull Configuration resolvedConfig, + @NonNull Configuration newParentConfig) { + if (mLatestSafeRegionBounds.isEmpty()) { + return; + } + // If activity can not be letterboxed for a safe region only or it has not been attached + // to a WindowContainer yet. + if (!isLetterboxedForSafeRegionOnlyAllowed() || mActivityRecord.getParent() == null) { + return; + } + resolvedConfig.windowConfiguration.setBounds(mLatestSafeRegionBounds); + mActivityRecord.computeConfigByResolveHint(resolvedConfig, newParentConfig); + } + + /** + * Safe region bounds can either be applied along with size compat, fixed orientation or + * aspect ratio conditions by sandboxing them to the safe region bounds. Or it can be applied + * independently when no other letterboxing condition is triggered. This method helps detecting + * the latter case. + * + * @return {@code true} if this application or activity has allowed safe region letterboxing and + * can be letterboxed only due to the safe region being set on the current or ancestor window + * container. + */ + boolean isLetterboxedForSafeRegionOnlyAllowed() { + return !mActivityRecord.areBoundsLetterboxed() && getNeedsSafeRegionBounds() + && getLatestSafeRegionBounds() != null; + } + + /** + * Set {@code true} if this activity needs to be within the safe region bounds, else false. + */ + public void setNeedsSafeRegionBounds(boolean needsSafeRegionBounds) { + mNeedsSafeRegionBounds = needsSafeRegionBounds; + } + + /** + * @return {@code true} if this activity needs to be within the safe region bounds. + */ + public boolean getNeedsSafeRegionBounds() { + return mNeedsSafeRegionBounds; + } + + /** @see android.view.WindowManager#PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING */ + boolean allowSafeRegionLetterboxing() { + return mAllowSafeRegionLetterboxing.getAsBoolean(); + } + + void dump(@NonNull PrintWriter pw, @NonNull String prefix) { + if (mNeedsSafeRegionBounds) { + pw.println(prefix + " mNeedsSafeRegionBounds=true"); + } + if (isLetterboxedForSafeRegionOnlyAllowed()) { + pw.println(prefix + " isLetterboxForSafeRegionOnlyAllowed=true"); + } + if (!allowSafeRegionLetterboxing()) { + pw.println(prefix + " allowSafeRegionLetterboxing=false"); + } + } +} diff --git a/services/core/java/com/android/server/wm/AppCompatUtils.java b/services/core/java/com/android/server/wm/AppCompatUtils.java index b91a12598e01..f872286726c3 100644 --- a/services/core/java/com/android/server/wm/AppCompatUtils.java +++ b/services/core/java/com/android/server/wm/AppCompatUtils.java @@ -216,6 +216,7 @@ final class AppCompatUtils { AppCompatCameraPolicy.getCameraCompatFreeformMode(top); appCompatTaskInfo.setHasMinAspectRatioOverride(top.mAppCompatController .getDesktopAspectRatioPolicy().hasMinAspectRatioOverride(task)); + appCompatTaskInfo.setOptOutEdgeToEdge(top.mOptOutEdgeToEdge); } /** @@ -241,6 +242,10 @@ final class AppCompatUtils { if (aspectRatioPolicy.isLetterboxedForAspectRatioOnly()) { return "ASPECT_RATIO"; } + if (activityRecord.mAppCompatController.getSafeRegionPolicy() + .isLetterboxedForSafeRegionOnlyAllowed()) { + return "SAFE_REGION"; + } return "UNKNOWN_REASON"; } diff --git a/services/core/java/com/android/server/wm/ContentRecorder.java b/services/core/java/com/android/server/wm/ContentRecorder.java index c26acec19743..1c2569251581 100644 --- a/services/core/java/com/android/server/wm/ContentRecorder.java +++ b/services/core/java/com/android/server/wm/ContentRecorder.java @@ -38,6 +38,7 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.view.ContentRecordingSession; import android.view.ContentRecordingSession.RecordContent; +import android.window.DesktopExperienceFlags; import android.view.Display; import android.view.DisplayInfo; import android.view.SurfaceControl; @@ -353,6 +354,13 @@ final class ContentRecorder implements WindowContainerListener { return; } + // Recording should not be started on displays that are eligible for hosting tasks. + // See android.view.Display#canHostTasks(). + if (DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue() + && mDisplayContent.mDisplay.canHostTasks()) { + return; + } + if (mContentRecordingSession.isWaitingForConsent() || !isDisplayReadyForMirroring()) { ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, "Content Recording: waiting to record, so do " + "nothing"); diff --git a/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java b/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java index fcc697242ff6..b8027546fdbd 100644 --- a/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java +++ b/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java @@ -38,7 +38,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.display.BrightnessSynchronizer; import com.android.internal.protolog.ProtoLog; import com.android.server.wm.utils.DisplayInfoOverrides.DisplayInfoFieldsUpdater; -import com.android.window.flags.Flags; import java.util.Arrays; import java.util.Objects; @@ -336,7 +335,6 @@ class DeferredDisplayUpdater { /** Returns {@code true} if the transition will control when to turn on the screen. */ boolean waitForTransition(@NonNull Message screenUnblocker) { - if (!Flags.waitForTransitionOnDisplaySwitch()) return false; if (!mShouldWaitForTransitionWhenScreenOn) { return false; } diff --git a/services/core/java/com/android/server/wm/DesktopModeBoundsCalculator.java b/services/core/java/com/android/server/wm/DesktopModeBoundsCalculator.java index 7a959c14fbd2..ce3ad889a308 100644 --- a/services/core/java/com/android/server/wm/DesktopModeBoundsCalculator.java +++ b/services/core/java/com/android/server/wm/DesktopModeBoundsCalculator.java @@ -24,6 +24,8 @@ import static android.content.pm.ActivityInfo.isFixedOrientationPortrait; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; +import static com.android.internal.policy.SystemBarUtils.getDesktopViewAppHeaderHeightPx; +import static com.android.internal.policy.DesktopModeCompatUtils.shouldExcludeCaptionFromAppBounds; import static com.android.server.wm.LaunchParamsUtil.applyLayoutGravity; import static com.android.server.wm.LaunchParamsUtil.calculateLayoutBounds; @@ -64,7 +66,8 @@ public final class DesktopModeBoundsCalculator { */ static void updateInitialBounds(@NonNull Task task, @Nullable WindowLayout layout, @Nullable ActivityRecord activity, @Nullable ActivityOptions options, - @NonNull Rect outBounds, @NonNull Consumer<String> logger) { + @NonNull LaunchParamsController.LaunchParams outParams, + @NonNull Consumer<String> logger) { // Use stable frame instead of raw frame to avoid launching freeform windows on top of // stable insets, which usually are system widgets such as sysbar & navbar. final Rect stableBounds = new Rect(); @@ -77,36 +80,44 @@ public final class DesktopModeBoundsCalculator { // during the size update. final boolean shouldRespectOptionPosition = updateOptionBoundsSize && DesktopModeFlags.ENABLE_CASCADING_WINDOWS.isTrue(); + final int captionHeight = activity != null && shouldExcludeCaptionFromAppBounds( + activity.info, task.isResizeable(), activity.mOptOutEdgeToEdge) + ? getDesktopViewAppHeaderHeightPx(activity.mWmService.mContext) : 0; if (options != null && options.getLaunchBounds() != null && !updateOptionBoundsSize) { - outBounds.set(options.getLaunchBounds()); - logger.accept("inherit-from-options=" + outBounds); + outParams.mBounds.set(options.getLaunchBounds()); + logger.accept("inherit-from-options=" + outParams.mBounds); } else if (layout != null) { final int verticalGravity = layout.gravity & Gravity.VERTICAL_GRAVITY_MASK; final int horizontalGravity = layout.gravity & Gravity.HORIZONTAL_GRAVITY_MASK; if (layout.hasSpecifiedSize()) { - calculateLayoutBounds(stableBounds, layout, outBounds, + calculateLayoutBounds(stableBounds, layout, outParams.mBounds, calculateIdealSize(stableBounds, DESKTOP_MODE_INITIAL_BOUNDS_SCALE)); - applyLayoutGravity(verticalGravity, horizontalGravity, outBounds, + applyLayoutGravity(verticalGravity, horizontalGravity, outParams.mBounds, stableBounds); logger.accept("layout specifies sizes, inheriting size and applying gravity"); } else if (verticalGravity > 0 || horizontalGravity > 0) { - outBounds.set(calculateInitialBounds(task, activity, stableBounds, options, - shouldRespectOptionPosition)); - applyLayoutGravity(verticalGravity, horizontalGravity, outBounds, + outParams.mBounds.set(calculateInitialBounds(task, activity, stableBounds, options, + shouldRespectOptionPosition, captionHeight)); + applyLayoutGravity(verticalGravity, horizontalGravity, outParams.mBounds, stableBounds); logger.accept("layout specifies gravity, applying desired bounds and gravity"); logger.accept("respecting option bounds cascaded position=" + shouldRespectOptionPosition); } } else { - outBounds.set(calculateInitialBounds(task, activity, stableBounds, options, - shouldRespectOptionPosition)); + outParams.mBounds.set(calculateInitialBounds(task, activity, stableBounds, options, + shouldRespectOptionPosition, captionHeight)); logger.accept("layout not specified, applying desired bounds"); logger.accept("respecting option bounds cascaded position=" + shouldRespectOptionPosition); } + if (updateOptionBoundsSize && captionHeight != 0) { + outParams.mAppBounds.set(outParams.mBounds); + outParams.mAppBounds.top += captionHeight; + logger.accept("excluding caption height from app bounds"); + } } /** @@ -119,7 +130,8 @@ public final class DesktopModeBoundsCalculator { @NonNull private static Rect calculateInitialBounds(@NonNull Task task, @NonNull ActivityRecord activity, @NonNull Rect stableBounds, - @Nullable ActivityOptions options, boolean shouldRespectOptionPosition + @Nullable ActivityOptions options, boolean shouldRespectOptionPosition, + int captionHeight ) { // Display bounds not taking into account insets. final TaskDisplayArea displayArea = task.getDisplayArea(); @@ -160,7 +172,8 @@ public final class DesktopModeBoundsCalculator { } // If activity is unresizeable, regardless of orientation, calculate maximum size // (within the ideal size) maintaining original aspect ratio. - yield maximizeSizeGivenAspectRatio(activityOrientation, idealSize, appAspectRatio); + yield maximizeSizeGivenAspectRatio(activityOrientation, idealSize, appAspectRatio, + captionHeight); } case ORIENTATION_PORTRAIT -> { // Device in portrait orientation. @@ -188,11 +201,12 @@ public final class DesktopModeBoundsCalculator { // ratio. yield maximizeSizeGivenAspectRatio(activityOrientation, new Size(customPortraitWidthForLandscapeApp, idealSize.getHeight()), - appAspectRatio); + appAspectRatio, captionHeight); } // For portrait unresizeable activities, calculate maximum size (within the ideal // size) maintaining original aspect ratio. - yield maximizeSizeGivenAspectRatio(activityOrientation, idealSize, appAspectRatio); + yield maximizeSizeGivenAspectRatio(activityOrientation, idealSize, appAspectRatio, + captionHeight); } default -> idealSize; }; @@ -232,13 +246,15 @@ public final class DesktopModeBoundsCalculator { * Calculates the largest size that can fit in a given area while maintaining a specific aspect * ratio. */ + // TODO(b/400617906): Merge duplicate initial bounds calculations to shared class. @NonNull private static Size maximizeSizeGivenAspectRatio( @ScreenOrientation int orientation, @NonNull Size targetArea, - float aspectRatio + float aspectRatio, + int captionHeight ) { - final int targetHeight = targetArea.getHeight(); + final int targetHeight = targetArea.getHeight() - captionHeight; final int targetWidth = targetArea.getWidth(); final int finalHeight; final int finalWidth; @@ -275,7 +291,7 @@ public final class DesktopModeBoundsCalculator { finalHeight = (int) (finalWidth / aspectRatio); } } - return new Size(finalWidth, finalHeight); + return new Size(finalWidth, finalHeight + captionHeight); } /** diff --git a/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java b/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java index ddcb5eccb1d8..03ba1a51ad7b 100644 --- a/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java +++ b/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java @@ -113,14 +113,23 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { // Copy over any values outParams.set(currentParams); - // In Proto2, trampoline task launches of an existing background task can result in the - // previous windowing mode to be restored even if the desktop mode state has changed. - // Let task launches inherit the windowing mode from the source task if available, which - // should have the desired windowing mode set by WM Shell. See b/286929122. if (source != null && source.getTask() != null) { final Task sourceTask = source.getTask(); - outParams.mWindowingMode = sourceTask.getWindowingMode(); - appendLog("inherit-from-source=" + outParams.mWindowingMode); + if (DesktopModeFlags.DISABLE_DESKTOP_LAUNCH_PARAMS_OUTSIDE_DESKTOP_BUG_FIX.isTrue() + && isEnteringDesktopMode(sourceTask, options, currentParams)) { + // If trampoline source is not freeform but we are entering or in desktop mode, + // ignore the source windowing mode and set the windowing mode to freeform + outParams.mWindowingMode = WINDOWING_MODE_FREEFORM; + appendLog("freeform window mode applied to task trampoline"); + } else { + // In Proto2, trampoline task launches of an existing background task can result in + // the previous windowing mode to be restored even if the desktop mode state has + // changed. Let task launches inherit the windowing mode from the source task if + // available, which should have the desired windowing mode set by WM Shell. + // See b/286929122. + outParams.mWindowingMode = sourceTask.getWindowingMode(); + appendLog("inherit-from-source=" + outParams.mWindowingMode); + } } if (phase == PHASE_WINDOWING_MODE) { @@ -133,6 +142,11 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { } if ((options == null || options.getLaunchBounds() == null) && task.hasOverrideBounds()) { + if (DesktopModeFlags.DISABLE_DESKTOP_LAUNCH_PARAMS_OUTSIDE_DESKTOP_BUG_FIX.isTrue()) { + // We are in desktop, return result done to prevent other modifiers from modifying + // exiting task bounds or resolved windowing mode. + return RESULT_DONE; + } appendLog("current task has bounds set, not overriding"); return RESULT_SKIP; } @@ -150,7 +164,7 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { } DesktopModeBoundsCalculator.updateInitialBounds(task, layout, activity, options, - outParams.mBounds, this::appendLog); + outParams, this::appendLog); appendLog("final desktop mode task bounds set to %s", outParams.mBounds); if (options != null && options.getFlexibleLaunchSize()) { // Return result done to prevent other modifiers from respecting option bounds and diff --git a/services/core/java/com/android/server/wm/Dimmer.java b/services/core/java/com/android/server/wm/Dimmer.java index 25fdf89afad1..2798e843d6dd 100644 --- a/services/core/java/com/android/server/wm/Dimmer.java +++ b/services/core/java/com/android/server/wm/Dimmer.java @@ -211,14 +211,17 @@ class Dimmer { * child should call setAppearance again to request the Dim to continue. * If multiple containers call this method, only the changes relative to the topmost will be * applied. + * The creation of the dim layer is delayed if the requested dim and blur are 0. * @param dimmingContainer Container requesting the dim * @param alpha Dim amount * @param blurRadius Blur amount */ protected void adjustAppearance(@NonNull WindowState dimmingContainer, float alpha, int blurRadius) { - final DimState d = obtainDimState(dimmingContainer); - d.prepareLookChange(alpha, blurRadius); + if (mDimState != null || (alpha != 0 || blurRadius != 0)) { + final DimState d = obtainDimState(dimmingContainer); + d.prepareLookChange(alpha, blurRadius); + } } /** diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 42b63d125d6b..76a39d9c884a 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -5698,7 +5698,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp // This display is configured to show system decorations. return true; } - if (isPublicSecondaryDisplayWithDesktopModeForceEnabled()) { + if (!DesktopExperienceFlags.ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT.isTrue() + && isPublicSecondaryDisplayWithDesktopModeForceEnabled()) { if (com.android.window.flags.Flags.rearDisplayDisableForceDesktopSystemDecorations()) { // System decorations should not be forced on a rear display due to security // policies. diff --git a/services/core/java/com/android/server/wm/LaunchParamsController.java b/services/core/java/com/android/server/wm/LaunchParamsController.java index fa65bda7104d..2406178e46fe 100644 --- a/services/core/java/com/android/server/wm/LaunchParamsController.java +++ b/services/core/java/com/android/server/wm/LaunchParamsController.java @@ -26,6 +26,7 @@ import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier. import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.RESULT_SKIP; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityOptions; import android.app.WindowConfiguration.WindowingMode; @@ -36,6 +37,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * {@link LaunchParamsController} calculates the {@link LaunchParams} by coordinating between @@ -96,18 +98,18 @@ class LaunchParamsController { mTmpResult.reset(); final LaunchParamsModifier modifier = mModifiers.get(i); - switch(modifier.onCalculate(task, layout, activity, source, options, request, phase, + switch (modifier.onCalculate(task, layout, activity, source, options, request, phase, mTmpCurrent, mTmpResult)) { case RESULT_SKIP: // Do not apply any results when we are told to skip continue; case RESULT_DONE: // Set result and return immediately. - result.set(mTmpResult); + result.merge(mTmpResult); return; case RESULT_CONTINUE: // Set result and continue - result.set(mTmpResult); + result.merge(mTmpResult); break; } } @@ -138,6 +140,10 @@ class LaunchParamsController { mService.deferWindowLayout(); try { if (task.getRootTask().inMultiWindowMode()) { + if (!mTmpParams.mAppBounds.isEmpty()) { + task.getRequestedOverrideConfiguration().windowConfiguration.setAppBounds( + mTmpParams.mAppBounds); + } task.setBounds(mTmpParams.mBounds); return true; } @@ -168,7 +174,11 @@ class LaunchParamsController { */ static class LaunchParams { /** The bounds within the parent container. */ + @NonNull final Rect mBounds = new Rect(); + /** The bounds within the parent container respecting insets. Usually empty. */ + @NonNull + final Rect mAppBounds = new Rect(); /** The display area the {@link Task} would prefer to be on. */ @Nullable @@ -178,24 +188,45 @@ class LaunchParamsController { @WindowingMode int mWindowingMode; + /** Whether the Activity needs the safe region bounds. A {@code null} value means unset. */ + @Nullable + Boolean mNeedsSafeRegionBounds = null; + /** Sets values back to default. {@link #isEmpty} will return {@code true} once called. */ void reset() { mBounds.setEmpty(); + mAppBounds.setEmpty(); mPreferredTaskDisplayArea = null; mWindowingMode = WINDOWING_MODE_UNDEFINED; + mNeedsSafeRegionBounds = null; } /** Copies the values set on the passed in {@link LaunchParams}. */ void set(LaunchParams params) { mBounds.set(params.mBounds); + mAppBounds.set(params.mAppBounds); + mPreferredTaskDisplayArea = params.mPreferredTaskDisplayArea; + mWindowingMode = params.mWindowingMode; + mNeedsSafeRegionBounds = params.mNeedsSafeRegionBounds; + } + + /** Merges the values set on the passed in {@link LaunchParams}. */ + void merge(LaunchParams params) { + mBounds.set(params.mBounds); + mAppBounds.set(params.mAppBounds); mPreferredTaskDisplayArea = params.mPreferredTaskDisplayArea; mWindowingMode = params.mWindowingMode; + // Only update mNeedsSafeRegionBounds if a modifier updates it by setting a non null + // value. Otherwise, carry over from previous modifiers + if (params.mNeedsSafeRegionBounds != null) { + mNeedsSafeRegionBounds = params.mNeedsSafeRegionBounds; + } } /** Returns {@code true} if no values have been explicitly set. */ boolean isEmpty() { - return mBounds.isEmpty() && mPreferredTaskDisplayArea == null - && mWindowingMode == WINDOWING_MODE_UNDEFINED; + return mBounds.isEmpty() && mAppBounds.isEmpty() && mPreferredTaskDisplayArea == null + && mWindowingMode == WINDOWING_MODE_UNDEFINED && mNeedsSafeRegionBounds == null; } boolean hasWindowingMode() { @@ -215,15 +246,20 @@ class LaunchParamsController { if (mPreferredTaskDisplayArea != that.mPreferredTaskDisplayArea) return false; if (mWindowingMode != that.mWindowingMode) return false; - return mBounds != null ? mBounds.equals(that.mBounds) : that.mBounds == null; + if (!mAppBounds.equals(that.mAppBounds)) return false; + if (!Objects.equals(mNeedsSafeRegionBounds, that.mNeedsSafeRegionBounds)) return false; + return !mBounds.isEmpty() ? mBounds.equals(that.mBounds) : that.mBounds.isEmpty(); } @Override public int hashCode() { - int result = mBounds != null ? mBounds.hashCode() : 0; + int result = !mBounds.isEmpty() ? mBounds.hashCode() : 0; + result = 31 * result + mAppBounds.hashCode(); result = 31 * result + (mPreferredTaskDisplayArea != null ? mPreferredTaskDisplayArea.hashCode() : 0); result = 31 * result + mWindowingMode; + result = 31 * result + (mNeedsSafeRegionBounds != null + ? Boolean.hashCode(mNeedsSafeRegionBounds) : 0); return result; } } diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index 960f5beae2b3..70dabf8d23c0 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -2333,15 +2333,24 @@ class TaskFragment extends WindowContainer<WindowContainer> { @Nullable DisplayInfo mTmpOverrideDisplayInfo; @Nullable AppCompatDisplayInsets mTmpCompatInsets; @Nullable Rect mParentAppBoundsOverride; + @Nullable Rect mParentBoundsOverride; int mTmpOverrideConfigOrientation; boolean mUseOverrideInsetsForConfig; void resolveTmpOverrides(DisplayContent dc, Configuration parentConfig, - boolean isFixedRotationTransforming) { - mParentAppBoundsOverride = new Rect(parentConfig.windowConfiguration.getAppBounds()); + boolean isFixedRotationTransforming, @Nullable Rect safeRegionBounds) { + mParentAppBoundsOverride = safeRegionBounds != null ? safeRegionBounds : new Rect( + parentConfig.windowConfiguration.getAppBounds()); + mParentBoundsOverride = safeRegionBounds != null ? safeRegionBounds : new Rect( + parentConfig.windowConfiguration.getBounds()); mTmpOverrideConfigOrientation = parentConfig.orientation; - final Insets insets; - if (mUseOverrideInsetsForConfig && dc != null + Insets insets = Insets.NONE; + if (safeRegionBounds != null) { + // Modify orientation based on the parent app bounds if safe region bounds are set. + mTmpOverrideConfigOrientation = + mParentAppBoundsOverride.height() >= mParentAppBoundsOverride.width() + ? ORIENTATION_PORTRAIT : ORIENTATION_LANDSCAPE; + } else if (mUseOverrideInsetsForConfig && dc != null && !isFloating(parentConfig.windowConfiguration.getWindowingMode())) { // Insets are decoupled from configuration by default from V+, use legacy // compatibility behaviour for apps targeting SDK earlier than 35 @@ -2357,10 +2366,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { .getDecorInsetsInfo(rotation, dw, dh); final Rect stableBounds = decorInsets.mOverrideConfigFrame; mTmpOverrideConfigOrientation = stableBounds.width() > stableBounds.height() - ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT; + ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT; insets = Insets.of(decorInsets.mOverrideNonDecorInsets); - } else { - insets = Insets.NONE; } mParentAppBoundsOverride.inset(insets); } diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 772a7fdfc684..5cbba355a06f 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -97,6 +97,7 @@ import com.android.server.wm.SurfaceAnimator.Animatable; import com.android.server.wm.SurfaceAnimator.AnimationType; import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback; import com.android.server.wm.utils.AlwaysTruePredicate; +import com.android.window.flags.Flags; import java.io.PrintWriter; import java.lang.ref.WeakReference; @@ -161,6 +162,15 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< protected @InsetsType int mMergedExcludeInsetsTypes = 0; private @InsetsType int mExcludeInsetsTypes = 0; + /** + * Bounds for the safe region for this window container which control the + * {@link AppCompatSafeRegionPolicy}. These bounds can be passed on to the subtree if the + * subtree has no other bounds for the safe region. The value will be null if there are no safe + * region bounds for the window container. + */ + @Nullable + private Rect mSafeRegionBounds; + @Nullable private ArrayMap<IBinder, DeathRecipient> mInsetsOwnerDeathRecipientMap; @@ -556,6 +566,38 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< mParent != null ? mParent.mMergedExcludeInsetsTypes : 0); } + /** + * Returns the safe region bounds on the window container. If the window container has no safe + * region bounds set, the safe region bounds as set on the nearest ancestor is returned. + */ + @Nullable + Rect getSafeRegionBounds() { + if (mSafeRegionBounds != null) { + return mSafeRegionBounds; + } + if (mParent == null) { + return null; + } + return mParent.getSafeRegionBounds(); + } + + /** + * Sets the safe region bounds on the window container. Set bounds to {@code null} to reset. + * + * @param safeRegionBounds the safe region {@link Rect} that should be set on this + * WindowContainer + */ + void setSafeRegionBounds(@Nullable Rect safeRegionBounds) { + if (!Flags.safeRegionLetterboxing()) { + Slog.i(TAG, "Feature safe region letterboxing is not available"); + return; + } + mSafeRegionBounds = safeRegionBounds; + // Trigger a config change whenever this method is called since the safe region bounds + // can be modified (including a reset). + onRequestedOverrideConfigurationChanged(getRequestedOverrideConfiguration()); + } + private void mergeExcludeInsetsTypesAndNotifyInsetsChanged( @InsetsType int excludeInsetsTypesFromParent) { final ArraySet<WindowState> changedWindows = new ArraySet<>(); @@ -3230,6 +3272,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< mLocalInsetsSources.valueAt(i).dump(childPrefix, pw); } } + pw.println(prefix + mSafeRegionBounds + " SafeRegionBounds"); } final void updateSurfacePositionNonOrganized() { diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index a012ec137892..6c3d51622ff5 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -78,6 +78,7 @@ import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_SET_LAUNCH_ADJACENT_FLAG_ROOT; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_SET_LAUNCH_ROOT; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_SET_REPARENT_LEAF_TASK_IF_RELAUNCH; +import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_SET_SAFE_REGION_BOUNDS; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_START_SHORTCUT; import static android.window.WindowContainerTransaction.HierarchyOp.REACHABILITY_EVENT_X; import static android.window.WindowContainerTransaction.HierarchyOp.REACHABILITY_EVENT_Y; @@ -1544,6 +1545,19 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub container.setExcludeInsetsTypes(hop.getExcludeInsetsTypes()); break; } + case HIERARCHY_OP_TYPE_SET_SAFE_REGION_BOUNDS: { + final WindowContainer container = WindowContainer.fromBinder(hop.getContainer()); + if (container == null || !container.isAttached()) { + Slog.e(TAG, + "Attempt to operate on unknown or detached container: " + container); + break; + } + if (chain.mTransition != null) { + chain.mTransition.collect(container); + } + container.setSafeRegionBounds(hop.getSafeRegionBounds()); + effects |= TRANSACT_EFFECTS_CLIENT_CONFIG; + } } return effects; } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index ce91fc5baba1..4a93904e466c 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -100,7 +100,6 @@ import static android.view.WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME; import static android.view.WindowManagerPolicyConstants.TYPE_LAYER_MULTIPLIER; import static android.view.WindowManagerPolicyConstants.TYPE_LAYER_OFFSET; -import static com.android.input.flags.Flags.removeInputChannelFromWindowstate; import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_ADD_REMOVE; import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_ANIM; import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_APP_TRANSITIONS; @@ -613,10 +612,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // Input channel and input window handle used by the input dispatcher. final InputWindowHandleWrapper mInputWindowHandle; - /** - * Only populated if flag REMOVE_INPUT_CHANNEL_FROM_WINDOWSTATE is disabled. - */ - private InputChannel mInputChannel; /** * The token will be assigned to {@link InputWindowHandle#token} if this window can receive @@ -1830,12 +1825,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP * Input Manager uses when discarding windows from input consideration. */ boolean isPotentialDragTarget(boolean targetInterceptsGlobalDrag) { - if (removeInputChannelFromWindowstate()) { - return (targetInterceptsGlobalDrag || isVisibleNow()) && !mRemoved - && mInputChannelToken != null && mInputWindowHandle != null; - } return (targetInterceptsGlobalDrag || isVisibleNow()) && !mRemoved - && mInputChannel != null && mInputWindowHandle != null; + && mInputChannelToken != null && mInputWindowHandle != null; } /** @@ -2583,25 +2574,13 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (mInputChannelToken != null) { throw new IllegalStateException("Window already has an input channel token."); } - if (removeInputChannelFromWindowstate()) { - String name = getName(); - InputChannel channel = mWmService.mInputManager.createInputChannel(name); - mInputChannelToken = channel.getToken(); - mInputWindowHandle.setToken(mInputChannelToken); - mWmService.mInputToWindowMap.put(mInputChannelToken, this); - channel.copyTo(outInputChannel); - channel.dispose(); - return; - } - if (mInputChannel != null) { - throw new IllegalStateException("Window already has an input channel."); - } String name = getName(); - mInputChannel = mWmService.mInputManager.createInputChannel(name); - mInputChannelToken = mInputChannel.getToken(); + InputChannel channel = mWmService.mInputManager.createInputChannel(name); + mInputChannelToken = channel.getToken(); mInputWindowHandle.setToken(mInputChannelToken); mWmService.mInputToWindowMap.put(mInputChannelToken, this); - mInputChannel.copyTo(outInputChannel); + channel.copyTo(outInputChannel); + channel.dispose(); } /** @@ -2624,12 +2603,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mInputChannelToken = null; } - if (!removeInputChannelFromWindowstate()) { - if (mInputChannel != null) { - mInputChannel.dispose(); - mInputChannel = null; - } - } mInputWindowHandle.setToken(null); } @@ -3886,14 +3859,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } /** - * Returns {@code true} if activity bounds are letterboxed or letterboxed for display cutout. + * Returns {@code true} if activity bounds are letterboxed or letterboxed for display cutout or + * letterboxed for a safe region. * * <p>Note that letterbox UI may not be shown even when this returns {@code true}. See {@link - * AppCompatLetterboxOverrides#shouldShowLetterboxUi} for more context. + * AppCompatLetterboxPolicy#shouldShowLetterboxUi} for more context. */ boolean areAppWindowBoundsLetterboxed() { return mActivityRecord != null && !isStartingWindowAssociatedToTask() - && (mActivityRecord.areBoundsLetterboxed() || isLetterboxedForDisplayCutout()); + && (mActivityRecord.areBoundsLetterboxed() || isLetterboxedForDisplayCutout() + || mActivityRecord.mAppCompatController + .getSafeRegionPolicy().isLetterboxedForSafeRegionOnlyAllowed()); } /** Returns {@code true} if the window is letterboxed for the display cutout. */ diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index a8c49e11e4e9..e32ce525cb40 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -2309,13 +2309,6 @@ static jint nativeGetKeyCodeForKeyLocation(JNIEnv* env, jobject nativeImplObj, j locationKeyCode); } -static void handleInputChannelDisposed(JNIEnv* env, jobject /* inputChannelObj */, - const std::shared_ptr<InputChannel>& inputChannel, - void* data) { - NativeInputManager* im = static_cast<NativeInputManager*>(data); - im->removeInputChannel(inputChannel->getConnectionToken()); -} - static jobject nativeCreateInputChannel(JNIEnv* env, jobject nativeImplObj, jstring nameObj) { NativeInputManager* im = getNativeInputManager(env, nativeImplObj); @@ -2337,8 +2330,6 @@ static jobject nativeCreateInputChannel(JNIEnv* env, jobject nativeImplObj, jstr return nullptr; } - android_view_InputChannel_setDisposeCallback(env, inputChannelObj, - handleInputChannelDisposed, im); return inputChannelObj; } diff --git a/services/tests/DynamicInstrumentationManagerServiceTests/Android.bp b/services/tests/DynamicInstrumentationManagerServiceTests/Android.bp index 2c2e5fdb68d9..b354e36e1e8f 100644 --- a/services/tests/DynamicInstrumentationManagerServiceTests/Android.bp +++ b/services/tests/DynamicInstrumentationManagerServiceTests/Android.bp @@ -29,6 +29,7 @@ android_test { static_libs: [ "androidx.test.core", "androidx.test.runner", + "flag-junit", "hamcrest-library", "platform-test-annotations", "services.core", diff --git a/services/tests/DynamicInstrumentationManagerServiceTests/src/com/android/server/TestClass.java b/services/tests/DynamicInstrumentationManagerServiceTests/src/com/android/server/TestClass.java index 085f5953f0e5..d3a287dc6423 100644 --- a/services/tests/DynamicInstrumentationManagerServiceTests/src/com/android/server/TestClass.java +++ b/services/tests/DynamicInstrumentationManagerServiceTests/src/com/android/server/TestClass.java @@ -17,6 +17,9 @@ package com.android.server; public class TestClass { + TestClass() { + } + void primitiveParams(boolean a, boolean[] b, byte c, byte[] d, char e, char[] f, short g, short[] h, int i, int[] j, long k, long[] l, float m, float[] n, double o, double[] p) { } diff --git a/services/tests/DynamicInstrumentationManagerServiceTests/src/com/android/server/os/instrumentation/ParseMethodDescriptorTest.java b/services/tests/DynamicInstrumentationManagerServiceTests/src/com/android/server/os/instrumentation/ParseMethodDescriptorTest.java index 6e14bad11837..905c244af4ec 100644 --- a/services/tests/DynamicInstrumentationManagerServiceTests/src/com/android/server/os/instrumentation/ParseMethodDescriptorTest.java +++ b/services/tests/DynamicInstrumentationManagerServiceTests/src/com/android/server/os/instrumentation/ParseMethodDescriptorTest.java @@ -22,6 +22,9 @@ import static org.junit.Assert.assertThrows; import android.os.instrumentation.MethodDescriptor; import android.os.instrumentation.MethodDescriptorParser; import android.platform.test.annotations.Presubmit; +import android.platform.test.annotations.RequiresFlagsEnabled; +import android.platform.test.flag.junit.CheckFlagsRule; +import android.platform.test.flag.junit.DeviceFlagsValueProvider; import androidx.test.filters.SmallTest; @@ -31,9 +34,10 @@ import com.android.server.TestClass; import com.android.server.TestInterface; import com.android.server.TestInterfaceImpl; +import org.junit.Rule; import org.junit.Test; -import java.lang.reflect.Method; +import java.lang.reflect.Executable; /** @@ -53,6 +57,10 @@ public class ParseMethodDescriptorTest { private static final String[] CLASS_PARAMS = new String[]{"java.lang.String", "java.lang.String[]"}; + @Rule + public final CheckFlagsRule mCheckFlagsRule = + DeviceFlagsValueProvider.createCheckFlagsRule(); + @Test public void primitiveParams() { assertNotNull(parseMethodDescriptor(TestClass.class.getName(), "primitiveParams", @@ -66,6 +74,13 @@ public class ParseMethodDescriptorTest { } @Test + @RequiresFlagsEnabled(com.android.art.flags.Flags.FLAG_EXECUTABLE_METHOD_FILE_OFFSETS_V2) + public void constructor() { + assertNotNull( + parseMethodDescriptor(TestClass.class.getName(), "<init>")); + } + + @Test public void publicMethod() { assertNotNull( parseMethodDescriptor(TestClass.class.getName(), "publicMethod")); @@ -119,13 +134,14 @@ public class ParseMethodDescriptorTest { new String[]{"int"})); } - private Method parseMethodDescriptor(String fqcn, String methodName) { + private Executable parseMethodDescriptor(String fqcn, String methodName) { return MethodDescriptorParser.parseMethodDescriptor( getClass().getClassLoader(), getMethodDescriptor(fqcn, methodName, new String[]{})); } - private Method parseMethodDescriptor(String fqcn, String methodName, String[] fqParameters) { + private Executable parseMethodDescriptor( + String fqcn, String methodName, String[] fqParameters) { return MethodDescriptorParser.parseMethodDescriptor( getClass().getClassLoader(), getMethodDescriptor(fqcn, methodName, fqParameters)); diff --git a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/UserDataPreparerTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/UserDataPreparerTest.java index e545a49d3139..554b5b4297f2 100644 --- a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/UserDataPreparerTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/UserDataPreparerTest.java @@ -19,8 +19,8 @@ package com.android.server.pm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/services/tests/displayservicetests/src/com/android/server/display/whitebalance/AmbientLuxTest.java b/services/tests/displayservicetests/src/com/android/server/display/whitebalance/AmbientLuxTest.java index f9fbf1bd5085..b41f03bb8030 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/whitebalance/AmbientLuxTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/whitebalance/AmbientLuxTest.java @@ -17,9 +17,9 @@ package com.android.server.display.whitebalance; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/services/tests/dreamservicetests/src/com/android/server/dreams/TestDreamEnvironment.java b/services/tests/dreamservicetests/src/com/android/server/dreams/TestDreamEnvironment.java index 7c239ef02e58..586ff52aa78c 100644 --- a/services/tests/dreamservicetests/src/com/android/server/dreams/TestDreamEnvironment.java +++ b/services/tests/dreamservicetests/src/com/android/server/dreams/TestDreamEnvironment.java @@ -328,6 +328,7 @@ public class TestDreamEnvironment { case DREAM_STATE_STARTED -> startDream(); case DREAM_STATE_WOKEN -> wakeDream(); } + mTestableLooper.processAllMessages(); } while (mCurrentDreamState < state); return true; diff --git a/services/tests/mockingservicestests/src/com/android/server/RescuePartyTest.java b/services/tests/mockingservicestests/src/com/android/server/RescuePartyTest.java index eda5e8613dba..77d67019c0ed 100644 --- a/services/tests/mockingservicestests/src/com/android/server/RescuePartyTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/RescuePartyTest.java @@ -67,6 +67,9 @@ import java.util.concurrent.TimeUnit; /** * Test RescueParty. + * TODO: b/354112511 delete this file + * Moved to frameworks/base/tests/PackageWatchdog/src/com/android/server/RescuePartyTest + * */ public class RescuePartyTest { private static final long CURRENT_NETWORK_TIME_MILLIS = 0L; diff --git a/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java index 2a513ae3a8e8..d79d88400cf9 100644 --- a/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java @@ -953,11 +953,13 @@ public final class AlarmManagerServiceTest { @Test @EnableFlags(Flags.FLAG_ACQUIRE_WAKELOCK_BEFORE_SEND) - public void testWakelockOrdering() throws Exception { + public void testWakelockOrderingFirstAlarm() throws Exception { final long triggerTime = mNowElapsedTest + 5000; final PendingIntent alarmPi = getNewMockPendingIntent(); setTestAlarm(ELAPSED_REALTIME_WAKEUP, triggerTime, alarmPi); + // Pretend that it is the first alarm in this batch, or no other alarms are still processing + mService.mBroadcastRefCount = 0; mNowElapsedTest = mTestTimer.getElapsed(); mTestTimer.expire(); @@ -975,20 +977,51 @@ public final class AlarmManagerServiceTest { @Test @EnableFlags(Flags.FLAG_ACQUIRE_WAKELOCK_BEFORE_SEND) - public void testWakelockReleasedWhenSendFails() throws Exception { + public void testWakelockOrderingNonFirst() throws Exception { final long triggerTime = mNowElapsedTest + 5000; final PendingIntent alarmPi = getNewMockPendingIntent(); setTestAlarm(ELAPSED_REALTIME_WAKEUP, triggerTime, alarmPi); + // Pretend that some previous alarms are still processing. + mService.mBroadcastRefCount = 3; + mNowElapsedTest = mTestTimer.getElapsed(); + mTestTimer.expire(); + + final ArgumentCaptor<PendingIntent.OnFinished> onFinishedCaptor = + ArgumentCaptor.forClass(PendingIntent.OnFinished.class); + verify(alarmPi).send(eq(mMockContext), eq(0), any(Intent.class), onFinishedCaptor.capture(), + any(Handler.class), isNull(), any()); + onFinishedCaptor.getValue().onSendFinished(alarmPi, null, 0, null, null); + + verify(mWakeLock, never()).acquire(); + verify(mWakeLock, never()).release(); + } + + @Test + @EnableFlags(Flags.FLAG_ACQUIRE_WAKELOCK_BEFORE_SEND) + public void testWakelockReleasedWhenSendFails() throws Exception { + final PendingIntent alarmPi = getNewMockPendingIntent(); doThrow(new PendingIntent.CanceledException("test")).when(alarmPi).send(eq(mMockContext), eq(0), any(Intent.class), any(), any(Handler.class), isNull(), any()); + setTestAlarm(ELAPSED_REALTIME_WAKEUP, mNowElapsedTest + 5000, alarmPi); + + // Pretend that it is the first alarm in this batch, or no other alarms are still processing + mService.mBroadcastRefCount = 0; mNowElapsedTest = mTestTimer.getElapsed(); mTestTimer.expire(); final InOrder inOrder = Mockito.inOrder(mWakeLock); inOrder.verify(mWakeLock).acquire(); inOrder.verify(mWakeLock).release(); + + setTestAlarm(ELAPSED_REALTIME_WAKEUP, mNowElapsedTest + 5000, alarmPi); + + // Pretend that some previous alarms are still processing. + mService.mBroadcastRefCount = 4; + mNowElapsedTest = mTestTimer.getElapsed(); + mTestTimer.expire(); + inOrder.verifyNoMoreInteractions(); } @Test diff --git a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java index 194bf4ba73f3..84110ae5cd02 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java @@ -34,9 +34,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java b/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java index 637c73f31ce0..dd5924ad4a7e 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java @@ -88,7 +88,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyLong; -import static org.mockito.Mockito.anyObject; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.clearInvocations; @@ -747,7 +747,7 @@ public final class BackgroundRestrictionTest { mCurrentTimeMillis = 10_000L; doReturn(mCurrentTimeMillis - windowMs).when(stats).getStatsStartTimestamp(); doReturn(mCurrentTimeMillis).when(stats).getStatsEndTimestamp(); - doReturn(statsList).when(mBatteryStatsInternal).getBatteryUsageStats(anyObject()); + doReturn(statsList).when(mBatteryStatsInternal).getBatteryUsageStats(any()); mAppFGSTracker.onForegroundServiceStateChanged(testPkgName, testUid, testPid, true); mAppFGSTracker.onForegroundServiceNotificationUpdated( @@ -1925,7 +1925,7 @@ public final class BackgroundRestrictionTest { mCurrentTimeMillis = 10_000L; doReturn(mCurrentTimeMillis - windowMs).when(stats).getStatsStartTimestamp(); doReturn(mCurrentTimeMillis).when(stats).getStatsEndTimestamp(); - doReturn(statsList).when(mBatteryStatsInternal).getBatteryUsageStats(anyObject()); + doReturn(statsList).when(mBatteryStatsInternal).getBatteryUsageStats(any()); // Run with a media playback service which starts/stops immediately, we should // goto the restricted bucket. @@ -3170,7 +3170,7 @@ public final class BackgroundRestrictionTest { inv.getArgument(2)); return null; }).when(telephonyManager).registerCarrierPrivilegesCallback( - anyInt(), anyObject(), anyObject()); + anyInt(), any(), any()); } public void registerCarrierPrivilegesCallback(int phoneId, Executor executor, diff --git a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java index 3a9c99d57d71..d540b2ec13eb 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java @@ -155,7 +155,6 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { doAnswer((invocation) -> { Log.v(TAG, "Intercepting startProcessLocked() for " + Arrays.toString(invocation.getArguments())); - assertHealth(); final String processName = invocation.getArgument(0); final ProcessStartBehavior behavior = mNewProcessStartBehaviors.getOrDefault( processName, mNextProcessStartBehavior.getAndSet(ProcessStartBehavior.SUCCESS)); @@ -206,6 +205,9 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { mActiveProcesses.remove(res); res.setKilled(true); break; + case MISSING_RESPONSE: + res.setPendingStart(true); + break; default: throw new UnsupportedOperationException(); } @@ -244,6 +246,7 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { mConstants.ALLOW_BG_ACTIVITY_START_TIMEOUT = 0; mConstants.PENDING_COLD_START_CHECK_INTERVAL_MILLIS = 500; mConstants.MAX_FROZEN_OUTGOING_BROADCASTS = 10; + mConstants.PENDING_COLD_START_ABANDON_TIMEOUT_MILLIS = 2000; } @After @@ -279,6 +282,8 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { FAIL_NULL, /** Process is killed without reporting to BroadcastQueue */ KILLED_WITHOUT_NOTIFY, + /** Process start fails without no response */ + MISSING_RESPONSE, } private enum ProcessBehavior { @@ -1173,6 +1178,37 @@ public class BroadcastQueueTest extends BaseBroadcastQueueTest { verifyScheduleReceiver(times(1), receiverOrangeApp, timezone); } + @Test + public void testProcessStartWithMissingResponse() throws Exception { + final ProcessRecord callerApp = makeActiveProcessRecord(PACKAGE_RED); + final ProcessRecord receiverBlueApp = makeActiveProcessRecord(PACKAGE_BLUE); + + mNewProcessStartBehaviors.put(PACKAGE_GREEN, ProcessStartBehavior.MISSING_RESPONSE); + + final Intent airplane = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); + enqueueBroadcast(makeBroadcastRecord(airplane, callerApp, List.of( + withPriority(makeManifestReceiver(PACKAGE_GREEN, CLASS_GREEN), 10), + withPriority(makeRegisteredReceiver(receiverBlueApp), 5), + withPriority(makeManifestReceiver(PACKAGE_YELLOW, CLASS_YELLOW), 0)))); + + final Intent timezone = new Intent(Intent.ACTION_TIMEZONE_CHANGED); + enqueueBroadcast(makeBroadcastRecord(timezone, callerApp, + List.of(makeManifestReceiver(PACKAGE_ORANGE, CLASS_ORANGE)))); + + waitForIdle(); + final ProcessRecord receiverGreenApp = mAms.getProcessRecordLocked(PACKAGE_GREEN, + getUidForPackage(PACKAGE_GREEN)); + final ProcessRecord receiverYellowApp = mAms.getProcessRecordLocked(PACKAGE_YELLOW, + getUidForPackage(PACKAGE_YELLOW)); + final ProcessRecord receiverOrangeApp = mAms.getProcessRecordLocked(PACKAGE_ORANGE, + getUidForPackage(PACKAGE_ORANGE)); + + verifyScheduleReceiver(times(1), receiverGreenApp, airplane); + verifyScheduleRegisteredReceiver(times(1), receiverBlueApp, airplane); + verifyScheduleReceiver(times(1), receiverYellowApp, airplane); + verifyScheduleReceiver(times(1), receiverOrangeApp, timezone); + } + /** * Verify that a broadcast sent to a frozen app, which gets killed as part of unfreezing * process due to pending sync binder transactions, is delivered as expected. diff --git a/services/tests/servicestests/src/com/android/server/rollback/WatchdogRollbackLoggerTest.java b/services/tests/mockingservicestests/src/com/android/server/rollback/WatchdogRollbackLoggerTest.java index 8257168f8d08..8257168f8d08 100644 --- a/services/tests/servicestests/src/com/android/server/rollback/WatchdogRollbackLoggerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/rollback/WatchdogRollbackLoggerTest.java diff --git a/services/tests/mockingservicestests/src/com/android/server/utils/TimingsTraceAndSlogTest.java b/services/tests/mockingservicestests/src/com/android/server/utils/TimingsTraceAndSlogTest.java index 52cd29cabb94..1415dd690a0a 100644 --- a/services/tests/mockingservicestests/src/com/android/server/utils/TimingsTraceAndSlogTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/utils/TimingsTraceAndSlogTest.java @@ -22,10 +22,10 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.contains; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.matches; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.contains; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.matches; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/IntrusionDetectionServiceTest.java b/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/IntrusionDetectionServiceTest.java index 879aa4893802..2fd316edf71a 100644 --- a/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/IntrusionDetectionServiceTest.java +++ b/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/IntrusionDetectionServiceTest.java @@ -409,7 +409,7 @@ public class IntrusionDetectionServiceTest { final String TAG = "startTestService"; final CountDownLatch latch = new CountDownLatch(1); LocalIntrusionDetectionEventTransport transport = - new LocalIntrusionDetectionEventTransport(); + new LocalIntrusionDetectionEventTransport(mContext); ServiceConnection serviceConnection = new ServiceConnection() { // Called when connection with the service is established. diff --git a/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/TestApp/src/com/android/coretests/apps/testapp/LocalIntrusionDetectionEventTransport.java b/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/TestApp/src/com/android/coretests/apps/testapp/LocalIntrusionDetectionEventTransport.java index f0012da44fa4..b0b781575cb3 100644 --- a/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/TestApp/src/com/android/coretests/apps/testapp/LocalIntrusionDetectionEventTransport.java +++ b/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/TestApp/src/com/android/coretests/apps/testapp/LocalIntrusionDetectionEventTransport.java @@ -18,8 +18,13 @@ package com.android.coretests.apps.testapp; +import android.app.admin.SecurityLog; +import android.app.admin.SecurityLog.SecurityEvent; +import android.content.Context; +import android.content.Intent; import android.security.intrusiondetection.IntrusionDetectionEvent; import android.security.intrusiondetection.IntrusionDetectionEventTransport; +import android.util.Log; import java.util.ArrayList; import java.util.List; @@ -36,6 +41,44 @@ import java.util.List; public class LocalIntrusionDetectionEventTransport extends IntrusionDetectionEventTransport { private List<IntrusionDetectionEvent> mEvents = new ArrayList<>(); + private static final String ACTION_SECURITY_EVENT_RECEIVED = + "com.android.coretests.apps.testapp.ACTION_SECURITY_EVENT_RECEIVED"; + private static final String TAG = "LocalIntrusionDetectionEventTransport"; + private static final String TEST_SECURITY_EVENT_TAG = "test_security_event_tag"; + private static Context sContext; + + public LocalIntrusionDetectionEventTransport(Context context) { + sContext = context; + } + + // Broadcast an intent to the CTS test service to indicate that the security + // event was received. + private static void broadcastSecurityEventReceived() { + try { + Intent intent = new Intent(ACTION_SECURITY_EVENT_RECEIVED); + sContext.sendBroadcast(intent); + Log.i(TAG, "LIZ_TESTING: sent broadcast"); + } catch (Exception e) { + Log.e(TAG, "Exception sending broadcast", e); + } + } + + private static void checkIfSecurityEventReceivedFromCts(List<IntrusionDetectionEvent> events) { + // Loop through the events and check if any of them are the security event + // that uses the TEST_SECURITY_EVENT_TAG tag, which is set by the CTS test. + for (IntrusionDetectionEvent event : events) { + if (event.getType() == IntrusionDetectionEvent.SECURITY_EVENT) { + SecurityEvent securityEvent = event.getSecurityEvent(); + Object[] eventData = (Object[]) securityEvent.getData(); + if (securityEvent.getTag() == SecurityLog.TAG_KEY_GENERATED + && eventData[1].equals(TEST_SECURITY_EVENT_TAG)) { + broadcastSecurityEventReceived(); + return; + } + } + } + } + @Override public boolean initialize() { return true; @@ -43,6 +86,11 @@ public class LocalIntrusionDetectionEventTransport extends IntrusionDetectionEve @Override public boolean addData(List<IntrusionDetectionEvent> events) { + // Our CTS tests will generate a security event. In order to + // verify the event is received with the appropriate data, we will + // check the events locally and set a property value that can be + // read by the test. + checkIfSecurityEventReceivedFromCts(events); mEvents.addAll(events); return true; } @@ -55,4 +103,4 @@ public class LocalIntrusionDetectionEventTransport extends IntrusionDetectionEve public List<IntrusionDetectionEvent> getEvents() { return mEvents; } -}
\ No newline at end of file +} diff --git a/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/TestApp/src/com/android/coretests/apps/testapp/TestLoggingService.java b/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/TestApp/src/com/android/coretests/apps/testapp/TestLoggingService.java index e4bf987402fd..9183a75580ff 100644 --- a/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/TestApp/src/com/android/coretests/apps/testapp/TestLoggingService.java +++ b/services/tests/security/intrusiondetection/src/com/android/server/security/intrusiondetection/TestApp/src/com/android/coretests/apps/testapp/TestLoggingService.java @@ -17,19 +17,20 @@ package com.android.coretests.apps.testapp; import android.app.Service; +import android.content.Context; import android.content.Intent; import android.os.IBinder; -import android.os.Process; - -import com.android.internal.infra.AndroidFuture; - public class TestLoggingService extends Service { private static final String TAG = "TestLoggingService"; private LocalIntrusionDetectionEventTransport mLocalIntrusionDetectionEventTransport; - public TestLoggingService() { - mLocalIntrusionDetectionEventTransport = new LocalIntrusionDetectionEventTransport(); + @Override + public void onCreate() { + super.onCreate(); + + Context context = getApplicationContext(); + mLocalIntrusionDetectionEventTransport = new LocalIntrusionDetectionEventTransport(context); } // Binder given to clients. diff --git a/services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java b/services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java index 5240f581fd9f..cc0d5e4710d2 100644 --- a/services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java @@ -32,8 +32,8 @@ 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.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java index ce3751abfed7..75df9a8707c0 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java @@ -23,10 +23,10 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -328,8 +328,8 @@ public class NetworkScoreServiceTest { // updateScores should update both caches mNetworkScoreService.updateScores(new ScoredNetwork[]{SCORED_NETWORK}); - verify(mNetworkScoreCache).updateScores(anyListOf(ScoredNetwork.class)); - verify(mNetworkScoreCache2).updateScores(anyListOf(ScoredNetwork.class)); + verify(mNetworkScoreCache).updateScores(anyList()); + verify(mNetworkScoreCache2).updateScores(anyList()); mNetworkScoreService.unregisterNetworkScoreCache( NetworkKey.TYPE_WIFI, mNetworkScoreCache2); @@ -337,7 +337,7 @@ public class NetworkScoreServiceTest { // updateScores should only update the first cache since the 2nd has been unregistered mNetworkScoreService.updateScores(new ScoredNetwork[]{SCORED_NETWORK}); - verify(mNetworkScoreCache, times(2)).updateScores(anyListOf(ScoredNetwork.class)); + verify(mNetworkScoreCache, times(2)).updateScores(anyList()); mNetworkScoreService.unregisterNetworkScoreCache( NetworkKey.TYPE_WIFI, mNetworkScoreCache); diff --git a/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java b/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java index 52428e8bc478..1621c5d41a3d 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java @@ -23,9 +23,9 @@ import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/services/tests/servicestests/src/com/android/server/PinnerServiceTest.java b/services/tests/servicestests/src/com/android/server/PinnerServiceTest.java index c18faef2c028..16df97b76c94 100644 --- a/services/tests/servicestests/src/com/android/server/PinnerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/PinnerServiceTest.java @@ -18,7 +18,7 @@ package com.android.server; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java index 9cfa51a85988..8253595a50d1 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -2374,14 +2374,6 @@ public class AccessibilityManagerServiceTest { return lockState; } - private void assertStartActivityWithExpectedComponentName(Context mockContext, - String componentName) { - verify(mockContext).startActivityAsUser(mIntentArgumentCaptor.capture(), - any(Bundle.class), any(UserHandle.class)); - assertThat(mIntentArgumentCaptor.getValue().getStringExtra( - Intent.EXTRA_COMPONENT_NAME)).isEqualTo(componentName); - } - private void assertStartActivityWithExpectedShortcutType(Context mockContext, @UserShortcutType int shortcutType) { verify(mockContext).startActivityAsUser(mIntentArgumentCaptor.capture(), @@ -2484,10 +2476,6 @@ public class AccessibilityManagerServiceTest { return mMockContext; } - public void addMockUserContext(int userId, Context context) { - mMockUserContexts.put(userId, context); - } - @Override @NonNull public Context createContextAsUser(UserHandle user, int flags) { diff --git a/services/tests/servicestests/src/com/android/server/accessibility/ActionReplacingCallbackTest.java b/services/tests/servicestests/src/com/android/server/accessibility/ActionReplacingCallbackTest.java index c16f3d3fa1ab..1792201a304a 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/ActionReplacingCallbackTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/ActionReplacingCallbackTest.java @@ -29,9 +29,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -129,7 +129,7 @@ public class ActionReplacingCallbackTest { mMockServiceCallback, mMockReplacerConnection, INTERACTION_ID, INTERROGATING_PID, INTERROGATING_TID); verify(mMockReplacerConnection).findAccessibilityNodeInfoByAccessibilityId( - eq(AccessibilityNodeInfo.ROOT_NODE_ID), (Region) anyObject(), + eq(AccessibilityNodeInfo.ROOT_NODE_ID), (Region) any(), mInteractionIdCaptor.capture(), eq(mActionReplacingCallback), eq(0), eq(INTERROGATING_PID), eq(INTERROGATING_TID), nullable(MagnificationSpec.class), nullable(float[].class), eq(null)); @@ -246,9 +246,9 @@ public class ActionReplacingCallbackTest { throws RemoteException { doThrow(RemoteException.class).when(mMockReplacerConnection) .findAccessibilityNodeInfoByAccessibilityId(eq(AccessibilityNodeInfo.ROOT_NODE_ID), - (Region) anyObject(), anyInt(), (ActionReplacingCallback) anyObject(), + (Region) any(), anyInt(), (ActionReplacingCallback) any(), eq(0), eq(INTERROGATING_PID), eq(INTERROGATING_TID), - (MagnificationSpec) anyObject(), nullable(float[].class), eq(null)); + (MagnificationSpec) any(), nullable(float[].class), eq(null)); ActionReplacingCallback actionReplacingCallback = new ActionReplacingCallback( mMockServiceCallback, mMockReplacerConnection, INTERACTION_ID, INTERROGATING_PID, INTERROGATING_TID); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureDispatcherTest.java b/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureDispatcherTest.java index 30d00ad716e6..f5a708d71ba3 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureDispatcherTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureDispatcherTest.java @@ -18,8 +18,8 @@ package com.android.server.accessibility; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java b/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java index ebb73e877db4..c3256cad0fd8 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java @@ -20,10 +20,10 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -96,12 +96,12 @@ public class KeyEventDispatcherTest { mLock, powerManager, mMessageCapturingHandler); mKeyEventFilter1 = mock(KeyEventFilter.class); - when(mKeyEventFilter1.onKeyEvent((KeyEvent) anyObject(), + when(mKeyEventFilter1.onKeyEvent((KeyEvent) any(), mFilter1SequenceCaptor.capture().intValue())) .thenReturn(true); mKeyEventFilter2 = mock(KeyEventFilter.class); - when(mKeyEventFilter2.onKeyEvent((KeyEvent) anyObject(), + when(mKeyEventFilter2.onKeyEvent((KeyEvent) any(), mFilter2SequenceCaptor.capture().intValue())) .thenReturn(true); } @@ -122,7 +122,7 @@ public class KeyEventDispatcherTest { @Test public void testNotifyKeyEvent_boundServiceDoesntProcessEvents_shouldReturnFalse() { KeyEventFilter keyEventFilter = mock(KeyEventFilter.class); - when(keyEventFilter.onKeyEvent((KeyEvent) anyObject(), anyInt())).thenReturn(false); + when(keyEventFilter.onKeyEvent((KeyEvent) any(), anyInt())).thenReturn(false); assertFalse(mKeyEventDispatcher .notifyKeyEventLocked(mKeyEvent, 0, Arrays.asList(keyEventFilter))); assertFalse(isTimeoutPending(mMessageCapturingHandler)); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/KeyboardInterceptorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/KeyboardInterceptorTest.java index c62cae5e9b6e..e3515125397a 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/KeyboardInterceptorTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/KeyboardInterceptorTest.java @@ -21,8 +21,8 @@ import static junit.framework.Assert.assertTrue; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -94,7 +94,7 @@ public class KeyboardInterceptorTest { when(mMockPolicy.interceptKeyBeforeDispatching((IBinder) argThat(nullValue()), argThat(matchesKeyEvent(event)), eq(0))).thenReturn(-1L); mInterceptor.onKeyEvent(event, 0); - verify(mMockAms, times(0)).notifyKeyEvent(anyObject(), anyInt()); + verify(mMockAms, times(0)).notifyKeyEvent(any(), anyInt()); assertFalse(mHandler.hasMessages()); } @@ -106,7 +106,7 @@ public class KeyboardInterceptorTest { mInterceptor.onKeyEvent(event, 0); assertTrue(mHandler.hasMessages()); - verify(mMockAms, times(0)).notifyKeyEvent(anyObject(), anyInt()); + verify(mMockAms, times(0)).notifyKeyEvent(any(), anyInt()); when(mMockPolicy.interceptKeyBeforeDispatching((IBinder) argThat(nullValue()), argThat(matchesKeyEvent(event)), eq(0))).thenReturn(0L); @@ -123,13 +123,13 @@ public class KeyboardInterceptorTest { mInterceptor.onKeyEvent(event, 0); assertTrue(mHandler.hasMessages()); - verify(mMockAms, times(0)).notifyKeyEvent(anyObject(), anyInt()); + verify(mMockAms, times(0)).notifyKeyEvent(any(), anyInt()); when(mMockPolicy.interceptKeyBeforeDispatching((IBinder) argThat(nullValue()), argThat(matchesKeyEvent(event)), eq(0))).thenReturn(-1L); mHandler.sendAllMessages(); - verify(mMockAms, times(0)).notifyKeyEvent(anyObject(), anyInt()); + verify(mMockAms, times(0)).notifyKeyEvent(any(), anyInt()); } @Test diff --git a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java index c75cfe67ab79..9b8e619c964d 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java @@ -29,9 +29,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java index ea25e7992dd9..a0482382fb41 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java @@ -18,12 +18,14 @@ package com.android.server.accessibility.autoclick; import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; +import static com.android.server.accessibility.autoclick.AutoclickTypePanel.AUTOCLICK_TYPE_RIGHT_CLICK; import static com.android.server.testutils.MockitoUtilsKt.eq; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -547,6 +549,29 @@ public class AutoclickControllerTest { @Test @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR) + public void triggerRightClickWithRevertToLeftClickEnabled_resetClickType() { + // Move mouse to initialize autoclick panel. + injectFakeMouseActionHoverMoveEvent(); + + AutoclickTypePanel mockAutoclickTypePanel = mock(AutoclickTypePanel.class); + mController.mAutoclickTypePanel = mockAutoclickTypePanel; + mController.clickPanelController.handleAutoclickTypeChange(AUTOCLICK_TYPE_RIGHT_CLICK); + + // Set ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK to true. + Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), + Settings.Secure.ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK, + AccessibilityUtils.State.ON, + mTestableContext.getUserId()); + mController.onChangeForTesting(/* selfChange= */ true, + Settings.Secure.getUriFor( + Settings.Secure.ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK)); + when(mockAutoclickTypePanel.isPaused()).thenReturn(false); + mController.mClickScheduler.run(); + assertThat(mController.mClickScheduler.getRevertToLeftClickForTesting()).isTrue(); + } + + @Test + @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR) public void pauseButton_flagOn_clickNotTriggeredWhenPaused() { injectFakeMouseActionHoverMoveEvent(); @@ -766,6 +791,8 @@ public class AutoclickControllerTest { // Set click type to right click. mController.clickPanelController.handleAutoclickTypeChange( AutoclickTypePanel.AUTOCLICK_TYPE_RIGHT_CLICK); + AutoclickTypePanel mockAutoclickTypePanel = mock(AutoclickTypePanel.class); + mController.mAutoclickTypePanel = mockAutoclickTypePanel; // Send hover move event. MotionEvent hoverMove = MotionEvent.obtain( @@ -787,6 +814,57 @@ public class AutoclickControllerTest { @Test @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR) + public void sendClick_clickType_scroll_showsScrollPanelOnlyOnce() { + MotionEventCaptor motionEventCaptor = new MotionEventCaptor(); + mController.setNext(motionEventCaptor); + + injectFakeMouseActionHoverMoveEvent(); + // Set delay to zero so click is scheduled to run immediately. + mController.mClickScheduler.updateDelay(0); + + // Set click type to scroll. + mController.clickPanelController.handleAutoclickTypeChange( + AutoclickTypePanel.AUTOCLICK_TYPE_SCROLL); + + // Mock the scroll panel to verify interactions. + AutoclickScrollPanel mockScrollPanel = mock(AutoclickScrollPanel.class); + mController.mAutoclickScrollPanel = mockScrollPanel; + + // First hover move event. + MotionEvent hoverMove1 = MotionEvent.obtain( + /* downTime= */ 0, + /* eventTime= */ 100, + /* action= */ MotionEvent.ACTION_HOVER_MOVE, + /* x= */ 30f, + /* y= */ 0f, + /* metaState= */ 0); + hoverMove1.setSource(InputDevice.SOURCE_MOUSE); + mController.onMotionEvent(hoverMove1, hoverMove1, /* policyFlags= */ 0); + mTestableLooper.processAllMessages(); + + // Verify scroll panel is shown once. + verify(mockScrollPanel, times(1)).show(); + assertThat(motionEventCaptor.downEvent).isNull(); + + // Second significant hover move event to trigger another autoclick. + MotionEvent hoverMove2 = MotionEvent.obtain( + /* downTime= */ 0, + /* eventTime= */ 200, + /* action= */ MotionEvent.ACTION_HOVER_MOVE, + /* x= */ 100f, + /* y= */ 100f, + /* metaState= */ 0); + hoverMove2.setSource(InputDevice.SOURCE_MOUSE); + mController.onMotionEvent(hoverMove2, hoverMove2, /* policyFlags= */ 0); + mTestableLooper.processAllMessages(); + + // Verify scroll panel is still only shown once (not called again). + verify(mockScrollPanel, times(1)).show(); + assertThat(motionEventCaptor.downEvent).isNull(); + } + + @Test + @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR) public void hoverOnAutoclickPanel_rightClickType_forceTriggerLeftClick() { MotionEventCaptor motionEventCaptor = new MotionEventCaptor(); mController.setNext(motionEventCaptor); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickTypePanelTest.java b/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickTypePanelTest.java index dd089fcb1d70..8bbbca0b7ed4 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickTypePanelTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickTypePanelTest.java @@ -198,6 +198,72 @@ public class AutoclickTypePanelTest { } @Test + public void clickLeftClickButton_resumeAutoClick() { + // Pause autoclick. + mPauseButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isTrue(); + + // Click the button and verify autoclick resumes. + mLeftClickButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isFalse(); + } + + @Test + public void clickRightClickButton_resumeAutoClick() { + // Pause autoclick. + mPauseButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isTrue(); + + // Click the button and verify autoclick resumes. + mRightClickButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isFalse(); + } + + @Test + public void clickDoubleClickButton_resumeAutoClick() { + // Pause autoclick. + mPauseButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isTrue(); + + // Click the button and verify autoclick resumes. + mDoubleClickButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isFalse(); + } + + @Test + public void clickDragButton_resumeAutoClick() { + // Pause autoclick. + mPauseButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isTrue(); + + // Click the button and verify autoclick resumes. + mDragButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isFalse(); + } + + @Test + public void clickScrollButton_resumeAutoClick() { + // Pause autoclick. + mPauseButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isTrue(); + + // Click the button and verify autoclick resumes. + mScrollButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isFalse(); + } + + @Test + public void clickPositionButton_resumeAutoClick() { + // Pause autoclick. + mPauseButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isTrue(); + + // Click the button and verify autoclick resumes. + mPositionButton.callOnClick(); + assertThat(mAutoclickTypePanel.isPaused()).isFalse(); + } + + @Test public void moveToNextCorner_positionButton_rotatesThroughAllPositions() { // Define all positions in sequence int[][] expectedPositions = { diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java index 4ea5fcfd79c8..31cdd6c3a658 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java @@ -43,8 +43,8 @@ import static org.junit.Assume.assumeTrue; import static org.mockito.AdditionalMatchers.gt; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; diff --git a/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java index 0c92abce7254..9a241043c52f 100644 --- a/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java @@ -19,11 +19,11 @@ package com.android.server.accounts; import static android.database.sqlite.SQLiteDatabase.deleteDatabase; import static org.mockito.ArgumentMatchers.contains; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; diff --git a/services/tests/servicestests/src/com/android/server/accounts/AccountsDbTest.java b/services/tests/servicestests/src/com/android/server/accounts/AccountsDbTest.java index 61ac74cc3490..514c07827ae9 100644 --- a/services/tests/servicestests/src/com/android/server/accounts/AccountsDbTest.java +++ b/services/tests/servicestests/src/com/android/server/accounts/AccountsDbTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java index 1627f683cd3e..6d656609c759 100644 --- a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java @@ -58,10 +58,10 @@ import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doNothing; diff --git a/services/tests/servicestests/src/com/android/server/appop/DiscreteAppOpSqlPersistenceTest.java b/services/tests/servicestests/src/com/android/server/appop/DiscreteAppOpSqlPersistenceTest.java index 01fee7f66497..918159f9262b 100644 --- a/services/tests/servicestests/src/com/android/server/appop/DiscreteAppOpSqlPersistenceTest.java +++ b/services/tests/servicestests/src/com/android/server/appop/DiscreteAppOpSqlPersistenceTest.java @@ -97,7 +97,8 @@ public class DiscreteAppOpSqlPersistenceTest { mDiscreteRegistry.recordDiscreteAccess(opEvent2); List<DiscreteOp> discreteOps = mDiscreteRegistry.getAllDiscreteOps(); - assertThat(discreteOps.size()).isEqualTo(1); + assertWithMessage("Expected list size is 1, but the list is: " + discreteOps) + .that(discreteOps.size()).isEqualTo(1); assertThat(discreteOps).contains(opEvent); } diff --git a/services/tests/servicestests/src/com/android/server/audio/MusicFxHelperTest.java b/services/tests/servicestests/src/com/android/server/audio/MusicFxHelperTest.java index d5638e9346f6..d89cf7bb5db5 100644 --- a/services/tests/servicestests/src/com/android/server/audio/MusicFxHelperTest.java +++ b/services/tests/servicestests/src/com/android/server/audio/MusicFxHelperTest.java @@ -16,7 +16,7 @@ package com.android.server.audio; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -107,13 +107,13 @@ public class MusicFxHelperTest { List<ResolveInfo> list, int bind, int broadcast, String packageName, int audioSession, int uid) { doReturn(mMockPackageManager).when(mMockContext).getPackageManager(); - doReturn(list).when(mMockPackageManager).queryBroadcastReceivers(anyObject(), anyInt()); + doReturn(list).when(mMockPackageManager).queryBroadcastReceivers(any(), anyInt()); if (list != null && list.size() != 0) { try { doReturn(uid).when(mMockPackageManager) - .getPackageUidAsUser(eq(packageName), anyObject(), anyInt()); + .getPackageUidAsUser(eq(packageName), any(), anyInt()); doReturn(mMusicFxUid).when(mMockPackageManager) - .getPackageUidAsUser(eq(mMusicFxPkgName), anyObject(), anyInt()); + .getPackageUidAsUser(eq(mMusicFxPkgName), any(), anyInt()); } catch (PackageManager.NameNotFoundException e) { Log.e(TAG, "NameNotFoundException: " + e); } @@ -123,8 +123,8 @@ public class MusicFxHelperTest { packageName, audioSession); mMusicFxHelper.handleAudioEffectBroadcast(mMockContext, intent); verify(mMockContext, times(bind)) - .bindServiceAsUser(anyObject(), anyObject(), anyInt(), anyObject()); - verify(mMockContext, times(broadcast)).sendBroadcastAsUser(anyObject(), anyObject()); + .bindServiceAsUser(any(), any(), anyInt(), any()); + verify(mMockContext, times(broadcast)).sendBroadcastAsUser(any(), any()); } /** @@ -136,13 +136,13 @@ public class MusicFxHelperTest { List<ResolveInfo> list, int unBind, int broadcast, String packageName, int audioSession, int uid) { doReturn(mMockPackageManager).when(mMockContext).getPackageManager(); - doReturn(list).when(mMockPackageManager).queryBroadcastReceivers(anyObject(), anyInt()); + doReturn(list).when(mMockPackageManager).queryBroadcastReceivers(any(), anyInt()); if (list != null && list.size() != 0) { try { doReturn(uid).when(mMockPackageManager) - .getPackageUidAsUser(eq(packageName), anyObject(), anyInt()); + .getPackageUidAsUser(eq(packageName), any(), anyInt()); doReturn(mMusicFxUid).when(mMockPackageManager) - .getPackageUidAsUser(eq(mMusicFxPkgName), anyObject(), anyInt()); + .getPackageUidAsUser(eq(mMusicFxPkgName), any(), anyInt()); } catch (PackageManager.NameNotFoundException e) { Log.e(TAG, "NameNotFoundException: " + e); } @@ -151,8 +151,8 @@ public class MusicFxHelperTest { Intent intent = newIntent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION, packageName, audioSession); mMusicFxHelper.handleAudioEffectBroadcast(mMockContext, intent); - verify(mMockContext, times(unBind)).unbindService(anyObject()); - verify(mMockContext, times(broadcast)).sendBroadcastAsUser(anyObject(), anyObject()); + verify(mMockContext, times(unBind)).unbindService(any()); + verify(mMockContext, times(broadcast)).sendBroadcastAsUser(any(), any()); } /** @@ -160,8 +160,8 @@ public class MusicFxHelperTest { */ private void sendMessage(int msgId, int uid, int unBinds, int broadcasts) { mMusicFxHelper.handleMessage(Message.obtain(null, msgId, uid /* arg1 */, 0 /* arg2 */)); - verify(mMockContext, times(broadcasts)).sendBroadcastAsUser(anyObject(), anyObject()); - verify(mMockContext, times(unBinds)).unbindService(anyObject()); + verify(mMockContext, times(broadcasts)).sendBroadcastAsUser(any(), any()); + verify(mMockContext, times(unBinds)).unbindService(any()); } /** @@ -209,15 +209,15 @@ public class MusicFxHelperTest { intent.setPackage(mTestPkg1); mMusicFxHelper.handleAudioEffectBroadcast(mMockContext, intent); verify(mMockContext, times(0)) - .bindServiceAsUser(anyObject(), anyObject(), anyInt(), anyObject()); - verify(mMockContext, times(0)).sendBroadcastAsUser(anyObject(), anyObject()); + .bindServiceAsUser(any(), any(), anyInt(), any()); + verify(mMockContext, times(0)).sendBroadcastAsUser(any(), any()); intent = newIntent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION, null, 1); intent.setPackage(mTestPkg2); mMusicFxHelper.handleAudioEffectBroadcast(mMockContext, intent); verify(mMockContext, times(0)) - .bindServiceAsUser(anyObject(), anyObject(), anyInt(), anyObject()); - verify(mMockContext, times(0)).sendBroadcastAsUser(anyObject(), anyObject()); + .bindServiceAsUser(any(), any(), anyInt(), any()); + verify(mMockContext, times(0)).sendBroadcastAsUser(any(), any()); } /** diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java index d8a616214f96..a5d6a19d1491 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java @@ -42,7 +42,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -451,7 +450,7 @@ public class AuthSessionTest { assertEquals(startFingerprintNow ? BiometricSensor.STATE_AUTHENTICATING : BiometricSensor.STATE_COOKIE_RETURNED, session.mPreAuthInfo.eligibleSensors.get(fingerprintSensorId).getSensorState()); - verify(mBiometricContext).updateContext((OperationContextExt) anyObject(), + verify(mBiometricContext).updateContext((OperationContextExt) any(), eq(session.isCrypto())); // start fingerprint sensor if it was delayed @@ -554,7 +553,7 @@ public class AuthSessionTest { session.onDialogDismissed(DISMISSED_REASON_BIOMETRIC_CONFIRMED, null); verify(mBiometricFrameworkStatsLogger, times(1)).authenticate( - (OperationContextExt) anyObject(), + (OperationContextExt) any(), eq(BiometricsProtoEnums.MODALITY_FACE), eq(BiometricsProtoEnums.ACTION_UNKNOWN), eq(BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT), @@ -582,10 +581,10 @@ public class AuthSessionTest { session.onDialogDismissed(DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED, null); verify(mBiometricFrameworkStatsLogger, never()).authenticate( - anyObject(), anyInt(), anyInt(), anyInt(), anyBoolean(), anyLong(), anyInt(), + any(), anyInt(), anyInt(), anyInt(), anyBoolean(), anyLong(), anyInt(), anyBoolean(), anyInt(), eq(-1f)); verify(mBiometricFrameworkStatsLogger, never()).error( - anyObject(), anyInt(), anyInt(), anyInt(), anyBoolean(), anyLong(), anyInt(), + any(), anyInt(), anyInt(), anyInt(), anyBoolean(), anyLong(), anyInt(), anyInt(), anyInt()); } @@ -605,7 +604,7 @@ public class AuthSessionTest { session.onDialogDismissed(DISMISSED_REASON_NEGATIVE, null); verify(mBiometricFrameworkStatsLogger, times(1)).error( - (OperationContextExt) anyObject(), + (OperationContextExt) any(), eq(BiometricsProtoEnums.MODALITY_FACE), eq(BiometricsProtoEnums.ACTION_AUTHENTICATE), eq(BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT), @@ -632,7 +631,7 @@ public class AuthSessionTest { session.onDialogDismissed(DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS, null); verify(mBiometricFrameworkStatsLogger, times(1)).error( - (OperationContextExt) anyObject(), + (OperationContextExt) any(), eq(BiometricsProtoEnums.MODALITY_FACE), eq(BiometricsProtoEnums.ACTION_AUTHENTICATE), eq(BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT), diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java index 5582e13cbb4d..d5fe0bf9cfdf 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java @@ -23,9 +23,9 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java index 03aaeb7e0db8..b52eb0a6857a 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java @@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java index 0a696ef44897..b01895a527c6 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/OverlayPackagesProviderTest.java @@ -27,7 +27,7 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.content.ComponentName; diff --git a/services/tests/servicestests/src/com/android/server/location/contexthub/ContextHubEndpointTest.java b/services/tests/servicestests/src/com/android/server/location/contexthub/ContextHubEndpointTest.java index 565a9b6c1c44..4d2dcf65bfeb 100644 --- a/services/tests/servicestests/src/com/android/server/location/contexthub/ContextHubEndpointTest.java +++ b/services/tests/servicestests/src/com/android/server/location/contexthub/ContextHubEndpointTest.java @@ -80,6 +80,10 @@ public class ContextHubEndpointTest { new HubMessage.Builder(SAMPLE_MESSAGE_TYPE, new byte[] {1, 2, 3, 4, 5}) .setResponseRequired(true) .build(); + private static final HubMessage SAMPLE_UNRELIABLE_MESSAGE = + new HubMessage.Builder(SAMPLE_MESSAGE_TYPE, new byte[] {1, 2, 3, 4, 5}) + .setResponseRequired(false) + .build(); private ContextHubClientManager mClientManager; private ContextHubEndpointManager mEndpointManager; @@ -260,6 +264,24 @@ public class ContextHubEndpointTest { unregisterExampleEndpoint(endpoint); } + @Test + public void testUnreliableMessage() throws RemoteException { + IContextHubEndpoint endpoint = registerExampleEndpoint(); + int sessionId = openTestSession(endpoint); + + mEndpointManager.onMessageReceived(sessionId, SAMPLE_UNRELIABLE_MESSAGE); + ArgumentCaptor<HubMessage> messageCaptor = ArgumentCaptor.forClass(HubMessage.class); + verify(mMockCallback).onMessageReceived(eq(sessionId), messageCaptor.capture()); + assertThat(messageCaptor.getValue()).isEqualTo(SAMPLE_UNRELIABLE_MESSAGE); + + // Confirm we can send another message + mEndpointManager.onMessageReceived(sessionId, SAMPLE_UNRELIABLE_MESSAGE); + verify(mMockCallback, times(2)).onMessageReceived(eq(sessionId), messageCaptor.capture()); + assertThat(messageCaptor.getValue()).isEqualTo(SAMPLE_UNRELIABLE_MESSAGE); + + unregisterExampleEndpoint(endpoint); + } + /** A helper method to create a session and validates reliable message sending. */ private void testMessageTransactionInternal( IContextHubEndpoint endpoint, boolean deliverMessageStatus) throws RemoteException { diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java b/services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java index 570256bf43e6..a46fc2206cf5 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/net/NetworkManagementServiceTest.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java index da14e451d656..03ba3b655fa8 100644 --- a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java @@ -25,11 +25,11 @@ import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.isNull; -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.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java index bbc2cb23b269..242ebc550d16 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java @@ -59,10 +59,10 @@ import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.set; import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.waitOnMainThread; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java index f5690b77d2fe..46c532bc40fa 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java @@ -23,9 +23,9 @@ import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.parceled; import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.set; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java index 19c26f0b60ab..88395a4889c4 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java @@ -21,10 +21,10 @@ import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertWith; import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.list; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; -import static org.mockito.Matchers.notNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.ArgumentMatchers.notNull; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java index ee1bf38a6b24..7ea33ad1184b 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java @@ -18,8 +18,8 @@ package com.android.server.pm; import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertExpectException; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/services/tests/servicestests/src/com/android/server/pm/permission/LegacyPermissionManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/pm/permission/LegacyPermissionManagerServiceTest.java index 3551af83aa47..5e5be12665d6 100644 --- a/services/tests/servicestests/src/com/android/server/pm/permission/LegacyPermissionManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/permission/LegacyPermissionManagerServiceTest.java @@ -17,10 +17,10 @@ package com.android.server.pm.permission; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.testng.Assert.assertThrows; diff --git a/services/tests/servicestests/src/com/android/server/rollback/AppDataRollbackHelperTest.java b/services/tests/servicestests/src/com/android/server/rollback/AppDataRollbackHelperTest.java index 2a4c3fdf8f43..64f88192a0c5 100644 --- a/services/tests/servicestests/src/com/android/server/rollback/AppDataRollbackHelperTest.java +++ b/services/tests/servicestests/src/com/android/server/rollback/AppDataRollbackHelperTest.java @@ -21,8 +21,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/services/tests/servicestests/src/com/android/server/storage/AppCollectorTest.java b/services/tests/servicestests/src/com/android/server/storage/AppCollectorTest.java index 3cdf1098622a..1b93d4a36ec7 100644 --- a/services/tests/servicestests/src/com/android/server/storage/AppCollectorTest.java +++ b/services/tests/servicestests/src/com/android/server/storage/AppCollectorTest.java @@ -48,10 +48,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; diff --git a/services/tests/servicestests/src/com/android/server/storage/DiskStatsLoggingServiceTest.java b/services/tests/servicestests/src/com/android/server/storage/DiskStatsLoggingServiceTest.java index b647b99df894..4a97b4670289 100644 --- a/services/tests/servicestests/src/com/android/server/storage/DiskStatsLoggingServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/storage/DiskStatsLoggingServiceTest.java @@ -18,11 +18,11 @@ package com.android.server.storage; import static com.google.common.truth.Truth.assertThat; -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.Matchers.isNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java index 9a7abd43aab6..15a60dc600e5 100644 --- a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java @@ -62,9 +62,9 @@ import static org.mockito.AdditionalMatchers.not; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.intThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.intThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/services/tests/servicestests/src/com/android/server/utils/PriorityDumpTest.java b/services/tests/servicestests/src/com/android/server/utils/PriorityDumpTest.java index 4eb2474da740..770dfe3666b0 100644 --- a/services/tests/servicestests/src/com/android/server/utils/PriorityDumpTest.java +++ b/services/tests/servicestests/src/com/android/server/utils/PriorityDumpTest.java @@ -20,8 +20,8 @@ import static com.android.server.utils.PriorityDump.dump; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertSame; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.verify; import android.platform.test.annotations.Presubmit; diff --git a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java index bf99b6af2345..3dcd1d7b7da5 100644 --- a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java @@ -43,7 +43,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import java.util.concurrent.CountDownLatch; @@ -340,7 +340,7 @@ public class WebViewUpdateServiceTest { runWebViewBootPreparationOnMainSync(); Mockito.verify(mTestSystemImpl, Mockito.never()).onWebViewProviderChanged( - Matchers.anyObject()); + ArgumentMatchers.any()); WebViewProviderResponse response = mWebViewUpdateServiceImpl.waitForAndGetProvider(); assertEquals(WebViewFactory.LIBLOAD_FAILED_LISTING_WEBVIEW_PACKAGES, response.status); @@ -378,7 +378,7 @@ public class WebViewUpdateServiceTest { runWebViewBootPreparationOnMainSync(); Mockito.verify(mTestSystemImpl, Mockito.never()).onWebViewProviderChanged( - Matchers.anyObject()); + ArgumentMatchers.any()); WebViewProviderResponse response = mWebViewUpdateServiceImpl.waitForAndGetProvider(); assertEquals(WebViewFactory.LIBLOAD_FAILED_LISTING_WEBVIEW_PACKAGES, response.status); @@ -822,7 +822,7 @@ public class WebViewUpdateServiceTest { checkPreparationPhasesForPackage(firstPackage, 1); Mockito.verify(mTestSystemImpl, Mockito.never()).killPackageDependents( - Mockito.anyObject()); + Mockito.any()); } @Test diff --git a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java index 4c0361d30d67..cdc28a13fc8e 100644 --- a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java +++ b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java @@ -25,10 +25,10 @@ import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; import static org.junit.Assert.assertNotEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java index a9759c8a61f3..46be9a57ce57 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java @@ -50,9 +50,9 @@ import static junit.framework.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java index 98440ecdad82..9c85b04fc4ff 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java @@ -40,10 +40,10 @@ import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java index 076e3e9fcc24..aef3d30dba93 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAssistantsTest.java @@ -36,8 +36,8 @@ import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java index bc01fc4f29c0..8fbd3bda98dd 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java @@ -48,7 +48,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; @@ -1114,8 +1113,8 @@ public class NotificationAttentionHelperTest extends UiServiceTestCase { verifyDelayedVibrate( mAttentionHelper.getVibratorHelper().createFallbackVibration( /* insistent= */ false)); - verify(mRingtonePlayer, never()).playAsync(anyObject(), anyObject(), anyBoolean(), - anyObject(), anyFloat()); + verify(mRingtonePlayer, never()).playAsync(any(), any(), anyBoolean(), + any(), anyFloat()); assertTrue(r.isInterruptive()); assertNotEquals(-1, r.getLastAudiblyAlertedMs()); } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelExtractorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelExtractorTest.java index 41011928f8b3..8de2b9c6d3a6 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelExtractorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelExtractorTest.java @@ -32,9 +32,9 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java index 5aecac2cab78..9e8023ff344f 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java @@ -23,9 +23,9 @@ import static com.google.common.truth.Truth.assertWithMessage; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index dd5c601619a0..bc8b7becc919 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -168,10 +168,10 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.atLeastOnce; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java index ec428d506e7b..91e4fd623cd4 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java @@ -25,8 +25,8 @@ import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java index 31436c602e56..62f7471597f0 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java @@ -25,7 +25,7 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java index dcd56e07f0d2..7f05ddefa891 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java @@ -28,9 +28,9 @@ import static junit.framework.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; diff --git a/services/tests/wmtests/src/com/android/server/policy/ModifierShortcutManagerTests.java b/services/tests/wmtests/src/com/android/server/policy/ModifierShortcutManagerTests.java index d961a6acc9c1..50fc77676958 100644 --- a/services/tests/wmtests/src/com/android/server/policy/ModifierShortcutManagerTests.java +++ b/services/tests/wmtests/src/com/android/server/policy/ModifierShortcutManagerTests.java @@ -21,7 +21,7 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat import static org.junit.Assert.assertEquals; import static org.mockito.AdditionalMatchers.aryEq; import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyObject; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.eq; @@ -90,7 +90,7 @@ public class ModifierShortcutManagerTests { XmlResourceParser testBookmarks = mResources.getXml( com.android.frameworks.wmtests.R.xml.bookmarks); - doReturn(mContext).when(mContext).createContextAsUser(anyObject(), anyInt()); + doReturn(mContext).when(mContext).createContextAsUser(any(), anyInt()); when(mContext.getResources()).thenReturn(mResources); when(mContext.getPackageManager()).thenReturn(mPackageManager); when(mResources.getXml(R.xml.bookmarks)).thenReturn(testBookmarks); @@ -106,7 +106,7 @@ public class ModifierShortcutManagerTests { doReturn(testActivityInfo).when(mPackageManager).getActivityInfo( eq(new ComponentName("com.test", "com.test.BookmarkTest")), anyInt()); - doReturn(testResolveInfo).when(mPackageManager).resolveActivity(anyObject(), anyInt()); + doReturn(testResolveInfo).when(mPackageManager).resolveActivity(any(), anyInt()); doThrow(new PackageManager.NameNotFoundException("com.test3")).when(mPackageManager) .getActivityInfo(eq(new ComponentName("com.test3", "com.test.BookmarkTest")), anyInt()); @@ -140,10 +140,10 @@ public class ModifierShortcutManagerTests { public void test_shortcutInfoFromIntent_appIntent() { Intent mockIntent = mock(Intent.class); ActivityInfo mockActivityInfo = mock(ActivityInfo.class); - when(mockActivityInfo.loadLabel(anyObject())).thenReturn("label"); + when(mockActivityInfo.loadLabel(any())).thenReturn("label"); mockActivityInfo.packageName = "android"; when(mockActivityInfo.getIconResource()).thenReturn(R.drawable.sym_def_app_icon); - when(mockIntent.resolveActivityInfo(anyObject(), anyInt())).thenReturn(mockActivityInfo); + when(mockIntent.resolveActivityInfo(any(), anyInt())).thenReturn(mockActivityInfo); KeyboardShortcutInfo info = mModifierShortcutManager.shortcutInfoFromIntent( 'a', mockIntent, true); @@ -161,7 +161,7 @@ public class ModifierShortcutManagerTests { Intent mockSelector = mock(Intent.class); ActivityInfo mockActivityInfo = mock(ActivityInfo.class); mockActivityInfo.name = com.android.internal.app.ResolverActivity.class.getName(); - when(mockIntent.resolveActivityInfo(anyObject(), anyInt())).thenReturn(mockActivityInfo); + when(mockIntent.resolveActivityInfo(any(), anyInt())).thenReturn(mockActivityInfo); when(mockIntent.getSelector()).thenReturn(mockSelector); when(mockSelector.getCategories()).thenReturn( Collections.singleton(Intent.CATEGORY_APP_BROWSER)); diff --git a/services/tests/wmtests/src/com/android/server/policy/ShortcutKeyTestBase.java b/services/tests/wmtests/src/com/android/server/policy/ShortcutKeyTestBase.java index 8ede9efd32a0..c57adfd69b06 100644 --- a/services/tests/wmtests/src/com/android/server/policy/ShortcutKeyTestBase.java +++ b/services/tests/wmtests/src/com/android/server/policy/ShortcutKeyTestBase.java @@ -44,7 +44,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy; import static com.android.server.policy.WindowManagerPolicy.ACTION_PASS_TO_USER; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static java.util.Collections.unmodifiableMap; @@ -111,7 +111,7 @@ class ShortcutKeyTestBase { mContext = spy(getInstrumentation().getTargetContext()); mResources = spy(mContext.getResources()); mPackageManager = spy(mContext.getPackageManager()); - doReturn(mContext).when(mContext).createContextAsUser(anyObject(), anyInt()); + doReturn(mContext).when(mContext).createContextAsUser(any(), anyInt()); doReturn(mResources).when(mContext).getResources(); doReturn(mSettingsProviderRule.mockContentResolver(mContext)) .when(mContext).getContentResolver(); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java index 86d901b640ff..862ce51d3459 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java @@ -20,6 +20,7 @@ import static android.app.ActivityManager.START_DELIVERED_TO_TOP; import static android.app.ActivityManager.START_TASK_TO_FRONT; import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SECONDARY_DISPLAY; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; +import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer; @@ -75,13 +76,15 @@ import java.util.concurrent.TimeUnit; * Tests for the {@link ActivityTaskSupervisor} class. * * Build/Install/Run: - * atest WmTests:ActivityTaskSupervisorTests + * atest WmTests:ActivityTaskSupervisorTests */ @MediumTest @Presubmit @RunWith(WindowTestRunner.class) public class ActivityTaskSupervisorTests extends WindowTestsBase { private static final long TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10); + private static final int DEFAULT_CALLING_PID = -1; + private static final int DEFAULT_CALLING_UID = -1; /** * Ensures that an activity is removed from the stopping activities list once it is resumed. @@ -110,7 +113,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase { .setCreateTask(true).build(); final ConditionVariable condition = new ConditionVariable(); final WaitResult taskToFrontWait = new WaitResult(); - final ComponentName[] launchedComponent = { null }; + final ComponentName[] launchedComponent = {null}; // Create a new thread so the waiting method in test can be notified. new Thread(() -> { synchronized (mAtm.mGlobalLock) { @@ -408,7 +411,8 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase { doNothing().when(mSupervisor.mService).moveTaskToFrontLocked(eq(null), eq(null), anyInt(), anyInt(), any()); - mSupervisor.startActivityFromRecents(-1, -1, activity.getRootTaskId(), safeOptions); + mSupervisor.startActivityFromRecents(DEFAULT_CALLING_PID, DEFAULT_CALLING_UID, + activity.getRootTaskId(), safeOptions); assertThat(activity.mLaunchCookie).isEqualTo(launchCookie); verify(mAtm).moveTaskToFrontLocked(any(), eq(null), anyInt(), anyInt(), eq(safeOptions)); @@ -426,12 +430,62 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase { doNothing().when(mSupervisor.mService).moveTaskToFrontLocked(eq(null), eq(null), anyInt(), anyInt(), any()); - mSupervisor.startActivityFromRecents(-1, -1, activity.getRootTaskId(), safeOptions); + mSupervisor.startActivityFromRecents(DEFAULT_CALLING_PID, DEFAULT_CALLING_UID, + activity.getRootTaskId(), safeOptions); assertThat(activity.mLaunchCookie).isNull(); verify(mAtm).moveTaskToFrontLocked(any(), eq(null), anyInt(), anyInt(), eq(safeOptions)); } + /** Verifies that launch from recents doesn't set the launch cookie on the activity. */ + @Test + public void testStartActivityFromRecents_inMultiWindowRootTask_homeNotMoved() { + final Task multiWindowRootTask = new TaskBuilder(mSupervisor).setWindowingMode( + WINDOWING_MODE_MULTI_WINDOW).setOnTop(true).build(); + + final ActivityRecord activity = new ActivityBuilder(mAtm).setParentTask( + multiWindowRootTask).setCreateTask(true).build(); + + SafeActivityOptions safeOptions = SafeActivityOptions.fromBundle( + ActivityOptions.makeBasic().toBundle(), + Binder.getCallingPid(), Binder.getCallingUid()); + + doNothing().when(mSupervisor.mService).moveTaskToFrontLocked(eq(null), eq(null), anyInt(), + anyInt(), any()); + + mSupervisor.startActivityFromRecents(DEFAULT_CALLING_PID, DEFAULT_CALLING_UID, + activity.getRootTaskId(), safeOptions); + + verify(mAtm).moveTaskToFrontLocked(any(), eq(null), anyInt(), anyInt(), eq(safeOptions)); + verify(mRootWindowContainer.getDefaultTaskDisplayArea(), never()).moveHomeRootTaskToFront( + any()); + verify(multiWindowRootTask.getDisplayArea(), never()).moveHomeRootTaskToFront(any()); + } + + /** Verifies that launch from recents doesn't set the launch cookie on the activity. */ + @Test + public void testStartActivityFromRecents_inFullScreenRootTask_homeMovedToFront() { + final Task fullscreenRootTask = new TaskBuilder(mSupervisor).setWindowingMode( + WINDOWING_MODE_FULLSCREEN).setOnTop(true).build(); + + final ActivityRecord activity = new ActivityBuilder(mAtm).setParentTask( + fullscreenRootTask).setCreateTask(true).build(); + + SafeActivityOptions safeOptions = SafeActivityOptions.fromBundle( + ActivityOptions.makeBasic().toBundle(), + Binder.getCallingPid(), Binder.getCallingUid()); + + doNothing().when(mSupervisor.mService).moveTaskToFrontLocked(eq(null), eq(null), anyInt(), + anyInt(), any()); + + mSupervisor.startActivityFromRecents(DEFAULT_CALLING_PID, DEFAULT_CALLING_UID, + activity.getRootTaskId(), safeOptions); + + verify(mAtm).moveTaskToFrontLocked(any(), eq(null), anyInt(), anyInt(), eq(safeOptions)); + verify(mRootWindowContainer.getDefaultTaskDisplayArea()).moveHomeRootTaskToFront(any()); + verify(fullscreenRootTask.getDisplayArea()).moveHomeRootTaskToFront(any()); + } + @Test public void testOpaque_leafTask_occludingActivity_isOpaque() { final ActivityRecord activity = new ActivityBuilder(mAtm).setCreateTask(true).build(); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatSafeRegionPolicyTests.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatSafeRegionPolicyTests.java new file mode 100644 index 000000000000..bdd57bce7c09 --- /dev/null +++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatSafeRegionPolicyTests.java @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm; + +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; + +import static org.junit.Assert.assertEquals; + +import android.platform.test.annotations.EnableFlags; +import android.platform.test.annotations.Presubmit; + +import androidx.annotation.NonNull; + +import com.android.window.flags.Flags; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.function.Consumer; + +/** + * Test class for {@link AppCompatSafeRegionPolicy}. + * Build/Install/Run: + * atest WmTests:AppCompatSafeRegionPolicyTests + */ +@Presubmit +@RunWith(WindowTestRunner.class) +@EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) +public class AppCompatSafeRegionPolicyTests extends WindowTestsBase { + + @Test + public void testHasNeedsSafeRegion_returnTrue() { + runTestScenario((robot) -> { + robot.activity().createActivityWithComponent(); + robot.setNeedsSafeRegionBounds(/*needsSafeRegionBounds*/ true); + + robot.checkNeedsSafeRegionBounds(/* expected */ true); + }); + } + + @Test + public void testDoesNotHaveNeedsSafeRegion_returnFalse() { + runTestScenario((robot) -> { + robot.activity().createActivityWithComponent(); + robot.setNeedsSafeRegionBounds(/*needsSafeRegionBounds*/ false); + + robot.checkNeedsSafeRegionBounds(/* expected */ false); + }); + } + + /** + * Runs a test scenario providing a Robot. + */ + void runTestScenario(@NonNull Consumer<AppCompatSafeRegionPolicyRobotTest> consumer) { + final AppCompatSafeRegionPolicyRobotTest robot = + new AppCompatSafeRegionPolicyRobotTest(mWm, mAtm, mSupervisor); + consumer.accept(robot); + } + + private static class AppCompatSafeRegionPolicyRobotTest extends AppCompatRobotBase { + + AppCompatSafeRegionPolicyRobotTest(@NonNull WindowManagerService wm, + @NonNull ActivityTaskManagerService atm, + @NonNull ActivityTaskSupervisor supervisor) { + super(wm, atm, supervisor); + } + + @Override + void onPostActivityCreation(@NonNull ActivityRecord activity) { + super.onPostActivityCreation(activity); + spyOn(activity.mAppCompatController.getSafeRegionPolicy()); + } + + AppCompatSafeRegionPolicy getAppCompatSafeRegionPolicy() { + return activity().top().mAppCompatController.getSafeRegionPolicy(); + } + + void setNeedsSafeRegionBounds(boolean needsSafeRegionBounds) { + doReturn(needsSafeRegionBounds).when( + getAppCompatSafeRegionPolicy()).getNeedsSafeRegionBounds(); + } + + void checkNeedsSafeRegionBounds(boolean expected) { + assertEquals(expected, getAppCompatSafeRegionPolicy().getNeedsSafeRegionBounds()); + } + } +} diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatUtilsTest.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatUtilsTest.java index bfd533aa8f79..b2cfbbd23b22 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppCompatUtilsTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatUtilsTest.java @@ -98,6 +98,24 @@ public class AppCompatUtilsTest extends WindowTestsBase { } @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void getLetterboxReasonString_isLetterboxedForSafeRegionOnly() { + runTestScenario((robot) -> { + robot.applyOnActivity((a) -> { + a.createActivityWithComponent(); + a.checkTopActivityInSizeCompatMode(/* inScm */ false); + }); + robot.setIsLetterboxedForFixedOrientationAndAspectRatio( + /* forFixedOrientationAndAspectRatio */ false); + robot.setIsLetterboxedForDisplayCutout(/* displayCutout */ false); + robot.setIsLetterboxedForAspectRatioOnly(/* forAspectRatio */ false); + robot.setIsLetterboxedForSafeRegionOnlyAllowed(/* safeRegionOnly */ true); + + robot.checkTopActivityLetterboxReason(/* expected */ "SAFE_REGION"); + }); + } + + @Test public void getLetterboxReasonString_aspectRatio() { runTestScenario((robot) -> { robot.applyOnActivity((a) -> { @@ -124,6 +142,7 @@ public class AppCompatUtilsTest extends WindowTestsBase { /* forFixedOrientationAndAspectRatio */ false); robot.setIsLetterboxedForDisplayCutout(/* displayCutout */ false); robot.setIsLetterboxedForAspectRatioOnly(/* forAspectRatio */ false); + robot.setIsLetterboxedForSafeRegionOnlyAllowed(/* safeRegionOnly */ false); robot.checkTopActivityLetterboxReason(/* expected */ "UNKNOWN_REASON"); }); @@ -253,6 +272,7 @@ public class AppCompatUtilsTest extends WindowTestsBase { void onPostActivityCreation(@NonNull ActivityRecord activity) { super.onPostActivityCreation(activity); spyOn(activity.mAppCompatController.getAspectRatioPolicy()); + spyOn(activity.mAppCompatController.getSafeRegionPolicy()); } @Override @@ -286,6 +306,11 @@ public class AppCompatUtilsTest extends WindowTestsBase { when(mWindowState.isLetterboxedForDisplayCutout()).thenReturn(displayCutout); } + void setIsLetterboxedForSafeRegionOnlyAllowed(boolean safeRegionOnly) { + when(activity().top().mAppCompatController.getSafeRegionPolicy() + .isLetterboxedForSafeRegionOnlyAllowed()).thenReturn(safeRegionOnly); + } + void setFreeformCameraCompatMode(@FreeformCameraCompatMode int mode) { doReturn(mode).when(activity().top().mDisplayContent.mAppCompatCameraPolicy .mCameraCompatFreeformPolicy).getCameraCompatMode(activity().top()); diff --git a/services/tests/wmtests/src/com/android/server/wm/ContentRecorderTests.java b/services/tests/wmtests/src/com/android/server/wm/ContentRecorderTests.java index 76b994d013f3..ad76662c6c18 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ContentRecorderTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ContentRecorderTests.java @@ -31,6 +31,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; +import static com.android.server.display.feature.flags.Flags.FLAG_ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT; import static com.google.common.truth.Truth.assertThat; @@ -51,6 +52,7 @@ import android.graphics.Point; import android.graphics.Rect; import android.media.projection.StopReason; import android.os.IBinder; +import android.platform.test.annotations.EnableFlags; import android.platform.test.annotations.Presubmit; import android.view.ContentRecordingSession; import android.view.Display; @@ -558,6 +560,22 @@ public class ContentRecorderTests extends WindowTestsBase { assertThat(mContentRecorder.isCurrentlyRecording()).isTrue(); } + @EnableFlags(FLAG_ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT) + @Test + public void testStartRecording_shouldShowSystemDecorations_recordingNotStarted() { + defaultInit(); + mContentRecorder.setContentRecordingSession(mTaskSession); + + spyOn(mVirtualDisplayContent.mDisplay); + doReturn(true).when(mVirtualDisplayContent.mDisplay).canHostTasks(); + + // WHEN a recording tries to start. + mContentRecorder.updateRecording(); + + // THEN recording does not start. + assertThat(mContentRecorder.isCurrentlyRecording()).isFalse(); + } + @Test public void testOnVisibleRequestedChanged_notifiesCallback() { defaultInit(); diff --git a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java index e87e107cd793..48731cb460d4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java @@ -41,6 +41,7 @@ import static android.util.DisplayMetrics.DENSITY_DEFAULT; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; +import static com.android.internal.policy.SystemBarUtils.getDesktopViewAppHeaderHeightPx; import static com.android.server.wm.DesktopModeBoundsCalculator.DESKTOP_MODE_INITIAL_BOUNDS_SCALE; import static com.android.server.wm.DesktopModeBoundsCalculator.DESKTOP_MODE_LANDSCAPE_APP_PADDING; import static com.android.server.wm.DesktopModeBoundsCalculator.centerInScreen; @@ -893,9 +894,11 @@ public class DesktopModeLaunchParamsModifierTests extends @Test @EnableFlags({Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE, - Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS}) + Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, + Flags.FLAG_EXCLUDE_CAPTION_FROM_APP_BOUNDS}) public void testDefaultLandscapeBounds_landscapeDevice_unResizable_landscapeOrientation() { setupDesktopModeLaunchParamsModifier(); + final int captionHeight = getDesktopViewAppHeaderHeightPx(mContext); final TestDisplayContent display = createDisplayContent(ORIENTATION_LANDSCAPE, LANDSCAPE_DISPLAY_BOUNDS); @@ -903,11 +906,11 @@ public class DesktopModeLaunchParamsModifierTests extends final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_LANDSCAPE, task, /* ignoreOrientationRequest */ true); - - final int desiredWidth = - (int) (LANDSCAPE_DISPLAY_BOUNDS.width() * DESKTOP_MODE_INITIAL_BOUNDS_SCALE); + final float displayAspectRatio = (float) LANDSCAPE_DISPLAY_BOUNDS.width() + / LANDSCAPE_DISPLAY_BOUNDS.height(); final int desiredHeight = (int) (LANDSCAPE_DISPLAY_BOUNDS.height() * DESKTOP_MODE_INITIAL_BOUNDS_SCALE); + final int desiredWidth = (int) ((desiredHeight - captionHeight) * displayAspectRatio); assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(task) .setActivity(activity).calculate()); @@ -916,7 +919,8 @@ public class DesktopModeLaunchParamsModifierTests extends } @Test - @EnableFlags(Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS) + @EnableFlags({Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, + Flags.FLAG_EXCLUDE_CAPTION_FROM_APP_BOUNDS}) public void testUnResizablePortraitBounds_landscapeDevice_unResizable_portraitOrientation() { setupDesktopModeLaunchParamsModifier(); @@ -925,6 +929,7 @@ public class DesktopModeLaunchParamsModifierTests extends final Task task = createTask(display, /* isResizeable */ false); final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_PORTRAIT, task, /* ignoreOrientationRequest */ true); + final int captionHeight = getDesktopViewAppHeaderHeightPx(mContext); spyOn(activity.mAppCompatController.getDesktopAspectRatioPolicy()); doReturn(LETTERBOX_ASPECT_RATIO).when(activity.mAppCompatController @@ -932,7 +937,7 @@ public class DesktopModeLaunchParamsModifierTests extends final int desiredHeight = (int) (LANDSCAPE_DISPLAY_BOUNDS.height() * DESKTOP_MODE_INITIAL_BOUNDS_SCALE); - final int desiredWidth = (int) (desiredHeight / LETTERBOX_ASPECT_RATIO); + final int desiredWidth = (int) ((desiredHeight - captionHeight) / LETTERBOX_ASPECT_RATIO); assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(task) .setActivity(activity).calculate()); @@ -1070,7 +1075,8 @@ public class DesktopModeLaunchParamsModifierTests extends @Test @EnableFlags({Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE, - Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS}) + Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, + Flags.FLAG_EXCLUDE_CAPTION_FROM_APP_BOUNDS}) public void testDefaultPortraitBounds_portraitDevice_unResizable_portraitOrientation() { setupDesktopModeLaunchParamsModifier(); @@ -1079,12 +1085,14 @@ public class DesktopModeLaunchParamsModifierTests extends final Task task = createTask(display, /* isResizeable */ false); final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_PORTRAIT, task, /* ignoreOrientationRequest */ true); + final int captionHeight = getDesktopViewAppHeaderHeightPx(mContext); - - final int desiredWidth = - (int) (PORTRAIT_DISPLAY_BOUNDS.width() * DESKTOP_MODE_INITIAL_BOUNDS_SCALE); + final float displayAspectRatio = (float) PORTRAIT_DISPLAY_BOUNDS.height() + / PORTRAIT_DISPLAY_BOUNDS.width(); final int desiredHeight = - (int) (PORTRAIT_DISPLAY_BOUNDS.height() * DESKTOP_MODE_INITIAL_BOUNDS_SCALE); + (int) (PORTRAIT_DISPLAY_BOUNDS.height() * DESKTOP_MODE_INITIAL_BOUNDS_SCALE); + final int desiredWidth = + (int) ((desiredHeight - captionHeight) / displayAspectRatio); assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(task) .setActivity(activity).calculate()); @@ -1093,7 +1101,8 @@ public class DesktopModeLaunchParamsModifierTests extends } @Test - @EnableFlags(Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS) + @EnableFlags({Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS, + Flags.FLAG_EXCLUDE_CAPTION_FROM_APP_BOUNDS}) public void testUnResizableLandscapeBounds_portraitDevice_unResizable_landscapeOrientation() { setupDesktopModeLaunchParamsModifier(); @@ -1102,6 +1111,7 @@ public class DesktopModeLaunchParamsModifierTests extends final Task task = createTask(display, /* isResizeable */ false); final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_LANDSCAPE, task, /* ignoreOrientationRequest */ true); + final int captionHeight = getDesktopViewAppHeaderHeightPx(mContext); spyOn(activity.mAppCompatController.getDesktopAspectRatioPolicy()); doReturn(LETTERBOX_ASPECT_RATIO).when(activity.mAppCompatController @@ -1109,7 +1119,7 @@ public class DesktopModeLaunchParamsModifierTests extends final int desiredWidth = PORTRAIT_DISPLAY_BOUNDS.width() - (DESKTOP_MODE_LANDSCAPE_APP_PADDING * 2); - final int desiredHeight = (int) (desiredWidth / LETTERBOX_ASPECT_RATIO); + final int desiredHeight = (int) (desiredWidth / LETTERBOX_ASPECT_RATIO) + captionHeight; assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(task) .setActivity(activity).calculate()); @@ -1483,6 +1493,24 @@ public class DesktopModeLaunchParamsModifierTests extends assertEquals(WINDOWING_MODE_FREEFORM, mResult.mWindowingMode); } + @Test + @EnableFlags({Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE, + Flags.FLAG_DISABLE_DESKTOP_LAUNCH_PARAMS_OUTSIDE_DESKTOP_BUG_FIX}) + public void testFreeformWindowingModeAppliedIfSourceTaskExists() { + setupDesktopModeLaunchParamsModifier(); + + final Task task = new TaskBuilder(mSupervisor).setActivityType( + ACTIVITY_TYPE_STANDARD).build(); + final Task sourceTask = new TaskBuilder(mSupervisor).setActivityType( + ACTIVITY_TYPE_STANDARD).setWindowingMode(WINDOWING_MODE_FULLSCREEN).build(); + final ActivityRecord sourceActivity = new ActivityBuilder(task.mAtmService) + .setTask(sourceTask).build(); + + assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(task) + .setSource(sourceActivity).calculate()); + assertEquals(WINDOWING_MODE_FREEFORM, mResult.mWindowingMode); + } + private Task createTask(DisplayContent display, Boolean isResizeable) { final int resizeMode = isResizeable ? RESIZE_MODE_RESIZEABLE : RESIZE_MODE_UNRESIZEABLE; diff --git a/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java b/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java index a30591ea7b15..9486bc522a9c 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java @@ -25,6 +25,7 @@ import static com.android.server.wm.utils.LastCallVerifier.lastCall; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -432,4 +433,32 @@ public class DimmerTests extends WindowTestsBase { verify(mTransaction, never()).setAlpha(dimLayer, 0.5f); verify(mTransaction).setAlpha(dimLayer, 0.9f); } + + /** + * A window requesting to dim to 0 and without blur would cause the dim to be created and + * destroyed continuously. + * Ensure the dim layer is not created until the window is requesting valid values. + */ + @Test + public void testDimNotCreatedIfNoAlphaNoBlur() { + mDimmer.adjustAppearance(mChild1, 0.0f, 0); + mDimmer.adjustPosition(mChild1, mChild1); + assertNull(mDimmer.getDimLayer()); + mDimmer.updateDims(mTransaction); + assertNull(mDimmer.getDimLayer()); + + mDimmer.adjustAppearance(mChild1, 0.9f, 0); + mDimmer.adjustPosition(mChild1, mChild1); + assertNotNull(mDimmer.getDimLayer()); + } + + /** + * If there is a blur, then the dim layer is created even though alpha is 0 + */ + @Test + public void testDimCreatedIfNoAlphaButHasBlur() { + mDimmer.adjustAppearance(mChild1, 0.0f, 10); + mDimmer.adjustPosition(mChild1, mChild1); + assertNotNull(mDimmer.getDimLayer()); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentDeferredUpdateTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentDeferredUpdateTests.java index 7033d79d0ee1..9ce4a80616ab 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentDeferredUpdateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentDeferredUpdateTests.java @@ -43,7 +43,6 @@ import androidx.test.filters.SmallTest; import com.android.server.LocalServices; import com.android.server.wm.TransitionController.OnStartCollect; -import com.android.window.flags.Flags; import org.junit.Before; import org.junit.Test; @@ -218,7 +217,6 @@ public class DisplayContentDeferredUpdateTests extends WindowTestsBase { @Test public void testWaitForTransition_displaySwitching_waitsForTransitionToBeStarted() { - mSetFlagsRule.enableFlags(Flags.FLAG_WAIT_FOR_TRANSITION_ON_DISPLAY_SWITCH); mDisplayContent.mDisplayUpdater.onDisplaySwitching(/* switching= */ true); boolean willWait = mDisplayContent.mDisplayUpdater.waitForTransition(mScreenUnblocker); assertThat(willWait).isTrue(); @@ -241,7 +239,6 @@ public class DisplayContentDeferredUpdateTests extends WindowTestsBase { @Test public void testWaitForTransition_displayNotSwitching_doesNotWait() { - mSetFlagsRule.enableFlags(Flags.FLAG_WAIT_FOR_TRANSITION_ON_DISPLAY_SWITCH); mDisplayContent.mDisplayUpdater.onDisplaySwitching(/* switching= */ false); boolean willWait = mDisplayContent.mDisplayUpdater.waitForTransition(mScreenUnblocker); @@ -251,19 +248,7 @@ public class DisplayContentDeferredUpdateTests extends WindowTestsBase { } @Test - public void testWaitForTransition_displayIsSwitchingButFlagDisabled_doesNotWait() { - mSetFlagsRule.disableFlags(Flags.FLAG_WAIT_FOR_TRANSITION_ON_DISPLAY_SWITCH); - mDisplayContent.mDisplayUpdater.onDisplaySwitching(/* switching= */ true); - - boolean willWait = mDisplayContent.mDisplayUpdater.waitForTransition(mScreenUnblocker); - - assertThat(willWait).isFalse(); - verify(mScreenUnblocker, never()).sendToTarget(); - } - - @Test public void testTwoDisplayUpdateAtTheSameTime_bothDisplaysAreUnblocked() { - mSetFlagsRule.enableFlags(Flags.FLAG_WAIT_FOR_TRANSITION_ON_DISPLAY_SWITCH); prepareSecondaryDisplay(); final WindowState defaultDisplayWindow = newWindowBuilder("DefaultDisplayWindow", diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsTests.java index 81e487a67725..521d8364a31f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsTests.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import android.annotation.NonNull; import android.app.WindowConfiguration; diff --git a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java index 67a95de8a5c1..ae005f228969 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java @@ -44,6 +44,7 @@ import android.app.ActivityOptions; import android.content.ComponentName; import android.content.pm.ActivityInfo.WindowLayout; import android.graphics.Rect; +import android.platform.test.annotations.EnableFlags; import android.platform.test.annotations.Presubmit; import android.util.ArrayMap; import android.util.SparseArray; @@ -52,6 +53,7 @@ import androidx.test.filters.MediumTest; import com.android.server.wm.LaunchParamsController.LaunchParams; import com.android.server.wm.LaunchParamsController.LaunchParamsModifier; +import com.android.window.flags.Flags; import org.junit.Before; import org.junit.Test; @@ -115,6 +117,7 @@ public class LaunchParamsControllerTests extends WindowTestsBase { expected.mPreferredTaskDisplayArea = mock(TaskDisplayArea.class); expected.mWindowingMode = WINDOWING_MODE_PINNED; expected.mBounds.set(200, 300, 400, 500); + expected.mNeedsSafeRegionBounds = true; mPersister.putLaunchParams(userId, name, expected); @@ -187,6 +190,7 @@ public class LaunchParamsControllerTests extends WindowTestsBase { params.mWindowingMode = WINDOWING_MODE_FREEFORM; params.mBounds.set(0, 0, 30, 20); params.mPreferredTaskDisplayArea = mock(TaskDisplayArea.class); + params.mNeedsSafeRegionBounds = true; final InstrumentedPositioner positioner2 = new InstrumentedPositioner(RESULT_CONTINUE, params); @@ -227,6 +231,158 @@ public class LaunchParamsControllerTests extends WindowTestsBase { } /** + * Tests only needs safe region bounds are not propagated if results are skipped. + */ + @Test + public void testSkip_needsSafeRegionBoundsNotModified() { + final LaunchParams params1 = new LaunchParams(); + params1.mNeedsSafeRegionBounds = true; + final InstrumentedPositioner positioner1 = new InstrumentedPositioner(RESULT_SKIP, params1); + + final LaunchParams params2 = new LaunchParams(); + params2.mNeedsSafeRegionBounds = false; + final InstrumentedPositioner positioner2 = + new InstrumentedPositioner(RESULT_CONTINUE, params2); + + mController.registerModifier(positioner1); + mController.registerModifier(positioner2); + + final LaunchParams result = new LaunchParams(); + + mController.calculate(null /*task*/, null /*layout*/, null /*activity*/, null /*source*/, + null /*options*/, null /*request*/, PHASE_BOUNDS, result); + + assertEquals(result, positioner2.getLaunchParams()); + } + + /** + * Tests only needs safe region bounds are propagated even if results are continued. + */ + @Test + public void testContinue_needsSafeRegionBoundsCarriedOver() { + final LaunchParams params1 = new LaunchParams(); + final InstrumentedPositioner positioner1 = + new InstrumentedPositioner(RESULT_CONTINUE, params1); + + final LaunchParams params2 = new LaunchParams(); + params2.mNeedsSafeRegionBounds = true; + final InstrumentedPositioner positioner2 = + new InstrumentedPositioner(RESULT_CONTINUE, params2); + + mController.registerModifier(positioner1); + mController.registerModifier(positioner2); + + final LaunchParams result = new LaunchParams(); + + mController.calculate(null /*task*/, null /*layout*/, null /*activity*/, null /*source*/, + null /*options*/, null /*request*/, PHASE_BOUNDS, result); + + // Safe region is propagated from positioner1 + assertEquals(result.mNeedsSafeRegionBounds, + positioner2.getLaunchParams().mNeedsSafeRegionBounds); + assertEquals(result.mWindowingMode, positioner1.getLaunchParams().mWindowingMode); + assertEquals(result.mBounds, positioner1.getLaunchParams().mBounds); + assertEquals(result.mPreferredTaskDisplayArea, + positioner1.getLaunchParams().mPreferredTaskDisplayArea); + } + + /** + * Tests needs safe region bounds are modified if results from the next continue have been set. + */ + @Test + public void testContinue_needsSafeRegionBoundsModifiedFromLaterContinue() { + final LaunchParams params1 = new LaunchParams(); + params1.mNeedsSafeRegionBounds = false; + final InstrumentedPositioner positioner1 = + new InstrumentedPositioner(RESULT_CONTINUE, params1); + + final LaunchParams params2 = new LaunchParams(); + params2.mNeedsSafeRegionBounds = true; + final InstrumentedPositioner positioner2 = + new InstrumentedPositioner(RESULT_CONTINUE, params2); + + mController.registerModifier(positioner1); + mController.registerModifier(positioner2); + + final LaunchParams result = new LaunchParams(); + + mController.calculate(null /*task*/, null /*layout*/, null /*activity*/, null /*source*/, + null /*options*/, null /*request*/, PHASE_BOUNDS, result); + + // Safe region is propagated from positioner1 + assertEquals(result.mNeedsSafeRegionBounds, + positioner1.getLaunchParams().mNeedsSafeRegionBounds); + assertEquals(result.mWindowingMode, positioner2.getLaunchParams().mWindowingMode); + assertEquals(result.mBounds, positioner2.getLaunchParams().mBounds); + assertEquals(result.mPreferredTaskDisplayArea, + positioner2.getLaunchParams().mPreferredTaskDisplayArea); + } + + /** + * Tests only needs safe region bounds are propagated to result done even if there are skipped + * and continued results and continue sets true for needs safe region bounds. + */ + @Test + public void testDone_ContinueSetsNeedsSafeRegionBounds() { + final LaunchParams params1 = new LaunchParams(); + final InstrumentedPositioner positioner1 = new InstrumentedPositioner(RESULT_DONE, params1); + + final LaunchParams params2 = new LaunchParams(); + final InstrumentedPositioner positioner2 = + new InstrumentedPositioner(RESULT_CONTINUE, params2); + + final LaunchParams params3 = new LaunchParams(); + final InstrumentedPositioner positioner3 = new InstrumentedPositioner(RESULT_SKIP, params3); + + final LaunchParams params4 = new LaunchParams(); + params4.mNeedsSafeRegionBounds = true; + final InstrumentedPositioner positioner4 = + new InstrumentedPositioner(RESULT_CONTINUE, params4); + + final LaunchParams params5 = new LaunchParams(); + params5.mNeedsSafeRegionBounds = false; + final InstrumentedPositioner positioner5 = new InstrumentedPositioner(RESULT_SKIP, params5); + + mController.registerModifier(positioner1); + mController.registerModifier(positioner2); + mController.registerModifier(positioner3); + mController.registerModifier(positioner4); + mController.registerModifier(positioner5); + + final LaunchParams result = new LaunchParams(); + + mController.calculate(null /*task*/, null /*layout*/, null /*activity*/, null /*source*/, + null /*options*/, null /*request*/, PHASE_BOUNDS, result); + + // Safe region is propagated from positioner4 + assertEquals(result.mNeedsSafeRegionBounds, + positioner4.getLaunchParams().mNeedsSafeRegionBounds); + assertEquals(result.mWindowingMode, positioner1.getLaunchParams().mWindowingMode); + assertEquals(result.mBounds, positioner1.getLaunchParams().mBounds); + assertEquals(result.mPreferredTaskDisplayArea, + positioner1.getLaunchParams().mPreferredTaskDisplayArea); + } + + /** + * Tests only needs safe region bounds are set if results are done. + */ + @Test + public void testDone_needsSafeRegionBoundsModified() { + final LaunchParams params = new LaunchParams(); + params.mNeedsSafeRegionBounds = true; + final InstrumentedPositioner positioner = new InstrumentedPositioner(RESULT_DONE, params); + + mController.registerModifier(positioner); + + final LaunchParams result = new LaunchParams(); + + mController.calculate(null /*task*/, null /*layout*/, null /*activity*/, null /*source*/, + null /*options*/, null /*request*/, PHASE_BOUNDS, result); + + assertEquals(result, positioner.getLaunchParams()); + } + + /** * Tests preferred display id calculation for VR. */ @Test @@ -372,6 +528,34 @@ public class LaunchParamsControllerTests extends WindowTestsBase { assertEquals(expected, task.mLastNonFullscreenBounds); } + /** + * Ensures that app bounds are set to exclude freeform caption if window is in freeform. + */ + @Test + @EnableFlags(Flags.FLAG_EXCLUDE_CAPTION_FROM_APP_BOUNDS) + public void testLayoutTaskBoundsFreeformAppBounds() { + final Rect expected = new Rect(10, 20, 30, 40); + + final LaunchParams params = new LaunchParams(); + params.mBounds.set(expected); + params.mAppBounds.set(expected); + final InstrumentedPositioner positioner = new InstrumentedPositioner(RESULT_DONE, params); + final Task task = new TaskBuilder(mAtm.mTaskSupervisor) + .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); + final ActivityOptions options = ActivityOptions.makeBasic().setFlexibleLaunchSize(true); + + mController.registerModifier(positioner); + + assertNotEquals(expected, task.getBounds()); + + layoutTask(task, options); + + // Task will make adjustments to requested bounds. We only need to guarantee that the + // requested bounds are expected. + assertEquals(expected, + task.getRequestedOverrideConfiguration().windowConfiguration.getAppBounds()); + } + public static class InstrumentedPositioner implements LaunchParamsModifier { private final int mReturnVal; @@ -473,4 +657,9 @@ public class LaunchParamsControllerTests extends WindowTestsBase { mController.layoutTask(task, null /* layout */, null /* activity */, null /* source */, null /* options */); } + + private void layoutTask(@NonNull Task task, ActivityOptions options) { + mController.layoutTask(task, null /* layout */, null /* activity */, null /* source */, + options /* options */); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java index 66d7963946b9..1356718be4dd 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import android.content.ComponentName; import android.content.pm.PackageManagerInternal; diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index e2c4a1d2dfea..fc70b80790c8 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -4738,6 +4738,213 @@ public class SizeCompatTests extends WindowTestsBase { } @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testIsLetterboxedForSafeRegionOnlyAllowed_noManifestProperty_returnsTrue() { + setUpLandscapeLargeScreenDisplayWithApp(); + + assertFalse(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED); + + setupSafeRegionBoundsParameters(/* dw */ 300, /* dh */ 200); + + // For an activity letterboxed only due to safe region, areBoundsLetterboxed will return + // false + assertFalse(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED); + // Since no manifest property is defined, the activity is opted in by default + assertTrue(mActivity.mAppCompatController.getSafeRegionPolicy() + .isLetterboxedForSafeRegionOnlyAllowed()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testIsLetterboxedForSafeRegionOnlyAllowed_allowedForActivity_returnsTrue() { + setUpLandscapeLargeScreenDisplayWithApp(); + + assertFalse(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED); + + setupSafeRegionBoundsParameters(/* dw */ 300, /* dh */ 200); + + // Activity can opt-out the safe region letterboxing by component level property. + final ComponentName name = getUniqueComponentName(mContext.getPackageName()); + final PackageManager pm = mContext.getPackageManager(); + spyOn(pm); + updateActivityLevelAllowSafeRegionLetterboxingProperty(name, pm, true /* value */); + updateApplicationLevelAllowSafeRegionLetterboxingProperty(name, pm, false /* value */); + final ActivityRecord optOutActivity = new ActivityBuilder(mAtm) + .setComponent(name).setTask(mTask).build(); + optOutActivity.mAppCompatController.getSafeRegionPolicy().setNeedsSafeRegionBounds(true); + + // Since activity manifest property is defined as true, the activity can be letterboxed + // for safe region + assertTrue(optOutActivity.mAppCompatController + .getSafeRegionPolicy().isLetterboxedForSafeRegionOnlyAllowed()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testIsLetterboxedForSafeRegionOnlyAllowed_notAllowedForActivity_returnsFalse() { + setUpLandscapeLargeScreenDisplayWithApp(); + + assertFalse(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED); + + setupSafeRegionBoundsParameters(/* dw */ 300, /* dh */ 200); + + final ComponentName name = getUniqueComponentName(mContext.getPackageName()); + final PackageManager pm = mContext.getPackageManager(); + spyOn(pm); + updateActivityLevelAllowSafeRegionLetterboxingProperty(name, pm, false /* value */); + updateApplicationLevelAllowSafeRegionLetterboxingProperty(name, pm, false /* value */); + final ActivityRecord optOutActivity = new ActivityBuilder(mAtm) + .setComponent(name).setTask(mTask).build(); + optOutActivity.mAppCompatController.getSafeRegionPolicy().setNeedsSafeRegionBounds(true); + + // Since activity manifest property is defined as false, the activity can not be letterboxed + // for safe region + assertFalse(optOutActivity.mAppCompatController + .getSafeRegionPolicy().isLetterboxedForSafeRegionOnlyAllowed()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testIsLetterboxedForSafeRegionOnlyAllowed_notAllowedForApplication_returnsFalse() { + setUpLandscapeLargeScreenDisplayWithApp(); + + assertFalse(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED); + + setupSafeRegionBoundsParameters(/* dw */ 300, /* dh */ 200); + + final ComponentName name = getUniqueComponentName(mContext.getPackageName()); + final PackageManager pm = mContext.getPackageManager(); + spyOn(pm); + updateActivityLevelAllowSafeRegionLetterboxingProperty(name, pm, false /* value */); + updateApplicationLevelAllowSafeRegionLetterboxingProperty(name, pm, false /* value */); + final ActivityRecord optOutAppActivity = new ActivityBuilder(mAtm) + .setComponent(name).setTask(mTask).build(); + optOutAppActivity.mAppCompatController.getSafeRegionPolicy().setNeedsSafeRegionBounds(true); + + // Since application manifest property is defined as false, the activity can not be + // letterboxed for safe region + assertFalse(optOutAppActivity.mAppCompatController + .getSafeRegionPolicy().isLetterboxedForSafeRegionOnlyAllowed()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testIsLetterboxedForSafeRegionOnlyAllowed_allowedForApplication_returnsTrue() { + setUpLandscapeLargeScreenDisplayWithApp(); + + assertFalse(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED); + + setupSafeRegionBoundsParameters(/* dw */ 300, /* dh */ 200); + + final ComponentName name = getUniqueComponentName(mContext.getPackageName()); + final PackageManager pm = mContext.getPackageManager(); + spyOn(pm); + updateActivityLevelAllowSafeRegionLetterboxingProperty(name, pm, false /* value */); + updateApplicationLevelAllowSafeRegionLetterboxingProperty(name, pm, true /* value */); + final ActivityRecord optOutAppActivity = new ActivityBuilder(mAtm) + .setComponent(name).setTask(mTask).build(); + optOutAppActivity.mAppCompatController.getSafeRegionPolicy().setNeedsSafeRegionBounds(true); + + // Since application manifest property is defined as true, the activity can be letterboxed + // for safe region + assertTrue(optOutAppActivity.mAppCompatController + .getSafeRegionPolicy().isLetterboxedForSafeRegionOnlyAllowed()); + } + + private void updateApplicationLevelAllowSafeRegionLetterboxingProperty(ComponentName name, + PackageManager pm, boolean propertyValueForApplication) { + final PackageManager.Property propertyForApplication = new PackageManager.Property( + "propertyName", /* value */ propertyValueForApplication, name.getPackageName(), + name.getClassName()); + try { + doReturn(propertyForApplication).when(pm).getPropertyAsUser( + WindowManager.PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING, + name.getPackageName(), /* className */ null, /* userId */ 0); + } catch (PackageManager.NameNotFoundException e) { + throw new RuntimeException(e); + } + } + + private void updateActivityLevelAllowSafeRegionLetterboxingProperty(ComponentName name, + PackageManager pm, boolean propertyValueForActivity) { + final PackageManager.Property propertyForActivity = new PackageManager.Property( + "propertyName", /* value */ propertyValueForActivity, name.getPackageName(), + name.getClassName()); + try { + doReturn(propertyForActivity).when(pm).getPropertyAsUser( + WindowManager.PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING, + name.getPackageName(), name.getClassName(), /* userId */ 0); + } catch (PackageManager.NameNotFoundException e) { + throw new RuntimeException(e); + } + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testAreBoundsLetterboxed_letterboxedForSafeRegionAndFixedOrientation_returnTrue() { + setUpLandscapeLargeScreenDisplayWithApp(); + mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); + + assertFalse(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED); + + final Rect safeRegionBounds = setupSafeRegionBoundsParameters(/* dw */ 500, /* dh */ 200); + + prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT); + + // Activity is letterboxed due to fixed orientation within the safe region + assertTrue(mActivity.mAppCompatController.getAspectRatioPolicy() + .isLetterboxedForFixedOrientationAndAspectRatio()); + assertTrue(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, + APP_COMPAT_STATE_CHANGED__STATE__LETTERBOXED_FOR_FIXED_ORIENTATION); + assertFalse(mActivity.mAppCompatController.getSafeRegionPolicy() + .isLetterboxedForSafeRegionOnlyAllowed()); + assertTrue(safeRegionBounds.contains(mActivity.getBounds())); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testAreBoundsLetterboxed_letterboxedForSafeRegionAndAspectRatio_returnTrue() { + setUpPortraitLargeScreenDisplayWithApp(); + + assertFalse(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED); + + final Rect safeRegionBounds = setupSafeRegionBoundsParameters(/* dw */ 200, /* dh */ 300); + + prepareMinAspectRatio(mActivity, 16 / 9f, SCREEN_ORIENTATION_PORTRAIT); + + // Activity is letterboxed due to min aspect ratio within the safe region + assertFalse(mActivity.mAppCompatController.getAspectRatioPolicy() + .isLetterboxedForFixedOrientationAndAspectRatio()); + assertTrue(mActivity.mAppCompatController.getAspectRatioPolicy() + .isLetterboxedForAspectRatioOnly()); + assertFalse(mActivity.inSizeCompatMode()); + assertTrue(mActivity.areBoundsLetterboxed()); + verifyLogAppCompatState(mActivity, + APP_COMPAT_STATE_CHANGED__STATE__LETTERBOXED_FOR_ASPECT_RATIO); + assertTrue(safeRegionBounds.contains(mActivity.getBounds())); + } + + private Rect setupSafeRegionBoundsParameters(int dw, int dh) { + final AppCompatController appCompatController = mActivity.mAppCompatController; + final AppCompatSafeRegionPolicy safeRegionPolicy = + appCompatController.getSafeRegionPolicy(); + safeRegionPolicy.setNeedsSafeRegionBounds(true); + spyOn(mTask); + final Rect safeRegionBounds = new Rect(100, 200, 100 + dw, 200 + dh); + doReturn(safeRegionBounds).when(mTask).getSafeRegionBounds(); + return safeRegionBounds; + } + + @Test public void testAreBoundsLetterboxed_letterboxedForSizeCompat_returnsTrue() { setUpDisplaySizeWithApp(1000, 2500); mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java b/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java index b2c195e8ebaa..547fc04f9fac 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java @@ -153,7 +153,7 @@ class TaskSnapshotPersisterTestBase extends WindowTestsBase { path = FILES_DIR.getPath() + "/snapshots/"; } for (int i = 0; i < fileNames.length; i++) { - files[i] = new File(path + fileNames[i]); + files[i] = new File(path, fileNames[i]); } return files; } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java index 4f310de1e48b..e0e65e67762e 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java @@ -1431,6 +1431,93 @@ public class WindowContainerTests extends WindowTestsBase { } @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBounds_appliedOnNodeAndChildren() { + final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(mWm); + final TestWindowContainer root = builder.setLayer(0).build(); + + final TestWindowContainer child1 = root.addChildWindow(); + final TestWindowContainer child2 = root.addChildWindow(); + final TestWindowContainer child11 = child1.addChildWindow(); + final TestWindowContainer child12 = child1.addChildWindow(); + final TestWindowContainer child21 = child2.addChildWindow(); + + assertNull(root.getSafeRegionBounds()); + assertNull(child1.getSafeRegionBounds()); + assertNull(child11.getSafeRegionBounds()); + assertNull(child12.getSafeRegionBounds()); + assertNull(child2.getSafeRegionBounds()); + assertNull(child21.getSafeRegionBounds()); + + final Rect tempSafeRegionBounds1 = new Rect(50, 50, 200, 300); + child1.setSafeRegionBounds(tempSafeRegionBounds1); + + assertNull(root.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child1.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child11.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child12.getSafeRegionBounds()); + assertNull(child2.getSafeRegionBounds()); + assertNull(child21.getSafeRegionBounds()); + + // Set different safe region bounds on child11 + final Rect tempSafeRegionBounds2 = new Rect(30, 30, 200, 200); + child11.setSafeRegionBounds(tempSafeRegionBounds2); + + assertNull(root.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child1.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds2, child11.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child12.getSafeRegionBounds()); + assertNull(child2.getSafeRegionBounds()); + assertNull(child21.getSafeRegionBounds()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBounds_resetSafeRegionBounds() { + final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(mWm); + final TestWindowContainer root = builder.setLayer(0).build(); + + final TestWindowContainer child1 = root.addChildWindow(); + final TestWindowContainer child2 = root.addChildWindow(); + final TestWindowContainer child11 = child1.addChildWindow(); + final TestWindowContainer child12 = child1.addChildWindow(); + final TestWindowContainer child21 = child2.addChildWindow(); + + assertNull(root.getSafeRegionBounds()); + assertNull(child1.getSafeRegionBounds()); + assertNull(child11.getSafeRegionBounds()); + assertNull(child12.getSafeRegionBounds()); + assertNull(child2.getSafeRegionBounds()); + assertNull(child21.getSafeRegionBounds()); + + final Rect tempSafeRegionBounds1 = new Rect(50, 50, 200, 300); + child1.setSafeRegionBounds(tempSafeRegionBounds1); + + assertNull(root.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child1.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child11.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child12.getSafeRegionBounds()); + assertNull(child2.getSafeRegionBounds()); + assertNull(child21.getSafeRegionBounds()); + + // Set different safe region bounds on child11 + final Rect tempSafeRegionBounds2 = new Rect(30, 30, 200, 200); + child11.setSafeRegionBounds(tempSafeRegionBounds2); + + assertEquals(tempSafeRegionBounds2, child11.getSafeRegionBounds()); + + // Reset safe region bounds on child11. Now child11 will use child1 safe region bounds. + child11.setSafeRegionBounds(/* safeRegionBounds */null); + + assertNull(root.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child1.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child11.getSafeRegionBounds()); + assertEquals(tempSafeRegionBounds1, child12.getSafeRegionBounds()); + assertNull(child2.getSafeRegionBounds()); + assertNull(child21.getSafeRegionBounds()); + } + + @Test public void testSetExcludeInsetsTypes_appliedOnNodeAndChildren() { final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(mWm); final TestWindowContainer root = builder.setLayer(0).build(); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTransactionTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTransactionTests.java index dcb68620e361..c0be214241a0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTransactionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTransactionTests.java @@ -36,8 +36,10 @@ import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.times; import android.content.Intent; +import android.graphics.Rect; import android.os.Binder; import android.os.Bundle; +import android.platform.test.annotations.EnableFlags; import android.platform.test.annotations.Presubmit; import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; @@ -46,6 +48,8 @@ import android.window.WindowContainerTransaction.HierarchyOp; import androidx.annotation.NonNull; import androidx.test.filters.SmallTest; +import com.android.window.flags.Flags; + import org.junit.Test; import org.junit.runner.RunWith; @@ -62,6 +66,8 @@ import java.util.List; @Presubmit @RunWith(WindowTestRunner.class) public class WindowContainerTransactionTests extends WindowTestsBase { + private final Rect mSafeRegionBounds = new Rect(50, 50, 200, 300); + @Test public void testRemoveTask() { final Task rootTask = createTask(mDisplayContent); @@ -209,6 +215,152 @@ public class WindowContainerTransactionTests extends WindowTestsBase { } @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBoundsOnTaskDisplayArea() { + final Task rootTask = createTask(mDisplayContent); + final Task task = createTaskInRootTask(rootTask, 0 /* userId */); + final ActivityRecord activity = createActivityRecord(mDisplayContent, task); + final TaskDisplayArea taskDisplayArea = mDisplayContent.getDefaultTaskDisplayArea(); + + final WindowContainerTransaction wct = new WindowContainerTransaction(); + final WindowContainerToken token = taskDisplayArea.mRemoteToken.toWindowContainerToken(); + // Set safe region bounds on the task display area + wct.setSafeRegionBounds(token, mSafeRegionBounds); + applyTransaction(wct); + + assertEquals(activity.getSafeRegionBounds(), mSafeRegionBounds); + assertEquals(task.getSafeRegionBounds(), mSafeRegionBounds); + assertEquals(rootTask.getSafeRegionBounds(), mSafeRegionBounds); + assertEquals(taskDisplayArea.getSafeRegionBounds(), mSafeRegionBounds); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBoundsOnRootTask() { + final Task rootTask = createTask(mDisplayContent); + final Task task = createTaskInRootTask(rootTask, 0 /* userId */); + final ActivityRecord activity = createActivityRecord(mDisplayContent, task); + final TaskDisplayArea taskDisplayArea = mDisplayContent.getDefaultTaskDisplayArea(); + + final WindowContainerTransaction wct = new WindowContainerTransaction(); + final WindowContainerToken token = rootTask.mRemoteToken.toWindowContainerToken(); + // Set safe region bounds on the root task + wct.setSafeRegionBounds(token, mSafeRegionBounds); + applyTransaction(wct); + + assertEquals(activity.getSafeRegionBounds(), mSafeRegionBounds); + assertEquals(task.getSafeRegionBounds(), mSafeRegionBounds); + assertEquals(rootTask.getSafeRegionBounds(), mSafeRegionBounds); + assertNull(taskDisplayArea.getSafeRegionBounds()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBoundsOnTask() { + final Task rootTask = createTask(mDisplayContent); + final Task task = createTaskInRootTask(rootTask, 0 /* userId */); + final ActivityRecord activity = createActivityRecord(mDisplayContent, task); + final TaskDisplayArea taskDisplayArea = mDisplayContent.getDefaultTaskDisplayArea(); + + final WindowContainerTransaction wct = new WindowContainerTransaction(); + final WindowContainerToken token = task.mRemoteToken.toWindowContainerToken(); + // Set safe region bounds on the task + wct.setSafeRegionBounds(token, mSafeRegionBounds); + applyTransaction(wct); + + assertEquals(activity.getSafeRegionBounds(), mSafeRegionBounds); + assertEquals(task.getSafeRegionBounds(), mSafeRegionBounds); + assertNull(rootTask.getSafeRegionBounds()); + assertNull(taskDisplayArea.getSafeRegionBounds()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBoundsOnTask_resetSafeRegionBounds() { + final Task rootTask = createTask(mDisplayContent); + final Task task = createTaskInRootTask(rootTask, 0 /* userId */); + final ActivityRecord activity = createActivityRecord(mDisplayContent, task); + final TaskDisplayArea taskDisplayArea = mDisplayContent.getDefaultTaskDisplayArea(); + + final WindowContainerTransaction wct = new WindowContainerTransaction(); + final WindowContainerToken token = task.mRemoteToken.toWindowContainerToken(); + // Set safe region bounds on the task + wct.setSafeRegionBounds(token, mSafeRegionBounds); + applyTransaction(wct); + + assertEquals(activity.getSafeRegionBounds(), mSafeRegionBounds); + assertEquals(task.getSafeRegionBounds(), mSafeRegionBounds); + assertNull(rootTask.getSafeRegionBounds()); + assertNull(taskDisplayArea.getSafeRegionBounds()); + + // Reset safe region bounds on the task + wct.setSafeRegionBounds(token, /* safeRegionBounds */null); + applyTransaction(wct); + + assertNull(activity.getSafeRegionBounds()); + assertNull(task.getSafeRegionBounds()); + assertNull(rootTask.getSafeRegionBounds()); + assertNull(taskDisplayArea.getSafeRegionBounds()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBoundsOnRootTaskAndTask() { + final Task rootTask = createTask(mDisplayContent); + final Task task = createTaskInRootTask(rootTask, 0 /* userId */); + final ActivityRecord activity = createActivityRecord(mDisplayContent, task); + final TaskDisplayArea taskDisplayArea = mDisplayContent.getDefaultTaskDisplayArea(); + + final WindowContainerTransaction wct = new WindowContainerTransaction(); + final WindowContainerToken token = rootTask.mRemoteToken.toWindowContainerToken(); + // Set safe region bounds on the root task + wct.setSafeRegionBounds(token, mSafeRegionBounds); + // Set different safe region bounds on task + final Rect tempSafeRegionBounds = new Rect(30, 30, 200, 200); + wct.setSafeRegionBounds(task.mRemoteToken.toWindowContainerToken(), tempSafeRegionBounds); + applyTransaction(wct); + + assertEquals(activity.getSafeRegionBounds(), tempSafeRegionBounds); + assertEquals(task.getSafeRegionBounds(), tempSafeRegionBounds); + assertEquals(rootTask.getSafeRegionBounds(), mSafeRegionBounds); + assertNull(taskDisplayArea.getSafeRegionBounds()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBoundsOnRootTaskAndTask_resetSafeRegionBoundsOnTask() { + final Task rootTask = createTask(mDisplayContent); + final Task task = createTaskInRootTask(rootTask, 0 /* userId */); + final ActivityRecord activity = createActivityRecord(mDisplayContent, task); + final TaskDisplayArea taskDisplayArea = mDisplayContent.getDefaultTaskDisplayArea(); + + final WindowContainerTransaction wct = new WindowContainerTransaction(); + final WindowContainerToken token = rootTask.mRemoteToken.toWindowContainerToken(); + // Set safe region bounds on the root task + wct.setSafeRegionBounds(token, mSafeRegionBounds); + // Set different safe region bounds on task + final Rect mTmpSafeRegionBounds = new Rect(30, 30, 200, 200); + wct.setSafeRegionBounds(task.mRemoteToken.toWindowContainerToken(), mTmpSafeRegionBounds); + applyTransaction(wct); + + // Task and activity will use different safe region bounds + assertEquals(activity.getSafeRegionBounds(), mTmpSafeRegionBounds); + assertEquals(task.getSafeRegionBounds(), mTmpSafeRegionBounds); + assertEquals(rootTask.getSafeRegionBounds(), mSafeRegionBounds); + assertNull(taskDisplayArea.getSafeRegionBounds()); + + // Reset safe region bounds on task + wct.setSafeRegionBounds(task.mRemoteToken.toWindowContainerToken(), + /* safeRegionBounds */null); + applyTransaction(wct); + + assertEquals(activity.getSafeRegionBounds(), mSafeRegionBounds); + assertEquals(task.getSafeRegionBounds(), mSafeRegionBounds); + assertEquals(rootTask.getSafeRegionBounds(), mSafeRegionBounds); + assertNull(taskDisplayArea.getSafeRegionBounds()); + } + + @Test public void testDesktopMode_moveTaskToFront() { final TestDesktopOrganizer desktopOrganizer = new TestDesktopOrganizer(mAtm); TaskDisplayArea tda = desktopOrganizer.mDefaultTDA; diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTraversalTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTraversalTests.java index 8606581539ff..669f5d28267d 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTraversalTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTraversalTests.java @@ -24,7 +24,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import android.platform.test.annotations.Presubmit; diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java index 5401a44d7016..6a35fa8e20ad 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java @@ -61,6 +61,7 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -1568,6 +1569,51 @@ public class WindowOrganizerTests extends WindowTestsBase { } @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBoundsOnRootTask() { + Task rootTask = mWm.mAtmService.mTaskOrganizerController.createRootTask( + mDisplayContent, WINDOWING_MODE_FULLSCREEN, null); + final Task task1 = createRootTask(); + final Task task2 = createTask(rootTask, false /* fakeDraw */); + WindowContainerTransaction wct = new WindowContainerTransaction(); + Rect safeRegionBounds = new Rect(50, 50, 200, 300); + + wct.setSafeRegionBounds(rootTask.mRemoteToken.toWindowContainerToken(), safeRegionBounds); + mWm.mAtmService.mWindowOrganizerController.applyTransaction(wct); + + assertEquals(rootTask.getSafeRegionBounds(), safeRegionBounds); + assertEquals(task2.getSafeRegionBounds(), safeRegionBounds); + assertNull(task1.getSafeRegionBounds()); + } + + @Test + @EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING) + public void testSetSafeRegionBoundsOnRootTask_resetSafeRegionBounds() { + Task rootTask = mWm.mAtmService.mTaskOrganizerController.createRootTask( + mDisplayContent, WINDOWING_MODE_FULLSCREEN, null); + final Task task1 = createRootTask(); + final Task task2 = createTask(rootTask, false /* fakeDraw */); + WindowContainerTransaction wct = new WindowContainerTransaction(); + Rect safeRegionBounds = new Rect(50, 50, 200, 300); + + wct.setSafeRegionBounds(rootTask.mRemoteToken.toWindowContainerToken(), safeRegionBounds); + mWm.mAtmService.mWindowOrganizerController.applyTransaction(wct); + + assertEquals(rootTask.getSafeRegionBounds(), safeRegionBounds); + assertEquals(task2.getSafeRegionBounds(), safeRegionBounds); + assertNull(task1.getSafeRegionBounds()); + + // Reset safe region bounds on the root task + wct.setSafeRegionBounds(rootTask.mRemoteToken.toWindowContainerToken(), + /* safeRegionBounds */null); + mWm.mAtmService.mWindowOrganizerController.applyTransaction(wct); + + assertNull(rootTask.getSafeRegionBounds()); + assertNull(task2.getSafeRegionBounds()); + assertNull(task1.getSafeRegionBounds()); + } + + @Test public void testReparentToOrganizedTask() { final ITaskOrganizer organizer = registerMockOrganizer(); Task rootTask = mWm.mAtmService.mTaskOrganizerController.createRootTask( diff --git a/telephony/java/android/telephony/TelephonyFrameworkInitializer.java b/telephony/java/android/telephony/TelephonyFrameworkInitializer.java index 7356cdc8889b..42d09cfc2e43 100644 --- a/telephony/java/android/telephony/TelephonyFrameworkInitializer.java +++ b/telephony/java/android/telephony/TelephonyFrameworkInitializer.java @@ -31,7 +31,6 @@ import android.telephony.euicc.EuiccManager; import android.telephony.ims.ImsManager; import android.telephony.satellite.SatelliteManager; -import com.android.internal.telephony.flags.Flags; import com.android.internal.util.Preconditions; @@ -77,9 +76,6 @@ public class TelephonyFrameworkInitializer { // also check through Compatibility framework a few lines below). @SuppressWarnings("AndroidFrameworkCompatChange") private static boolean hasSystemFeature(Context context, String feature) { - // Check release status of this change in behavior. - if (!Flags.minimalTelephonyManagersConditionalOnFeatures()) return true; - // Check SDK version of the vendor partition. final int vendorApiLevel = SystemProperties.getInt( "ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT); diff --git a/tests/Input/assets/testPointerScale.png b/tests/Input/assets/testPointerScale.png Binary files differindex 54d37c24afc6..781df47a5e24 100644 --- a/tests/Input/assets/testPointerScale.png +++ b/tests/Input/assets/testPointerScale.png diff --git a/tests/Internal/src/com/android/internal/app/AppLocaleCollectorTest.java b/tests/Internal/src/com/android/internal/app/AppLocaleCollectorTest.java index d16e90e26aaa..9d60e7c8b0b0 100644 --- a/tests/Internal/src/com/android/internal/app/AppLocaleCollectorTest.java +++ b/tests/Internal/src/com/android/internal/app/AppLocaleCollectorTest.java @@ -20,7 +20,7 @@ import static com.android.internal.app.AppLocaleStore.AppLocaleResult.LocaleStat import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -123,7 +123,7 @@ public class AppLocaleCollectorTest { doReturn(mAllAppActiveLocales).when(mAppLocaleCollector).getAllAppActiveLocales(); doReturn(mImeLocales).when(mAppLocaleCollector).getActiveImeLocales(); doReturn(mSystemSupportedLocales).when(mAppLocaleCollector).getSystemSupportedLocale( - anyObject(), eq(null), eq(true)); + any(), eq(null), eq(true)); doReturn(mSystemCurrentLocales).when( mAppLocaleCollector).getSystemCurrentLocales(); @@ -159,7 +159,7 @@ public class AppLocaleCollectorTest { doReturn(mAllAppActiveLocales).when(mAppLocaleCollector).getAllAppActiveLocales(); doReturn(mImeLocales).when(mAppLocaleCollector).getActiveImeLocales(); doReturn(mSystemSupportedLocales).when(mAppLocaleCollector).getSystemSupportedLocale( - anyObject(), eq(null), eq(true)); + any(), eq(null), eq(true)); doReturn(mSystemCurrentLocales).when( mAppLocaleCollector).getSystemCurrentLocales(); diff --git a/tests/PackageWatchdog/src/com/android/server/RescuePartyTest.java b/tests/PackageWatchdog/src/com/android/server/RescuePartyTest.java new file mode 100644 index 000000000000..eda5e8613dba --- /dev/null +++ b/tests/PackageWatchdog/src/com/android/server/RescuePartyTest.java @@ -0,0 +1,523 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server; + +import static com.android.dx.mockito.inline.extended.ExtendedMockito.any; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.anyBoolean; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.anyInt; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.anyLong; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.anyString; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.when; +import static com.android.server.PackageWatchdog.MITIGATION_RESULT_SKIPPED; +import static com.android.server.PackageWatchdog.MITIGATION_RESULT_SUCCESS; +import static com.android.server.RescueParty.DEFAULT_FACTORY_RESET_THROTTLE_DURATION_MIN; +import static com.android.server.RescueParty.LEVEL_FACTORY_RESET; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.spy; + +import android.content.ContentResolver; +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.content.pm.VersionedPackage; +import android.os.RecoverySystem; +import android.os.SystemProperties; +import android.provider.DeviceConfig; +import android.provider.Settings; + +import com.android.dx.mockito.inline.extended.ExtendedMockito; +import com.android.server.PackageWatchdog.PackageHealthObserverImpact; +import com.android.server.RescueParty.RescuePartyObserver; +import com.android.server.am.SettingsToPropertiesMapper; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.MockitoSession; +import org.mockito.quality.Strictness; +import org.mockito.stubbing.Answer; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.HashSet; +import java.util.concurrent.TimeUnit; + + +/** + * Test RescueParty. + */ +public class RescuePartyTest { + private static final long CURRENT_NETWORK_TIME_MILLIS = 0L; + + private static VersionedPackage sFailingPackage = new VersionedPackage("com.package.name", 1); + private static final String PROP_DISABLE_RESCUE = "persist.sys.disable_rescue"; + private static final String PERSISTENT_PACKAGE = "com.persistent.package"; + private static final String NON_PERSISTENT_PACKAGE = "com.nonpersistent.package"; + private static final String PROP_DEVICE_CONFIG_DISABLE_FLAG = + "persist.device_config.configuration.disable_rescue_party"; + private static final String PROP_DISABLE_FACTORY_RESET_FLAG = + "persist.device_config.configuration.disable_rescue_party_factory_reset"; + + private MockitoSession mSession; + private HashMap<String, String> mSystemSettingsMap; + private HashMap<String, String> mCrashRecoveryPropertiesMap; + //Records the namespaces wiped by setProperties(). + private HashSet<String> mNamespacesWiped; + + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private Context mMockContext; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private PackageWatchdog mMockPackageWatchdog; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private ContentResolver mMockContentResolver; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private PackageManager mPackageManager; + + // Mock only sysprop apis + private PackageWatchdog.BootThreshold mSpyBootThreshold; + + @Before + public void setUp() throws Exception { + mSession = + ExtendedMockito.mockitoSession().initMocks( + this) + .strictness(Strictness.LENIENT) + .spyStatic(DeviceConfig.class) + .spyStatic(SystemProperties.class) + .spyStatic(Settings.Global.class) + .spyStatic(Settings.Secure.class) + .spyStatic(SettingsToPropertiesMapper.class) + .spyStatic(RecoverySystem.class) + .spyStatic(RescueParty.class) + .spyStatic(PackageWatchdog.class) + .startMocking(); + mSystemSettingsMap = new HashMap<>(); + mNamespacesWiped = new HashSet<>(); + + when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver); + when(mMockContext.getPackageManager()).thenReturn(mPackageManager); + ApplicationInfo persistentApplicationInfo = new ApplicationInfo(); + persistentApplicationInfo.flags |= + ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_PERSISTENT; + + // If the package name is PERSISTENT_PACKAGE, then set the flags to be persistent and + // system. Don't set any flags otherwise. + when(mPackageManager.getApplicationInfo(eq(PERSISTENT_PACKAGE), + anyInt())).thenReturn(persistentApplicationInfo); + when(mPackageManager.getApplicationInfo(eq(NON_PERSISTENT_PACKAGE), + anyInt())).thenReturn(new ApplicationInfo()); + // Reset observer instance to get new mock context on every run + RescuePartyObserver.reset(); + + // Mock SystemProperties setter and various getters + doAnswer((Answer<Void>) invocationOnMock -> { + String key = invocationOnMock.getArgument(0); + String value = invocationOnMock.getArgument(1); + + mSystemSettingsMap.put(key, value); + return null; + } + ).when(() -> SystemProperties.set(anyString(), anyString())); + + doAnswer((Answer<Boolean>) invocationOnMock -> { + String key = invocationOnMock.getArgument(0); + boolean defaultValue = invocationOnMock.getArgument(1); + + String storedValue = mSystemSettingsMap.get(key); + return storedValue == null ? defaultValue : Boolean.parseBoolean(storedValue); + } + ).when(() -> SystemProperties.getBoolean(anyString(), anyBoolean())); + + doAnswer((Answer<Integer>) invocationOnMock -> { + String key = invocationOnMock.getArgument(0); + int defaultValue = invocationOnMock.getArgument(1); + + String storedValue = mSystemSettingsMap.get(key); + return storedValue == null ? defaultValue : Integer.parseInt(storedValue); + } + ).when(() -> SystemProperties.getInt(anyString(), anyInt())); + + doAnswer((Answer<Long>) invocationOnMock -> { + String key = invocationOnMock.getArgument(0); + long defaultValue = invocationOnMock.getArgument(1); + + String storedValue = mSystemSettingsMap.get(key); + return storedValue == null ? defaultValue : Long.parseLong(storedValue); + } + ).when(() -> SystemProperties.getLong(anyString(), anyLong())); + + // Mock DeviceConfig + doAnswer((Answer<Boolean>) invocationOnMock -> true) + .when(() -> DeviceConfig.setProperty(anyString(), anyString(), anyString(), + anyBoolean())); + doAnswer((Answer<Void>) invocationOnMock -> null) + .when(() -> DeviceConfig.resetToDefaults(anyInt(), anyString())); + doAnswer((Answer<Boolean>) invocationOnMock -> { + DeviceConfig.Properties properties = invocationOnMock.getArgument(0); + String namespace = properties.getNamespace(); + // record a wipe + if (properties.getKeyset().isEmpty()) { + mNamespacesWiped.add(namespace); + } + return true; + } + ).when(() -> DeviceConfig.setProperties(any(DeviceConfig.Properties.class))); + + // Mock PackageWatchdog + doAnswer((Answer<PackageWatchdog>) invocationOnMock -> mMockPackageWatchdog) + .when(() -> PackageWatchdog.getInstance(mMockContext)); + mockCrashRecoveryProperties(mMockPackageWatchdog); + + doReturn(CURRENT_NETWORK_TIME_MILLIS).when(() -> RescueParty.getElapsedRealtime()); + + setCrashRecoveryPropRescueBootCount(0); + SystemProperties.set(RescueParty.PROP_ENABLE_RESCUE, Boolean.toString(true)); + SystemProperties.set(PROP_DEVICE_CONFIG_DISABLE_FLAG, Boolean.toString(false)); + } + + @After + public void tearDown() throws Exception { + mSession.finishMocking(); + } + + @Test + public void testBootLoopNoFlags() { + // this is old test where the flag needs to be disabled + noteBoot(1); + assertTrue(RescueParty.isRebootPropertySet()); + + setCrashRecoveryPropAttemptingReboot(false); + noteBoot(2); + assertTrue(RescueParty.isFactoryResetPropertySet()); + } + + @Test + public void testPersistentAppCrashNoFlags() { + // this is old test where the flag needs to be disabled + noteAppCrash(1, true); + assertTrue(RescueParty.isRebootPropertySet()); + + setCrashRecoveryPropAttemptingReboot(false); + noteAppCrash(2, true); + assertTrue(RescueParty.isFactoryResetPropertySet()); + } + + @Test + public void testIsRecoveryTriggeredReboot() { + for (int i = 0; i < LEVEL_FACTORY_RESET; i++) { + noteBoot(i + 1); + } + assertFalse(RescueParty.isFactoryResetPropertySet()); + setCrashRecoveryPropAttemptingReboot(false); + noteBoot(LEVEL_FACTORY_RESET + 1); + assertTrue(RescueParty.isRecoveryTriggeredReboot()); + assertTrue(RescueParty.isFactoryResetPropertySet()); + } + + @Test + public void testIsRecoveryTriggeredRebootOnlyAfterRebootCompleted() { + for (int i = 0; i < LEVEL_FACTORY_RESET; i++) { + noteBoot(i + 1); + } + int mitigationCount = LEVEL_FACTORY_RESET + 1; + assertFalse(RescueParty.isFactoryResetPropertySet()); + noteBoot(mitigationCount++); + assertFalse(RescueParty.isFactoryResetPropertySet()); + noteBoot(mitigationCount++); + assertFalse(RescueParty.isFactoryResetPropertySet()); + noteBoot(mitigationCount++); + setCrashRecoveryPropAttemptingReboot(false); + noteBoot(mitigationCount + 1); + assertTrue(RescueParty.isRecoveryTriggeredReboot()); + assertTrue(RescueParty.isFactoryResetPropertySet()); + } + + @Test + public void testThrottlingOnBootFailures() { + setCrashRecoveryPropAttemptingReboot(false); + long now = System.currentTimeMillis(); + long beforeTimeout = now - TimeUnit.MINUTES.toMillis( + DEFAULT_FACTORY_RESET_THROTTLE_DURATION_MIN - 1); + setCrashRecoveryPropLastFactoryReset(beforeTimeout); + for (int i = 1; i <= LEVEL_FACTORY_RESET; i++) { + noteBoot(i); + } + assertFalse(RescueParty.isRecoveryTriggeredReboot()); + } + + @Test + public void testThrottlingOnAppCrash() { + setCrashRecoveryPropAttemptingReboot(false); + long now = System.currentTimeMillis(); + long beforeTimeout = now - TimeUnit.MINUTES.toMillis( + DEFAULT_FACTORY_RESET_THROTTLE_DURATION_MIN - 1); + setCrashRecoveryPropLastFactoryReset(beforeTimeout); + for (int i = 0; i <= LEVEL_FACTORY_RESET; i++) { + noteAppCrash(i + 1, true); + } + assertFalse(RescueParty.isRecoveryTriggeredReboot()); + } + + @Test + public void testNotThrottlingAfterTimeoutOnBootFailures() { + setCrashRecoveryPropAttemptingReboot(false); + long now = System.currentTimeMillis(); + long afterTimeout = now - TimeUnit.MINUTES.toMillis( + DEFAULT_FACTORY_RESET_THROTTLE_DURATION_MIN + 1); + setCrashRecoveryPropLastFactoryReset(afterTimeout); + for (int i = 1; i <= LEVEL_FACTORY_RESET; i++) { + noteBoot(i); + } + assertTrue(RescueParty.isRecoveryTriggeredReboot()); + } + + @Test + public void testNotThrottlingAfterTimeoutOnAppCrash() { + when(mMockContext.getPackageManager()).thenReturn(mPackageManager); + setCrashRecoveryPropAttemptingReboot(false); + long now = System.currentTimeMillis(); + long afterTimeout = now - TimeUnit.MINUTES.toMillis( + DEFAULT_FACTORY_RESET_THROTTLE_DURATION_MIN + 1); + setCrashRecoveryPropLastFactoryReset(afterTimeout); + for (int i = 0; i <= LEVEL_FACTORY_RESET; i++) { + noteAppCrash(i + 1, true); + } + assertTrue(RescueParty.isRecoveryTriggeredReboot()); + } + + @Test + public void testExplicitlyEnablingAndDisablingRescue() { + SystemProperties.set(RescueParty.PROP_ENABLE_RESCUE, Boolean.toString(false)); + SystemProperties.set(PROP_DISABLE_RESCUE, Boolean.toString(true)); + assertEquals(RescuePartyObserver.getInstance(mMockContext).onExecuteHealthCheckMitigation( + sFailingPackage, PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), + MITIGATION_RESULT_SKIPPED); + + SystemProperties.set(RescueParty.PROP_ENABLE_RESCUE, Boolean.toString(true)); + assertEquals(RescuePartyObserver.getInstance(mMockContext).onExecuteHealthCheckMitigation( + sFailingPackage, PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), + MITIGATION_RESULT_SUCCESS); + } + + @Test + public void testDisablingRescueByDeviceConfigFlag() { + SystemProperties.set(RescueParty.PROP_ENABLE_RESCUE, Boolean.toString(false)); + SystemProperties.set(PROP_DEVICE_CONFIG_DISABLE_FLAG, Boolean.toString(true)); + + assertEquals(RescuePartyObserver.getInstance(mMockContext).onExecuteHealthCheckMitigation( + sFailingPackage, PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), + MITIGATION_RESULT_SKIPPED); + + // Restore the property value initialized in SetUp() + SystemProperties.set(RescueParty.PROP_ENABLE_RESCUE, Boolean.toString(true)); + SystemProperties.set(PROP_DEVICE_CONFIG_DISABLE_FLAG, Boolean.toString(false)); + } + + @Test + public void testDisablingFactoryResetByDeviceConfigFlag() { + SystemProperties.set(PROP_DISABLE_FACTORY_RESET_FLAG, Boolean.toString(true)); + + for (int i = 0; i < LEVEL_FACTORY_RESET; i++) { + noteBoot(i + 1); + } + assertFalse(RescueParty.isFactoryResetPropertySet()); + + // Restore the property value initialized in SetUp() + SystemProperties.set(PROP_DISABLE_FACTORY_RESET_FLAG, ""); + } + + @Test + public void testHealthCheckLevelsNoFlags() { + // this is old test where the flag needs to be disabled + RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); + + // Ensure that no action is taken for cases where the failure reason is unknown + assertEquals(observer.onHealthCheckFailed(null, PackageWatchdog.FAILURE_REASON_UNKNOWN, 1), + PackageHealthObserverImpact.USER_IMPACT_LEVEL_0); + + // Ensure the correct user impact is returned for each mitigation count. + assertEquals(observer.onHealthCheckFailed(null, + PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 1), + PackageHealthObserverImpact.USER_IMPACT_LEVEL_50); + + assertEquals(observer.onHealthCheckFailed(null, + PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING, 2), + PackageHealthObserverImpact.USER_IMPACT_LEVEL_100); + } + + @Test + public void testBootLoopLevelsNoFlags() { + RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext); + + assertEquals(observer.onBootLoop(1), PackageHealthObserverImpact.USER_IMPACT_LEVEL_50); + assertEquals(observer.onBootLoop(2), PackageHealthObserverImpact.USER_IMPACT_LEVEL_100); + } + + + private void noteBoot(int mitigationCount) { + RescuePartyObserver.getInstance(mMockContext).onExecuteBootLoopMitigation(mitigationCount); + } + + private void noteAppCrash(int mitigationCount, boolean isPersistent) { + String packageName = isPersistent ? PERSISTENT_PACKAGE : NON_PERSISTENT_PACKAGE; + RescuePartyObserver.getInstance(mMockContext).onExecuteHealthCheckMitigation( + new VersionedPackage(packageName, 1), PackageWatchdog.FAILURE_REASON_APP_CRASH, + mitigationCount); + } + + // Mock CrashRecoveryProperties as they cannot be accessed due to SEPolicy restrictions + private void mockCrashRecoveryProperties(PackageWatchdog watchdog) { + // mock properties in RescueParty + try { + + doAnswer((Answer<Boolean>) invocationOnMock -> { + String storedValue = mCrashRecoveryPropertiesMap + .getOrDefault("crashrecovery.attempting_factory_reset", "false"); + return Boolean.parseBoolean(storedValue); + }).when(() -> RescueParty.isFactoryResetPropertySet()); + doAnswer((Answer<Void>) invocationOnMock -> { + boolean value = invocationOnMock.getArgument(0); + mCrashRecoveryPropertiesMap.put("crashrecovery.attempting_factory_reset", + Boolean.toString(value)); + return null; + }).when(() -> RescueParty.setFactoryResetProperty(anyBoolean())); + + doAnswer((Answer<Boolean>) invocationOnMock -> { + String storedValue = mCrashRecoveryPropertiesMap + .getOrDefault("crashrecovery.attempting_reboot", "false"); + return Boolean.parseBoolean(storedValue); + }).when(() -> RescueParty.isRebootPropertySet()); + doAnswer((Answer<Void>) invocationOnMock -> { + boolean value = invocationOnMock.getArgument(0); + setCrashRecoveryPropAttemptingReboot(value); + return null; + }).when(() -> RescueParty.setRebootProperty(anyBoolean())); + + doAnswer((Answer<Long>) invocationOnMock -> { + String storedValue = mCrashRecoveryPropertiesMap + .getOrDefault("persist.crashrecovery.last_factory_reset", "0"); + return Long.parseLong(storedValue); + }).when(() -> RescueParty.getLastFactoryResetTimeMs()); + doAnswer((Answer<Void>) invocationOnMock -> { + long value = invocationOnMock.getArgument(0); + setCrashRecoveryPropLastFactoryReset(value); + return null; + }).when(() -> RescueParty.setLastFactoryResetTimeMs(anyLong())); + + doAnswer((Answer<Integer>) invocationOnMock -> { + String storedValue = mCrashRecoveryPropertiesMap + .getOrDefault("crashrecovery.max_rescue_level_attempted", "0"); + return Integer.parseInt(storedValue); + }).when(() -> RescueParty.getMaxRescueLevelAttempted()); + doAnswer((Answer<Void>) invocationOnMock -> { + int value = invocationOnMock.getArgument(0); + mCrashRecoveryPropertiesMap.put("crashrecovery.max_rescue_level_attempted", + Integer.toString(value)); + return null; + }).when(() -> RescueParty.setMaxRescueLevelAttempted(anyInt())); + + } catch (Exception e) { + // tests will fail, just printing the error + System.out.println("Error while mocking crashrecovery properties " + e.getMessage()); + } + + // mock properties in BootThreshold + try { + mSpyBootThreshold = spy(watchdog.new BootThreshold( + PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT, + PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_WINDOW_MS)); + mCrashRecoveryPropertiesMap = new HashMap<>(); + + doAnswer((Answer<Integer>) invocationOnMock -> { + String storedValue = mCrashRecoveryPropertiesMap + .getOrDefault("crashrecovery.rescue_boot_count", "0"); + return Integer.parseInt(storedValue); + }).when(mSpyBootThreshold).getCount(); + doAnswer((Answer<Void>) invocationOnMock -> { + int count = invocationOnMock.getArgument(0); + setCrashRecoveryPropRescueBootCount(count); + return null; + }).when(mSpyBootThreshold).setCount(anyInt()); + + doAnswer((Answer<Integer>) invocationOnMock -> { + String storedValue = mCrashRecoveryPropertiesMap + .getOrDefault("crashrecovery.boot_mitigation_count", "0"); + return Integer.parseInt(storedValue); + }).when(mSpyBootThreshold).getMitigationCount(); + doAnswer((Answer<Void>) invocationOnMock -> { + int count = invocationOnMock.getArgument(0); + mCrashRecoveryPropertiesMap.put("crashrecovery.boot_mitigation_count", + Integer.toString(count)); + return null; + }).when(mSpyBootThreshold).setMitigationCount(anyInt()); + + doAnswer((Answer<Long>) invocationOnMock -> { + String storedValue = mCrashRecoveryPropertiesMap + .getOrDefault("crashrecovery.rescue_boot_start", "0"); + return Long.parseLong(storedValue); + }).when(mSpyBootThreshold).getStart(); + doAnswer((Answer<Void>) invocationOnMock -> { + long count = invocationOnMock.getArgument(0); + mCrashRecoveryPropertiesMap.put("crashrecovery.rescue_boot_start", + Long.toString(count)); + return null; + }).when(mSpyBootThreshold).setStart(anyLong()); + + doAnswer((Answer<Long>) invocationOnMock -> { + String storedValue = mCrashRecoveryPropertiesMap + .getOrDefault("crashrecovery.boot_mitigation_start", "0"); + return Long.parseLong(storedValue); + }).when(mSpyBootThreshold).getMitigationStart(); + doAnswer((Answer<Void>) invocationOnMock -> { + long count = invocationOnMock.getArgument(0); + mCrashRecoveryPropertiesMap.put("crashrecovery.boot_mitigation_start", + Long.toString(count)); + return null; + }).when(mSpyBootThreshold).setMitigationStart(anyLong()); + + Field mBootThresholdField = watchdog.getClass().getDeclaredField("mBootThreshold"); + mBootThresholdField.setAccessible(true); + mBootThresholdField.set(watchdog, mSpyBootThreshold); + } catch (Exception e) { + // tests will fail, just printing the error + System.out.println("Error while spying BootThreshold " + e.getMessage()); + } + } + + private void setCrashRecoveryPropRescueBootCount(int count) { + mCrashRecoveryPropertiesMap.put("crashrecovery.rescue_boot_count", + Integer.toString(count)); + } + + private void setCrashRecoveryPropAttemptingReboot(boolean value) { + mCrashRecoveryPropertiesMap.put("crashrecovery.attempting_reboot", + Boolean.toString(value)); + } + + private void setCrashRecoveryPropLastFactoryReset(long value) { + mCrashRecoveryPropertiesMap.put("persist.crashrecovery.last_factory_reset", + Long.toString(value)); + } +} diff --git a/tests/testables/src/android/testing/TestableLooper.java b/tests/testables/src/android/testing/TestableLooper.java index 649241aaaa8c..6b099450064f 100644 --- a/tests/testables/src/android/testing/TestableLooper.java +++ b/tests/testables/src/android/testing/TestableLooper.java @@ -238,6 +238,36 @@ public class TestableLooper { while (processQueuedMessages() != 0) ; } + public long peekWhen() { + if (isAtLeastBaklava()) { + return peekWhenBaklava(); + } else { + return peekWhenLegacy(); + } + } + + private long peekWhenBaklava() { + Long when = mQueueWrapper.peekWhen(); + if (when != null) { + return when; + } else { + return 0; + } + } + + private long peekWhenLegacy() { + try { + Message msg = (Message) MESSAGE_QUEUE_MESSAGES_FIELD.get(mLooper.getQueue()); + if (msg != null) { + return msg.getWhen(); + } else { + return 0; + } + } catch (IllegalAccessException e) { + throw new RuntimeException("Access failed in TestableLooper: set - Message.when", e); + } + } + public void moveTimeForward(long milliSeconds) { if (isAtLeastBaklava()) { moveTimeForwardBaklava(milliSeconds); diff --git a/tests/testables/tests/src/android/testing/TestableLooperTest.java b/tests/testables/tests/src/android/testing/TestableLooperTest.java index fd5c4caca484..a7e0125eb3d4 100644 --- a/tests/testables/tests/src/android/testing/TestableLooperTest.java +++ b/tests/testables/tests/src/android/testing/TestableLooperTest.java @@ -17,8 +17,8 @@ package android.testing; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/tests/utils/testutils/tests/src/android/os/test/TestLooperTest.java b/tests/utils/testutils/tests/src/android/os/test/TestLooperTest.java index 6205b98d4e79..05f237f0002f 100644 --- a/tests/utils/testutils/tests/src/android/os/test/TestLooperTest.java +++ b/tests/utils/testutils/tests/src/android/os/test/TestLooperTest.java @@ -19,7 +19,7 @@ package android.os.test; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java index 6608dda95a4b..a34908051360 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java @@ -37,10 +37,10 @@ import static com.android.server.vcn.VcnGatewayConnection.VcnNetworkAgent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectingStateTest.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectingStateTest.java index f6123d29f35a..e1a572e7a481 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectingStateTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectingStateTest.java @@ -21,7 +21,7 @@ import static com.android.server.vcn.VcnGatewayConnection.VcnIkeSession; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java index 8374fd944568..7f0cabf7d159 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java @@ -24,8 +24,8 @@ import static com.android.server.vcn.VcnTestUtils.setupIpSecManager; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; diff --git a/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java b/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java index 2b92428918db..0185931d628f 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java @@ -18,9 +18,9 @@ package com.android.server.vcn; import static android.net.NetworkProvider.NetworkOfferCallback; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/tests/vcn/java/com/android/server/vcn/VcnTest.java b/tests/vcn/java/com/android/server/vcn/VcnTest.java index bd4aeba761da..c12adcbab08a 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnTest.java @@ -31,10 +31,10 @@ import static com.android.server.vcn.Vcn.VcnContentResolver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/tests/vcn/java/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluatorTest.java b/tests/vcn/java/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluatorTest.java index 27c1bc105bde..3ca84cf05cd1 100644 --- a/tests/vcn/java/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluatorTest.java +++ b/tests/vcn/java/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluatorTest.java @@ -28,7 +28,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; @@ -83,7 +82,7 @@ public class UnderlyingNetworkEvaluatorTest extends NetworkEvaluationTestBase { .thenReturn(mIpSecPacketLossDetector); when(mCarrierConfig.getIntArray( - eq(VCN_NETWORK_SELECTION_PENALTY_TIMEOUT_MINUTES_LIST_KEY), anyObject())) + eq(VCN_NETWORK_SELECTION_PENALTY_TIMEOUT_MINUTES_LIST_KEY), any())) .thenReturn(new int[] {PENALTY_TIMEOUT_MIN}); mNetworkEvaluator = newValidUnderlyingNetworkEvaluator(); @@ -309,7 +308,7 @@ public class UnderlyingNetworkEvaluatorTest extends NetworkEvaluationTestBase { public void testSetCarrierConfig() throws Exception { final int additionalTimeoutMin = 10; when(mCarrierConfig.getIntArray( - eq(VCN_NETWORK_SELECTION_PENALTY_TIMEOUT_MINUTES_LIST_KEY), anyObject())) + eq(VCN_NETWORK_SELECTION_PENALTY_TIMEOUT_MINUTES_LIST_KEY), any())) .thenReturn(new int[] {PENALTY_TIMEOUT_MIN + additionalTimeoutMin}); // Update evaluator and penalize the network diff --git a/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java b/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java index 02da835d1002..c30e7bfdfa50 100644 --- a/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java +++ b/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyLong; import static org.mockito.Mockito.doNothing; |
