Merge "Hide IME first when clicking on area outside bubble" into main
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 2d05606..96d6f32 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -307,6 +307,11 @@
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+cc_aconfig_library {
+ name: "android_security_flags_aconfig_c_lib",
+ aconfig_declarations: "android.security.flags-aconfig",
+}
+
// UsageStats
aconfig_declarations {
name: "android.app.usage.flags-aconfig",
diff --git a/DREAM_MANAGER_OWNERS b/DREAM_MANAGER_OWNERS
deleted file mode 100644
index 48bde60..0000000
--- a/DREAM_MANAGER_OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-brycelee@google.com
diff --git a/apct-tests/perftests/OWNERS b/apct-tests/perftests/OWNERS
index 8ff3f9b..f4346b1 100644
--- a/apct-tests/perftests/OWNERS
+++ b/apct-tests/perftests/OWNERS
@@ -8,4 +8,3 @@
shayba@google.com
shombert@google.com
timmurray@google.com
-wessam@google.com
diff --git a/apct-tests/perftests/core/src/android/libcore/varhandles/generate_java.py b/apct-tests/perftests/core/src/android/libcore/varhandles/generate_java.py
index 01abdb6..cfcb1d2 100755
--- a/apct-tests/perftests/core/src/android/libcore/varhandles/generate_java.py
+++ b/apct-tests/perftests/core/src/android/libcore/varhandles/generate_java.py
@@ -21,7 +21,7 @@
To run use: python generate_java.py <destination_directory>
And then to correct lint errors (from frameworks/base):
-../../tools/repohooks/tools/google-java-format.py --fix --sort-imports --google-java-format-diff ../../external/google-java-format/scripts/google-java-format-diff.py
+../../tools/repohooks/tools/google-java-format.py --fix --google-java-format-diff ../../external/google-java-format/scripts/google-java-format-diff.py
"""
diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java
index 65628d3..fd9600c 100644
--- a/core/java/android/accessibilityservice/AccessibilityService.java
+++ b/core/java/android/accessibilityservice/AccessibilityService.java
@@ -16,7 +16,6 @@
package android.accessibilityservice;
-import static android.accessibilityservice.AccessibilityServiceInfo.CAPABILITY_CAN_CONTROL_MAGNIFICATION;
import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_FULLSCREEN;
import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY;
@@ -70,8 +69,6 @@
import android.view.accessibility.AccessibilityWindowInfo;
import android.view.inputmethod.EditorInfo;
-import androidx.annotation.GuardedBy;
-
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.inputmethod.CancellationGroup;
import com.android.internal.inputmethod.IAccessibilityInputMethodSession;
@@ -643,8 +640,6 @@
/** The detected gesture information for different displays */
boolean onGesture(AccessibilityGestureEvent gestureInfo);
boolean onKeyEvent(KeyEvent event);
- /** Magnification SystemUI connection changed callbacks */
- void onMagnificationSystemUIConnectionChanged(boolean connected);
/** Magnification changed callbacks for different displays */
void onMagnificationChanged(int displayId, @NonNull Region region,
MagnificationConfig config);
@@ -795,6 +790,7 @@
public static final String KEY_ACCESSIBILITY_SCREENSHOT_TIMESTAMP =
"screenshot_timestamp";
+
/**
* Annotations for result codes of attaching accessibility overlays.
*
@@ -841,13 +837,6 @@
private WindowManager mWindowManager;
- @GuardedBy("mLock")
- private boolean mServiceConnected;
- @GuardedBy("mLock")
- private boolean mMagnificationSystemUIConnected;
- @GuardedBy("mLock")
- private boolean mServiceConnectedNotified;
-
/** List of magnification controllers, mapping from displayId -> MagnificationController. */
private final SparseArray<MagnificationController> mMagnificationControllers =
new SparseArray<>(0);
@@ -897,14 +886,11 @@
for (int i = 0; i < mMagnificationControllers.size(); i++) {
mMagnificationControllers.valueAt(i).onServiceConnectedLocked();
}
- checkIsMagnificationSystemUIConnectedAlready();
final AccessibilityServiceInfo info = getServiceInfo();
if (info != null) {
updateInputMethod(info);
mMotionEventSources = info.getMotionEventSources();
}
- mServiceConnected = true;
- mServiceConnectedNotified = false;
}
if (mSoftKeyboardController != null) {
mSoftKeyboardController.onServiceConnected();
@@ -912,57 +898,7 @@
// The client gets to handle service connection last, after we've set
// up any state upon which their code may rely.
- if (android.view.accessibility.Flags
- .waitMagnificationSystemUiConnectionToNotifyServiceConnected()) {
- notifyOnServiceConnectedIfReady();
- } else {
- onServiceConnected();
- }
- }
-
- private void notifyOnServiceConnectedIfReady() {
- synchronized (mLock) {
- if (mServiceConnectedNotified) {
- return;
- }
- boolean canControlMagnification;
- final AccessibilityServiceInfo info = getServiceInfo();
- if (info != null) {
- int flagMask = CAPABILITY_CAN_CONTROL_MAGNIFICATION;
- canControlMagnification = (info.getCapabilities() & flagMask) == flagMask;
- } else {
- canControlMagnification = false;
- }
- boolean ready = canControlMagnification
- ? (mServiceConnected && mMagnificationSystemUIConnected)
- : mServiceConnected;
- if (ready) {
- getMainExecutor().execute(() -> onServiceConnected());
- mServiceConnectedNotified = true;
- }
- }
- }
-
- @GuardedBy("mLock")
- private void checkIsMagnificationSystemUIConnectedAlready() {
- if (!android.view.accessibility.Flags
- .waitMagnificationSystemUiConnectionToNotifyServiceConnected()) {
- return;
- }
- if (mMagnificationSystemUIConnected) {
- return;
- }
- final IAccessibilityServiceConnection connection =
- AccessibilityInteractionClient.getInstance(this).getConnection(mConnectionId);
- if (connection != null) {
- try {
- boolean connected = connection.isMagnificationSystemUIConnected();
- mMagnificationSystemUIConnected = connected;
- } catch (RemoteException re) {
- Log.w(LOG_TAG, "Failed to check magnification system ui connection", re);
- re.rethrowFromSystemServer();
- }
- }
+ onServiceConnected();
}
private void updateInputMethod(AccessibilityServiceInfo info) {
@@ -1424,22 +1360,6 @@
}
}
- private void onMagnificationSystemUIConnectionChanged(boolean connected) {
- if (!android.view.accessibility.Flags
- .waitMagnificationSystemUiConnectionToNotifyServiceConnected()) {
- return;
- }
-
- synchronized (mLock) {
- boolean changed = (mMagnificationSystemUIConnected != connected);
- mMagnificationSystemUIConnected = connected;
-
- if (changed) {
- notifyOnServiceConnectedIfReady();
- }
- }
- }
-
private void onMagnificationChanged(int displayId, @NonNull Region region,
MagnificationConfig config) {
MagnificationController controller;
@@ -2903,11 +2823,6 @@
}
@Override
- public void onMagnificationSystemUIConnectionChanged(boolean connected) {
- AccessibilityService.this.onMagnificationSystemUIConnectionChanged(connected);
- }
-
- @Override
public void onMagnificationChanged(int displayId, @NonNull Region region,
MagnificationConfig config) {
AccessibilityService.this.onMagnificationChanged(displayId, region, config);
@@ -3117,16 +3032,6 @@
});
}
- @Override
- public void onMagnificationSystemUIConnectionChanged(boolean connected) {
- mExecutor.execute(() -> {
- if (mConnectionId != AccessibilityInteractionClient.NO_ID) {
- mCallback.onMagnificationSystemUIConnectionChanged(connected);
- }
- return;
- });
- }
-
/** Magnification changed callbacks for different displays */
public void onMagnificationChanged(int displayId, @NonNull Region region,
MagnificationConfig config) {
diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
index f1479ef..3bc61e5 100644
--- a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
+++ b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
@@ -48,8 +48,6 @@
void onKeyEvent(in KeyEvent event, int sequence);
- void onMagnificationSystemUIConnectionChanged(boolean connected);
-
void onMagnificationChanged(int displayId, in Region region, in MagnificationConfig config);
void onMotionEvent(in MotionEvent event);
diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
index 149e719..713d8e5 100644
--- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
+++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
@@ -130,9 +130,6 @@
void setMagnificationCallbackEnabled(int displayId, boolean enabled);
@RequiresNoPermission
- boolean isMagnificationSystemUIConnected();
-
- @RequiresNoPermission
boolean setSoftKeyboardShowMode(int showMode);
@RequiresNoPermission
diff --git a/core/java/android/app/ApplicationStartInfo.java b/core/java/android/app/ApplicationStartInfo.java
index 3715c6e..f77c50a 100644
--- a/core/java/android/app/ApplicationStartInfo.java
+++ b/core/java/android/app/ApplicationStartInfo.java
@@ -416,11 +416,34 @@
/**
* @see #getStartIntent
+ *
+ * <p class="note"> Note: This method will clone the provided intent and ensure that the cloned
+ * intent doesn't contain any large objects like bitmaps in its extras by stripping it in the
+ * least aggressive acceptable way for the individual intent.</p>
+ *
* @hide
*/
public void setIntent(Intent startIntent) {
if (startIntent != null) {
- mStartIntent = startIntent.maybeStripForHistory();
+ if (startIntent.canStripForHistory()) {
+ // If maybeStripForHistory will return a lightened version, do that.
+ mStartIntent = startIntent.maybeStripForHistory();
+ } else if (startIntent.getExtras() != null) {
+ // If maybeStripForHistory would not return a lightened version and extras is
+ // non-null then extras contains un-parcelled data. Use cloneFilter to strip data
+ // more aggressively.
+ mStartIntent = startIntent.cloneFilter();
+ } else {
+ // Finally, if maybeStripForHistory would not return a lightened version and extras
+ // is null then do a regular clone so we don't leak the intent.
+ mStartIntent = new Intent(startIntent);
+ }
+
+ // If the newly cloned intent has an original intent, clear that as we don't need it and
+ // can't guarantee it doesn't need to be stripped as well.
+ if (mStartIntent.getOriginalIntent() != null) {
+ mStartIntent.setOriginalIntent(null);
+ }
}
}
diff --git a/core/java/android/app/OWNERS b/core/java/android/app/OWNERS
index 2e38c06..0fad979 100644
--- a/core/java/android/app/OWNERS
+++ b/core/java/android/app/OWNERS
@@ -61,7 +61,7 @@
per-file ComponentCaller.java = file:COMPONENT_CALLER_OWNERS
# DreamManager
-per-file DreamManager.java = file:/DREAM_MANAGER_OWNERS
+per-file DreamManager.java = file:/core/java/android/service/dreams/OWNERS
# GrammaticalInflectionManager
per-file *GrammaticalInflection* = file:/services/core/java/com/android/server/grammaticalinflection/OWNERS
diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java
index 273a79e..348d4d8f 100644
--- a/core/java/android/app/UiAutomation.java
+++ b/core/java/android/app/UiAutomation.java
@@ -1969,11 +1969,6 @@
}
@Override
- public void onMagnificationSystemUIConnectionChanged(boolean connected) {
- /* do nothing */
- }
-
- @Override
public void onMagnificationChanged(int displayId, @NonNull Region region,
MagnificationConfig config) {
/* do nothing */
diff --git a/core/java/android/app/pinner/OWNERS b/core/java/android/app/pinner/OWNERS
index 3e3fa66..fe5da9f 100644
--- a/core/java/android/app/pinner/OWNERS
+++ b/core/java/android/app/pinner/OWNERS
@@ -5,6 +5,5 @@
philipcuadra@google.com
shombert@google.com
timmurray@google.com
-wessam@google.com
jdduke@google.com
-shayba@google.com
\ No newline at end of file
+shayba@google.com
diff --git a/core/java/android/companion/virtual/IVirtualDevice.aidl b/core/java/android/companion/virtual/IVirtualDevice.aidl
index 30a1135..24f18cc 100644
--- a/core/java/android/companion/virtual/IVirtualDevice.aidl
+++ b/core/java/android/companion/virtual/IVirtualDevice.aidl
@@ -281,5 +281,5 @@
* Returns the id of the virtual camera with given config.
*/
@EnforcePermission("CREATE_VIRTUAL_DEVICE")
- int getVirtualCameraId(in VirtualCameraConfig camera);
+ String getVirtualCameraId(in VirtualCameraConfig camera);
}
diff --git a/core/java/android/companion/virtual/VirtualDeviceInternal.java b/core/java/android/companion/virtual/VirtualDeviceInternal.java
index 00d5343..60448ba 100644
--- a/core/java/android/companion/virtual/VirtualDeviceInternal.java
+++ b/core/java/android/companion/virtual/VirtualDeviceInternal.java
@@ -378,8 +378,8 @@
VirtualCamera createVirtualCamera(@NonNull VirtualCameraConfig config) {
try {
mVirtualDevice.registerVirtualCamera(config);
- return new VirtualCamera(mVirtualDevice,
- Integer.toString(mVirtualDevice.getVirtualCameraId(config)), config);
+ return new VirtualCamera(mVirtualDevice, mVirtualDevice.getVirtualCameraId(config),
+ config);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
diff --git a/core/java/android/content/pm/multiuser.aconfig b/core/java/android/content/pm/multiuser.aconfig
index 5668c54..a9c07d1 100644
--- a/core/java/android/content/pm/multiuser.aconfig
+++ b/core/java/android/content/pm/multiuser.aconfig
@@ -267,3 +267,13 @@
purpose: PURPOSE_BUGFIX
}
}
+
+flag {
+ name: "use_private_space_icon_in_biometric_prompt"
+ namespace: "profile_experiences"
+ description: "Update the biometric prompt from generic Settings icon to private space icon"
+ bug: "333528540"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
diff --git a/core/java/android/os/BatteryConsumer.java b/core/java/android/os/BatteryConsumer.java
index b417534..7bdd53d 100644
--- a/core/java/android/os/BatteryConsumer.java
+++ b/core/java/android/os/BatteryConsumer.java
@@ -197,6 +197,9 @@
POWER_COMPONENT_MOBILE_RADIO,
POWER_COMPONENT_WIFI,
POWER_COMPONENT_BLUETOOTH,
+ POWER_COMPONENT_AUDIO,
+ POWER_COMPONENT_VIDEO,
+ POWER_COMPONENT_FLASHLIGHT,
};
static final int COLUMN_INDEX_BATTERY_CONSUMER_TYPE = 0;
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 8aa2c35..30d2dec 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1238,6 +1238,18 @@
public static final int VANILLA_ICE_CREAM = 35;
}
+ /**
+ * The vendor API for 2024 Q2
+ *
+ * <p>For Android 14-QPR3 and later, the vendor API level is completely decoupled from the SDK
+ * API level and the format has switched to YYYYMM (year and month)
+ *
+ * @see <a href="https://preview.source.android.com/docs/core/architecture/api-flags">Vendor API
+ * level</a>
+ * @hide
+ */
+ public static final int VENDOR_API_2024_Q2 = 202404;
+
/** The type of build, like "user" or "eng". */
public static final String TYPE = getString("ro.build.type");
diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java
index 61b52c6..e6b1c07 100644
--- a/core/java/android/os/FileUtils.java
+++ b/core/java/android/os/FileUtils.java
@@ -580,6 +580,8 @@
", copied:" + progress +
", read:" + (count - countToRead) +
", in pipe: " + countInPipe);
+ Os.close(pipes[0]);
+ Os.close(pipes[1]);
throw new ErrnoException("splice, pipe --> fdOut", EIO);
} else {
progress += t;
@@ -607,6 +609,8 @@
listener.onProgress(progressSnapshot);
});
}
+ Os.close(pipes[0]);
+ Os.close(pipes[1]);
return progress;
}
diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig
index 34fb963..e029e52 100644
--- a/core/java/android/permission/flags.aconfig
+++ b/core/java/android/permission/flags.aconfig
@@ -193,7 +193,7 @@
namespace: "permissions"
description: "Enable getDeviceId API in OpEventProxyInfo"
bug: "337340961"
- }
+}
flag {
name: "device_aware_app_op_new_schema_enabled"
@@ -201,4 +201,15 @@
namespace: "permissions"
description: "Persist device attributed AppOp accesses on the disk"
bug: "308201969"
-}
\ No newline at end of file
+}
+
+flag {
+ name: "apex_signature_permission_allowlist_enabled"
+ is_fixed_read_only: true
+ namespace: "permissions"
+ description: "Enable reading signature permission allowlist from APEXes"
+ bug: "308573169"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 53a30b2..05345d8 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6147,6 +6147,15 @@
public static final String TOUCHPAD_RIGHT_CLICK_ZONE = "touchpad_right_click_zone";
/**
+ * Pointer fill style, specified by
+ * {@link android.view.PointerIcon.PointerIconVectorStyleFill} constants.
+ *
+ * @hide
+ */
+ @Readable
+ public static final String POINTER_FILL_STYLE = "pointer_fill_style";
+
+ /**
* Whether lock-to-app will be triggered by long-press on recents.
* @hide
*/
@@ -6348,6 +6357,7 @@
PRIVATE_SETTINGS.add(SIP_ADDRESS_ONLY);
PRIVATE_SETTINGS.add(SIP_ASK_ME_EACH_TIME);
PRIVATE_SETTINGS.add(POINTER_SPEED);
+ PRIVATE_SETTINGS.add(POINTER_FILL_STYLE);
PRIVATE_SETTINGS.add(LOCK_TO_APP_ENABLED);
PRIVATE_SETTINGS.add(EGG_MODE);
PRIVATE_SETTINGS.add(SHOW_BATTERY_PERCENT);
diff --git a/core/java/android/service/dreams/OWNERS b/core/java/android/service/dreams/OWNERS
index 77bcee8..119ca55 100644
--- a/core/java/android/service/dreams/OWNERS
+++ b/core/java/android/service/dreams/OWNERS
@@ -1,10 +1,11 @@
-# Bug component: 78010
+# Bug component: 66910
brycelee@google.com
-dsandler@google.com
-galinap@google.com
-jjaggi@google.com
lusilva@google.com
-michaelwr@google.com
-santoscordon@google.com
wxyz@google.com
+justinkoh@google.com
+
+rgl@google.com
+santoscordon@google.com
+
+dsandler@google.com
diff --git a/core/java/android/service/ondeviceintelligence/IOnDeviceSandboxedInferenceService.aidl b/core/java/android/service/ondeviceintelligence/IOnDeviceSandboxedInferenceService.aidl
index 2aa17c4..1af3b0f 100644
--- a/core/java/android/service/ondeviceintelligence/IOnDeviceSandboxedInferenceService.aidl
+++ b/core/java/android/service/ondeviceintelligence/IOnDeviceSandboxedInferenceService.aidl
@@ -21,6 +21,7 @@
import android.app.ondeviceintelligence.ITokenInfoCallback;
import android.app.ondeviceintelligence.IProcessingSignal;
import android.app.ondeviceintelligence.Feature;
+import android.os.IRemoteCallback;
import android.os.ICancellationSignal;
import android.os.PersistableBundle;
import android.os.Bundle;
@@ -34,18 +35,19 @@
* @hide
*/
oneway interface IOnDeviceSandboxedInferenceService {
- void registerRemoteStorageService(in IRemoteStorageService storageService);
+ void registerRemoteStorageService(in IRemoteStorageService storageService,
+ in IRemoteCallback remoteCallback) = 0;
void requestTokenInfo(int callerUid, in Feature feature, in Bundle request,
in AndroidFuture cancellationSignal,
- in ITokenInfoCallback tokenInfoCallback);
+ in ITokenInfoCallback tokenInfoCallback) = 1;
void processRequest(int callerUid, in Feature feature, in Bundle request, in int requestType,
in AndroidFuture cancellationSignal,
in AndroidFuture processingSignal,
- in IResponseCallback callback);
+ in IResponseCallback callback) = 2;
void processRequestStreaming(int callerUid, in Feature feature, in Bundle request, in int requestType,
in AndroidFuture cancellationSignal,
in AndroidFuture processingSignal,
- in IStreamingResponseCallback callback);
+ in IStreamingResponseCallback callback) = 3;
void updateProcessingState(in Bundle processingState,
- in IProcessingUpdateStatusCallback callback);
+ in IProcessingUpdateStatusCallback callback) = 4;
}
\ No newline at end of file
diff --git a/core/java/android/service/ondeviceintelligence/OnDeviceSandboxedInferenceService.java b/core/java/android/service/ondeviceintelligence/OnDeviceSandboxedInferenceService.java
index d00485c..a77e076 100644
--- a/core/java/android/service/ondeviceintelligence/OnDeviceSandboxedInferenceService.java
+++ b/core/java/android/service/ondeviceintelligence/OnDeviceSandboxedInferenceService.java
@@ -51,6 +51,7 @@
import android.os.HandlerExecutor;
import android.os.IBinder;
import android.os.ICancellationSignal;
+import android.os.IRemoteCallback;
import android.os.Looper;
import android.os.OutcomeReceiver;
import android.os.ParcelFileDescriptor;
@@ -148,9 +149,12 @@
if (SERVICE_INTERFACE.equals(intent.getAction())) {
return new IOnDeviceSandboxedInferenceService.Stub() {
@Override
- public void registerRemoteStorageService(IRemoteStorageService storageService) {
+ public void registerRemoteStorageService(IRemoteStorageService storageService,
+ IRemoteCallback remoteCallback) throws RemoteException {
Objects.requireNonNull(storageService);
mRemoteStorageService = storageService;
+ remoteCallback.sendResult(
+ Bundle.EMPTY); //to notify caller uid to system-server.
}
@Override
diff --git a/core/java/android/text/flags/flags.aconfig b/core/java/android/text/flags/flags.aconfig
index 70dc300e..7023ef7 100644
--- a/core/java/android/text/flags/flags.aconfig
+++ b/core/java/android/text/flags/flags.aconfig
@@ -191,3 +191,23 @@
purpose: PURPOSE_BUGFIX
}
}
+
+flag {
+ name: "disable_handwriting_initiator_for_ime"
+ namespace: "text"
+ description: "Don't initiate handwriting for IME views."
+ bug: "343304685"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
+
+flag {
+ name: "fix_null_typeface_bolding"
+ namespace: "text"
+ description: "Use a bold typeface when bolding is enabled and the original typeface is null"
+ bug: "314811487"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
diff --git a/core/java/android/view/PointerIcon.java b/core/java/android/view/PointerIcon.java
index 71199e9..7c2577f 100644
--- a/core/java/android/view/PointerIcon.java
+++ b/core/java/android/view/PointerIcon.java
@@ -17,6 +17,7 @@
package android.view;
import android.annotation.FlaggedApi;
+import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.TestApi;
@@ -43,8 +44,13 @@
import android.util.SparseArray;
import android.view.flags.Flags;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.util.XmlUtils;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
* Represents an icon that can be used as a mouse pointer.
* <p>
@@ -164,6 +170,29 @@
// every time we need to resolve the icon (i.e. on each input event).
private static final SparseArray<PointerIcon> SYSTEM_ICONS = new SparseArray<>();
+ /** @hide */
+ @IntDef(prefix = {"POINTER_ICON_VECTOR_STYLE_FILL_"}, value = {
+ POINTER_ICON_VECTOR_STYLE_FILL_BLACK,
+ POINTER_ICON_VECTOR_STYLE_FILL_GREEN,
+ POINTER_ICON_VECTOR_STYLE_FILL_YELLOW,
+ POINTER_ICON_VECTOR_STYLE_FILL_PINK,
+ POINTER_ICON_VECTOR_STYLE_FILL_BLUE
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface PointerIconVectorStyleFill {}
+
+ /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_BLACK = 0;
+ /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_GREEN = 1;
+ /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_YELLOW = 2;
+ /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_PINK = 3;
+ /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_BLUE = 4;
+
+ // If adding a PointerIconVectorStyleFill, update END value for {@link SystemSettingsValidators}
+ /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_BEGIN =
+ POINTER_ICON_VECTOR_STYLE_FILL_BLACK;
+ /** @hide */ public static final int POINTER_ICON_VECTOR_STYLE_FILL_END =
+ POINTER_ICON_VECTOR_STYLE_FILL_BLUE;
+
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
private final int mType;
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@@ -261,7 +290,7 @@
}
final PointerIcon icon = new PointerIcon(type);
- icon.loadResource(context.getResources(), resourceId);
+ icon.loadResource(context.getResources(), resourceId, context.getTheme());
return icon;
}
@@ -324,7 +353,7 @@
}
PointerIcon icon = new PointerIcon(TYPE_CUSTOM);
- icon.loadResource(resources, resourceId);
+ icon.loadResource(resources, resourceId, null);
return icon;
}
@@ -443,7 +472,8 @@
return new BitmapDrawable(resources, bitmap);
}
- private void loadResource(@NonNull Resources resources, @XmlRes int resourceId) {
+ private void loadResource(@NonNull Resources resources, @XmlRes int resourceId,
+ @Nullable Resources.Theme theme) {
final XmlResourceParser parser = resources.getXml(resourceId);
final int bitmapRes;
final float hotSpotX;
@@ -467,7 +497,7 @@
throw new IllegalArgumentException("<pointer-icon> is missing bitmap attribute.");
}
- Drawable drawable = resources.getDrawable(bitmapRes);
+ Drawable drawable = resources.getDrawable(bitmapRes, theme);
if (drawable instanceof AnimationDrawable) {
// Extract animation frame bitmaps.
final AnimationDrawable animationDrawable = (AnimationDrawable) drawable;
@@ -649,6 +679,27 @@
}
/**
+ * Convert fill style constant to resource ID.
+ *
+ * @hide
+ */
+ public static int vectorFillStyleToResource(@PointerIconVectorStyleFill int fillStyle) {
+ return switch (fillStyle) {
+ case POINTER_ICON_VECTOR_STYLE_FILL_BLACK ->
+ com.android.internal.R.style.PointerIconVectorStyleFillBlack;
+ case POINTER_ICON_VECTOR_STYLE_FILL_GREEN ->
+ com.android.internal.R.style.PointerIconVectorStyleFillGreen;
+ case POINTER_ICON_VECTOR_STYLE_FILL_YELLOW ->
+ com.android.internal.R.style.PointerIconVectorStyleFillYellow;
+ case POINTER_ICON_VECTOR_STYLE_FILL_PINK ->
+ com.android.internal.R.style.PointerIconVectorStyleFillPink;
+ case POINTER_ICON_VECTOR_STYLE_FILL_BLUE ->
+ com.android.internal.R.style.PointerIconVectorStyleFillBlue;
+ default -> com.android.internal.R.style.PointerIconVectorStyleFillBlack;
+ };
+ }
+
+ /**
* Sets whether drop shadow will draw in the native code.
*
* @hide
@@ -658,4 +709,14 @@
public void setDrawNativeDropShadow(boolean drawNativeDropShadow) {
mDrawNativeDropShadow = drawNativeDropShadow;
}
+
+ /**
+ * Gets the PointerIcon's bitmap.
+ *
+ * @hide
+ */
+ @VisibleForTesting
+ public Bitmap getBitmap() {
+ return mBitmap;
+ }
}
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index de81828..14bb681 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -33899,8 +33899,7 @@
int category;
switch (getViewRootImpl().intermittentUpdateState()) {
case ViewRootImpl.INTERMITTENT_STATE_INTERMITTENT -> category =
- (sToolkitFrameRateBySizeReadOnlyFlagValue ? FRAME_RATE_CATEGORY_LOW
- : FRAME_RATE_CATEGORY_NORMAL) | FRAME_RATE_CATEGORY_REASON_INTERMITTENT;
+ FRAME_RATE_CATEGORY_NORMAL | FRAME_RATE_CATEGORY_REASON_INTERMITTENT;
case ViewRootImpl.INTERMITTENT_STATE_NOT_INTERMITTENT ->
category = mSizeBasedFrameRateCategoryAndReason;
default -> category = mLastFrameRateCategory;
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index e0f9fcc..beb1a5d 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -127,6 +127,7 @@
import static com.android.window.flags.Flags.enableBufferTransformHintFromDisplay;
import static com.android.window.flags.Flags.setScPropertiesInClient;
import static com.android.window.flags.Flags.windowSessionRelayoutInfo;
+import static com.android.text.flags.Flags.disableHandwritingInitiatorForIme;
import android.Manifest;
import android.accessibilityservice.AccessibilityService;
@@ -7416,6 +7417,8 @@
final KeyEvent event = (KeyEvent)q.mEvent;
if (mView.dispatchKeyEventPreIme(event)) {
return FINISH_HANDLED;
+ } else if (q.forPreImeOnly()) {
+ return FINISH_NOT_HANDLED;
}
return FORWARD;
}
@@ -7835,7 +7838,11 @@
private int processPointerEvent(QueuedInputEvent q) {
final MotionEvent event = (MotionEvent)q.mEvent;
final int action = event.getAction();
- boolean handled = mHandwritingInitiator.onTouchEvent(event);
+ boolean handled = false;
+ if (!disableHandwritingInitiatorForIme()
+ || mWindowAttributes.type != TYPE_INPUT_METHOD) {
+ handled = mHandwritingInitiator.onTouchEvent(event);
+ }
if (handled) {
// If handwriting is started, toolkit doesn't receive ACTION_UP.
mLastClickToolType = event.getToolType(event.getActionIndex());
@@ -7987,7 +7994,9 @@
}
PointerIcon pointerIcon = null;
- if (event.isStylusPointer() && mIsStylusPointerIconEnabled) {
+ if (event.isStylusPointer() && mIsStylusPointerIconEnabled
+ && (!disableHandwritingInitiatorForIme()
+ || mWindowAttributes.type != TYPE_INPUT_METHOD)) {
pointerIcon = mHandwritingInitiator.onResolvePointerIcon(mContext, event);
}
if (pointerIcon == null) {
@@ -9906,6 +9915,7 @@
public static final int FLAG_RESYNTHESIZED = 1 << 4;
public static final int FLAG_UNHANDLED = 1 << 5;
public static final int FLAG_MODIFIED_FOR_COMPATIBILITY = 1 << 6;
+ public static final int FLAG_PRE_IME_ONLY = 1 << 7;
public QueuedInputEvent mNext;
@@ -9913,6 +9923,13 @@
public InputEventReceiver mReceiver;
public int mFlags;
+ public boolean forPreImeOnly() {
+ if ((mFlags & FLAG_PRE_IME_ONLY) != 0) {
+ return true;
+ }
+ return false;
+ }
+
public boolean shouldSkipIme() {
if ((mFlags & FLAG_DELIVER_POST_IME) != 0) {
return true;
@@ -9939,6 +9956,7 @@
hasPrevious = flagToString("FINISHED_HANDLED", FLAG_FINISHED_HANDLED, hasPrevious, sb);
hasPrevious = flagToString("RESYNTHESIZED", FLAG_RESYNTHESIZED, hasPrevious, sb);
hasPrevious = flagToString("UNHANDLED", FLAG_UNHANDLED, hasPrevious, sb);
+ hasPrevious = flagToString("FLAG_PRE_IME_ONLY", FLAG_PRE_IME_ONLY, hasPrevious, sb);
if (!hasPrevious) {
sb.append("0");
}
@@ -9995,7 +10013,7 @@
}
@UnsupportedAppUsage
- void enqueueInputEvent(InputEvent event,
+ QueuedInputEvent enqueueInputEvent(InputEvent event,
InputEventReceiver receiver, int flags, boolean processImmediately) {
QueuedInputEvent q = obtainQueuedInputEvent(event, receiver, flags);
@@ -10034,6 +10052,7 @@
} else {
scheduleProcessInputEvents();
}
+ return q;
}
private void scheduleProcessInputEvents() {
@@ -12355,29 +12374,45 @@
+ "IWindow:%s Session:%s",
mOnBackInvokedDispatcher, mBasePackageName, mWindow, mWindowSession));
}
- mOnBackInvokedDispatcher.attachToWindow(mWindowSession, mWindow,
+ mOnBackInvokedDispatcher.attachToWindow(mWindowSession, mWindow, this,
mImeBackAnimationController);
}
- private void sendBackKeyEvent(int action) {
+ /**
+ * Sends {@link KeyEvent#ACTION_DOWN ACTION_DOWN} and {@link KeyEvent#ACTION_UP ACTION_UP}
+ * back key events
+ *
+ * @param preImeOnly whether the back events should be sent to the pre-ime stage only
+ * @return whether the event was handled (i.e. onKeyPreIme consumed it if preImeOnly=true)
+ */
+ public boolean injectBackKeyEvents(boolean preImeOnly) {
+ boolean consumed;
+ try {
+ processingBackKey(true);
+ sendBackKeyEvent(KeyEvent.ACTION_DOWN, preImeOnly);
+ consumed = sendBackKeyEvent(KeyEvent.ACTION_UP, preImeOnly);
+ } finally {
+ processingBackKey(false);
+ }
+ return consumed;
+ }
+
+ private boolean sendBackKeyEvent(int action, boolean preImeOnly) {
long when = SystemClock.uptimeMillis();
final KeyEvent ev = new KeyEvent(when, when, action,
KeyEvent.KEYCODE_BACK, 0 /* repeat */, 0 /* metaState */,
KeyCharacterMap.VIRTUAL_KEYBOARD, 0 /* scancode */,
KeyEvent.FLAG_FROM_SYSTEM | KeyEvent.FLAG_VIRTUAL_HARD_KEY,
InputDevice.SOURCE_KEYBOARD);
- enqueueInputEvent(ev, null /* receiver */, 0 /* flags */, true /* processImmediately */);
+ int flags = preImeOnly ? QueuedInputEvent.FLAG_PRE_IME_ONLY : 0;
+ QueuedInputEvent q = enqueueInputEvent(ev, null /* receiver */, flags,
+ true /* processImmediately */);
+ return (q.mFlags & QueuedInputEvent.FLAG_FINISHED_HANDLED) != 0;
}
private void registerCompatOnBackInvokedCallback() {
mCompatOnBackInvokedCallback = () -> {
- try {
- processingBackKey(true);
- sendBackKeyEvent(KeyEvent.ACTION_DOWN);
- sendBackKeyEvent(KeyEvent.ACTION_UP);
- } finally {
- processingBackKey(false);
- }
+ injectBackKeyEvents(/* preImeOnly */ false);
};
if (mOnBackInvokedDispatcher.hasImeOnBackInvokedDispatcher()) {
Log.d(TAG, "Skip registering CompatOnBackInvokedCallback on IME dispatcher");
diff --git a/core/java/android/view/accessibility/AccessibilityDisplayProxy.java b/core/java/android/view/accessibility/AccessibilityDisplayProxy.java
index 1fe8180..12e0814 100644
--- a/core/java/android/view/accessibility/AccessibilityDisplayProxy.java
+++ b/core/java/android/view/accessibility/AccessibilityDisplayProxy.java
@@ -302,10 +302,6 @@
}
@Override
- public void onMagnificationSystemUIConnectionChanged(boolean connected) {
- }
-
- @Override
public void onMagnificationChanged(int displayId, @NonNull Region region,
MagnificationConfig config) {
}
diff --git a/core/java/android/view/accessibility/flags/accessibility_flags.aconfig b/core/java/android/view/accessibility/flags/accessibility_flags.aconfig
index edf3387..ab7b226 100644
--- a/core/java/android/view/accessibility/flags/accessibility_flags.aconfig
+++ b/core/java/android/view/accessibility/flags/accessibility_flags.aconfig
@@ -169,13 +169,3 @@
description: "Feature flag for declaring system pinch zoom opt-out apis"
bug: "315089687"
}
-
-flag {
- name: "wait_magnification_system_ui_connection_to_notify_service_connected"
- namespace: "accessibility"
- description: "Decide whether AccessibilityService needs to wait until magnification system ui connection is ready to trigger onServiceConnected"
- bug: "337800504"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
diff --git a/core/java/android/view/flags/view_flags.aconfig b/core/java/android/view/flags/view_flags.aconfig
index c0d31fa..4d4e4af 100644
--- a/core/java/android/view/flags/view_flags.aconfig
+++ b/core/java/android/view/flags/view_flags.aconfig
@@ -28,6 +28,14 @@
}
flag {
+ name: "enable_vector_cursor_a11y_settings"
+ namespace: "systemui"
+ description: "Feature flag to enable accessibility settings for vector cursors."
+ bug: "302275042"
+ is_fixed_read_only: true
+}
+
+flag {
name: "sensitive_content_app_protection_api"
is_exported: true
namespace: "permissions"
diff --git a/core/java/android/view/textclassifier/intent/OWNERS b/core/java/android/view/textclassifier/intent/OWNERS
index ac80d9f..3465fe6 100644
--- a/core/java/android/view/textclassifier/intent/OWNERS
+++ b/core/java/android/view/textclassifier/intent/OWNERS
@@ -4,5 +4,4 @@
toki@google.com
svetoslavganov@android.com
svetoslavganov@google.com
-augale@google.com
joannechung@google.com
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 78dd3b1..fd3837f 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4817,7 +4817,11 @@
if (mFontWeightAdjustment != 0
&& mFontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED) {
if (tf == null) {
- tf = Typeface.DEFAULT;
+ if (Flags.fixNullTypefaceBolding()) {
+ tf = Typeface.DEFAULT_BOLD;
+ } else {
+ tf = Typeface.DEFAULT;
+ }
} else {
int newWeight = Math.min(
Math.max(tf.getWeight() + mFontWeightAdjustment, FontStyle.FONT_WEIGHT_MIN),
diff --git a/core/java/android/window/BackProgressAnimator.java b/core/java/android/window/BackProgressAnimator.java
index 94d7811..d28500c 100644
--- a/core/java/android/window/BackProgressAnimator.java
+++ b/core/java/android/window/BackProgressAnimator.java
@@ -19,8 +19,12 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.util.FloatProperty;
+import android.util.TimeUtils;
+import android.view.Choreographer;
import com.android.internal.dynamicanimation.animation.DynamicAnimation;
+import com.android.internal.dynamicanimation.animation.FlingAnimation;
+import com.android.internal.dynamicanimation.animation.FloatValueHolder;
import com.android.internal.dynamicanimation.animation.SpringAnimation;
import com.android.internal.dynamicanimation.animation.SpringForce;
@@ -40,6 +44,7 @@
* always receive progress values in [0, 1].
*/
private static final float SCALE_FACTOR = 100f;
+ private static final float FLING_FRICTION = 8f;
private final SpringAnimation mSpring;
private ProgressCallback mCallback;
private float mProgress = 0;
@@ -48,11 +53,17 @@
private boolean mBackAnimationInProgress = false;
@Nullable
private Runnable mBackCancelledFinishRunnable;
+ @Nullable
+ private Runnable mBackInvokedFinishRunnable;
+ private FlingAnimation mBackInvokedFlingAnim;
private final DynamicAnimation.OnAnimationEndListener mOnAnimationEndListener =
(animation, canceled, value, velocity) -> {
- invokeBackCancelledRunnable();
+ if (mBackCancelledFinishRunnable != null) invokeBackCancelledRunnable();
+ if (mBackInvokedFinishRunnable != null) invokeBackInvokedRunnable();
reset();
};
+ private final DynamicAnimation.OnAnimationUpdateListener mOnBackInvokedFlingUpdateListener =
+ (animation, progress, velocity) -> updateProgressValue(progress, velocity);
private void setProgress(float progress) {
@@ -78,7 +89,7 @@
@Override
public void onAnimationUpdate(DynamicAnimation animation, float value, float velocity) {
- updateProgressValue(value, velocity);
+ if (mBackInvokedFinishRunnable == null) updateProgressValue(value, velocity);
}
@@ -134,6 +145,12 @@
// Ensure that last progress value that apps see is 0
updateProgressValue(0, 0);
invokeBackCancelledRunnable();
+ } else if (mBackInvokedFinishRunnable != null) {
+ invokeBackInvokedRunnable();
+ }
+ if (mBackInvokedFlingAnim != null) {
+ mBackInvokedFlingAnim.cancel();
+ mBackInvokedFlingAnim = null;
}
mSpring.animateToFinalPosition(0);
if (mSpring.canSkipToEnd()) {
@@ -149,6 +166,30 @@
}
/**
+ * Animate the back progress animation a bit further with a high friction considering the
+ * current progress and velocity.
+ *
+ * @param finishCallback the callback to be invoked when the final destination is reached
+ */
+ public void onBackInvoked(@NonNull Runnable finishCallback) {
+ mBackInvokedFinishRunnable = finishCallback;
+ mSpring.animateToFinalPosition(0);
+
+ mBackInvokedFlingAnim = new FlingAnimation(new FloatValueHolder())
+ .setStartValue(mProgress)
+ .setFriction(FLING_FRICTION)
+ .setStartVelocity(mVelocity)
+ .setMinValue(0)
+ .setMaxValue(SCALE_FACTOR);
+ mBackInvokedFlingAnim.addUpdateListener(mOnBackInvokedFlingUpdateListener);
+ mBackInvokedFlingAnim.addEndListener(mOnAnimationEndListener);
+ mBackInvokedFlingAnim.start();
+ // do an animation-frame immediately to prevent idle frame
+ mBackInvokedFlingAnim.doAnimationFrame(
+ Choreographer.getInstance().getLastFrameTimeNanos() / TimeUtils.NANOS_PER_MS);
+ }
+
+ /**
* Animate the back progress animation from current progress to start position.
* This should be called when back is cancelled.
*
@@ -196,4 +237,11 @@
mBackCancelledFinishRunnable = null;
}
+ private void invokeBackInvokedRunnable() {
+ mBackInvokedFlingAnim.removeUpdateListener(mOnBackInvokedFlingUpdateListener);
+ mBackInvokedFlingAnim.removeEndListener(mOnAnimationEndListener);
+ mBackInvokedFinishRunnable.run();
+ mBackInvokedFinishRunnable = null;
+ }
+
}
\ No newline at end of file
diff --git a/core/java/android/window/ImeOnBackInvokedDispatcher.java b/core/java/android/window/ImeOnBackInvokedDispatcher.java
index 2a12507..ce1f986 100644
--- a/core/java/android/window/ImeOnBackInvokedDispatcher.java
+++ b/core/java/android/window/ImeOnBackInvokedDispatcher.java
@@ -55,6 +55,9 @@
static final int RESULT_CODE_UNREGISTER = 1;
@NonNull
private final ResultReceiver mResultReceiver;
+ // The handler to run callbacks on. This should be on the same thread
+ // the ViewRootImpl holding IME's WindowOnBackInvokedDispatcher is created on.
+ private Handler mHandler;
public ImeOnBackInvokedDispatcher(Handler handler) {
mResultReceiver = new ResultReceiver(handler) {
@@ -68,6 +71,10 @@
};
}
+ void setHandler(@NonNull Handler handler) {
+ mHandler = handler;
+ }
+
/**
* Override this method to return the {@link WindowOnBackInvokedDispatcher} of the window
* that should receive the forwarded callback.
@@ -326,7 +333,7 @@
@Override
public void onBackInvoked() {
- mCallback.onBackInvoked();
+ mHandler.post(mCallback::onBackInvoked);
}
@Override
@@ -336,7 +343,7 @@
private void maybeRunOnAnimationCallback(Consumer<OnBackAnimationCallback> block) {
if (mCallback instanceof OnBackAnimationCallback) {
- block.accept((OnBackAnimationCallback) mCallback);
+ mHandler.post(() -> block.accept((OnBackAnimationCallback) mCallback));
}
}
}
diff --git a/core/java/android/window/TransitionInfo.java b/core/java/android/window/TransitionInfo.java
index 1d42c93..8bd39fb 100644
--- a/core/java/android/window/TransitionInfo.java
+++ b/core/java/android/window/TransitionInfo.java
@@ -1114,7 +1114,7 @@
private final Rect mTransitionBounds = new Rect();
private HardwareBuffer mThumbnail;
private int mAnimations;
- // TODO(b/295805497): Extract it from AnimationOptions
+ // TODO(b/295805497): Extract mBackgroundColor from AnimationOptions
private @ColorInt int mBackgroundColor;
// Customize activity transition animation
private CustomActivityTransition mCustomActivityOpenTransition;
diff --git a/core/java/android/window/WindowOnBackInvokedDispatcher.java b/core/java/android/window/WindowOnBackInvokedDispatcher.java
index 0ff52f1..4c993c2 100644
--- a/core/java/android/window/WindowOnBackInvokedDispatcher.java
+++ b/core/java/android/window/WindowOnBackInvokedDispatcher.java
@@ -37,6 +37,7 @@
import android.view.IWindowSession;
import android.view.ImeBackAnimationController;
import android.view.MotionEvent;
+import android.view.ViewRootImpl;
import androidx.annotation.VisibleForTesting;
@@ -49,6 +50,7 @@
import java.util.HashMap;
import java.util.Objects;
import java.util.TreeMap;
+import java.util.function.BooleanSupplier;
import java.util.function.Supplier;
/**
@@ -68,6 +70,7 @@
public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {
private IWindowSession mWindowSession;
private IWindow mWindow;
+ private ViewRootImpl mViewRoot;
@VisibleForTesting
public final BackTouchTracker mTouchTracker = new BackTouchTracker();
@VisibleForTesting
@@ -134,10 +137,12 @@
* is attached a window.
*/
public void attachToWindow(@NonNull IWindowSession windowSession, @NonNull IWindow window,
+ @Nullable ViewRootImpl viewRoot,
@Nullable ImeBackAnimationController imeBackAnimationController) {
synchronized (mLock) {
mWindowSession = windowSession;
mWindow = window;
+ mViewRoot = viewRoot;
mImeBackAnimationController = imeBackAnimationController;
if (!mAllCallbacks.isEmpty()) {
setTopOnBackInvokedCallback(getTopCallback());
@@ -151,6 +156,7 @@
clear();
mWindow = null;
mWindowSession = null;
+ mViewRoot = null;
mImeBackAnimationController = null;
}
}
@@ -176,8 +182,6 @@
return;
}
if (callback instanceof ImeOnBackInvokedDispatcher.ImeOnBackInvokedCallback) {
- // Fall back to compat back key injection if legacy back behaviour should be used.
- if (!isOnBackInvokedCallbackEnabled()) return;
if (callback instanceof ImeOnBackInvokedDispatcher.DefaultImeOnBackAnimationCallback
&& mImeBackAnimationController != null) {
// register ImeBackAnimationController instead to play predictive back animation
@@ -300,6 +304,14 @@
}
}
+ private boolean callOnKeyPreIme() {
+ if (mViewRoot != null && !isOnBackInvokedCallbackEnabled(mViewRoot.mContext)) {
+ return mViewRoot.injectBackKeyEvents(/*preImeOnly*/ true);
+ } else {
+ return false;
+ }
+ }
+
private void setTopOnBackInvokedCallback(@Nullable OnBackInvokedCallback callback) {
if (mWindowSession == null || mWindow == null) {
return;
@@ -308,8 +320,8 @@
OnBackInvokedCallbackInfo callbackInfo = null;
if (callback != null) {
int priority = mAllCallbacks.get(callback);
- final IOnBackInvokedCallback iCallback = new OnBackInvokedCallbackWrapper(
- callback, mTouchTracker, mProgressAnimator, mHandler);
+ final IOnBackInvokedCallback iCallback = new OnBackInvokedCallbackWrapper(callback,
+ mTouchTracker, mProgressAnimator, mHandler, this::callOnKeyPreIme);
callbackInfo = new OnBackInvokedCallbackInfo(
iCallback,
priority,
@@ -399,16 +411,20 @@
private final BackTouchTracker mTouchTracker;
@NonNull
private final Handler mHandler;
+ @NonNull
+ private final BooleanSupplier mOnKeyPreIme;
OnBackInvokedCallbackWrapper(
@NonNull OnBackInvokedCallback callback,
@NonNull BackTouchTracker touchTracker,
@NonNull BackProgressAnimator progressAnimator,
- @NonNull Handler handler) {
+ @NonNull Handler handler,
+ @NonNull BooleanSupplier onKeyPreIme) {
mCallback = new WeakReference<>(callback);
mTouchTracker = touchTracker;
mProgressAnimator = progressAnimator;
mHandler = handler;
+ mOnKeyPreIme = onKeyPreIme;
}
@Override
@@ -451,11 +467,11 @@
public void onBackInvoked() throws RemoteException {
mHandler.post(() -> {
mTouchTracker.reset();
+ if (consumedByOnKeyPreIme()) return;
boolean isInProgress = mProgressAnimator.isBackAnimationInProgress();
- mProgressAnimator.reset();
- // TODO(b/333957271): Re-introduce auto fling progress generation.
final OnBackInvokedCallback callback = mCallback.get();
if (callback == null) {
+ mProgressAnimator.reset();
Log.d(TAG, "Trying to call onBackInvoked() on a null callback reference.");
return;
}
@@ -463,10 +479,40 @@
Log.w(TAG, "ProgressAnimator was not in progress, skip onBackInvoked().");
return;
}
- callback.onBackInvoked();
+ OnBackAnimationCallback animationCallback = getBackAnimationCallback();
+ if (animationCallback != null) {
+ mProgressAnimator.onBackInvoked(callback::onBackInvoked);
+ } else {
+ mProgressAnimator.reset();
+ callback.onBackInvoked();
+ }
});
}
+ private boolean consumedByOnKeyPreIme() {
+ final OnBackInvokedCallback callback = mCallback.get();
+ if (callback instanceof ImeBackAnimationController
+ || callback instanceof ImeOnBackInvokedDispatcher.ImeOnBackInvokedCallback) {
+ // call onKeyPreIme API if the current callback is an IME callback and the app has
+ // not set enableOnBackInvokedCallback="false"
+ try {
+ boolean consumed = mOnKeyPreIme.getAsBoolean();
+ if (consumed) {
+ // back event intercepted by app in onKeyPreIme -> cancel the IME animation.
+ final OnBackAnimationCallback animationCallback =
+ getBackAnimationCallback();
+ if (animationCallback != null) {
+ mProgressAnimator.onBackCancelled(animationCallback::onBackCancelled);
+ }
+ return true;
+ }
+ } catch (Exception e) {
+ Log.d(TAG, "Failed to call onKeyPreIme", e);
+ }
+ }
+ return false;
+ }
+
@Override
public void setTriggerBack(boolean triggerBack) throws RemoteException {
mTouchTracker.setTriggerBack(triggerBack);
@@ -504,6 +550,7 @@
public void setImeOnBackInvokedDispatcher(
@NonNull ImeOnBackInvokedDispatcher imeDispatcher) {
mImeDispatcher = imeDispatcher;
+ mImeDispatcher.setHandler(mHandler);
}
/** Returns true if a non-null {@link ImeOnBackInvokedDispatcher} has been set. **/
diff --git a/core/java/android/window/flags/lse_desktop_experience.aconfig b/core/java/android/window/flags/lse_desktop_experience.aconfig
index 1742fe3..daf2fe3 100644
--- a/core/java/android/window/flags/lse_desktop_experience.aconfig
+++ b/core/java/android/window/flags/lse_desktop_experience.aconfig
@@ -52,6 +52,13 @@
}
flag {
+ name: "enable_desktop_windowing_scvh_cache"
+ namespace: "lse_desktop_experience"
+ description: "Enables a SurfaceControlViewHost cache for window decorations"
+ bug: "345146928"
+}
+
+flag {
name: "enable_desktop_windowing_wallpaper_activity"
namespace: "lse_desktop_experience"
description: "Enables desktop wallpaper activity to show wallpaper in the desktop mode"
diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig
index d6f65f8..b714682 100644
--- a/core/java/android/window/flags/windowing_frontend.aconfig
+++ b/core/java/android/window/flags/windowing_frontend.aconfig
@@ -19,6 +19,16 @@
}
flag {
+ name: "blast_sync_notification_shade_on_display_switch"
+ namespace: "windowing_frontend"
+ description: "Make the buffer content of notification shade synchronize with display switch"
+ bug: "337154331"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
+
+flag {
name: "edge_to_edge_by_default"
namespace: "windowing_frontend"
description: "Make app go edge-to-edge by default when targeting SDK 35 or greater"
diff --git a/core/java/com/android/internal/dynamicanimation/animation/FlingAnimation.java b/core/java/com/android/internal/dynamicanimation/animation/FlingAnimation.java
new file mode 100644
index 0000000..2bd0568
--- /dev/null
+++ b/core/java/com/android/internal/dynamicanimation/animation/FlingAnimation.java
@@ -0,0 +1,203 @@
+/*
+ * 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.dynamicanimation.animation;
+
+import android.annotation.FloatRange;
+/**
+ * <p>Fling animation is an animation that continues an initial momentum (most often from gesture
+ * velocity) and gradually slows down. The fling animation will come to a stop when the velocity of
+ * the animation is below the threshold derived from {@link #setMinimumVisibleChange(float)},
+ * or when the value of the animation has gone beyond the min or max value defined via
+ * {@link DynamicAnimation#setMinValue(float)} or {@link DynamicAnimation#setMaxValue(float)}.
+ * It is recommended to restrict the fling animation with min and/or max value, such that the
+ * animation can end when it goes beyond screen bounds, thus preserving CPU cycles and resources.
+ *
+ * <p>For example, you can create a fling animation that animates the translationX of a view:
+ * <pre class="prettyprint">
+ * FlingAnimation flingAnim = new FlingAnimation(view, DynamicAnimation.TRANSLATION_X)
+ * // Sets the start velocity to -2000 (pixel/s)
+ * .setStartVelocity(-2000)
+ * // Optional but recommended to set a reasonable min and max range for the animation.
+ * // In this particular case, we set the min and max to -200 and 2000 respectively.
+ * .setMinValue(-200).setMaxValue(2000);
+ * flingAnim.start();
+ * </pre>
+ */
+public final class FlingAnimation extends DynamicAnimation<FlingAnimation> {
+ private final DragForce mFlingForce = new DragForce();
+ /**
+ * <p>This creates a FlingAnimation that animates a {@link FloatValueHolder} instance. During
+ * the animation, the {@link FloatValueHolder} instance will be updated via
+ * {@link FloatValueHolder#setValue(float)} each frame. The caller can obtain the up-to-date
+ * animation value via {@link FloatValueHolder#getValue()}.
+ *
+ * <p><strong>Note:</strong> changing the value in the {@link FloatValueHolder} via
+ * {@link FloatValueHolder#setValue(float)} outside of the animation during an
+ * animation run will not have any effect on the on-going animation.
+ *
+ * @param floatValueHolder the property to be animated
+ */
+ public FlingAnimation(FloatValueHolder floatValueHolder) {
+ super(floatValueHolder);
+ mFlingForce.setValueThreshold(getValueThreshold());
+ }
+ /**
+ * Sets the friction for the fling animation. The greater the friction is, the sooner the
+ * animation will slow down. When not set, the friction defaults to 1.
+ *
+ * @param friction the friction used in the animation
+ * @return the animation whose friction will be scaled
+ * @throws IllegalArgumentException if the input friction is not positive
+ */
+ public FlingAnimation setFriction(
+ @FloatRange(from = 0.0, fromInclusive = false) float friction) {
+ if (friction <= 0) {
+ throw new IllegalArgumentException("Friction must be positive");
+ }
+ mFlingForce.setFrictionScalar(friction);
+ return this;
+ }
+ /**
+ * Returns the friction being set on the animation via {@link #setFriction(float)}. If the
+ * friction has not been set, the default friction of 1 will be returned.
+ *
+ * @return friction being used in the animation
+ */
+ public float getFriction() {
+ return mFlingForce.getFrictionScalar();
+ }
+ /**
+ * Sets the min value of the animation. When a fling animation reaches the min value, the
+ * animation will end immediately. Animations will not animate beyond the min value.
+ *
+ * @param minValue minimum value of the property to be animated
+ * @return the Animation whose min value is being set
+ */
+ @Override
+ public FlingAnimation setMinValue(float minValue) {
+ super.setMinValue(minValue);
+ return this;
+ }
+ /**
+ * Sets the max value of the animation. When a fling animation reaches the max value, the
+ * animation will end immediately. Animations will not animate beyond the max value.
+ *
+ * @param maxValue maximum value of the property to be animated
+ * @return the Animation whose max value is being set
+ */
+ @Override
+ public FlingAnimation setMaxValue(float maxValue) {
+ super.setMaxValue(maxValue);
+ return this;
+ }
+ /**
+ * Start velocity of the animation. Default velocity is 0. Unit: pixel/second
+ *
+ * <p>A <b>non-zero</b> start velocity is required for a FlingAnimation. If no start velocity is
+ * set through {@link #setStartVelocity(float)}, the start velocity defaults to 0. In that
+ * case, the fling animation will consider itself done in the next frame.
+ *
+ * <p>Note when using a fixed value as the start velocity (as opposed to getting the velocity
+ * through touch events), it is recommended to define such a value in dp/second and convert it
+ * to pixel/second based on the density of the screen to achieve a consistent look across
+ * different screens.
+ *
+ * <p>To convert from dp/second to pixel/second:
+ * <pre class="prettyprint">
+ * float pixelPerSecond = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dpPerSecond,
+ * getResources().getDisplayMetrics());
+ * </pre>
+ *
+ * @param startVelocity start velocity of the animation in pixel/second
+ * @return the Animation whose start velocity is being set
+ */
+ @Override
+ public FlingAnimation setStartVelocity(float startVelocity) {
+ super.setStartVelocity(startVelocity);
+ return this;
+ }
+ @Override
+ boolean updateValueAndVelocity(long deltaT) {
+ MassState state = mFlingForce.updateValueAndVelocity(mValue, mVelocity, deltaT);
+ mValue = state.mValue;
+ mVelocity = state.mVelocity;
+ // When the animation hits the max/min value, consider animation done.
+ if (mValue < mMinValue) {
+ mValue = mMinValue;
+ return true;
+ }
+ if (mValue > mMaxValue) {
+ mValue = mMaxValue;
+ return true;
+ }
+ if (isAtEquilibrium(mValue, mVelocity)) {
+ return true;
+ }
+ return false;
+ }
+ @Override
+ float getAcceleration(float value, float velocity) {
+ return mFlingForce.getAcceleration(value, velocity);
+ }
+ @Override
+ boolean isAtEquilibrium(float value, float velocity) {
+ return value >= mMaxValue
+ || value <= mMinValue
+ || mFlingForce.isAtEquilibrium(value, velocity);
+ }
+ @Override
+ void setValueThreshold(float threshold) {
+ mFlingForce.setValueThreshold(threshold);
+ }
+ private static final class DragForce implements Force {
+ private static final float DEFAULT_FRICTION = -4.2f;
+ // This multiplier is used to calculate the velocity threshold given a certain value
+ // threshold. The idea is that if it takes >= 1 frame to move the value threshold amount,
+ // then the velocity is a reasonable threshold.
+ private static final float VELOCITY_THRESHOLD_MULTIPLIER = 1000f / 16f;
+ private float mFriction = DEFAULT_FRICTION;
+ private float mVelocityThreshold;
+ // Internal state to hold a value/velocity pair.
+ private final DynamicAnimation.MassState mMassState = new DynamicAnimation.MassState();
+ void setFrictionScalar(float frictionScalar) {
+ mFriction = frictionScalar * DEFAULT_FRICTION;
+ }
+ float getFrictionScalar() {
+ return mFriction / DEFAULT_FRICTION;
+ }
+ MassState updateValueAndVelocity(float value, float velocity, long deltaT) {
+ mMassState.mVelocity = (float) (velocity * Math.exp((deltaT / 1000f) * mFriction));
+ mMassState.mValue = (float) (value - velocity / mFriction
+ + velocity / mFriction * Math.exp(mFriction * deltaT / 1000f));
+ if (isAtEquilibrium(mMassState.mValue, mMassState.mVelocity)) {
+ mMassState.mVelocity = 0f;
+ }
+ return mMassState;
+ }
+ @Override
+ public float getAcceleration(float position, float velocity) {
+ return velocity * mFriction;
+ }
+ @Override
+ public boolean isAtEquilibrium(float value, float velocity) {
+ return Math.abs(velocity) < mVelocityThreshold;
+ }
+ void setValueThreshold(float threshold) {
+ mVelocityThreshold = threshold * VELOCITY_THRESHOLD_MULTIPLIER;
+ }
+ }
+}
+
diff --git a/core/java/com/android/internal/os/BatteryStatsHistory.java b/core/java/com/android/internal/os/BatteryStatsHistory.java
index 244165f..5c270e0 100644
--- a/core/java/com/android/internal/os/BatteryStatsHistory.java
+++ b/core/java/com/android/internal/os/BatteryStatsHistory.java
@@ -1514,6 +1514,36 @@
}
/**
+ * Records an event when some state2 flag changes to true.
+ */
+ public void recordState2StartEvent(long elapsedRealtimeMs, long uptimeMs, int stateFlags,
+ int uid, String name) {
+ synchronized (this) {
+ mHistoryCur.states2 |= stateFlags;
+ mHistoryCur.eventCode = EVENT_STATE_CHANGE | EVENT_FLAG_START;
+ mHistoryCur.eventTag = mHistoryCur.localEventTag;
+ mHistoryCur.eventTag.uid = uid;
+ mHistoryCur.eventTag.string = name;
+ writeHistoryItem(elapsedRealtimeMs, uptimeMs);
+ }
+ }
+
+ /**
+ * Records an event when some state2 flag changes to false.
+ */
+ public void recordState2StopEvent(long elapsedRealtimeMs, long uptimeMs, int stateFlags,
+ int uid, String name) {
+ synchronized (this) {
+ mHistoryCur.states2 &= ~stateFlags;
+ mHistoryCur.eventCode = EVENT_STATE_CHANGE | EVENT_FLAG_FINISH;
+ mHistoryCur.eventTag = mHistoryCur.localEventTag;
+ mHistoryCur.eventTag.uid = uid;
+ mHistoryCur.eventTag.string = name;
+ writeHistoryItem(elapsedRealtimeMs, uptimeMs);
+ }
+ }
+
+ /**
* Records an event when some state2 flag changes to false.
*/
public void recordState2StopEvent(long elapsedRealtimeMs, long uptimeMs, int stateFlags) {
diff --git a/core/java/com/android/internal/statusbar/StatusBarIcon.java b/core/java/com/android/internal/statusbar/StatusBarIcon.java
index 4f80afa..76ce452 100644
--- a/core/java/com/android/internal/statusbar/StatusBarIcon.java
+++ b/core/java/com/android/internal/statusbar/StatusBarIcon.java
@@ -22,7 +22,21 @@
import android.os.UserHandle;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
+
public class StatusBarIcon implements Parcelable {
+ public enum Type {
+ // Notification: the sender avatar for important conversations
+ PeopleAvatar,
+ // Notification: the monochrome version of the app icon if available; otherwise fall back to
+ // the small icon
+ MaybeMonochromeAppIcon,
+ // Notification: the small icon from the notification
+ NotifSmallIcon,
+ // The wi-fi, cellular or battery icon.
+ SystemIcon
+ }
+
public UserHandle user;
public String pkg;
public Icon icon;
@@ -30,9 +44,10 @@
public boolean visible = true;
public int number;
public CharSequence contentDescription;
+ public Type type;
public StatusBarIcon(UserHandle user, String resPackage, Icon icon, int iconLevel, int number,
- CharSequence contentDescription) {
+ CharSequence contentDescription, Type type) {
if (icon.getType() == Icon.TYPE_RESOURCE
&& TextUtils.isEmpty(icon.getResPackage())) {
// This is an odd situation where someone's managed to hand us an icon without a
@@ -46,15 +61,17 @@
this.iconLevel = iconLevel;
this.number = number;
this.contentDescription = contentDescription;
+ this.type = type;
}
public StatusBarIcon(String iconPackage, UserHandle user,
int iconId, int iconLevel, int number,
- CharSequence contentDescription) {
+ CharSequence contentDescription, Type type) {
this(user, iconPackage, Icon.createWithResource(iconPackage, iconId),
- iconLevel, number, contentDescription);
+ iconLevel, number, contentDescription, type);
}
+ @NonNull
@Override
public String toString() {
return "StatusBarIcon(icon=" + icon
@@ -65,10 +82,11 @@
+ " )";
}
+ @NonNull
@Override
public StatusBarIcon clone() {
StatusBarIcon that = new StatusBarIcon(this.user, this.pkg, this.icon,
- this.iconLevel, this.number, this.contentDescription);
+ this.iconLevel, this.number, this.contentDescription, this.type);
that.visible = this.visible;
return that;
}
@@ -88,6 +106,7 @@
this.visible = in.readInt() != 0;
this.number = in.readInt();
this.contentDescription = in.readCharSequence();
+ this.type = Type.valueOf(in.readString());
}
public void writeToParcel(Parcel out, int flags) {
@@ -98,6 +117,7 @@
out.writeInt(this.visible ? 1 : 0);
out.writeInt(this.number);
out.writeCharSequence(this.contentDescription);
+ out.writeString(this.type.name());
}
public int describeContents() {
diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
index 707f109..6832825 100644
--- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
+++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
@@ -52,6 +52,7 @@
*/
public class ActionBarOverlayLayout extends ViewGroup implements DecorContentParent {
private static final String TAG = "ActionBarOverlayLayout";
+ private static final Rect EMPTY_RECT = new Rect();
private int mActionBarHeight;
//private WindowDecorActionBar mActionBar;
@@ -294,55 +295,53 @@
}
private boolean applyInsets(View view, Rect insets, boolean toPadding,
- boolean left, boolean top, boolean bottom, boolean right) {
+ boolean left, boolean top, boolean right, boolean bottom) {
boolean changed;
if (toPadding) {
- changed = setMargin(view, left, top, bottom, right, 0, 0, 0, 0);
- changed |= setPadding(view, left, top, bottom, right,
- insets.left, insets.top, insets.right, insets.bottom);
+ changed = setMargin(view, EMPTY_RECT, left, top, right, bottom);
+ changed |= setPadding(view, insets, left, top, right, bottom);
} else {
- changed = setPadding(view, left, top, bottom, right, 0, 0, 0, 0);
- changed |= setMargin(view, left, top, bottom, right,
- insets.left, insets.top, insets.right, insets.bottom);
+ changed = setPadding(view, EMPTY_RECT, left, top, right, bottom);
+ changed |= setMargin(view, insets, left, top, right, bottom);
}
return changed;
}
- private boolean setPadding(View view, boolean left, boolean top, boolean bottom, boolean right,
- int l, int t, int r, int b) {
- if ((left && view.getPaddingLeft() != l)
- || (top && view.getPaddingTop() != t)
- || (right && view.getPaddingRight() != r)
- || (bottom && view.getPaddingBottom() != b)) {
+ private boolean setPadding(View view, Rect insets,
+ boolean left, boolean top, boolean right, boolean bottom) {
+ if ((left && view.getPaddingLeft() != insets.left)
+ || (top && view.getPaddingTop() != insets.top)
+ || (right && view.getPaddingRight() != insets.right)
+ || (bottom && view.getPaddingBottom() != insets.bottom)) {
view.setPadding(
- left ? l : view.getPaddingLeft(),
- top ? t : view.getPaddingTop(),
- right ? r : view.getPaddingRight(),
- bottom ? b : view.getPaddingBottom());
+ left ? insets.left : view.getPaddingLeft(),
+ top ? insets.top : view.getPaddingTop(),
+ right ? insets.right : view.getPaddingRight(),
+ bottom ? insets.bottom : view.getPaddingBottom());
return true;
}
return false;
}
- private boolean setMargin(View view, boolean left, boolean top, boolean bottom, boolean right,
- int l, int t, int r, int b) {
- LayoutParams lp = (LayoutParams) view.getLayoutParams();
+ private boolean setMargin(View view, Rect insets,
+ boolean left, boolean top, boolean right, boolean bottom) {
+ final LayoutParams lp = (LayoutParams) view.getLayoutParams();
boolean changed = false;
- if (left && lp.leftMargin != l) {
+ if (left && lp.leftMargin != insets.left) {
changed = true;
- lp.leftMargin = l;
+ lp.leftMargin = insets.left;
}
- if (top && lp.topMargin != t) {
+ if (top && lp.topMargin != insets.top) {
changed = true;
- lp.topMargin = t;
+ lp.topMargin = insets.top;
}
- if (right && lp.rightMargin != r) {
+ if (right && lp.rightMargin != insets.right) {
changed = true;
- lp.rightMargin = r;
+ lp.rightMargin = insets.right;
}
- if (bottom && lp.bottomMargin != b) {
+ if (bottom && lp.bottomMargin != insets.bottom) {
changed = true;
- lp.bottomMargin = b;
+ lp.bottomMargin = insets.bottom;
}
return changed;
}
@@ -370,7 +369,7 @@
// The top and bottom action bars are always within the content area.
boolean changed = applyInsets(mActionBarTop, mSystemInsets,
- mActionBarExtendsIntoSystemInsets, true, true, false, true);
+ mActionBarExtendsIntoSystemInsets, true, true, true, false);
if (mActionBarBottom != null) {
changed |= applyInsets(mActionBarBottom, mSystemInsets,
mActionBarExtendsIntoSystemInsets, true, false, true, true);
@@ -522,7 +521,7 @@
);
}
}
- applyInsets(mContent, mContentInsets, false /* toPadding */, true, true, true, true);
+ setMargin(mContent, mContentInsets, true, true, true, true);
if (!mLastInnerInsets.equals(mInnerInsets)) {
// If the inner insets have changed, we need to dispatch this down to
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 55f2dee..00262be 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java
@@ -30,7 +30,7 @@
ArrayList<Operation> mOperations;
RemoteComposeState mRemoteComposeState = new RemoteComposeState();
-
+ TimeVariables mTimeVariables = new TimeVariables();
// Semantic version of the document
Version mVersion = new Version(0, 1, 0);
@@ -70,6 +70,7 @@
public void setWidth(int width) {
this.mWidth = width;
+ mRemoteComposeState.setWindowWidth(width);
}
public int getHeight() {
@@ -78,6 +79,8 @@
public void setHeight(int height) {
this.mHeight = height;
+ mRemoteComposeState.setWindowHeight(height);
+
}
public RemoteComposeBuffer getBuffer() {
@@ -111,21 +114,21 @@
/**
* Sets the way the player handles the content
*
- * @param scroll set the horizontal behavior (NONE|SCROLL_HORIZONTAL|SCROLL_VERTICAL)
+ * @param scroll set the horizontal behavior (NONE|SCROLL_HORIZONTAL|SCROLL_VERTICAL)
* @param alignment set the alignment of the content (TOP|CENTER|BOTTOM|START|END)
- * @param sizing set the type of sizing for the content (NONE|SIZING_LAYOUT|SIZING_SCALE)
- * @param mode set the mode of sizing, either LAYOUT modes or SCALE modes
- * the LAYOUT modes are:
- * - LAYOUT_MATCH_PARENT
- * - LAYOUT_WRAP_CONTENT
- * or adding an horizontal mode and a vertical mode:
- * - LAYOUT_HORIZONTAL_MATCH_PARENT
- * - LAYOUT_HORIZONTAL_WRAP_CONTENT
- * - LAYOUT_HORIZONTAL_FIXED
- * - LAYOUT_VERTICAL_MATCH_PARENT
- * - LAYOUT_VERTICAL_WRAP_CONTENT
- * - LAYOUT_VERTICAL_FIXED
- * The LAYOUT_*_FIXED modes will use the intrinsic document size
+ * @param sizing set the type of sizing for the content (NONE|SIZING_LAYOUT|SIZING_SCALE)
+ * @param mode set the mode of sizing, either LAYOUT modes or SCALE modes
+ * the LAYOUT modes are:
+ * - LAYOUT_MATCH_PARENT
+ * - LAYOUT_WRAP_CONTENT
+ * or adding an horizontal mode and a vertical mode:
+ * - LAYOUT_HORIZONTAL_MATCH_PARENT
+ * - LAYOUT_HORIZONTAL_WRAP_CONTENT
+ * - LAYOUT_HORIZONTAL_FIXED
+ * - LAYOUT_VERTICAL_MATCH_PARENT
+ * - LAYOUT_VERTICAL_WRAP_CONTENT
+ * - LAYOUT_VERTICAL_FIXED
+ * The LAYOUT_*_FIXED modes will use the intrinsic document size
*/
public void setRootContentBehavior(int scroll, int alignment, int sizing, int mode) {
this.mContentScroll = scroll;
@@ -138,8 +141,8 @@
* Given dimensions w x h of where to paint the content, returns the corresponding scale factor
* according to the contentSizing information
*
- * @param w horizontal dimension of the rendering area
- * @param h vertical dimension of the rendering area
+ * @param w horizontal dimension of the rendering area
+ * @param h vertical dimension of the rendering area
* @param scaleOutput will contain the computed scale factor
*/
public void computeScale(float w, float h, float[] scaleOutput) {
@@ -154,37 +157,43 @@
float scale = Math.min(1f, Math.min(scaleX, scaleY));
contentScaleX = scale;
contentScaleY = scale;
- } break;
+ }
+ break;
case RootContentBehavior.SCALE_FIT: {
float scaleX = w / mWidth;
float scaleY = h / mHeight;
float scale = Math.min(scaleX, scaleY);
contentScaleX = scale;
contentScaleY = scale;
- } break;
+ }
+ break;
case RootContentBehavior.SCALE_FILL_WIDTH: {
float scale = w / mWidth;
contentScaleX = scale;
contentScaleY = scale;
- } break;
+ }
+ break;
case RootContentBehavior.SCALE_FILL_HEIGHT: {
float scale = h / mHeight;
contentScaleX = scale;
contentScaleY = scale;
- } break;
+ }
+ break;
case RootContentBehavior.SCALE_CROP: {
float scaleX = w / mWidth;
float scaleY = h / mHeight;
float scale = Math.max(scaleX, scaleY);
contentScaleX = scale;
contentScaleY = scale;
- } break;
+ }
+ break;
case RootContentBehavior.SCALE_FILL_BOUNDS: {
float scaleX = w / mWidth;
float scaleY = h / mHeight;
contentScaleX = scaleX;
contentScaleY = scaleY;
- } break;
+ }
+ break;
default:
// nothing
}
@@ -197,10 +206,10 @@
* Given dimensions w x h of where to paint the content, returns the corresponding translation
* according to the contentAlignment information
*
- * @param w horizontal dimension of the rendering area
- * @param h vertical dimension of the rendering area
- * @param contentScaleX the horizontal scale we are going to use for the content
- * @param contentScaleY the vertical scale we are going to use for the content
+ * @param w horizontal dimension of the rendering area
+ * @param h vertical dimension of the rendering area
+ * @param contentScaleX the horizontal scale we are going to use for the content
+ * @param contentScaleY the vertical scale we are going to use for the content
* @param translateOutput will contain the computed translation
*/
private void computeTranslate(float w, float h, float contentScaleX, float contentScaleY,
@@ -215,26 +224,32 @@
switch (horizontalContentAlignment) {
case RootContentBehavior.ALIGNMENT_START: {
// nothing
- } break;
+ }
+ break;
case RootContentBehavior.ALIGNMENT_HORIZONTAL_CENTER: {
translateX = (w - contentWidth) / 2f;
- } break;
+ }
+ break;
case RootContentBehavior.ALIGNMENT_END: {
translateX = w - contentWidth;
- } break;
+ }
+ break;
default:
// nothing (same as alignment_start)
}
switch (verticalContentAlignment) {
case RootContentBehavior.ALIGNMENT_TOP: {
// nothing
- } break;
+ }
+ break;
case RootContentBehavior.ALIGNMENT_VERTICAL_CENTER: {
translateY = (h - contentHeight) / 2f;
- } break;
+ }
+ break;
case RootContentBehavior.ALIGNMENT_BOTTOM: {
translateY = h - contentHeight;
- } break;
+ }
+ break;
default:
// nothing (same as alignment_top)
}
@@ -291,7 +306,13 @@
this.mMetadata = metadata;
}
- public boolean contains(float x, float y) {
+ /**
+ * Returns true if x,y coordinate is within bounds
+ * @param x x-coordinate
+ * @param y y-coordinate
+ * @return x,y coordinate is within bounds
+ */
+ public boolean contains(float x, float y) {
return x >= mLeft && x < mRight
&& y >= mTop && y < mBottom;
}
@@ -341,16 +362,22 @@
public void initializeContext(RemoteContext context) {
mRemoteComposeState.reset();
mClickAreas.clear();
-
+ mRemoteComposeState.setNextId(RemoteComposeState.START_ID);
context.mDocument = this;
context.mRemoteComposeState = mRemoteComposeState;
-
// mark context to be in DATA mode, which will skip the painting ops.
context.mMode = RemoteContext.ContextMode.DATA;
- for (Operation op: mOperations) {
+ mTimeVariables.updateTime(context);
+
+ for (Operation op : mOperations) {
+ if (op instanceof VariableSupport) {
+ ((VariableSupport) op).updateVariables(context);
+ ((VariableSupport) op).registerListening(context);
+ }
op.apply(context);
}
context.mMode = RemoteContext.ContextMode.UNSET;
+
}
///////////////////////////////////////////////////////////////////////////////////////////////
@@ -375,7 +402,7 @@
* @param minorVersion minor version number, increased when adding new features
* @param patch patch level, increased upon bugfixes
*/
- void setVersion(int majorVersion, int minorVersion, int patch) {
+ void setVersion(int majorVersion, int minorVersion, int patch) {
mVersion = new Version(majorVersion, minorVersion, patch);
}
@@ -389,13 +416,13 @@
* the click coordinates will be the one reported; the order of addition of those click areas
* is therefore meaningful.
*
- * @param id the id of the area, which will be reported on click
+ * @param id the id of the area, which will be reported on click
* @param contentDescription the content description (used for accessibility)
- * @param left the left coordinate of the click area (in pixels)
- * @param top the top coordinate of the click area (in pixels)
- * @param right the right coordinate of the click area (in pixels)
- * @param bottom the bottom coordinate of the click area (in pixels)
- * @param metadata arbitrary metadata associated with the are, also reported on click
+ * @param left the left coordinate of the click area (in pixels)
+ * @param top the top coordinate of the click area (in pixels)
+ * @param right the right coordinate of the click area (in pixels)
+ * @param bottom the bottom coordinate of the click area (in pixels)
+ * @param metadata arbitrary metadata associated with the are, also reported on click
*/
public void addClickArea(int id, String contentDescription,
float left, float top, float right, float bottom, String metadata) {
@@ -417,7 +444,7 @@
* listeners.
*/
public void onClick(float x, float y) {
- for (ClickAreaRepresentation clickArea: mClickAreas) {
+ for (ClickAreaRepresentation clickArea : mClickAreas) {
if (clickArea.contains(x, y)) {
warnClickListeners(clickArea);
}
@@ -430,7 +457,7 @@
* @param id the click area id
*/
public void performClick(int id) {
- for (ClickAreaRepresentation clickArea: mClickAreas) {
+ for (ClickAreaRepresentation clickArea : mClickAreas) {
if (clickArea.mId == id) {
warnClickListeners(clickArea);
}
@@ -441,17 +468,36 @@
* Warn click listeners when a click area is activated
*/
private void warnClickListeners(ClickAreaRepresentation clickArea) {
- for (ClickCallbacks listener: mClickListeners) {
+ for (ClickCallbacks listener : mClickListeners) {
listener.click(clickArea.mId, clickArea.mMetadata);
}
}
- ///////////////////////////////////////////////////////////////////////////////////////////////
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ for (Operation op : mOperations) {
+ builder.append(op.toString());
+ builder.append("\n");
+ }
+ return builder.toString();
+ }
+
+ //////////////////////////////////////////////////////////////////////////
// Painting
- ///////////////////////////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
private final float[] mScaleOutput = new float[2];
private final float[] mTranslateOutput = new float[2];
+ private int mRepaintNext = -1; // delay to next repaint -1 = don't 1 = asap
+
+ /**
+ * Returns > 0 if it needs to repaint
+ * @return
+ */
+ public int needsRepaint() {
+ return mRepaintNext;
+ }
/**
* Paint the document
@@ -475,6 +521,11 @@
context.mPaintContext.translate(mTranslateOutput[0], mTranslateOutput[1]);
context.mPaintContext.scale(mScaleOutput[0], mScaleOutput[1]);
}
+ mTimeVariables.updateTime(context);
+ context.loadFloat(RemoteContext.ID_WINDOW_WIDTH, getWidth());
+ context.loadFloat(RemoteContext.ID_WINDOW_HEIGHT, getHeight());
+ mRepaintNext = context.updateOps();
+
for (Operation op : mOperations) {
// operations will only be executed if no theme is set (ie UNSPECIFIED)
// or the theme is equal as the one passed in argument to paint.
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 54b277a..4b45ab6 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/Operations.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/Operations.java
@@ -19,6 +19,7 @@
import com.android.internal.widget.remotecompose.core.operations.ClickArea;
import com.android.internal.widget.remotecompose.core.operations.ClipPath;
import com.android.internal.widget.remotecompose.core.operations.ClipRect;
+import com.android.internal.widget.remotecompose.core.operations.ColorExpression;
import com.android.internal.widget.remotecompose.core.operations.DrawArc;
import com.android.internal.widget.remotecompose.core.operations.DrawBitmap;
import com.android.internal.widget.remotecompose.core.operations.DrawBitmapInt;
@@ -28,9 +29,12 @@
import com.android.internal.widget.remotecompose.core.operations.DrawPath;
import com.android.internal.widget.remotecompose.core.operations.DrawRect;
import com.android.internal.widget.remotecompose.core.operations.DrawRoundRect;
+import com.android.internal.widget.remotecompose.core.operations.DrawText;
+import com.android.internal.widget.remotecompose.core.operations.DrawTextAnchored;
import com.android.internal.widget.remotecompose.core.operations.DrawTextOnPath;
-import com.android.internal.widget.remotecompose.core.operations.DrawTextRun;
import com.android.internal.widget.remotecompose.core.operations.DrawTweenPath;
+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.MatrixRestore;
import com.android.internal.widget.remotecompose.core.operations.MatrixRotate;
@@ -42,7 +46,10 @@
import com.android.internal.widget.remotecompose.core.operations.PathData;
import com.android.internal.widget.remotecompose.core.operations.RootContentBehavior;
import com.android.internal.widget.remotecompose.core.operations.RootContentDescription;
+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.TextFromFloat;
+import com.android.internal.widget.remotecompose.core.operations.TextMerge;
import com.android.internal.widget.remotecompose.core.operations.Theme;
import com.android.internal.widget.remotecompose.core.operations.utilities.IntMap;
@@ -67,9 +74,10 @@
public static final int DRAW_BITMAP = 44;
public static final int DRAW_BITMAP_INT = 66;
public static final int DATA_BITMAP = 101;
+ public static final int DATA_SHADER = 45;
public static final int DATA_TEXT = 102;
-/////////////////////////////=====================
+ /////////////////////////////=====================
public static final int CLIP_PATH = 38;
public static final int CLIP_RECT = 39;
public static final int PAINT_VALUES = 40;
@@ -91,6 +99,12 @@
public static final int MATRIX_SAVE = 130;
public static final int MATRIX_RESTORE = 131;
public static final int MATRIX_SET = 132;
+ public static final int DATA_FLOAT = 80;
+ public static final int ANIMATED_FLOAT = 81;
+ public static final int DRAW_TEXT_ANCHOR = 133;
+ public static final int COLOR_EXPRESSIONS = 134;
+ public static final int TEXT_FROM_FLOAT = 135;
+ public static final int TEXT_MERGE = 136;
/////////////////////////////////////////======================
public static IntMap<CompanionOperation> map = new IntMap<>();
@@ -114,7 +128,7 @@
map.put(DRAW_RECT, DrawRect.COMPANION);
map.put(DRAW_ROUND_RECT, DrawRoundRect.COMPANION);
map.put(DRAW_TEXT_ON_PATH, DrawTextOnPath.COMPANION);
- map.put(DRAW_TEXT_RUN, DrawTextRun.COMPANION);
+ map.put(DRAW_TEXT_RUN, DrawText.COMPANION);
map.put(DRAW_TWEEN_PATH, DrawTweenPath.COMPANION);
map.put(DATA_PATH, PathData.COMPANION);
map.put(PAINT_VALUES, PaintData.COMPANION);
@@ -126,6 +140,13 @@
map.put(MATRIX_TRANSLATE, MatrixTranslate.COMPANION);
map.put(CLIP_PATH, ClipPath.COMPANION);
map.put(CLIP_RECT, ClipRect.COMPANION);
+ map.put(DATA_SHADER, ShaderData.COMPANION);
+ map.put(DATA_FLOAT, FloatConstant.COMPANION);
+ map.put(ANIMATED_FLOAT, FloatExpression.COMPANION);
+ map.put(DRAW_TEXT_ANCHOR, DrawTextAnchored.COMPANION);
+ map.put(COLOR_EXPRESSIONS, ColorExpression.COMPANION);
+ map.put(TEXT_FROM_FLOAT, TextFromFloat.COMPANION);
+ map.put(TEXT_MERGE, TextMerge.COMPANION);
}
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 eece8ad52..ecd0efc 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/PaintContext.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/PaintContext.java
@@ -68,7 +68,35 @@
public abstract void drawTextOnPath(int textId, int pathId, float hOffset, float vOffset);
- public abstract void drawTextRun(int textID,
+ /**
+ * Return the dimensions (left, top, right, bottom).
+ * Relative to a drawTextRun x=0, y=0;
+ *
+ * @param textId
+ * @param start
+ * @param end if end is -1 it means the whole string
+ * @param monospace measure with better support for monospace
+ * @param bounds the bounds (left, top, right, bottom)
+ */
+ public abstract void getTextBounds(int textId,
+ int start,
+ int end,
+ boolean monospace,
+ float[]bounds);
+
+ /**
+ * Draw a text starting ast x,y
+ *
+ * @param textId reference to the text
+ * @param start
+ * @param end
+ * @param contextStart
+ * @param contextEnd
+ * @param x
+ * @param y
+ * @param rtl
+ */
+ public abstract void drawTextRun(int textId,
int start,
int end,
int contextStart,
@@ -77,6 +105,14 @@
float y,
boolean rtl);
+ /**
+ * Draw an interpolation between two paths
+ * @param path1Id
+ * @param path2Id
+ * @param tween 0.0 = is path1 1.0 is path2
+ * @param start
+ * @param stop
+ */
public abstract void drawTweenPath(int path1Id,
int path2Id,
float tween,
@@ -85,21 +121,70 @@
public abstract void applyPaint(PaintBundle mPaintData);
- public abstract void mtrixScale(float scaleX, float scaleY, float centerX, float centerY);
+ /**
+ * Scale the rendering by scaleX and saleY (1.0 = no scale).
+ * Scaling is done about centerX,centerY.
+ *
+ * @param scaleX
+ * @param scaleY
+ * @param centerX
+ * @param centerY
+ */
+ public abstract void matrixScale(float scaleX, float scaleY, float centerX, float centerY);
+ /**
+ * Translate the rendering
+ * @param translateX
+ * @param translateY
+ */
public abstract void matrixTranslate(float translateX, float translateY);
+ /**
+ * Skew the rendering
+ * @param skewX
+ * @param skewY
+ */
public abstract void matrixSkew(float skewX, float skewY);
+ /**
+ * Rotate the rendering.
+ * Note rotates are cumulative.
+ * @param rotate angle to rotate
+ * @param pivotX x-coordinate about which to rotate
+ * @param pivotY y-coordinate about which to rotate
+ */
public abstract void matrixRotate(float rotate, float pivotX, float pivotY);
+ /**
+ * Save the current state of the transform
+ */
public abstract void matrixSave();
+ /**
+ * Restore the previously saved state of the transform
+ */
public abstract void matrixRestore();
+ /**
+ * Set the clip to a rectangle.
+ * Drawing outside the current clip region will have no effect
+ * @param left
+ * @param top
+ * @param right
+ * @param bottom
+ */
public abstract void clipRect(float left, float top, float right, float bottom);
+ /**
+ * Clip based on a path.
+ * @param pathId
+ * @param regionOp
+ */
public abstract void clipPath(int pathId, int regionOp);
+ /**
+ * Reset the paint
+ */
+ public abstract void reset();
}
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 c2e8131..52fc314 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeBuffer.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeBuffer.java
@@ -19,6 +19,7 @@
import com.android.internal.widget.remotecompose.core.operations.ClickArea;
import com.android.internal.widget.remotecompose.core.operations.ClipPath;
import com.android.internal.widget.remotecompose.core.operations.ClipRect;
+import com.android.internal.widget.remotecompose.core.operations.ColorExpression;
import com.android.internal.widget.remotecompose.core.operations.DrawArc;
import com.android.internal.widget.remotecompose.core.operations.DrawBitmap;
import com.android.internal.widget.remotecompose.core.operations.DrawBitmapInt;
@@ -28,9 +29,12 @@
import com.android.internal.widget.remotecompose.core.operations.DrawPath;
import com.android.internal.widget.remotecompose.core.operations.DrawRect;
import com.android.internal.widget.remotecompose.core.operations.DrawRoundRect;
+import com.android.internal.widget.remotecompose.core.operations.DrawText;
+import com.android.internal.widget.remotecompose.core.operations.DrawTextAnchored;
import com.android.internal.widget.remotecompose.core.operations.DrawTextOnPath;
-import com.android.internal.widget.remotecompose.core.operations.DrawTextRun;
import com.android.internal.widget.remotecompose.core.operations.DrawTweenPath;
+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.MatrixRestore;
import com.android.internal.widget.remotecompose.core.operations.MatrixRotate;
@@ -43,8 +47,12 @@
import com.android.internal.widget.remotecompose.core.operations.RootContentBehavior;
import com.android.internal.widget.remotecompose.core.operations.RootContentDescription;
import com.android.internal.widget.remotecompose.core.operations.TextData;
+import com.android.internal.widget.remotecompose.core.operations.TextFromFloat;
+import com.android.internal.widget.remotecompose.core.operations.TextMerge;
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.paint.PaintBundle;
+import com.android.internal.widget.remotecompose.core.operations.utilities.easing.FloatAnimation;
import java.io.File;
import java.io.FileInputStream;
@@ -58,9 +66,20 @@
* Provides an abstract buffer to encode/decode RemoteCompose operations
*/
public class RemoteComposeBuffer {
+ public static final int EASING_CUBIC_STANDARD = FloatAnimation.CUBIC_STANDARD;
+ public static final int EASING_CUBIC_ACCELERATE = FloatAnimation.CUBIC_ACCELERATE;
+ public static final int EASING_CUBIC_DECELERATE = FloatAnimation.CUBIC_DECELERATE;
+ public static final int EASING_CUBIC_LINEAR = FloatAnimation.CUBIC_LINEAR;
+ public static final int EASING_CUBIC_ANTICIPATE = FloatAnimation.CUBIC_ANTICIPATE;
+ public static final int EASING_CUBIC_OVERSHOOT = FloatAnimation.CUBIC_OVERSHOOT;
+ public static final int EASING_CUBIC_CUSTOM = FloatAnimation.CUBIC_CUSTOM;
+ public static final int EASING_SPLINE_CUSTOM = FloatAnimation.SPLINE_CUSTOM;
+ public static final int EASING_EASE_OUT_BOUNCE = FloatAnimation.EASE_OUT_BOUNCE;
+ public static final int EASING_EASE_OUT_ELASTIC = FloatAnimation.EASE_OUT_ELASTIC;
WireBuffer mBuffer = new WireBuffer();
Platform mPlatform = null;
RemoteComposeState mRemoteComposeState;
+ private static final boolean DEBUG = false;
/**
* Provides an abstract buffer to encode/decode RemoteCompose operations
@@ -171,7 +190,7 @@
*
* @param text the string to inject in the buffer
*/
- int addText(String text) {
+ public int addText(String text) {
int id = mRemoteComposeState.dataGetId(text);
if (id == -1) {
id = mRemoteComposeState.cache(text);
@@ -350,7 +369,6 @@
addDrawPath(id);
}
-
/**
* Draw the specified path
*
@@ -426,12 +444,160 @@
float y,
boolean rtl) {
int textId = addText(text);
- DrawTextRun.COMPANION.apply(
+ DrawText.COMPANION.apply(
mBuffer, textId, start, end,
contextStart, contextEnd, x, y, rtl);
}
/**
+ * Draw the text, with origin at (x,y). The origin is interpreted
+ * based on the Align setting in the paint.
+ *
+ * @param textId The text to be drawn
+ * @param start The index of the first character in text to draw
+ * @param end (end - 1) is the index of the last character in text to draw
+ * @param contextStart
+ * @param contextEnd
+ * @param x The x-coordinate of the origin of the text being drawn
+ * @param y The y-coordinate of the baseline of the text being drawn
+ * @param rtl Draw RTTL
+ */
+ public void addDrawTextRun(int textId,
+ int start,
+ int end,
+ int contextStart,
+ int contextEnd,
+ float x,
+ float y,
+ boolean rtl) {
+ DrawText.COMPANION.apply(
+ mBuffer, textId, start, end,
+ contextStart, contextEnd, x, y, rtl);
+ }
+
+ /**
+ * Draw a text on canvas at relative to position (x, y),
+ * offset panX and panY.
+ * <br>
+ * The panning factors (panX, panY) mapped to the
+ * resulting bounding box of the text, in such a way that a
+ * panning factor of (0.0, 0.0) would center the text at (x, y)
+ * <ul>
+ * <li> Panning of -1.0, -1.0 - the text above & right of x,y.</li>
+ * <li>Panning of 1.0, 1.0 - the text is below and to the left</li>
+ * <li>Panning of 1.0, 0.0 - the test is centered & to the right of x,y</li>
+ * </ul>
+ * Setting panY to NaN results in y being the baseline of the text.
+ *
+ * @param text text to draw
+ * @param x Coordinate of the Anchor
+ * @param y Coordinate of the Anchor
+ * @param panX justifies text -1.0=right, 0.0=center, 1.0=left
+ * @param panY position text -1.0=above, 0.0=center, 1.0=below, Nan=baseline
+ * @param flags 1 = RTL
+ */
+ public void drawTextAnchored(String text,
+ float x,
+ float y,
+ float panX,
+ float panY,
+ int flags) {
+ int textId = addText(text);
+ DrawTextAnchored.COMPANION.apply(
+ mBuffer, textId,
+ x, y,
+ panX, panY,
+ flags);
+ }
+
+ /**
+ * Add a text and id so that it can be used
+ *
+ * @param text
+ * @return
+ */
+ public int createTextId(String text) {
+ return addText(text);
+ }
+
+ /**
+ * Merge two text (from id's) output one id
+ * @param id1 left id
+ * @param id2 right id
+ * @return new id that merges the two text
+ */
+ public int textMerge(int id1, int id2) {
+ int textId = addText(id1 + "+" + id2);
+ TextMerge.COMPANION.apply(mBuffer, textId, id1, id2);
+ return textId;
+ }
+
+ public static final int PAD_AFTER_SPACE = TextFromFloat.PAD_AFTER_SPACE;
+ public static final int PAD_AFTER_NONE = TextFromFloat.PAD_AFTER_NONE;
+ public static final int PAD_AFTER_ZERO = TextFromFloat.PAD_AFTER_ZERO;
+ public static final int PAD_PRE_SPACE = TextFromFloat.PAD_PRE_SPACE;
+ public static final int PAD_PRE_NONE = TextFromFloat.PAD_PRE_NONE;
+ public static final int PAD_PRE_ZERO = TextFromFloat.PAD_PRE_ZERO;
+
+ /**
+ * Create a TextFromFloat command which creates text from a Float.
+ *
+ * @param value The value to convert
+ * @param digitsBefore the digits before the decimal point
+ * @param digitsAfter the digits after the decimal point
+ * @param flags configure the behaviour using PAD_PRE_* and PAD_AFTER* flags
+ * @return id of the string that can be passed to drawTextAnchored
+ */
+ public int createTextFromFloat(float value, short digitsBefore,
+ short digitsAfter, int flags) {
+ String placeHolder = Utils.floatToString(value)
+ + "(" + digitsBefore + "," + digitsAfter + "," + flags + ")";
+ int id = mRemoteComposeState.dataGetId(placeHolder);
+ if (id == -1) {
+ id = mRemoteComposeState.cache(placeHolder);
+ // TextData.COMPANION.apply(mBuffer, id, text);
+ }
+ TextFromFloat.COMPANION.apply(mBuffer, id, value, digitsBefore,
+ digitsAfter, flags);
+ return id;
+ }
+
+ /**
+ * Draw a text on canvas at relative to position (x, y),
+ * offset panX and panY.
+ * <br>
+ * The panning factors (panX, panY) mapped to the
+ * resulting bounding box of the text, in such a way that a
+ * panning factor of (0.0, 0.0) would center the text at (x, y)
+ * <ul>
+ * <li> Panning of -1.0, -1.0 - the text above & right of x,y.</li>
+ * <li>Panning of 1.0, 1.0 - the text is below and to the left</li>
+ * <li>Panning of 1.0, 0.0 - the test is centered & to the right of x,y</li>
+ * </ul>
+ * Setting panY to NaN results in y being the baseline of the text.
+ *
+ * @param textId text to draw
+ * @param x Coordinate of the Anchor
+ * @param y Coordinate of the Anchor
+ * @param panX justifies text -1.0=right, 0.0=center, 1.0=left
+ * @param panY position text -1.0=above, 0.0=center, 1.0=below, Nan=baseline
+ * @param flags 1 = RTL
+ */
+ public void drawTextAnchored(int textId,
+ float x,
+ float y,
+ float panX,
+ float panY,
+ int flags) {
+
+ DrawTextAnchored.COMPANION.apply(
+ mBuffer, textId,
+ x, y,
+ panX, panY,
+ flags);
+ }
+
+ /**
* draw an interpolation between two paths that have the same pattern
* <p>
* Warning paths objects are not immutable and this is not taken into consideration
@@ -490,6 +656,10 @@
return id;
}
+ /**
+ * Adds a paint Bundle to the doc
+ * @param paint
+ */
public void addPaint(PaintBundle paint) {
PaintData.COMPANION.apply(mBuffer, paint);
}
@@ -499,7 +669,9 @@
mBuffer.setIndex(0);
while (mBuffer.available()) {
int opId = mBuffer.readByte();
- System.out.println(">>> " + opId);
+ if (DEBUG) {
+ Utils.log(">> " + opId);
+ }
CompanionOperation operation = Operations.map.get(opId);
if (operation == null) {
throw new RuntimeException("Unknown operation encountered " + opId);
@@ -519,7 +691,6 @@
Theme.COMPANION.apply(mBuffer, theme);
}
-
static String version() {
return "v1.0";
}
@@ -654,8 +825,8 @@
/**
* Add a pre-concat of the current matrix with the specified scale.
*
- * @param scaleX The amount to scale in X
- * @param scaleY The amount to scale in Y
+ * @param scaleX The amount to scale in X
+ * @param scaleY The amount to scale in Y
*/
public void addMatrixScale(float scaleX, float scaleY) {
MatrixScale.COMPANION.apply(mBuffer, scaleX, scaleY, Float.NaN, Float.NaN);
@@ -673,12 +844,174 @@
MatrixScale.COMPANION.apply(mBuffer, scaleX, scaleY, centerX, centerY);
}
+ /**
+ * sets the clip based on clip id
+ * @param pathId 0 clears the clip
+ */
public void addClipPath(int pathId) {
ClipPath.COMPANION.apply(mBuffer, pathId);
}
+ /**
+ * Sets the clip based on clip rec
+ * @param left
+ * @param top
+ * @param right
+ * @param bottom
+ */
public void addClipRect(float left, float top, float right, float bottom) {
ClipRect.COMPANION.apply(mBuffer, left, top, right, bottom);
}
+
+ /**
+ * Add a float return a NaN number pointing to that float
+ * @param value
+ * @return
+ */
+ public float addFloat(float value) {
+ int id = mRemoteComposeState.cacheFloat(value);
+ FloatConstant.COMPANION.apply(mBuffer, id, value);
+ return Utils.asNan(id);
+ }
+
+ /**
+ * Add a float that is a computation based on variables
+ * @param value A RPN style float operation i.e. "4, 3, ADD" outputs 7
+ * @return NaN id of the result of the calculation
+ */
+ public float addAnimatedFloat(float... value) {
+ int id = mRemoteComposeState.cache(value);
+ FloatExpression.COMPANION.apply(mBuffer, id, value, null);
+ return Utils.asNan(id);
+ }
+
+ /**
+ * Add a float that is a computation based on variables.
+ * see packAnimation
+ * @param value A RPN style float operation i.e. "4, 3, ADD" outputs 7
+ * @param animation Array of floats that represents animation
+ * @return NaN id of the result of the calculation
+ */
+ public float addAnimatedFloat(float[] value, float[] animation) {
+ int id = mRemoteComposeState.cache(value);
+ FloatExpression.COMPANION.apply(mBuffer, id, value, animation);
+ return Utils.asNan(id);
+ }
+
+ /**
+ * Add a color that represents the tween between two colors
+ * @param color1
+ * @param color2
+ * @param tween
+ * @return id of the color (color ids are short)
+ */
+ public short addColorExpression(int color1, int color2, float tween) {
+ ColorExpression c = new ColorExpression(0, 0, color1, color2, tween);
+ short id = (short) mRemoteComposeState.cache(c);
+ c.mId = id;
+ c.write(mBuffer);
+ return id;
+ }
+
+ /**
+ * Add a color that represents the tween between two colors where color1
+ * is the id of a color
+ * @param color1
+ * @param color2
+ * @param tween
+ * @return id of the color (color ids are short)
+ */
+ public short addColorExpression(short color1, int color2, float tween) {
+ ColorExpression c = new ColorExpression(0, 1, color1, color2, tween);
+ short id = (short) mRemoteComposeState.cache(c);
+ c.mId = id;
+ c.write(mBuffer);
+ return id;
+ }
+
+ /**
+ * Add a color that represents the tween between two colors where color2
+ * is the id of a color
+ * @param color1
+ * @param color2
+ * @param tween
+ * @return id of the color (color ids are short)
+ */
+ public short addColorExpression(int color1, short color2, float tween) {
+ ColorExpression c = new ColorExpression(0, 2, color1, color2, tween);
+ short id = (short) mRemoteComposeState.cache(c);
+ c.mId = id;
+ c.write(mBuffer);
+ return id;
+ }
+
+ /**
+ * Add a color that represents the tween between two colors where color1 &
+ * color2 are the ids of colors
+ * @param color1
+ * @param color2
+ * @param tween
+ * @return id of the color (color ids are short)
+ */
+ public short addColorExpression(short color1, short color2, float tween) {
+ ColorExpression c = new ColorExpression(0, 3, color1, color2, tween);
+ short id = (short) mRemoteComposeState.cache(c);
+ c.mId = id;
+ c.write(mBuffer);
+ return id;
+ }
+
+ /**
+ * Color calculated by Hue saturation and value.
+ * (as floats they can be variables used to create color transitions)
+ * @param hue
+ * @param sat
+ * @param value
+ * @return id of the color (color ids are short)
+ */
+ public short addColorExpression(float hue, float sat, float value) {
+ ColorExpression c = new ColorExpression(0, hue, sat, value);
+ short id = (short) mRemoteComposeState.cache(c);
+ c.mId = id;
+ c.write(mBuffer);
+ return id;
+ }
+
+ /**
+ * Color calculated by Alpha, Hue saturation and value.
+ * (as floats they can be variables used to create color transitions)
+ * @param alpha
+ * @param hue
+ * @param sat
+ * @param value
+ * @return id of the color (color ids are short)
+ */
+ public short addColorExpression(int alpha, float hue, float sat, float value) {
+ ColorExpression c = new ColorExpression(0, alpha, hue, sat, value);
+ short id = (short) mRemoteComposeState.cache(c);
+ c.mId = id;
+ c.write(mBuffer);
+ return id;
+ }
+
+ /**
+ * create and animation based on description and return as an array of
+ * floats. see addAnimatedFloat
+ * @param duration
+ * @param type
+ * @param spec
+ * @param initialValue
+ * @param wrap
+ * @return
+ */
+ public static float[] packAnimation(float duration,
+ int type,
+ float[] spec,
+ float initialValue,
+ float wrap) {
+
+ return FloatAnimation.packToFloatArray(duration, type, spec, initialValue, wrap);
+ }
+
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java
index 17e8c83..66a37e67 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java
@@ -15,26 +15,53 @@
*/
package com.android.internal.widget.remotecompose.core;
+import static com.android.internal.widget.remotecompose.core.RemoteContext.ID_CONTINUOUS_SEC;
+import static com.android.internal.widget.remotecompose.core.RemoteContext.ID_TIME_IN_MIN;
+import static com.android.internal.widget.remotecompose.core.RemoteContext.ID_TIME_IN_SEC;
+import static com.android.internal.widget.remotecompose.core.RemoteContext.ID_WINDOW_HEIGHT;
+import static com.android.internal.widget.remotecompose.core.RemoteContext.ID_WINDOW_WIDTH;
+
import com.android.internal.widget.remotecompose.core.operations.utilities.IntMap;
+import java.util.ArrayList;
import java.util.HashMap;
/**
* Represents runtime state for a RemoteCompose document
+ * State includes things like the value of variables
*/
public class RemoteComposeState {
-
+ public static final int START_ID = 42;
+ private static final int MAX_FLOATS = 500;
private final IntMap<Object> mIntDataMap = new IntMap<>();
private final IntMap<Boolean> mIntWrittenMap = new IntMap<>();
private final HashMap<Object, Integer> mDataIntMap = new HashMap();
+ private final float[] mFloatMap = new float[MAX_FLOATS]; // efficient cache
+ private final int[] mColorMap = new int[MAX_FLOATS]; // efficient cache
+ private int mNextId = START_ID;
- private static int sNextId = 42;
+ {
+ for (int i = 0; i < mFloatMap.length; i++) {
+ mFloatMap[i] = Float.NaN;
+ }
+ }
- public Object getFromId(int id) {
+ /**
+ * Get Object based on id. The system will cache things like bitmaps
+ * Paths etc. They can be accessed with this command
+ * @param id
+ * @return
+ */
+ public Object getFromId(int id) {
return mIntDataMap.get(id);
}
- public boolean containsId(int id) {
+ /**
+ * true if the cache contain this id
+ * @param id
+ * @return
+ */
+ public boolean containsId(int id) {
return mIntDataMap.get(id) != null;
}
@@ -69,6 +96,65 @@
}
/**
+ * Insert an item in the cache
+ */
+ public void update(int id, Object item) {
+ mDataIntMap.remove(mIntDataMap.get(id));
+ mDataIntMap.put(item, id);
+ mIntDataMap.put(id, item);
+ }
+
+ /**
+ * Insert an item in the cache
+ */
+ public int cacheFloat(float item) {
+ int id = nextId();
+ mFloatMap[id] = item;
+ return id;
+ }
+
+ /**
+ * Insert an item in the cache
+ */
+ public void cacheFloat(int id, float item) {
+ mFloatMap[id] = item;
+ }
+
+ /**
+ * Insert an item in the cache
+ */
+ public void updateFloat(int id, float item) {
+ mFloatMap[id] = item;
+ }
+
+ /**
+ * get float
+ */
+ public float getFloat(int id) {
+ return mFloatMap[id];
+ }
+
+ /**
+ * Get the float value
+ *
+ * @param id
+ * @return
+ */
+ public int getColor(int id) {
+ return mColorMap[id];
+ }
+
+ /**
+ * Modify the color at id.
+ * @param id
+ * @param color
+ */
+ public void updateColor(int id, int color) {
+ mColorMap[id] = color;
+ }
+
+
+ /**
* Method to determine if a cached value has been written to the documents WireBuffer based on
* its id.
*/
@@ -79,22 +165,90 @@
/**
* Method to mark that a value, represented by its id, has been written to the WireBuffer
*/
- public void markWritten(int id) {
+ public void markWritten(int id) {
mIntWrittenMap.put(id, true);
}
/**
- * Clear the record of the values that have been written to the WireBuffer.
+ * Clear the record of the values that have been written to the WireBuffer.
*/
void reset() {
mIntWrittenMap.clear();
}
- public static int nextId() {
- return sNextId++;
+ /**
+ * Get the next available id
+ * @return
+ */
+ public int nextId() {
+ return mNextId++;
}
- public static void setNextId(int id) {
- sNextId = id;
+
+ /**
+ * Set the next id
+ * @param id
+ */
+ public void setNextId(int id) {
+ mNextId = id;
+ }
+
+ IntMap<ArrayList<VariableSupport>> mVarListeners = new IntMap<>();
+ ArrayList<VariableSupport> mAllVarListeners = new ArrayList<>();
+
+ private void add(int id, VariableSupport variableSupport) {
+ ArrayList<VariableSupport> v = mVarListeners.get(id);
+ if (v == null) {
+ v = new ArrayList<VariableSupport>();
+ mVarListeners.put(id, v);
+ }
+ v.add(variableSupport);
+ mAllVarListeners.add(variableSupport);
+ }
+
+ /**
+ * Commands that listen to variables add themselves.
+ * @param id
+ * @param variableSupport
+ */
+ public void listenToVar(int id, VariableSupport variableSupport) {
+ add(id, variableSupport);
+ }
+
+ /**
+ * List of Commands that need to be updated
+ * @param context
+ * @return
+ */
+ public int getOpsToUpdate(RemoteContext context) {
+ for (VariableSupport vs : mAllVarListeners) {
+ vs.updateVariables(context);
+ }
+ if (mVarListeners.get(ID_CONTINUOUS_SEC) != null) {
+ return 1;
+ }
+ if (mVarListeners.get(ID_TIME_IN_SEC) != null) {
+ return 1000;
+ }
+ if (mVarListeners.get(ID_TIME_IN_MIN) != null) {
+ return 1000 * 60;
+ }
+ return -1;
+ }
+
+ /**
+ * Set the width of the overall document on screen.
+ * @param width
+ */
+ public void setWindowWidth(float width) {
+ updateFloat(ID_WINDOW_WIDTH, width);
+ }
+
+ /**
+ * Set the width of the overall document on screen.
+ * @param height
+ */
+ public void setWindowHeight(float height) {
+ updateFloat(ID_WINDOW_HEIGHT, height);
}
}
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 d16cbc5..7e72168 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2023 The Android Open Source Project
+ * 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.
@@ -15,7 +15,10 @@
*/
package com.android.internal.widget.remotecompose.core;
+import com.android.internal.widget.remotecompose.core.operations.FloatExpression;
+import com.android.internal.widget.remotecompose.core.operations.ShaderData;
import com.android.internal.widget.remotecompose.core.operations.Theme;
+import com.android.internal.widget.remotecompose.core.operations.Utils;
/**
* Specify an abstract context used to playback RemoteCompose documents
@@ -27,7 +30,7 @@
public abstract class RemoteContext {
protected CoreDocument mDocument;
public RemoteComposeState mRemoteComposeState;
-
+ long mStart = System.nanoTime(); // todo This should be set at a hi level
protected PaintContext mPaintContext = null;
ContextMode mMode = ContextMode.UNSET;
@@ -37,9 +40,40 @@
public float mWidth = 0f;
public float mHeight = 0f;
+ /**
+ * Load a path under an id.
+ * Paths can be use in clip drawPath and drawTweenPath
+ * @param instanceId
+ * @param floatPath
+ */
public abstract void loadPathData(int instanceId, float[] floatPath);
/**
+ * Associate a name with a give id.
+ *
+ * @param varName
+ * @param varId
+ * @param varType
+ */
+ public abstract void loadVariableName(String varName, int varId, int varType);
+
+ /**
+ * Save a color under a given id
+ * @param id
+ * @param color
+ */
+ public abstract void loadColor(int id, int color);
+
+ /**
+ * gets the time animation clock as float in seconds
+ * @return a monotonic time in seconds (arbitrary zero point)
+ */
+ public float getAnimationTime() {
+ return (System.nanoTime() - mStart) * 1E-9f;
+ }
+
+
+ /**
* The context can be used in a few different mode, allowing operations to skip being executed:
* - UNSET : all operations will get executed
* - DATA : only operations dealing with DATA (eg loading a bitmap) should execute
@@ -96,6 +130,8 @@
public void header(int majorVersion, int minorVersion, int patchVersion,
int width, int height, long capabilities
) {
+ mRemoteComposeState.setWindowWidth(width);
+ mRemoteComposeState.setWindowHeight(height);
mDocument.setVersion(majorVersion, minorVersion, patchVersion);
mDocument.setWidth(width);
mDocument.setHeight(height);
@@ -137,9 +173,105 @@
///////////////////////////////////////////////////////////////////////////////////////////////
// Data handling
///////////////////////////////////////////////////////////////////////////////////////////////
+
+ /**
+ * Save a bitmap under an imageId
+ * @param imageId
+ * @param width
+ * @param height
+ * @param bitmap
+ */
public abstract void loadBitmap(int imageId, int width, int height, byte[] bitmap);
+
+ /**
+ * Save a string under a given id
+ * @param id
+ * @param text
+ */
public abstract void loadText(int id, String text);
+ /**
+ * Get a string given an id
+ * @param id
+ * @return
+ */
+ public abstract String getText(int id);
+
+ /**
+ * Load a float
+ * @param id
+ * @param value
+ */
+ public abstract void loadFloat(int id, float value);
+
+ /**
+ * Load an animated float associated with an id
+ * Todo: Remove?
+ * @param id
+ * @param animatedFloat
+ */
+ public abstract void loadAnimatedFloat(int id, FloatExpression animatedFloat);
+
+ /**
+ * Save a shader under and ID
+ * @param id
+ * @param value
+ */
+ public abstract void loadShader(int id, ShaderData value);
+
+ /**
+ * Get a float given an id
+ * @param id
+ * @return
+ */
+ public abstract float getFloat(int id);
+
+ /**
+ * Get the color given and ID
+ * @param id
+ * @return
+ */
+ public abstract int getColor(int id);
+
+ /**
+ * called to notify system that a command is interested in a variable
+ * @param id
+ * @param variableSupport
+ */
+ public abstract void listensTo(int id, VariableSupport variableSupport);
+
+ /**
+ * Notify commands with variables have changed
+ * @return
+ */
+ public abstract int updateOps();
+
+ /**
+ * Get a shader given the id
+ * @param id
+ * @return
+ */
+ public abstract ShaderData getShader(int id);
+
+ public static final int ID_CONTINUOUS_SEC = 1;
+ public static final int ID_TIME_IN_SEC = 2;
+ public static final int ID_TIME_IN_MIN = 3;
+ public static final int ID_TIME_IN_HR = 4;
+ public static final int ID_WINDOW_WIDTH = 5;
+ public static final int ID_WINDOW_HEIGHT = 6;
+ public static final int ID_COMPONENT_WIDTH = 7;
+ public static final int ID_COMPONENT_HEIGHT = 8;
+ public static final int ID_CALENDAR_MONTH = 9;
+
+ public static final float FLOAT_CONTINUOUS_SEC = Utils.asNan(ID_CONTINUOUS_SEC);
+ public static final float FLOAT_TIME_IN_SEC = Utils.asNan(ID_TIME_IN_SEC);
+ public static final float FLOAT_TIME_IN_MIN = Utils.asNan(ID_TIME_IN_MIN);
+ public static final float FLOAT_TIME_IN_HR = Utils.asNan(ID_TIME_IN_HR);
+ public static final float FLOAT_CALENDAR_MONTH = Utils.asNan(ID_CALENDAR_MONTH);
+ public static final float FLOAT_WINDOW_WIDTH = Utils.asNan(ID_WINDOW_WIDTH);
+ public static final float FLOAT_WINDOW_HEIGHT = Utils.asNan(ID_WINDOW_HEIGHT);
+ public static final float FLOAT_COMPONENT_WIDTH = Utils.asNan(ID_COMPONENT_WIDTH);
+ public static final float FLOAT_COMPONENT_HEIGHT = Utils.asNan(ID_COMPONENT_HEIGHT);
///////////////////////////////////////////////////////////////////////////////////////////////
// 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
new file mode 100644
index 0000000..e9708b7
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/TimeVariables.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.widget.remotecompose.core;
+
+import java.time.LocalDateTime;
+
+/**
+ * This generates the standard system variables for time.
+ */
+public class TimeVariables {
+ /**
+ * This class populates all time variables in the system
+ * @param context
+ */
+ public void updateTime(RemoteContext context) {
+ LocalDateTime dateTime = LocalDateTime.now();
+ // This define the time in the format
+ // seconds run from Midnight=0 quantized to seconds hour 0..3599
+ // minutes run from Midnight=0 quantized to minutes 0..1439
+ // hours run from Midnight=0 quantized to Hours 0-23
+ // CONTINUOUS_SEC is seconds from midnight looping every hour 0-3600
+ // CONTINUOUS_SEC is accurate to milliseconds due to float precession
+ int month = dateTime.getDayOfMonth();
+ int hour = dateTime.getHour();
+ int minute = dateTime.getMinute();
+ int seconds = dateTime.getSecond();
+ int currentMinute = hour * 60 + minute;
+ int currentSeconds = minute * 60 + seconds;
+ float sec = currentSeconds + dateTime.getNano() * 1E-9f;
+
+ context.loadFloat(RemoteContext.ID_CONTINUOUS_SEC, sec);
+ context.loadFloat(RemoteContext.ID_TIME_IN_SEC, currentSeconds);
+ context.loadFloat(RemoteContext.ID_TIME_IN_MIN, currentMinute);
+ context.loadFloat(RemoteContext.ID_TIME_IN_HR, hour);
+ context.loadFloat(RemoteContext.ID_CALENDAR_MONTH, month);
+
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/VariableSupport.java b/core/java/com/android/internal/widget/remotecompose/core/VariableSupport.java
new file mode 100644
index 0000000..d59b1bc
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/VariableSupport.java
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+/**
+ * Interface for operators that interact with variables
+ * Threw this they register to listen to particular variables
+ * and are notified when they change
+ */
+public interface VariableSupport {
+ /**
+ * Call to allow an operator to register interest in variables.
+ * Typically they call context.listensTo(id, this)
+ * @param context
+ */
+ void registerListening(RemoteContext context);
+
+ /**
+ * Called to be notified that the variables you are interested have changed.
+ * @param context
+ */
+ void updateVariables(RemoteContext context);
+}
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 76b7144..f186322 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
@@ -51,11 +51,12 @@
@Override
public String toString() {
- return "BITMAP DATA $imageId";
+ return "BITMAP DATA " + mImageId;
}
public static class Companion implements CompanionOperation {
- private Companion() {}
+ private Companion() {
+ }
@Override
public String name() {
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/ClipPath.java b/core/java/com/android/internal/widget/remotecompose/core/operations/ClipPath.java
index 8d4a787..e6d5fe7 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/ClipPath.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/ClipPath.java
@@ -24,6 +24,11 @@
import java.util.List;
+/**
+ * Defines a path that clips a the subsequent drawing commands
+ * Use MatrixSave and MatrixRestore commands to remove clip
+ * TODO allow id 0 to mean null?
+ */
public class ClipPath extends PaintOperation {
public static final Companion COMPANION = new Companion();
int mId;
@@ -93,5 +98,4 @@
public void paint(PaintContext context) {
context.clipPath(mId, mRegionOp);
}
-}
-
+}
\ No newline at end of file
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/ClipRect.java b/core/java/com/android/internal/widget/remotecompose/core/operations/ClipRect.java
index 803618a..613eceb 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/ClipRect.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/ClipRect.java
@@ -15,88 +15,36 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
-import com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
-
-public class ClipRect extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mLeft;
- float mTop;
- float mRight;
- float mBottom;
+/**
+ * Support clip with a rectangle
+ */
+public class ClipRect extends DrawBase4 {
+ public static final Companion COMPANION =
+ new Companion(Operations.CLIP_RECT) {
+ @Override
+ public Operation construct(float x1,
+ float y1,
+ float x2,
+ float y2) {
+ return new ClipRect(x1, y1, x2, y2);
+ }
+ };
public ClipRect(
float left,
float top,
float right,
float bottom) {
- mLeft = left;
- mTop = top;
- mRight = right;
- mBottom = bottom;
-
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mLeft, mTop, mRight, mBottom);
- }
-
- @Override
- public String toString() {
- return "ClipRect " + mLeft + " " + mTop
- + " " + mRight + " " + mBottom + ";";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float sLeft = buffer.readFloat();
- float srcTop = buffer.readFloat();
- float srcRight = buffer.readFloat();
- float srcBottom = buffer.readFloat();
-
- ClipRect op = new ClipRect(sLeft, srcTop, srcRight, srcBottom);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "ClipRect";
- }
-
- @Override
- public int id() {
- return Operations.CLIP_RECT;
- }
-
- public void apply(WireBuffer buffer,
- float left,
- float top,
- float right,
- float bottom) {
- buffer.start(Operations.CLIP_RECT);
- buffer.writeFloat(left);
- buffer.writeFloat(top);
- buffer.writeFloat(right);
- buffer.writeFloat(bottom);
- }
+ super(left, top, right, bottom);
+ mName = "ClipRect";
}
@Override
public void paint(PaintContext context) {
- context.clipRect(mLeft,
- mTop,
- mRight,
- mBottom);
+ context.clipRect(mX1, mY1, mX2, mY2);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/ColorExpression.java b/core/java/com/android/internal/widget/remotecompose/core/operations/ColorExpression.java
new file mode 100644
index 0000000..7d28cea
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/ColorExpression.java
@@ -0,0 +1,242 @@
+/*
+ * 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 com.android.internal.widget.remotecompose.core.CompanionOperation;
+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 java.util.List;
+
+/**
+ * Operation to Colors
+ * Color modes
+ * mMode = 0 two colors and a tween
+ * mMode = 1 color1 is a colorID.
+ * mMode = 2 color2 is a colorID.
+ * mMode = 3 color1 & color2 are ids
+ * mMode = 4 H S V mode
+ */
+public class ColorExpression implements Operation, VariableSupport {
+ public int mId;
+ int mMode;
+ public int mColor1;
+ public int mColor2;
+ public float mTween = 0.0f;
+
+
+ public float mHue = 0; // only in Mode 4
+ public float mSat = 0;
+ public float mValue = 0;
+ public float mOutHue = 0; // only in Mode 4
+ public float mOutSat = 0;
+ public float mOutValue = 0;
+ public int mAlpha = 0xFF; // only used in hsv mode
+
+ public float mOutTween = 0.0f;
+ public int mOutColor1;
+ public int mOutColor2;
+ public static final Companion COMPANION = new Companion();
+ public static final int HSV_MODE = 4;
+ public ColorExpression(int id, float hue, float sat, float value) {
+ mMode = HSV_MODE;
+ mAlpha = 0xFF;
+ mOutHue = mHue = hue;
+ mOutSat = mSat = sat;
+ mOutValue = mValue = value;
+ mColor1 = Float.floatToRawIntBits(hue);
+ mColor2 = Float.floatToRawIntBits(sat);
+ mTween = value;
+ }
+ public ColorExpression(int id, int alpha, float hue, float sat, float value) {
+ mMode = HSV_MODE;
+ mAlpha = alpha;
+ mOutHue = mHue = hue;
+ mOutSat = mSat = sat;
+ mOutValue = mValue = value;
+ mColor1 = Float.floatToRawIntBits(hue);
+ mColor2 = Float.floatToRawIntBits(sat);
+ mTween = value;
+ }
+
+ public ColorExpression(int id, int mode, int color1, int color2, float tween) {
+ this.mId = id;
+ this.mMode = mode & 0xFF;
+ this.mAlpha = (mode >> 16) & 0xFF;
+ if (mMode == HSV_MODE) {
+ mOutHue = mHue = Float.intBitsToFloat(color1);
+ mOutSat = mSat = Float.intBitsToFloat(color2);
+ mOutValue = mValue = tween;
+ }
+ this.mColor1 = color1;
+ this.mColor2 = color2;
+ this.mTween = tween;
+ this.mOutTween = tween;
+ this.mOutColor1 = color1;
+ this.mOutColor2 = color2;
+
+ }
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ if (mMode == 4) {
+ if (Float.isNaN(mHue)) {
+ mOutHue = context.getFloat(Utils.idFromNan(mHue));
+ }
+ if (Float.isNaN(mSat)) {
+ mOutSat = context.getFloat(Utils.idFromNan(mSat));
+ }
+ if (Float.isNaN(mValue)) {
+ mOutValue = context.getFloat(Utils.idFromNan(mValue));
+ }
+ }
+ if (Float.isNaN(mTween)) {
+ mOutTween = context.getFloat(Utils.idFromNan(mTween));
+ }
+ if ((mMode & 1) == 1) {
+ mOutColor1 = context.getColor(mColor1);
+ }
+ if ((mMode & 2) == 2) {
+ mOutColor2 = context.getColor(mColor2);
+ }
+ }
+
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ if (mMode == 4) {
+ if (Float.isNaN(mHue)) {
+ context.listensTo(Utils.idFromNan(mHue), this);
+ }
+ if (Float.isNaN(mSat)) {
+ context.listensTo(Utils.idFromNan(mSat), this);
+ }
+ if (Float.isNaN(mValue)) {
+ context.listensTo(Utils.idFromNan(mValue), this);
+ }
+ return;
+ }
+ if (Float.isNaN(mTween)) {
+ context.listensTo(Utils.idFromNan(mTween), this);
+ }
+ if ((mMode & 1) == 1) {
+ context.listensTo(mColor1, this);
+ }
+ if ((mMode & 2) == 2) {
+ context.listensTo(mColor2, this);
+ }
+ }
+
+ @Override
+ public void apply(RemoteContext context) {
+ if (mMode == 4) {
+ context.loadColor(mId, (mAlpha << 24)
+ | (0xFFFFFF & Utils.hsvToRgb(mOutHue, mOutSat, mOutValue)));
+ return;
+ }
+ if (mOutTween == 0.0) {
+ context.loadColor(mId, mColor1);
+ } else {
+ if ((mMode & 1) == 1) {
+ mOutColor1 = context.getColor(mColor1);
+ }
+ if ((mMode & 2) == 2) {
+ mOutColor2 = context.getColor(mColor2);
+ }
+
+ context.loadColor(mId,
+ Utils.interpolateColor(mOutColor1, mOutColor2, mOutTween));
+ }
+
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ int mode = mMode | (mAlpha << 16);
+ COMPANION.apply(buffer, mId, mode, mColor1, mColor2, mTween);
+ }
+
+ @Override
+ public String toString() {
+ if (mMode == 4) {
+ return "ColorExpression[" + mId + "] = hsv (" + Utils.floatToString(mHue)
+ + ", " + Utils.floatToString(mSat)
+ + ", " + Utils.floatToString(mValue) + ")";
+ }
+
+ String c1 = (mMode & 1) == 1 ? "[" + mColor1 + "]" : Utils.colorInt(mColor1);
+ String c2 = (mMode & 2) == 2 ? "[" + mColor2 + "]" : Utils.colorInt(mColor2);
+ return "ColorExpression[" + mId + "] = tween(" + c1
+ + ", " + c2 + ", "
+ + Utils.floatToString(mTween) + ")";
+ }
+
+ public static class Companion implements CompanionOperation {
+ private Companion() {
+ }
+
+ @Override
+ public String name() {
+ return "ColorExpression";
+ }
+
+ @Override
+ public int id() {
+ return Operations.COLOR_EXPRESSIONS;
+ }
+
+ /**
+ * Call to write a ColorExpression object on the buffer
+ * @param buffer
+ * @param id of the ColorExpression object
+ * @param mode if colors are id or actual values
+ * @param color1
+ * @param color2
+ * @param tween
+ */
+ public void apply(WireBuffer buffer,
+ int id, int mode,
+ int color1, int color2, float tween) {
+ buffer.start(Operations.COLOR_EXPRESSIONS);
+ buffer.writeInt(id);
+ buffer.writeInt(mode);
+ buffer.writeInt(color1);
+ buffer.writeInt(color2);
+ buffer.writeFloat(tween);
+
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ int id = buffer.readInt();
+ int mode = buffer.readInt();
+ int color1 = buffer.readInt();
+ int color2 = buffer.readInt();
+ float tween = buffer.readFloat();
+
+ operations.add(new ColorExpression(id, mode, color1, color2, tween));
+ }
+ }
+
+ @Override
+ public String deepToString(String indent) {
+ return indent + toString();
+ }
+
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawArc.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawArc.java
index e829975..c176864 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawArc.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawArc.java
@@ -15,107 +15,36 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
-import com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
+public class DrawArc extends DrawBase6 {
+ public static final Companion COMPANION =
+ new Companion(Operations.DRAW_ARC) {
+ @Override
+ public Operation construct(float v1,
+ float v2,
+ float v3,
+ float v4,
+ float v5,
+ float v6) {
+ return new DrawArc(v1, v2, v3, v4, v5, v6);
+ }
+ };
-public class DrawArc extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mLeft;
- float mTop;
- float mRight;
- float mBottom;
- float mStartAngle;
- float mSweepAngle;
-
- public DrawArc(
- float left,
- float top,
- float right,
- float bottom,
- float startAngle,
- float sweepAngle) {
- mLeft = left;
- mTop = top;
- mRight = right;
- mBottom = bottom;
- mStartAngle = startAngle;
- mSweepAngle = sweepAngle;
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mLeft,
- mTop,
- mRight,
- mBottom,
- mStartAngle,
- mSweepAngle);
- }
-
- @Override
- public String toString() {
- return "DrawArc " + mLeft + " " + mTop
- + " " + mRight + " " + mBottom + " "
- + "- " + mStartAngle + " " + mSweepAngle + ";";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float sLeft = buffer.readFloat();
- float srcTop = buffer.readFloat();
- float srcRight = buffer.readFloat();
- float srcBottom = buffer.readFloat();
- float mStartAngle = buffer.readFloat();
- float mSweepAngle = buffer.readFloat();
- DrawArc op = new DrawArc(sLeft, srcTop, srcRight, srcBottom,
- mStartAngle, mSweepAngle);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "DrawArc";
- }
-
- @Override
- public int id() {
- return Operations.DRAW_ARC;
- }
-
- public void apply(WireBuffer buffer,
- float left,
- float top,
- float right,
- float bottom,
- float startAngle,
- float sweepAngle) {
- buffer.start(Operations.DRAW_ARC);
- buffer.writeFloat(left);
- buffer.writeFloat(top);
- buffer.writeFloat(right);
- buffer.writeFloat(bottom);
- buffer.writeFloat(startAngle);
- buffer.writeFloat(sweepAngle);
- }
+ public DrawArc(float v1,
+ float v2,
+ float v3,
+ float v4,
+ float v5,
+ float v6) {
+ super(v1, v2, v3, v4, v5, v6);
+ mName = "DrawArc";
}
@Override
public void paint(PaintContext context) {
- context.drawArc(mLeft,
- mTop,
- mRight,
- mBottom,
- mStartAngle,
- mSweepAngle);
+ context.drawArc(mV1, mV2, mV3, mV4, mV5, mV6);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase2.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase2.java
new file mode 100644
index 0000000..0963c13
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase2.java
@@ -0,0 +1,134 @@
+/*
+ * 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 static com.android.internal.widget.remotecompose.core.operations.Utils.floatToString;
+
+import com.android.internal.widget.remotecompose.core.CompanionOperation;
+import com.android.internal.widget.remotecompose.core.Operation;
+import com.android.internal.widget.remotecompose.core.Operations;
+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 java.util.List;
+
+/**
+ * Base class for commands that take 3 float
+ */
+public abstract class DrawBase2 extends PaintOperation
+ implements VariableSupport {
+ public static final Companion COMPANION =
+ new Companion(Operations.DRAW_CIRCLE) {
+ @Override
+ public Operation construct(float x1, float y1) {
+ // subclass should return new DrawX(x1, y1);
+ return null;
+ }
+ };
+ protected String mName = "DrawRectBase";
+ float mV1;
+ float mV2;
+ float mValue1;
+ float mValue2;
+
+ public DrawBase2(float v1, float v2) {
+ mValue1 = v1;
+ mValue2 = v2;
+ mV1 = v1;
+ mV2 = v2;
+ }
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ mV1 = (Float.isNaN(mValue1))
+ ? context.getFloat(Utils.idFromNan(mValue1)) : mValue1;
+ mV2 = (Float.isNaN(mValue2))
+ ? context.getFloat(Utils.idFromNan(mValue2)) : mValue2;
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ if (Float.isNaN(mValue1)) {
+ context.listensTo(Utils.idFromNan(mValue1), this);
+ }
+ if (Float.isNaN(mValue2)) {
+ context.listensTo(Utils.idFromNan(mValue2), this);
+ }
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mV1, mV2);
+ }
+
+ @Override
+ public String toString() {
+ return mName + " " + floatToString(mV1) + " " + floatToString(mV2);
+ }
+
+ public static class Companion implements CompanionOperation {
+ public final int OP_CODE;
+
+ protected Companion(int code) {
+ OP_CODE = code;
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ float v1 = buffer.readFloat();
+ float v2 = buffer.readFloat();
+
+ Operation op = construct(v1, v2);
+ operations.add(op);
+ }
+
+ /**
+ * Override to construct a 2 float value operation
+ * @param x1
+ * @param y1
+ * @return
+ */
+ public Operation construct(float x1, float y1) {
+ return null;
+ }
+
+ @Override
+ public String name() {
+ return "DrawRect";
+ }
+
+ @Override
+ public int id() {
+ return OP_CODE;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param x1
+ * @param y1
+ */
+ public void apply(WireBuffer buffer,
+ float x1,
+ float y1) {
+ buffer.start(OP_CODE);
+ buffer.writeFloat(x1);
+ buffer.writeFloat(y1);
+ }
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase3.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase3.java
new file mode 100644
index 0000000..56b2f1f
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase3.java
@@ -0,0 +1,157 @@
+/*
+ * 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 static com.android.internal.widget.remotecompose.core.operations.Utils.floatToString;
+
+import com.android.internal.widget.remotecompose.core.CompanionOperation;
+import com.android.internal.widget.remotecompose.core.Operation;
+import com.android.internal.widget.remotecompose.core.Operations;
+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 java.util.List;
+
+/**
+ * Base class for commands that take 3 float
+ */
+public abstract class DrawBase3 extends PaintOperation
+ implements VariableSupport {
+ public static final Companion COMPANION =
+ new Companion(Operations.DRAW_CIRCLE) {
+ @Override
+ public Operation construct(float x1, float y1, float x2) {
+ // subclass should return new DrawX(x1, y1, x2, y2);
+ return null;
+ }
+ };
+ protected String mName = "DrawRectBase";
+ float mV1;
+ float mV2;
+ float mV3;
+ float mValue1;
+ float mValue2;
+ float mValue3;
+
+ public DrawBase3(
+ float v1,
+ float v2,
+ float v3) {
+ mValue1 = v1;
+ mValue2 = v2;
+ mValue3 = v3;
+
+ mV1 = v1;
+ mV2 = v2;
+ mV3 = v3;
+ }
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ mV1 = (Float.isNaN(mValue1))
+ ? context.getFloat(Utils.idFromNan(mValue1)) : mValue1;
+ mV2 = (Float.isNaN(mValue2))
+ ? context.getFloat(Utils.idFromNan(mValue2)) : mValue2;
+ mV3 = (Float.isNaN(mValue3))
+ ? context.getFloat(Utils.idFromNan(mValue3)) : mValue3;
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ if (Float.isNaN(mValue1)) {
+ context.listensTo(Utils.idFromNan(mValue1), this);
+ }
+ if (Float.isNaN(mValue2)) {
+ context.listensTo(Utils.idFromNan(mValue2), this);
+ }
+ if (Float.isNaN(mValue3)) {
+ context.listensTo(Utils.idFromNan(mValue3), this);
+ }
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mV1, mV2, mV3);
+ }
+
+ @Override
+ public String toString() {
+ return mName + " " + floatToString(mV1) + " " + floatToString(mV2)
+ + " " + floatToString(mV3);
+ }
+
+ public static class Companion implements CompanionOperation {
+ public final int OP_CODE;
+
+ protected Companion(int code) {
+ OP_CODE = code;
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ float v1 = buffer.readFloat();
+ float v2 = buffer.readFloat();
+ float v3 = buffer.readFloat();
+
+ Operation op = construct(v1, v2, v3);
+ operations.add(op);
+ }
+
+ /**
+ * Construct and Operation from the 3 variables.
+ * This must be overridden by subclasses
+ * @param x1
+ * @param y1
+ * @param x2
+ * @return
+ */
+ public Operation construct(float x1,
+ float y1,
+ float x2) {
+ return null;
+ }
+
+ @Override
+ public String name() {
+ return "DrawRect";
+ }
+
+ @Override
+ public int id() {
+ return OP_CODE;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param x1
+ * @param y1
+ * @param x2
+ */
+ public void apply(WireBuffer buffer,
+ float x1,
+ float y1,
+ float x2) {
+ buffer.start(OP_CODE);
+ buffer.writeFloat(x1);
+ buffer.writeFloat(y1);
+ buffer.writeFloat(x2);
+
+ }
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase4.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase4.java
new file mode 100644
index 0000000..ec35a16
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase4.java
@@ -0,0 +1,171 @@
+/*
+ * 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 static com.android.internal.widget.remotecompose.core.operations.Utils.floatToString;
+
+import com.android.internal.widget.remotecompose.core.CompanionOperation;
+import com.android.internal.widget.remotecompose.core.Operation;
+import com.android.internal.widget.remotecompose.core.Operations;
+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 java.util.List;
+
+/**
+ * Base class for draw commands that take 4 floats
+ */
+public abstract class DrawBase4 extends PaintOperation
+ implements VariableSupport {
+ public static final Companion COMPANION =
+ new Companion(Operations.DRAW_RECT) {
+ @Override
+ public Operation construct(float x1, float y1, float x2, float y2) {
+ // return new DrawRectBase(x1, y1, x2, y2);
+ return null;
+ }
+ };
+ protected String mName = "DrawRectBase";
+ float mX1;
+ float mY1;
+ float mX2;
+ float mY2;
+ float mX1Value;
+ float mY1Value;
+ float mX2Value;
+ float mY2Value;
+
+ public DrawBase4(
+ float x1,
+ float y1,
+ float x2,
+ float y2) {
+ mX1Value = x1;
+ mY1Value = y1;
+ mX2Value = x2;
+ mY2Value = y2;
+
+ mX1 = x1;
+ mY1 = y1;
+ mX2 = x2;
+ mY2 = y2;
+ }
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ mX1 = (Float.isNaN(mX1Value))
+ ? context.getFloat(Utils.idFromNan(mX1Value)) : mX1Value;
+ mY1 = (Float.isNaN(mY1Value))
+ ? context.getFloat(Utils.idFromNan(mY1Value)) : mY1Value;
+ mX2 = (Float.isNaN(mX2Value))
+ ? context.getFloat(Utils.idFromNan(mX2Value)) : mX2Value;
+ mY2 = (Float.isNaN(mY2Value))
+ ? context.getFloat(Utils.idFromNan(mY2Value)) : mY2Value;
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ if (Float.isNaN(mX1Value)) {
+ context.listensTo(Utils.idFromNan(mX1Value), this);
+ }
+ if (Float.isNaN(mY1Value)) {
+ context.listensTo(Utils.idFromNan(mY1Value), this);
+ }
+ if (Float.isNaN(mX2Value)) {
+ context.listensTo(Utils.idFromNan(mX2Value), this);
+ }
+ if (Float.isNaN(mY2Value)) {
+ context.listensTo(Utils.idFromNan(mY2Value), this);
+ }
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mX1, mY1, mX2, mY2);
+ }
+
+ @Override
+ public String toString() {
+ return mName + " " + floatToString(mX1Value, mX1) + " " + floatToString(mY1Value, mY1)
+ + " " + floatToString(mX2Value, mX2) + " " + floatToString(mY2Value, mY2);
+ }
+
+ public static class Companion implements CompanionOperation {
+ public final int OP_CODE;
+
+ protected Companion(int code) {
+ OP_CODE = code;
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ float sLeft = buffer.readFloat();
+ float srcTop = buffer.readFloat();
+ float srcRight = buffer.readFloat();
+ float srcBottom = buffer.readFloat();
+
+ Operation op = construct(sLeft, srcTop, srcRight, srcBottom);
+ operations.add(op);
+ }
+
+ /**
+ * Construct and Operation from the 3 variables.
+ * @param x1
+ * @param y1
+ * @param x2
+ * @param y2
+ * @return
+ */
+ public Operation construct(float x1,
+ float y1,
+ float x2,
+ float y2) {
+ return null;
+ }
+
+ @Override
+ public String name() {
+ return "DrawRect";
+ }
+
+ @Override
+ public int id() {
+ return OP_CODE;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param x1
+ * @param y1
+ * @param x2
+ * @param y2
+ */
+ public void apply(WireBuffer buffer,
+ float x1,
+ float y1,
+ float x2,
+ float y2) {
+ buffer.start(OP_CODE);
+ buffer.writeFloat(x1);
+ buffer.writeFloat(y1);
+ buffer.writeFloat(x2);
+ buffer.writeFloat(y2);
+ }
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase6.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase6.java
new file mode 100644
index 0000000..2f4335e
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBase6.java
@@ -0,0 +1,202 @@
+/*
+ * 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 static com.android.internal.widget.remotecompose.core.operations.Utils.floatToString;
+
+import com.android.internal.widget.remotecompose.core.CompanionOperation;
+import com.android.internal.widget.remotecompose.core.Operation;
+import com.android.internal.widget.remotecompose.core.Operations;
+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 java.util.List;
+
+/**
+ * Base class for draw commands the take 6 floats
+ */
+public abstract class DrawBase6 extends PaintOperation
+ implements VariableSupport {
+ public static final Companion COMPANION =
+ new Companion(Operations.DRAW_RECT) {
+ public Operation construct(float x1, float y1, float x2, float y2) {
+ // return new DrawRectBase(x1, y1, x2, y2);
+ return null;
+ }
+ };
+ protected String mName = "DrawRectBase";
+ float mV1;
+ float mV2;
+ float mV3;
+ float mV4;
+ float mV5;
+ float mV6;
+ float mValue1;
+ float mValue2;
+ float mValue3;
+ float mValue4;
+ float mValue5;
+ float mValue6;
+
+ public DrawBase6(
+ float v1,
+ float v2,
+ float v3,
+ float v4,
+ float v5,
+ float v6) {
+ mValue1 = v1;
+ mValue2 = v2;
+ mValue3 = v3;
+ mValue4 = v4;
+ mValue5 = v5;
+ mValue6 = v6;
+
+ mV1 = v1;
+ mV2 = v2;
+ mV3 = v3;
+ mV4 = v4;
+ mV5 = v5;
+ mV6 = v6;
+ }
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ mV1 = (Float.isNaN(mValue1))
+ ? context.getFloat(Utils.idFromNan(mValue1)) : mValue1;
+ mV2 = (Float.isNaN(mValue2))
+ ? context.getFloat(Utils.idFromNan(mValue2)) : mValue2;
+ mV3 = (Float.isNaN(mValue3))
+ ? context.getFloat(Utils.idFromNan(mValue3)) : mValue3;
+ mV4 = (Float.isNaN(mValue4))
+ ? context.getFloat(Utils.idFromNan(mValue4)) : mValue4;
+ mV5 = (Float.isNaN(mValue5))
+ ? context.getFloat(Utils.idFromNan(mValue5)) : mValue5;
+ mV6 = (Float.isNaN(mValue6))
+ ? context.getFloat(Utils.idFromNan(mValue6)) : mValue6;
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ if (Float.isNaN(mValue1)) {
+ context.listensTo(Utils.idFromNan(mValue1), this);
+ }
+ if (Float.isNaN(mValue2)) {
+ context.listensTo(Utils.idFromNan(mValue2), this);
+ }
+ if (Float.isNaN(mValue3)) {
+ context.listensTo(Utils.idFromNan(mValue3), this);
+ }
+ if (Float.isNaN(mValue4)) {
+ context.listensTo(Utils.idFromNan(mValue4), this);
+ }
+ if (Float.isNaN(mValue5)) {
+ context.listensTo(Utils.idFromNan(mValue5), this);
+ }
+ if (Float.isNaN(mValue6)) {
+ context.listensTo(Utils.idFromNan(mValue6), this);
+ }
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mV1, mV2, mV3, mV4, mV5, mV6);
+ }
+
+ @Override
+ public String toString() {
+ return mName + " " + floatToString(mV1) + " " + floatToString(mV2)
+ + " " + floatToString(mV3) + " " + floatToString(mV4);
+ }
+
+ public static class Companion implements CompanionOperation {
+ public final int OP_CODE;
+
+ protected Companion(int code) {
+ OP_CODE = code;
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ float sv1 = buffer.readFloat();
+ float sv2 = buffer.readFloat();
+ float sv3 = buffer.readFloat();
+ float sv4 = buffer.readFloat();
+ float sv5 = buffer.readFloat();
+ float sv6 = buffer.readFloat();
+
+ Operation op = construct(sv1, sv2, sv3, sv4, sv5, sv6);
+ operations.add(op);
+ }
+
+ /**
+ * writes out a the operation to the buffer.
+ * @param v1
+ * @param v2
+ * @param v3
+ * @param v4
+ * @param v5
+ * @param v6
+ * @return
+ */
+ public Operation construct(float v1,
+ float v2,
+ float v3,
+ float v4,
+ float v5,
+ float v6) {
+ return null;
+ }
+
+ @Override
+ public String name() {
+ return "DrawRect";
+ }
+
+ @Override
+ public int id() {
+ return OP_CODE;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param v1
+ * @param v2
+ * @param v3
+ * @param v4
+ * @param v5
+ * @param v6
+ */
+ public void apply(WireBuffer buffer,
+ float v1,
+ float v2,
+ float v3,
+ float v4,
+ float v5,
+ float v6) {
+ buffer.start(OP_CODE);
+ buffer.writeFloat(v1);
+ buffer.writeFloat(v2);
+ buffer.writeFloat(v3);
+ buffer.writeFloat(v4);
+ buffer.writeFloat(v5);
+ buffer.writeFloat(v6);
+ }
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBitmap.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBitmap.java
index 2e971f5..ca40d12 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBitmap.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawBitmap.java
@@ -20,16 +20,22 @@
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 java.util.List;
-public class DrawBitmap extends PaintOperation {
+public class DrawBitmap extends PaintOperation implements VariableSupport {
public static final Companion COMPANION = new Companion();
float mLeft;
float mTop;
float mRight;
float mBottom;
+ float mOutputLeft;
+ float mOutputTop;
+ float mOutputRight;
+ float mOutputBottom;
int mId;
int mDescriptionId = 0;
@@ -49,6 +55,34 @@
}
@Override
+ public void updateVariables(RemoteContext context) {
+ mOutputLeft = (Float.isNaN(mLeft))
+ ? context.getFloat(Utils.idFromNan(mLeft)) : mLeft;
+ mOutputTop = (Float.isNaN(mTop))
+ ? context.getFloat(Utils.idFromNan(mTop)) : mTop;
+ mOutputRight = (Float.isNaN(mRight))
+ ? context.getFloat(Utils.idFromNan(mRight)) : mRight;
+ mOutputBottom = (Float.isNaN(mBottom))
+ ? context.getFloat(Utils.idFromNan(mBottom)) : mBottom;
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ if (Float.isNaN(mLeft)) {
+ context.listensTo(Utils.idFromNan(mLeft), this);
+ }
+ if (Float.isNaN(mTop)) {
+ context.listensTo(Utils.idFromNan(mTop), this);
+ }
+ if (Float.isNaN(mRight)) {
+ context.listensTo(Utils.idFromNan(mRight), this);
+ }
+ if (Float.isNaN(mBottom)) {
+ context.listensTo(Utils.idFromNan(mBottom), this);
+ }
+ }
+
+ @Override
public void write(WireBuffer buffer) {
COMPANION.apply(buffer, mId, mLeft, mTop, mRight, mBottom, mDescriptionId);
}
@@ -105,9 +139,9 @@
@Override
public void paint(PaintContext context) {
- context.drawBitmap(mId, mLeft,
- mTop,
- mRight,
- mBottom);
+ context.drawBitmap(mId, mOutputLeft,
+ mOutputTop,
+ mOutputRight,
+ mOutputBottom);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawCircle.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawCircle.java
index 9ce754d..3a22e4f 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawCircle.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawCircle.java
@@ -1,89 +1,31 @@
-/*
- * 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 com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
+public class DrawCircle extends DrawBase3 {
+ public static final Companion COMPANION =
+ new Companion(Operations.DRAW_CIRCLE) {
+ @Override
+ public Operation construct(float x1,
+ float y1,
+ float x2
+ ) {
+ return new DrawCircle(x1, y1, x2);
+ }
+ };
-public class DrawCircle extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mCenterX;
- float mCenterY;
- float mRadius;
-
- public DrawCircle(float centerX, float centerY, float radius) {
- mCenterX = centerX;
- mCenterY = centerY;
- mRadius = radius;
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mCenterX,
- mCenterY,
- mRadius);
- }
-
- @Override
- public String toString() {
- return "";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float centerX = buffer.readFloat();
- float centerY = buffer.readFloat();
- float radius = buffer.readFloat();
-
- DrawCircle op = new DrawCircle(centerX, centerY, radius);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "";
- }
-
- @Override
- public int id() {
- return 0;
- }
-
- public void apply(WireBuffer buffer, float centerX, float centerY, float radius) {
- buffer.start(Operations.DRAW_CIRCLE);
- buffer.writeFloat(centerX);
- buffer.writeFloat(centerY);
- buffer.writeFloat(radius);
- }
+ public DrawCircle(
+ float left,
+ float top,
+ float right) {
+ super(left, top, right);
+ mName = "DrawCircle";
}
@Override
public void paint(PaintContext context) {
- context.drawCircle(mCenterX,
- mCenterY,
- mRadius);
+ context.drawCircle(mV1, mV2, mV3);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawLine.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawLine.java
index c7a8315..c70c6ea 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawLine.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawLine.java
@@ -15,83 +15,28 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
-import com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
-
-public class DrawLine extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mX1;
- float mY1;
- float mX2;
- float mY2;
+public class DrawLine extends DrawBase4 {
+ public static final Companion COMPANION = new Companion(Operations.DRAW_LINE) {
+ @Override
+ public Operation construct(float x1,
+ float y1,
+ float x2,
+ float y2) {
+ return new DrawLine(x1, y1, x2, y2);
+ }
+ };
public DrawLine(
- float x1,
- float y1,
- float x2,
- float y2) {
- mX1 = x1;
- mY1 = y1;
- mX2 = x2;
- mY2 = y2;
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mX1,
- mY1,
- mX2,
- mY2);
- }
-
- @Override
- public String toString() {
- return "DrawArc " + mX1 + " " + mY1
- + " " + mX2 + " " + mY2 + ";";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float x1 = buffer.readFloat();
- float y1 = buffer.readFloat();
- float x2 = buffer.readFloat();
- float y2 = buffer.readFloat();
-
- DrawLine op = new DrawLine(x1, y1, x2, y2);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "DrawLine";
- }
-
- @Override
- public int id() {
- return Operations.DRAW_LINE;
- }
-
- public void apply(WireBuffer buffer,
- float x1,
- float y1,
- float x2,
- float y2) {
- buffer.start(Operations.DRAW_LINE);
- buffer.writeFloat(x1);
- buffer.writeFloat(y1);
- buffer.writeFloat(x2);
- buffer.writeFloat(y2);
- }
+ float left,
+ float top,
+ float right,
+ float bottom) {
+ super(left, top, right, bottom);
+ mName = "DrawLine";
}
@Override
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawOval.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawOval.java
index 7143753..ba17994 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawOval.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawOval.java
@@ -15,88 +15,33 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
-import com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
-
-public class DrawOval extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mLeft;
- float mTop;
- float mRight;
- float mBottom;
-
+public class DrawOval extends DrawBase4 {
+ public static final Companion COMPANION =
+ new Companion(Operations.DRAW_OVAL) {
+ @Override
+ public Operation construct(float x1,
+ float y1,
+ float x2,
+ float y2) {
+ return new DrawOval(x1, y1, x2, y2);
+ }
+ };
public DrawOval(
float left,
float top,
float right,
float bottom) {
- mLeft = left;
- mTop = top;
- mRight = right;
- mBottom = bottom;
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mLeft, mTop, mRight, mBottom);
- }
-
- @Override
- public String toString() {
- return "DrawOval " + mLeft + " " + mTop
- + " " + mRight + " " + mBottom + ";";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float sLeft = buffer.readFloat();
- float srcTop = buffer.readFloat();
- float srcRight = buffer.readFloat();
- float srcBottom = buffer.readFloat();
-
- DrawOval op = new DrawOval(sLeft, srcTop, srcRight, srcBottom);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "DrawOval";
- }
-
- @Override
- public int id() {
- return Operations.DRAW_OVAL;
- }
-
- public void apply(WireBuffer buffer,
- float left,
- float top,
- float right,
- float bottom) {
- buffer.start(Operations.DRAW_OVAL);
- buffer.writeFloat(left);
- buffer.writeFloat(top);
- buffer.writeFloat(right);
- buffer.writeFloat(bottom);
- }
+ super(left, top, right, bottom);
+ mName = "DrawOval";
}
@Override
public void paint(PaintContext context) {
- context.drawOval(mLeft,
- mTop,
- mRight,
- mBottom);
+ context.drawOval(mX1, mY1, mX2, mY2);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawPath.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawPath.java
index 7b8a9e9..6dbc5a6 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawPath.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawPath.java
@@ -41,7 +41,7 @@
@Override
public String toString() {
- return "DrawPath " + ";";
+ return "DrawPath " + "[" + mId + "]" + ", " + mStart + ", " + mEnd;
}
public static class Companion implements CompanionOperation {
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawRect.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawRect.java
index 4775241..633aed4 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawRect.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawRect.java
@@ -15,88 +15,37 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
-import com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
-
-public class DrawRect extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mLeft;
- float mTop;
- float mRight;
- float mBottom;
+/**
+ * Draw a Rectangle
+ */
+public class DrawRect extends DrawBase4 {
+ public static final Companion COMPANION =
+ new Companion(Operations.DRAW_RECT) {
+ @Override
+ public Operation construct(float x1,
+ float y1,
+ float x2,
+ float y2) {
+ return new DrawRect(x1, y1, x2, y2);
+ }
+ };
public DrawRect(
float left,
float top,
float right,
float bottom) {
- mLeft = left;
- mTop = top;
- mRight = right;
- mBottom = bottom;
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mLeft, mTop, mRight, mBottom);
- }
-
- @Override
- public String toString() {
- return "DrawRect " + mLeft + " " + mTop
- + " " + mRight + " " + mBottom + ";";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float sLeft = buffer.readFloat();
- float srcTop = buffer.readFloat();
- float srcRight = buffer.readFloat();
- float srcBottom = buffer.readFloat();
-
- DrawRect op = new DrawRect(sLeft, srcTop, srcRight, srcBottom);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "DrawRect";
- }
-
- @Override
- public int id() {
- return Operations.DRAW_RECT;
- }
-
- public void apply(WireBuffer buffer,
- float left,
- float top,
- float right,
- float bottom) {
- buffer.start(Operations.DRAW_RECT);
- buffer.writeFloat(left);
- buffer.writeFloat(top);
- buffer.writeFloat(right);
- buffer.writeFloat(bottom);
- }
+ super(left, top, right, bottom);
+ mName = "DrawRect";
}
@Override
public void paint(PaintContext context) {
- context.drawRect(mLeft,
- mTop,
- mRight,
- mBottom);
+ context.drawRect(mX1, mY1, mX2, mY2);
}
}
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 8da16e7..b9d0a67 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
@@ -15,104 +15,40 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
-import com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
+/**
+ * Draw a rounded rectangle
+ */
+public class DrawRoundRect extends DrawBase6 {
+ public static final Companion COMPANION =
+ new Companion(Operations.DRAW_ROUND_RECT) {
+ @Override
+ public Operation construct(float v1,
+ float v2,
+ float v3,
+ float v4,
+ float v5,
+ float v6) {
+ return new DrawRoundRect(v1, v2, v3, v4, v5, v6);
+ }
+ };
-public class DrawRoundRect extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mLeft;
- float mTop;
- float mRight;
- float mBottom;
- float mRadiusX;
- float mRadiusY;
-
- public DrawRoundRect(
- float left,
- float top,
- float right,
- float bottom,
- float radiusX,
- float radiusY) {
- mLeft = left;
- mTop = top;
- mRight = right;
- mBottom = bottom;
- mRadiusX = radiusX;
- mRadiusY = radiusY;
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mLeft, mTop, mRight, mBottom, mRadiusX, mRadiusY);
- }
-
- @Override
- public String toString() {
- return "DrawRoundRect " + mLeft + " " + mTop
- + " " + mRight + " " + mBottom
- + " (" + mRadiusX + " " + mRadiusY + ");";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float sLeft = buffer.readFloat();
- float srcTop = buffer.readFloat();
- float srcRight = buffer.readFloat();
- float srcBottom = buffer.readFloat();
- float srcRadiusX = buffer.readFloat();
- float srcRadiusY = buffer.readFloat();
-
- DrawRoundRect op = new DrawRoundRect(sLeft, srcTop, srcRight,
- srcBottom, srcRadiusX, srcRadiusY);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "DrawOval";
- }
-
- @Override
- public int id() {
- return Operations.DRAW_ROUND_RECT;
- }
-
- public void apply(WireBuffer buffer,
- float left,
- float top,
- float right,
- float bottom,
- float radiusX,
- float radiusY) {
- buffer.start(Operations.DRAW_ROUND_RECT);
- buffer.writeFloat(left);
- buffer.writeFloat(top);
- buffer.writeFloat(right);
- buffer.writeFloat(bottom);
- buffer.writeFloat(radiusX);
- buffer.writeFloat(radiusY);
- }
+ public DrawRoundRect(float v1,
+ float v2,
+ float v3,
+ float v4,
+ float v5,
+ float v6) {
+ super(v1, v2, v3, v4, v5, v6);
+ mName = "ClipRect";
}
@Override
public void paint(PaintContext context) {
- context.drawRoundRect(mLeft,
- mTop,
- mRight,
- mBottom,
- mRadiusX,
- mRadiusY
+ context.drawRoundRect(mV1, mV2, mV3, mV4, mV5, mV6
);
}
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
new file mode 100644
index 0000000..f8f8afd
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawText.java
@@ -0,0 +1,136 @@
+/*
+ * 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 com.android.internal.widget.remotecompose.core.CompanionOperation;
+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.WireBuffer;
+
+import java.util.List;
+
+/**
+ * Draw Text
+ */
+public class DrawText extends PaintOperation {
+ public static final Companion COMPANION = new Companion();
+ int mTextID;
+ int mStart = 0;
+ int mEnd = 0;
+ int mContextStart = 0;
+ int mContextEnd = 0;
+ float mX = 0f;
+ float mY = 0f;
+ boolean mRtl = false;
+
+ public DrawText(int textID,
+ int start,
+ int end,
+ int contextStart,
+ int contextEnd,
+ float x,
+ float y,
+ boolean rtl) {
+ mTextID = textID;
+ mStart = start;
+ mEnd = end;
+ mContextStart = contextStart;
+ mContextEnd = contextEnd;
+ mX = x;
+ mY = y;
+ mRtl = rtl;
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mTextID, mStart, mEnd, mContextStart, mContextEnd, mX, mY, mRtl);
+
+ }
+
+ @Override
+ public String toString() {
+ return "DrawTextRun [" + mTextID + "] " + mStart + ", " + mEnd + ", " + mX + ", " + mY;
+ }
+
+ public static class Companion implements CompanionOperation {
+ private Companion() {
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ int text = buffer.readInt();
+ int start = buffer.readInt();
+ int end = buffer.readInt();
+ int contextStart = buffer.readInt();
+ int contextEnd = buffer.readInt();
+ float x = buffer.readFloat();
+ float y = buffer.readFloat();
+ boolean rtl = buffer.readBoolean();
+ DrawText op = new DrawText(text, start, end, contextStart, contextEnd, x, y, rtl);
+
+ operations.add(op);
+ }
+
+ @Override
+ public String name() {
+ return "";
+ }
+
+ @Override
+ public int id() {
+ return 0;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param textID
+ * @param start
+ * @param end
+ * @param contextStart
+ * @param contextEnd
+ * @param x
+ * @param y
+ * @param rtl
+ */
+ public void apply(WireBuffer buffer,
+ int textID,
+ int start,
+ int end,
+ int contextStart,
+ int contextEnd,
+ float x,
+ float y,
+ boolean rtl) {
+ buffer.start(Operations.DRAW_TEXT_RUN);
+ buffer.writeInt(textID);
+ buffer.writeInt(start);
+ buffer.writeInt(end);
+ buffer.writeInt(contextStart);
+ buffer.writeInt(contextEnd);
+ buffer.writeFloat(x);
+ buffer.writeFloat(y);
+ buffer.writeBoolean(rtl);
+ }
+ }
+
+ @Override
+ public void paint(PaintContext context) {
+ context.drawTextRun(mTextID, mStart, mEnd, mContextStart, mContextEnd, mX, mY, mRtl);
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTextAnchored.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTextAnchored.java
new file mode 100644
index 0000000..4f0641f
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTextAnchored.java
@@ -0,0 +1,204 @@
+/*
+ * 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 com.android.internal.widget.remotecompose.core.CompanionOperation;
+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 java.util.List;
+
+/**
+ * Draw Text in Anchored to a point
+ */
+public class DrawTextAnchored extends PaintOperation implements VariableSupport {
+ public static final Companion COMPANION = new Companion();
+ int mTextID;
+ float mX;
+ float mY;
+ float mPanX;
+ float mPanY;
+ int mFlags;
+ float mOutX;
+ float mOutY;
+ float mOutPanX;
+ float mOutPanY;
+
+ public static final int ANCHOR_TEXT_RTL = 1;
+ public static final int ANCHOR_MONOSPACE_MEASURE = 2;
+
+ public DrawTextAnchored(int textID,
+ float x,
+ float y,
+ float panX,
+ float panY,
+ int flags) {
+ mTextID = textID;
+ mX = x;
+ mY = y;
+ mOutX = mX;
+ mOutY = mY;
+ mFlags = flags;
+ mOutPanX = mPanX = panX;
+ mOutPanY = mPanY = panY;
+ }
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ mOutX = (Float.isNaN(mX))
+ ? context.getFloat(Utils.idFromNan(mX)) : mX;
+ mOutY = (Float.isNaN(mY))
+ ? context.getFloat(Utils.idFromNan(mY)) : mY;
+ mOutPanX = (Float.isNaN(mPanX))
+ ? context.getFloat(Utils.idFromNan(mPanX)) : mPanX;
+ mOutPanY = (Float.isNaN(mPanY))
+ ? context.getFloat(Utils.idFromNan(mPanY)) : mPanY;
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ if (Float.isNaN(mX)) {
+ context.listensTo(Utils.idFromNan(mX), this);
+ }
+ if (Float.isNaN(mY)) {
+ context.listensTo(Utils.idFromNan(mY), this);
+ }
+ if (Float.isNaN(mPanX)) {
+ context.listensTo(Utils.idFromNan(mPanX), this);
+ }
+ if (Float.isNaN(mPanY) && Utils.idFromNan(mPanY) > 0) {
+ context.listensTo(Utils.idFromNan(mPanY), this);
+ }
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mTextID, mX,
+ mY,
+ mPanX,
+ mPanY,
+ mFlags);
+ }
+
+ @Override
+ public String toString() {
+ return "DrawTextAnchored [" + mTextID + "] " + floatToStr(mX) + ", "
+ + floatToStr(mY) + ", "
+ + floatToStr(mPanX) + ", " + floatToStr(mPanY) + ", "
+ + Integer.toBinaryString(mFlags);
+ }
+
+ private static String floatToStr(float v) {
+ if (Float.isNaN(v)) {
+ return "[" + Utils.idFromNan(v) + "]";
+ }
+ return Float.toString(v);
+ }
+
+ public static class Companion implements CompanionOperation {
+ private Companion() {
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ int textID = buffer.readInt();
+ float x = buffer.readFloat();
+ float y = buffer.readFloat();
+ float panX = buffer.readFloat();
+ float panY = buffer.readFloat();
+ int flags = buffer.readInt();
+
+ DrawTextAnchored op = new DrawTextAnchored(textID,
+ x, y,
+ panX, panY,
+ flags);
+
+ operations.add(op);
+ }
+
+ @Override
+ public String name() {
+ return "";
+ }
+
+ @Override
+ public int id() {
+ return 0;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param textID
+ * @param x
+ * @param y
+ * @param panX
+ * @param panY
+ * @param flags
+ */
+ public void apply(WireBuffer buffer,
+ int textID,
+ float x,
+ float y,
+ float panX,
+ float panY,
+ int flags) {
+ buffer.start(Operations.DRAW_TEXT_ANCHOR);
+ buffer.writeInt(textID);
+ buffer.writeFloat(x);
+ buffer.writeFloat(y);
+ buffer.writeFloat(panX);
+ buffer.writeFloat(panY);
+ buffer.writeInt(flags);
+ }
+ }
+
+ float[] mBounds = new float[4];
+
+ private float getHorizontalOffset() {
+ // TODO scale TextSize / BaseTextSize;
+ float scale = 1.0f;
+
+ float textWidth = scale * (mBounds[2] - mBounds[0]);
+ float boxWidth = 0;
+ return (boxWidth - textWidth) * (1 + mOutPanX) / 2.f
+ - (scale * mBounds[0]);
+ }
+
+ private float getVerticalOffset() {
+ // TODO scale TextSize / BaseTextSize;
+ float scale = 1.0f;
+ float boxHeight = 0;
+ float textHeight = scale * (mBounds[3] - mBounds[1]);
+ return (boxHeight - textHeight) * (1 - mOutPanY) / 2
+ - (scale * mBounds[1]);
+ }
+
+ @Override
+ public void paint(PaintContext context) {
+ context.getTextBounds(mTextID, 0, -1,
+ (mFlags & ANCHOR_MONOSPACE_MEASURE) != 0, mBounds);
+ float x = mOutX + getHorizontalOffset();
+ float y = (Float.isNaN(mOutPanY)) ? mOutY : mOutY + getVerticalOffset();
+ context.drawTextRun(mTextID, 0, -1, 0, 1, x, y,
+ (mFlags & ANCHOR_TEXT_RTL) == 1);
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTextOnPath.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTextOnPath.java
index 1856e30..b1a0172 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTextOnPath.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTextOnPath.java
@@ -24,6 +24,9 @@
import java.util.List;
+/**
+ * Draw text along a path.
+ */
public class DrawTextOnPath extends PaintOperation {
public static final Companion COMPANION = new Companion();
int mPathId;
@@ -45,7 +48,8 @@
@Override
public String toString() {
- return "DrawTextOnPath " + " " + mPathId + ";";
+ return "DrawTextOnPath [" + mTextId + "] [" + mPathId + "] "
+ + mHOffset + ", " + mVOffset;
}
public static class Companion implements CompanionOperation {
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTweenPath.java b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTweenPath.java
index ef0a4ad..48fc94e 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTweenPath.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/DrawTweenPath.java
@@ -58,7 +58,7 @@
public String toString() {
return "DrawTweenPath " + mPath1Id + " " + mPath2Id
+ " " + mTween + " " + mStart + " "
- + "- " + mStop + ";";
+ + "- " + mStop;
}
public static class Companion implements CompanionOperation {
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
new file mode 100644
index 0000000..576b53f
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/FloatConstant.java
@@ -0,0 +1,93 @@
+/*
+ * 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 com.android.internal.widget.remotecompose.core.CompanionOperation;
+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.WireBuffer;
+
+import java.util.List;
+
+/**
+ * Operation to deal with Text data
+ */
+public class FloatConstant implements Operation {
+ public int mTextId;
+ public float mValue;
+ public static final Companion COMPANION = new Companion();
+ public static final int MAX_STRING_SIZE = 4000;
+
+ public FloatConstant(int textId, float value) {
+ this.mTextId = textId;
+ this.mValue = value;
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mTextId, mValue);
+ }
+
+ @Override
+ public String toString() {
+ return "FloatConstant[" + mTextId + "] = " + mValue + "";
+ }
+
+ public static class Companion implements CompanionOperation {
+ private Companion() {}
+
+ @Override
+ public String name() {
+ return "FloatExpression";
+ }
+
+ @Override
+ public int id() {
+ return Operations.DATA_FLOAT;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param textId
+ * @param value
+ */
+ public void apply(WireBuffer buffer, int textId, float value) {
+ buffer.start(Operations.DATA_FLOAT);
+ buffer.writeInt(textId);
+ buffer.writeFloat(value);
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ int textId = buffer.readInt();
+
+ float value = buffer.readFloat();
+ operations.add(new FloatConstant(textId, value));
+ }
+ }
+
+ @Override
+ public void apply(RemoteContext context) {
+ context.loadFloat(mTextId, mValue);
+ }
+
+ @Override
+ public String deepToString(String indent) {
+ return indent + toString();
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/FloatExpression.java b/core/java/com/android/internal/widget/remotecompose/core/operations/FloatExpression.java
new file mode 100644
index 0000000..354f41b
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/FloatExpression.java
@@ -0,0 +1,206 @@
+/*
+ * 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 com.android.internal.widget.remotecompose.core.CompanionOperation;
+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.operations.utilities.AnimatedFloatExpression;
+import com.android.internal.widget.remotecompose.core.operations.utilities.easing.FloatAnimation;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Operation to deal with AnimatedFloats
+ * This is designed to be an optimized calculation for things like
+ * injecting the width of the component int draw rect
+ * As well as supporting generalized animation floats.
+ * The floats represent a RPN style calculator
+ */
+public class FloatExpression implements Operation, VariableSupport {
+ public int mId;
+ public float[] mSrcValue;
+ public float[] mSrcAnimation;
+ public FloatAnimation mFloatAnimation;
+ public float[] mPreCalcValue;
+ private float mLastChange = Float.NaN;
+ AnimatedFloatExpression mExp = new AnimatedFloatExpression();
+ public static final Companion COMPANION = new Companion();
+ public static final int MAX_STRING_SIZE = 4000;
+
+ public FloatExpression(int id, float[] value, float[] animation) {
+ this.mId = id;
+ this.mSrcValue = value;
+ this.mSrcAnimation = animation;
+ if (mSrcAnimation != null) {
+ mFloatAnimation = new FloatAnimation(mSrcAnimation);
+ }
+ }
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ if (mPreCalcValue == null || mPreCalcValue.length != mSrcValue.length) {
+ mPreCalcValue = new float[mSrcValue.length];
+ }
+ //Utils.log("updateVariables ");
+ boolean value_changed = false;
+ for (int i = 0; i < mSrcValue.length; i++) {
+ float v = mSrcValue[i];
+ if (Float.isNaN(v) && !AnimatedFloatExpression.isMathOperator(v)) {
+ float newValue = context.getFloat(Utils.idFromNan(v));
+ if (mFloatAnimation != null) {
+ if (mPreCalcValue[i] != newValue) {
+ mLastChange = context.getAnimationTime();
+ value_changed = true;
+ mPreCalcValue[i] = newValue;
+ }
+ } else {
+ mPreCalcValue[i] = newValue;
+ }
+ } else {
+ mPreCalcValue[i] = mSrcValue[i];
+ }
+ }
+ if (value_changed && mFloatAnimation != null) {
+ float v = mExp.eval(Arrays.copyOf(mPreCalcValue, mPreCalcValue.length));
+ if (Float.isNaN(mFloatAnimation.getTargetValue())) {
+ mFloatAnimation.setInitialValue(v);
+ } else {
+ mFloatAnimation.setInitialValue(mFloatAnimation.getTargetValue());
+ }
+ mFloatAnimation.setTargetValue(v);
+ }
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ for (int i = 0; i < mSrcValue.length; i++) {
+ float v = mSrcValue[i];
+ if (Float.isNaN(v) && !AnimatedFloatExpression.isMathOperator(v)) {
+ context.listensTo(Utils.idFromNan(v), this);
+ }
+ }
+ }
+
+ @Override
+ public void apply(RemoteContext context) {
+ updateVariables(context);
+ float t = context.getAnimationTime();
+ if (Float.isNaN(mLastChange)) {
+ mLastChange = t;
+ }
+ if (mFloatAnimation != null) {
+ float f = mFloatAnimation.get(t - mLastChange);
+ context.loadFloat(mId, f);
+ } else {
+ context.loadFloat(mId, mExp.eval(Arrays.copyOf(mPreCalcValue, mPreCalcValue.length)));
+ }
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mId, mSrcValue, mSrcAnimation);
+ }
+
+ @Override
+ public String toString() {
+ String[] labels = new String[mSrcValue.length];
+ for (int i = 0; i < mSrcValue.length; i++) {
+ if (Float.isNaN(mSrcValue[i])) {
+ labels[i] = "[" + Utils.idFromNan(mSrcValue[i]) + "]";
+ }
+
+ }
+ return "FloatExpression[" + mId + "] = ("
+ + AnimatedFloatExpression.toString(mPreCalcValue, labels) + ")";
+ }
+
+ public static class Companion implements CompanionOperation {
+ private Companion() {
+ }
+
+ @Override
+ public String name() {
+ return "FloatExpression";
+ }
+
+ @Override
+ public int id() {
+ return Operations.ANIMATED_FLOAT;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param id
+ * @param value
+ * @param animation
+ */
+ public void apply(WireBuffer buffer, int id, float[] value, float[] animation) {
+ buffer.start(Operations.ANIMATED_FLOAT);
+ buffer.writeInt(id);
+
+ int len = value.length;
+ if (animation != null) {
+ len |= (animation.length << 16);
+ }
+ buffer.writeInt(len);
+
+ for (int i = 0; i < value.length; i++) {
+ buffer.writeFloat(value[i]);
+ }
+ if (animation != null) {
+ for (int i = 0; i < animation.length; i++) {
+ buffer.writeFloat(animation[i]);
+ }
+ }
+
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ int id = buffer.readInt();
+ int len = buffer.readInt();
+ int valueLen = len & 0xFFFF;
+ int animLen = (len >> 16) & 0xFFFF;
+ float[] values = new float[valueLen];
+ for (int i = 0; i < values.length; i++) {
+ values[i] = buffer.readFloat();
+ }
+
+ float[] animation;
+ if (animLen != 0) {
+ animation = new float[animLen];
+ for (int i = 0; i < animation.length; i++) {
+ animation[i] = buffer.readFloat();
+ }
+ } else {
+ animation = null;
+ }
+ operations.add(new FloatExpression(id, values, animation));
+ }
+ }
+
+ @Override
+ public String deepToString(String indent) {
+ return indent + toString();
+ }
+
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixRestore.java b/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixRestore.java
index 482e0e2..0dad45c 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixRestore.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixRestore.java
@@ -37,7 +37,7 @@
@Override
public String toString() {
- return "MatrixRestore;";
+ return "MatrixRestore";
}
public static class Companion implements CompanionOperation {
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixRotate.java b/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixRotate.java
index d6c89e0..bbf4135 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixRotate.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixRotate.java
@@ -15,68 +15,29 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
-import com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
-
-public class MatrixRotate extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mRotate, mPivotX, mPivotY;
+public class MatrixRotate extends DrawBase3 {
+ public static final Companion COMPANION =
+ new Companion(Operations.MATRIX_ROTATE) {
+ @Override
+ public Operation construct(float rotate,
+ float pivotX,
+ float pivotY
+ ) {
+ return new MatrixRotate(rotate, pivotX, pivotY);
+ }
+ };
public MatrixRotate(float rotate, float pivotX, float pivotY) {
- mRotate = rotate;
- mPivotX = pivotX;
- mPivotY = pivotY;
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mRotate, mPivotX, mPivotY);
- }
-
- @Override
- public String toString() {
- return "DrawArc " + mRotate + ", " + mPivotX + ", " + mPivotY + ";";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float rotate = buffer.readFloat();
- float pivotX = buffer.readFloat();
- float pivotY = buffer.readFloat();
- MatrixRotate op = new MatrixRotate(rotate, pivotX, pivotY);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "Matrix";
- }
-
- @Override
- public int id() {
- return Operations.MATRIX_ROTATE;
- }
-
- public void apply(WireBuffer buffer, float rotate, float pivotX, float pivotY) {
- buffer.start(Operations.MATRIX_ROTATE);
- buffer.writeFloat(rotate);
- buffer.writeFloat(pivotX);
- buffer.writeFloat(pivotY);
- }
+ super(rotate, pivotX, pivotY);
+ mName = "MatrixRotate";
}
@Override
public void paint(PaintContext context) {
- context.matrixRotate(mRotate, mPivotX, mPivotY);
+ context.matrixRotate(mV1, mV2, mV3);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixScale.java b/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixScale.java
index 28aa68dd..04b940b 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixScale.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixScale.java
@@ -15,74 +15,30 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
-import com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
-
-public class MatrixScale extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mScaleX, mScaleY;
- float mCenterX, mCenterY;
+public class MatrixScale extends DrawBase4 {
+ public static final Companion COMPANION =
+ new Companion(Operations.MATRIX_SCALE) {
+ @Override
+ public Operation construct(float scaleX,
+ float scaleY,
+ float centerX,
+ float centerY
+ ) {
+ return new MatrixScale(scaleX, scaleY, centerX, centerY);
+ }
+ };
public MatrixScale(float scaleX, float scaleY, float centerX, float centerY) {
- mScaleX = scaleX;
- mScaleY = scaleY;
- mCenterX = centerX;
- mCenterY = centerY;
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mScaleX, mScaleY, mCenterX, mCenterY);
- }
-
- @Override
- public String toString() {
- return "MatrixScale " + mScaleY + ", " + mScaleY + ";";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float scaleX = buffer.readFloat();
- float scaleY = buffer.readFloat();
- float centerX = buffer.readFloat();
- float centerY = buffer.readFloat();
- MatrixScale op = new MatrixScale(scaleX, scaleY, centerX, centerY);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "Matrix";
- }
-
- @Override
- public int id() {
- return Operations.MATRIX_SCALE;
- }
-
- public void apply(WireBuffer buffer, float scaleX, float scaleY,
- float centerX, float centerY) {
- buffer.start(Operations.MATRIX_SCALE);
- buffer.writeFloat(scaleX);
- buffer.writeFloat(scaleY);
- buffer.writeFloat(centerX);
- buffer.writeFloat(centerY);
-
- }
+ super(scaleX, scaleY, centerX, centerY);
+ mName = "MatrixScale";
}
@Override
public void paint(PaintContext context) {
- context.mtrixScale(mScaleX, mScaleY, mCenterX, mCenterY);
+ context.matrixScale(mX1, mY1, mX2, mY2);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixTranslate.java b/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixTranslate.java
index 3298752..4f34e98 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixTranslate.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/MatrixTranslate.java
@@ -15,65 +15,28 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
-import com.android.internal.widget.remotecompose.core.CompanionOperation;
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.WireBuffer;
-import java.util.List;
-
-public class MatrixTranslate extends PaintOperation {
- public static final Companion COMPANION = new Companion();
- float mTranslateX, mTranslateY;
+public class MatrixTranslate extends DrawBase2 {
+ public static final Companion COMPANION =
+ new Companion(Operations.MATRIX_TRANSLATE) {
+ @Override
+ public Operation construct(float x1,
+ float y1
+ ) {
+ return new MatrixTranslate(x1, y1);
+ }
+ };
public MatrixTranslate(float translateX, float translateY) {
- mTranslateX = translateX;
- mTranslateY = translateY;
- }
-
- @Override
- public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mTranslateX, mTranslateY);
- }
-
- @Override
- public String toString() {
- return "DrawArc " + mTranslateY + ", " + mTranslateY + ";";
- }
-
- public static class Companion implements CompanionOperation {
- private Companion() {
- }
-
- @Override
- public void read(WireBuffer buffer, List<Operation> operations) {
- float translateX = buffer.readFloat();
- float translateY = buffer.readFloat();
- MatrixTranslate op = new MatrixTranslate(translateX, translateY);
- operations.add(op);
- }
-
- @Override
- public String name() {
- return "Matrix";
- }
-
- @Override
- public int id() {
- return Operations.MATRIX_TRANSLATE;
- }
-
- public void apply(WireBuffer buffer, float translateX, float translateY) {
- buffer.start(Operations.MATRIX_TRANSLATE);
- buffer.writeFloat(translateX);
- buffer.writeFloat(translateY);
- }
+ super(translateX, translateY);
+ mName = "MatrixTranslate";
}
@Override
public void paint(PaintContext context) {
- context.matrixTranslate(mTranslateX, mTranslateY);
+ context.matrixTranslate(mV1, mV2);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/NamedVariable.java b/core/java/com/android/internal/widget/remotecompose/core/operations/NamedVariable.java
new file mode 100644
index 0000000..0c5b286
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/NamedVariable.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.widget.remotecompose.core.operations;
+
+import com.android.internal.widget.remotecompose.core.CompanionOperation;
+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.WireBuffer;
+
+import java.util.List;
+
+/**
+ * Operation to deal with Text data
+ */
+public class NamedVariable implements Operation {
+ public int mVarId;
+ public String mVarName;
+ public int mVarType;
+ public static final Companion COMPANION = new Companion();
+ public static final int MAX_STRING_SIZE = 4000;
+
+ public NamedVariable(int varId, int varType, String name) {
+ this.mVarId = varId;
+ this.mVarType = varType;
+ this.mVarName = name;
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mVarId, mVarType, mVarName);
+ }
+
+ @Override
+ public String toString() {
+ return "VariableName[" + mVarId + "] = \""
+ + Utils.trimString(mVarName, 10) + "\" type=" + mVarType;
+ }
+
+ public static class Companion implements CompanionOperation {
+ private Companion() {
+ }
+
+ @Override
+ public String name() {
+ return "TextData";
+ }
+
+ @Override
+ public int id() {
+ return Operations.DATA_TEXT;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param varId
+ * @param varType
+ * @param text
+ */
+ public void apply(WireBuffer buffer, int varId, int varType, String text) {
+ buffer.start(Operations.DATA_TEXT);
+ buffer.writeInt(varId);
+ buffer.writeInt(varType);
+ buffer.writeUTF8(text);
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ int varId = buffer.readInt();
+ int varType = buffer.readInt();
+ String text = buffer.readUTF8(MAX_STRING_SIZE);
+ operations.add(new NamedVariable(varId, varType, text));
+ }
+ }
+
+ @Override
+ public void apply(RemoteContext context) {
+ context.loadVariableName(mVarName, mVarId, mVarType);
+ }
+
+ @Override
+ public String deepToString(String indent) {
+ return indent + toString();
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/PaintData.java b/core/java/com/android/internal/widget/remotecompose/core/operations/PaintData.java
index e5683ec..0807bcd 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/PaintData.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/PaintData.java
@@ -20,12 +20,14 @@
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.operations.paint.PaintBundle;
import java.util.List;
-public class PaintData extends PaintOperation {
+public class PaintData extends PaintOperation implements VariableSupport {
public PaintBundle mPaintData = new PaintBundle();
public static final Companion COMPANION = new Companion();
public static final int MAX_STRING_SIZE = 4000;
@@ -34,6 +36,16 @@
}
@Override
+ public void updateVariables(RemoteContext context) {
+ mPaintData.updateVariables(context);
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ mPaintData.registerVars(context, this);
+ }
+
+ @Override
public void write(WireBuffer buffer) {
COMPANION.apply(buffer, mPaintData);
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/PathData.java b/core/java/com/android/internal/widget/remotecompose/core/operations/PathData.java
index 2646b27..e467e7b 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/PathData.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/PathData.java
@@ -18,27 +18,50 @@
import com.android.internal.widget.remotecompose.core.CompanionOperation;
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 java.util.Arrays;
import java.util.List;
-public class PathData implements Operation {
+public class PathData implements Operation, VariableSupport {
public static final Companion COMPANION = new Companion();
int mInstanceId;
- float[] mRef;
float[] mFloatPath;
- float[] mRetFloats;
+ float[] mOutputPath;
PathData(int instanceId, float[] floatPath) {
mInstanceId = instanceId;
mFloatPath = floatPath;
+ mOutputPath = Arrays.copyOf(mFloatPath, mFloatPath.length);
+ }
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ for (int i = 0; i < mFloatPath.length; i++) {
+ float v = mFloatPath[i];
+ if (Utils.isVariable(v)) {
+ mOutputPath[i] = (Float.isNaN(v))
+ ? context.getFloat(Utils.idFromNan(v)) : v;
+ } else {
+ mOutputPath[i] = v;
+ }
+ }
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ for (int i = 0; i < mFloatPath.length; i++) {
+ if (Float.isNaN(mFloatPath[i])) {
+ context.listensTo(Utils.idFromNan(mFloatPath[i]), this);
+ }
+ }
}
@Override
public void write(WireBuffer buffer) {
- COMPANION.apply(buffer, mInstanceId, mFloatPath);
+ COMPANION.apply(buffer, mInstanceId, mOutputPath);
}
@Override
@@ -46,29 +69,35 @@
return pathString(mFloatPath);
}
- public float[] getFloatPath(PaintContext context) {
- float[] ret = mRetFloats; // Assume retFloats is declared elsewhere
- if (ret == null) {
- return mFloatPath; // Assume floatPath is declared elsewhere
- }
- float[] localRef = mRef; // Assume ref is of type Float[]
- if (localRef == null) {
- for (int i = 0; i < mFloatPath.length; i++) {
- ret[i] = mFloatPath[i];
- }
- } else {
- for (int i = 0; i < mFloatPath.length; i++) {
- float lr = localRef[i];
- if (Float.isNaN(lr)) {
- ret[i] = Utils.getActualValue(lr);
- } else {
- ret[i] = mFloatPath[i];
- }
- }
- }
- return ret;
+ @Override
+ public String toString() {
+ return "PathData[" + mInstanceId + "] = " + "\"" + deepToString(" ") + "\"";
}
+ /**
+ * public float[] getFloatPath(PaintContext context) {
+ * float[] ret = mRetFloats; // Assume retFloats is declared elsewhere
+ * if (ret == null) {
+ * return mFloatPath; // Assume floatPath is declared elsewhere
+ * }
+ * float[] localRef = mRef; // Assume ref is of type Float[]
+ * if (localRef == null) {
+ * for (int i = 0; i < mFloatPath.length; i++) {
+ * ret[i] = mFloatPath[i];
+ * }
+ * } else {
+ * for (int i = 0; i < mFloatPath.length; i++) {
+ * float lr = localRef[i];
+ * if (Float.isNaN(lr)) {
+ * ret[i] = Utils.getActualValue(lr);
+ * } else {
+ * ret[i] = mFloatPath[i];
+ * }
+ * }
+ * }
+ * return ret;
+ * }
+ */
public static final int MOVE = 10;
public static final int LINE = 11;
public static final int QUADRATIC = 12;
@@ -155,7 +184,7 @@
str.append(".");
break;
default:
- str.append("X");
+ str.append("[" + id + "]");
break;
}
} else {
@@ -170,7 +199,7 @@
@Override
public void apply(RemoteContext context) {
- context.loadPathData(mInstanceId, mFloatPath);
+ context.loadPathData(mInstanceId, mOutputPath);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/RootContentBehavior.java b/core/java/com/android/internal/widget/remotecompose/core/operations/RootContentBehavior.java
index 6d924eb..997e8dc 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/RootContentBehavior.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/RootContentBehavior.java
@@ -94,7 +94,6 @@
public static final int SCALE_CROP = 5;
public static final int SCALE_FILL_BOUNDS = 6;
-
public static final Companion COMPANION = new Companion();
/**
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/RootContentDescription.java b/core/java/com/android/internal/widget/remotecompose/core/operations/RootContentDescription.java
index 64c7f3e..076b28e 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/RootContentDescription.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/RootContentDescription.java
@@ -48,7 +48,7 @@
@Override
public String toString() {
- return "ROOT_CONTENT_DESCRIPTION " + mContentDescription;
+ return "RootContentDescription " + mContentDescription;
}
@Override
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/ShaderData.java b/core/java/com/android/internal/widget/remotecompose/core/operations/ShaderData.java
new file mode 100644
index 0000000..8463ac5
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/ShaderData.java
@@ -0,0 +1,309 @@
+/*
+ * 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 com.android.internal.widget.remotecompose.core.CompanionOperation;
+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 java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Operation to deal with bitmap data
+ * On getting an Image during a draw call the bitmap is compressed and saved
+ * in playback the image is decompressed
+ */
+public class ShaderData implements Operation, VariableSupport {
+ int mShaderTextId; // the actual text of a shader
+ int mShaderID; // allows shaders to be referenced by number
+ HashMap<String, float[]> mUniformRawFloatMap = null;
+ HashMap<String, float[]> mUniformFloatMap = null;
+ HashMap<String, int[]> mUniformIntMap = null;
+ HashMap<String, Integer> mUniformBitmapMap = null;
+
+ public static final int MAX_IMAGE_DIMENSION = 8000;
+
+ public static final Companion COMPANION = new Companion();
+
+ public ShaderData(int shaderID,
+ int shaderTextId,
+ HashMap<String, float[]> floatMap,
+ HashMap<String, int[]> intMap,
+ HashMap<String, Integer> bitmapMap) {
+ mShaderID = shaderID;
+ mShaderTextId = shaderTextId;
+ if (floatMap != null) {
+ mUniformFloatMap = new HashMap<>();
+ mUniformRawFloatMap = new HashMap<>();
+
+ for (String name : floatMap.keySet()) {
+ mUniformRawFloatMap.put(name, floatMap.get(name));
+ mUniformFloatMap.put(name, floatMap.get(name));
+ }
+ }
+
+ if (intMap != null) {
+ mUniformIntMap = new HashMap<>();
+ for (String name : intMap.keySet()) {
+ mUniformIntMap.put(name, intMap.get(name));
+ }
+ }
+ if (bitmapMap != null) {
+ mUniformBitmapMap = new HashMap<>();
+ for (String name : bitmapMap.keySet()) {
+ mUniformBitmapMap.put(name, bitmapMap.get(name));
+ }
+ }
+
+ }
+
+ public int getShaderTextId() {
+ return mShaderTextId;
+ }
+
+ /**
+ * get names of all known floats
+ * @return
+ */
+ public String[] getUniformFloatNames() {
+ if (mUniformFloatMap == null) return new String[0];
+ return mUniformFloatMap.keySet().toArray(new String[0]);
+ }
+
+ /**
+ * Get float values associated with the name
+ * @param name
+ * @return
+ */
+ public float[] getUniformFloats(String name) {
+ return mUniformFloatMap.get(name);
+ }
+
+ /**
+ * get the name of all know uniform integers
+ * @return
+ */
+ public String[] getUniformIntegerNames() {
+ if (mUniformIntMap == null) return new String[0];
+ return mUniformIntMap.keySet().toArray(new String[0]);
+ }
+
+ /**
+ * Get Int value associated with the name
+ * @param name
+ * @return
+ */
+ public int[] getUniformInts(String name) {
+ return mUniformIntMap.get(name);
+ }
+
+ /**
+ * get list of uniform Bitmaps
+ * @return
+ */
+ public String[] getUniformBitmapNames() {
+ if (mUniformBitmapMap == null) return new String[0];
+ return mUniformBitmapMap.keySet().toArray(new String[0]);
+ }
+
+ /**
+ * Get a bitmap stored under that name
+ * @param name
+ * @return
+ */
+ public int getUniformBitmapId(String name) {
+ return mUniformBitmapMap.get(name);
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mShaderID, mShaderTextId,
+ mUniformFloatMap, mUniformIntMap, mUniformBitmapMap);
+ }
+
+ @Override
+ public String toString() {
+ return "SHADER DATA " + mShaderID;
+ }
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ for (String name : mUniformRawFloatMap.keySet()) {
+ float[] value = mUniformRawFloatMap.get(name);
+ float[] out = null;
+ for (int i = 0; i < value.length; i++) {
+ if (Float.isNaN(value[i])) {
+ if (out == null) { // need to copy
+ out = Arrays.copyOf(value, value.length);
+ }
+ out[i] = context.getFloat(Utils.idFromNan(value[i]));
+ }
+ }
+ mUniformFloatMap.put(name, out == null ? value : out);
+ }
+ }
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ for (String name : mUniformRawFloatMap.keySet()) {
+ float[] value = mUniformRawFloatMap.get(name);
+ for (int i = 0; i < value.length; i++) {
+ if (Float.isNaN(value[i])) {
+ context.listensTo(Utils.idFromNan(value[i]), this);
+ }
+ }
+ }
+ }
+
+ public static class Companion implements CompanionOperation {
+ private Companion() {
+ }
+
+ @Override
+ public String name() {
+ return "BitmapData";
+ }
+
+ @Override
+ public int id() {
+ return Operations.DATA_SHADER;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param shaderID
+ * @param shaderTextId
+ * @param floatMap
+ * @param intMap
+ * @param bitmapMap
+ */
+ public void apply(WireBuffer buffer, int shaderID, int shaderTextId,
+ HashMap<String, float[]> floatMap,
+ HashMap<String, int[]> intMap,
+ HashMap<String, Integer> bitmapMap) {
+ buffer.start(Operations.DATA_SHADER);
+ buffer.writeInt(shaderID);
+
+ buffer.writeInt(shaderTextId);
+ int floatSize = (floatMap == null) ? 0 : floatMap.size();
+ int intSize = (intMap == null) ? 0 : intMap.size();
+ int bitmapSize = (bitmapMap == null) ? 0 : bitmapMap.size();
+ int sizes = floatSize | (intSize << 8) | (bitmapSize << 16);
+ buffer.writeInt(sizes);
+
+ if (floatSize > 0) {
+
+ for (String name : floatMap.keySet()) {
+ buffer.writeUTF8(name);
+ float[] values = floatMap.get(name);
+ buffer.writeInt(values.length);
+
+ for (int i = 0; i < values.length; i++) {
+ buffer.writeFloat(values[i]);
+ }
+ }
+ }
+
+ if (intSize > 0) {
+ for (String name : intMap.keySet()) {
+ buffer.writeUTF8(name);
+ int[] values = intMap.get(name);
+ buffer.writeInt(values.length);
+ for (int i = 0; i < values.length; i++) {
+ buffer.writeInt(values[i]);
+ }
+ }
+ }
+ if (bitmapSize > 0) {
+ for (String name : bitmapMap.keySet()) {
+ buffer.writeUTF8(name);
+ int value = bitmapMap.get(name);
+ buffer.writeInt(value);
+ }
+ }
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ int shaderID = buffer.readInt();
+ int shaderTextId = buffer.readInt();
+ HashMap<String, float[]> floatMap = null;
+ HashMap<String, int[]> intMap = null;
+ HashMap<String, Integer> bitmapMap = null;
+
+ int sizes = buffer.readInt();
+
+ int floatMapSize = sizes & 0xFF;
+ if (floatMapSize > 0) {
+ floatMap = new HashMap<>();
+ for (int i = 0; i < floatMapSize; i++) {
+ String name = buffer.readUTF8();
+ int len = buffer.readInt();
+ float[] val = new float[len];
+
+ for (int j = 0; j < len; j++) {
+ val[j] = buffer.readFloat();
+ }
+
+ floatMap.put(name, val);
+ }
+ }
+ int intMapSize = (sizes >> 8) & 0xFF;
+
+ if (intMapSize > 0) {
+
+ intMap = new HashMap<>();
+ for (int i = 0; i < intMapSize; i++) {
+ String name = buffer.readUTF8();
+ int len = buffer.readInt();
+ int[] val = new int[len];
+ for (int j = 0; j < len; j++) {
+ val[j] = buffer.readInt();
+ }
+ intMap.put(name, val);
+ }
+ }
+ int bitmapMapSize = (sizes >> 16) & 0xFF;
+
+ if (bitmapMapSize > 0) {
+ bitmapMap = new HashMap<>();
+ for (int i = 0; i < bitmapMapSize; i++) {
+ String name = buffer.readUTF8();
+ int val = buffer.readInt();
+ bitmapMap.put(name, val);
+ }
+ }
+ operations.add(new ShaderData(shaderID, shaderTextId,
+ floatMap, intMap, bitmapMap));
+ }
+ }
+
+ @Override
+ public void apply(RemoteContext context) {
+ context.loadShader(mShaderID, this);
+ }
+
+ @Override
+ public String deepToString(String indent) {
+ return indent + toString();
+ }
+}
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 5b622ae..ed13449 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
@@ -44,11 +44,13 @@
@Override
public String toString() {
- return "TEXT DATA " + mTextId + "\"" + mText + "\"";
+ return "TextData[" + mTextId + "] = \""
+ + Utils.trimString(mText, 10) + "\"";
}
public static class Companion implements CompanionOperation {
- private Companion() {}
+ private Companion() {
+ }
@Override
public String name() {
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/TextFromFloat.java b/core/java/com/android/internal/widget/remotecompose/core/operations/TextFromFloat.java
new file mode 100644
index 0000000..65a39a1e
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/TextFromFloat.java
@@ -0,0 +1,172 @@
+/*
+ * 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 com.android.internal.widget.remotecompose.core.CompanionOperation;
+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.operations.utilities.StringUtils;
+
+import java.util.List;
+
+/**
+ * Operation convert floats to text
+ * This command is structured [command][textID][before,after][flags]
+ * before and after define number of digits before and after the decimal point
+ */
+public class TextFromFloat implements Operation, VariableSupport {
+ public int mTextId;
+ public float mValue;
+ public float mOutValue;
+ public short mDigitsBefore;
+ public short mDigitsAfter;
+ public int mFlags;
+ public static final Companion COMPANION = new Companion();
+ public static final int MAX_STRING_SIZE = 4000;
+ char mPre = ' ';
+ char mAfter = ' ';
+ // Theses flags define what how to/if fill the space
+ public static final int PAD_AFTER_SPACE = 0; // pad past point with space
+ public static final int PAD_AFTER_NONE = 1; // do not pad past last digit
+ public static final int PAD_AFTER_ZERO = 3; // pad with 0 past last digit
+ public static final int PAD_PRE_SPACE = 0; // pad before number with spaces
+ public static final int PAD_PRE_NONE = 4; // pad before number with 0s
+ public static final int PAD_PRE_ZERO = 12; // do not pad before number
+
+ public TextFromFloat(int textId, float value, short digitsBefore,
+ short digitsAfter, int flags) {
+ this.mTextId = textId;
+ this.mValue = value;
+ this.mDigitsAfter = digitsAfter;
+ this.mDigitsBefore = digitsBefore;
+ this.mFlags = flags;
+ mOutValue = mValue;
+ switch (mFlags & 3) {
+ case PAD_AFTER_SPACE:
+ mAfter = ' ';
+ break;
+ case PAD_AFTER_NONE:
+ mAfter = 0;
+ break;
+ case PAD_AFTER_ZERO:
+ mAfter = '0';
+ break;
+ }
+ switch (mFlags & 12) {
+ case PAD_PRE_SPACE:
+ mPre = ' ';
+ break;
+ case PAD_PRE_NONE:
+ mPre = 0;
+ break;
+ case PAD_PRE_ZERO:
+ mPre = '0';
+ break;
+ }
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mTextId, mValue, mDigitsAfter, mDigitsBefore, mFlags);
+ }
+
+ @Override
+ public String toString() {
+ return "TextFromFloat[" + mTextId + "] = "
+ + Utils.floatToString(mValue) + " " + mDigitsBefore
+ + "." + mDigitsAfter + " " + mFlags;
+ }
+
+
+ @Override
+ public void updateVariables(RemoteContext context) {
+ if (Float.isNaN(mValue)) {
+ mOutValue = context.getFloat(Utils.idFromNan(mValue));
+ }
+
+ }
+
+
+ @Override
+ public void registerListening(RemoteContext context) {
+ if (Float.isNaN(mValue)) {
+ context.listensTo(Utils.idFromNan(mValue), this);
+ }
+ }
+
+ public static class Companion implements CompanionOperation {
+ private Companion() {
+ }
+
+ @Override
+ public String name() {
+ return "TextData";
+ }
+
+ @Override
+ public int id() {
+ return Operations.TEXT_FROM_FLOAT;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param textId
+ * @param value
+ * @param digitsBefore
+ * @param digitsAfter
+ * @param flags
+ */
+ public void apply(WireBuffer buffer, int textId,
+ float value, short digitsBefore,
+ short digitsAfter, int flags) {
+ buffer.start(Operations.TEXT_FROM_FLOAT);
+ buffer.writeInt(textId);
+ buffer.writeFloat(value);
+ buffer.writeInt((digitsBefore << 16) | digitsAfter);
+ buffer.writeInt(flags);
+
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ int textId = buffer.readInt();
+ float value = buffer.readFloat();
+ int tmp = buffer.readInt();
+ short post = (short) (tmp & 0xFFFF);
+ short pre = (short) ((tmp >> 16) & 0xFFFF);
+
+ int flags = buffer.readInt();
+ operations.add(new TextFromFloat(textId, value, pre, post, flags));
+ }
+ }
+
+ @Override
+ public void apply(RemoteContext context) {
+ float v = mOutValue;
+ String s = StringUtils.floatToString(v, mDigitsBefore,
+ mDigitsAfter, mPre, mAfter);
+ context.loadText(mTextId, s);
+ }
+
+ @Override
+ public String deepToString(String indent) {
+ return indent + toString();
+ }
+}
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
new file mode 100644
index 0000000..a0fc854
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/TextMerge.java
@@ -0,0 +1,101 @@
+/*
+ * 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 com.android.internal.widget.remotecompose.core.CompanionOperation;
+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.WireBuffer;
+
+import java.util.List;
+
+/**
+ * Operation to deal with Text data
+ */
+public class TextMerge implements Operation {
+ public int mTextId;
+ public int mSrcId1;
+ public int mSrcId2;
+ public static final Companion COMPANION = new Companion();
+ public static final int MAX_STRING_SIZE = 4000;
+
+ public TextMerge(int textId, int srcId1, int srcId2) {
+ this.mTextId = textId;
+ this.mSrcId1 = srcId1;
+ this.mSrcId2 = srcId2;
+ }
+
+ @Override
+ public void write(WireBuffer buffer) {
+ COMPANION.apply(buffer, mTextId, mSrcId1, mSrcId2);
+ }
+
+ @Override
+ public String toString() {
+ return "TextMerge[" + mTextId + "] = [" + mSrcId1 + " ] + [ " + mSrcId2 + "]";
+ }
+
+ public static class Companion implements CompanionOperation {
+ private Companion() {
+ }
+
+ @Override
+ public String name() {
+ return "TextData";
+ }
+
+ @Override
+ public int id() {
+ return Operations.TEXT_MERGE;
+ }
+
+ /**
+ * Writes out the operation to the buffer
+ * @param buffer
+ * @param textId
+ * @param srcId1
+ * @param srcId2
+ */
+ public void apply(WireBuffer buffer, int textId, int srcId1, int srcId2) {
+ buffer.start(Operations.TEXT_MERGE);
+ buffer.writeInt(textId);
+ buffer.writeInt(srcId1);
+ buffer.writeInt(srcId2);
+ }
+
+ @Override
+ public void read(WireBuffer buffer, List<Operation> operations) {
+ int textId = buffer.readInt();
+ int srcId1 = buffer.readInt();
+ int srcId2 = buffer.readInt();
+
+ operations.add(new TextMerge(textId, srcId1, srcId2));
+ }
+ }
+
+ @Override
+ public void apply(RemoteContext context) {
+ String str1 = context.getText(mSrcId1);
+ String str2 = context.getText(mSrcId2);
+ context.loadText(mTextId, str1 + str2);
+ }
+
+ @Override
+ public String deepToString(String indent) {
+ return indent + toString();
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/Utils.java b/core/java/com/android/internal/widget/remotecompose/core/operations/Utils.java
index 00e2f20..fdc6860 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/Utils.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/Utils.java
@@ -15,13 +15,16 @@
*/
package com.android.internal.widget.remotecompose.core.operations;
+/**
+ * Utilities to be used across all core operations
+ */
public class Utils {
public static float asNan(int v) {
return Float.intBitsToFloat(v | -0x800000);
}
public static int idFromNan(float value) {
- int b = Float.floatToRawIntBits(value);
+ int b = Float.floatToRawIntBits(value);
return b & 0xFFFFF;
}
@@ -29,13 +32,194 @@
return 0;
}
- String getFloatString(float value) {
- if (Float.isNaN(value)) {
- int id = idFromNan(value);
- if (id > 0) {
- return "NaN(" + id + ")";
- }
+ /**
+ * trim a string to n characters if needing to trim
+ * end in "..."
+ *
+ * @param str
+ * @param n
+ * @return
+ */
+ static String trimString(String str, int n) {
+ if (str.length() > n) {
+ str = str.substring(0, n - 3) + "...";
}
- return "" + value;
+ return str;
}
+
+ /**
+ * print the id and the value of a float
+ * @param idvalue
+ * @param value
+ * @return
+ */
+ public static String floatToString(float idvalue, float value) {
+ if (Float.isNaN(idvalue)) {
+ return "[" + idFromNan(idvalue) + "]" + floatToString(value);
+ }
+ return floatToString(value);
+ }
+
+ /**
+ * Convert float to string but render nan id in brackets [n]
+ * @param value
+ * @return
+ */
+ public static String floatToString(float value) {
+ if (Float.isNaN(value)) {
+ return "[" + idFromNan(value) + "]";
+ }
+ return Float.toString(value);
+ }
+
+ /**
+ * Debugging util to print a message and include the file/line it came from
+ * @param str
+ */
+ public static void log(String str) {
+ StackTraceElement s = new Throwable().getStackTrace()[1];
+ System.out.println("(" + s.getFileName() + ":" + s.getLineNumber() + ")." + str);
+ }
+
+ /**
+ * Debugging util to print the stack
+ * @param str
+ * @param n
+ */
+ public static void logStack(String str, int n) {
+ StackTraceElement[] st = new Throwable().getStackTrace();
+ for (int i = 1; i < n + 1; i++) {
+ StackTraceElement s = st[i];
+ String space = new String(new char[i]).replace('\0', ' ');
+ System.out.println(space + "(" + s.getFileName()
+ + ":" + s.getLineNumber() + ")." + str);
+ }
+ }
+
+ /**
+ * Is a variable Allowed int calculation and references.
+ *
+ * @param v
+ * @return
+ */
+ public static boolean isVariable(float v) {
+ if (Float.isNaN(v)) {
+ int id = idFromNan(v);
+ return id > 40 || id < 10;
+ }
+ return false;
+ }
+
+ /**
+ * print a color in the familiar 0xAARRGGBB pattern
+ *
+ * @param color
+ * @return
+ */
+ public static String colorInt(int color) {
+ String str = "000000000000" + Integer.toHexString(color);
+ return "0x" + str.substring(str.length() - 8);
+ }
+
+ /**
+ * Interpolate two colors.
+ * gamma corrected colors are interpolated in the form c1 * (1-t) + c2 * t
+ *
+ * @param c1
+ * @param c2
+ * @param t
+ * @return
+ */
+ public static int interpolateColor(int c1, int c2, float t) {
+ if (Float.isNaN(t) || t == 0.0f) {
+ return c1;
+ } else if (t == 1.0f) {
+ return c2;
+ }
+ int a = 0xFF & (c1 >> 24);
+ int r = 0xFF & (c1 >> 16);
+ int g = 0xFF & (c1 >> 8);
+ int b = 0xFF & c1;
+ float f_r = (float) Math.pow(r / 255.0f, 2.2);
+ float f_g = (float) Math.pow(g / 255.0f, 2.2);
+ float f_b = (float) Math.pow(b / 255.0f, 2.2);
+ float c1fr = f_r;
+ float c1fg = f_g;
+ float c1fb = f_b;
+ float c1fa = a / 255f;
+
+ a = 0xFF & (c2 >> 24);
+ r = 0xFF & (c2 >> 16);
+ g = 0xFF & (c2 >> 8);
+ b = 0xFF & c2;
+ f_r = (float) Math.pow(r / 255.0f, 2.2);
+ f_g = (float) Math.pow(g / 255.0f, 2.2);
+ f_b = (float) Math.pow(b / 255.0f, 2.2);
+ float c2fr = f_r;
+ float c2fg = f_g;
+ float c2fb = f_b;
+ float c2fa = a / 255f;
+ f_r = c1fr + t * (c2fr - c1fr);
+ f_g = c1fg + t * (c2fg - c1fg);
+ f_b = c1fb + t * (c2fb - c1fb);
+ float f_a = c1fa + t * (c2fa - c1fa);
+
+ int outr = clamp((int) ((float) Math.pow(f_r, 1.0 / 2.2) * 255.0f));
+ int outg = clamp((int) ((float) Math.pow(f_g, 1.0 / 2.2) * 255.0f));
+ int outb = clamp((int) ((float) Math.pow(f_b, 1.0 / 2.2) * 255.0f));
+ int outa = clamp((int) (f_a * 255.0f));
+
+
+ return (outa << 24 | outr << 16 | outg << 8 | outb);
+ }
+
+ /**
+ * Efficient clamping function
+ *
+ * @param c
+ * @return number between 0 and 255
+ */
+ public static int clamp(int c) {
+ int n = 255;
+ c &= ~(c >> 31);
+ c -= n;
+ c &= (c >> 31);
+ c += n;
+ return c;
+ }
+
+ /**
+ * convert hue saturation and value to RGB
+ *
+ * @param hue 0..1
+ * @param saturation 0..1 0=on the gray scale
+ * @param value 0..1 0=black
+ * @return
+ */
+ public static int hsvToRgb(float hue, float saturation, float value) {
+ int h = (int) (hue * 6);
+ float f = hue * 6 - h;
+ int p = (int) (0.5f + 255 * value * (1 - saturation));
+ int q = (int) (0.5f + 255 * value * (1 - f * saturation));
+ int t = (int) (0.5f + 255 * value * (1 - (1 - f) * saturation));
+ int v = (int) (0.5f + 255 * value);
+ switch (h) {
+ case 0:
+ return 0XFF000000 | (v << 16) + (t << 8) + p;
+ case 1:
+ return 0XFF000000 | (q << 16) + (v << 8) + p;
+ case 2:
+ return 0XFF000000 | (p << 16) + (v << 8) + t;
+ case 3:
+ return 0XFF000000 | (p << 16) + (q << 8) + v;
+ case 4:
+ return 0XFF000000 | (t << 16) + (p << 8) + v;
+ case 5:
+ return 0XFF000000 | (v << 16) + (p << 8) + q;
+
+ }
+ return 0;
+ }
+
+
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintBundle.java b/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintBundle.java
index 8abb0bf..a7d0ac6 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintBundle.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintBundle.java
@@ -15,43 +15,60 @@
*/
package com.android.internal.widget.remotecompose.core.operations.paint;
+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.operations.Utils;
import java.util.Arrays;
+/**
+ * Paint Bundle represents a delta of changes to a paint object
+ */
public class PaintBundle {
int[] mArray = new int[200];
+ int[] mOutArray = null;
int mPos = 0;
- public void applyPaintChange(PaintChanges p) {
+ /**
+ * Apply changes to a PaintChanges interface
+ * @param paintContext
+ * @param p
+ */
+ public void applyPaintChange(PaintContext paintContext, PaintChanges p) {
int i = 0;
int mask = 0;
+ if (mOutArray == null) {
+ mOutArray = mArray;
+ }
while (i < mPos) {
- int cmd = mArray[i++];
+ int cmd = mOutArray[i++];
mask = mask | (1 << (cmd - 1));
switch (cmd & 0xFFFF) {
case TEXT_SIZE: {
- p.setTextSize(Float.intBitsToFloat(mArray[i++]));
+ p.setTextSize(Float.intBitsToFloat(mOutArray[i++]));
break;
}
case TYPEFACE:
int style = (cmd >> 16);
int weight = style & 0x3ff;
boolean italic = (style >> 10) > 0;
- int font_type = mArray[i++];
+ int font_type = mOutArray[i++];
p.setTypeFace(font_type, weight, italic);
break;
+ case COLOR_ID: // mOutArray should have already decoded it
case COLOR: {
- p.setColor(mArray[i++]);
+ p.setColor(mOutArray[i++]);
break;
}
case STROKE_WIDTH: {
- p.setStrokeWidth(Float.intBitsToFloat(mArray[i++]));
+ p.setStrokeWidth(Float.intBitsToFloat(mOutArray[i++]));
break;
}
case STROKE_MITER: {
- p.setStrokeMiter(Float.intBitsToFloat(mArray[i++]));
+ p.setStrokeMiter(Float.intBitsToFloat(mOutArray[i++]));
break;
}
case STROKE_CAP: {
@@ -63,6 +80,7 @@
break;
}
case SHADER: {
+ p.setShader(mOutArray[i++]);
break;
}
case STROKE_JOIN: {
@@ -81,17 +99,16 @@
p.setFilterBitmap(!((cmd >> 16) == 0));
break;
}
-
case GRADIENT: {
- i = callSetGradient(cmd, mArray, i, p);
+ i = callSetGradient(cmd, mOutArray, i, p);
break;
}
case COLOR_FILTER: {
- p.setColorFilter(mArray[i++], cmd >> 16);
+ p.setColorFilter(mOutArray[i++], cmd >> 16);
break;
}
case ALPHA: {
- p.setAlpha(Float.intBitsToFloat(mArray[i++]));
+ p.setAlpha(Float.intBitsToFloat(mOutArray[i++]));
break;
}
}
@@ -106,7 +123,6 @@
switch (id) {
case TEXT_SIZE:
return "TEXT_SIZE";
-
case COLOR:
return "COLOR";
case STROKE_WIDTH:
@@ -133,7 +149,6 @@
return "ALPHA";
case COLOR_FILTER:
return "COLOR_FILTER";
-
}
return "????" + id + "????";
}
@@ -154,6 +169,14 @@
return str + "]";
}
+ private static String asFloatStr(int value) {
+ float fValue = Float.intBitsToFloat(value);
+ if (Float.isNaN(fValue)) {
+ return "[" + Utils.idFromNan(fValue) + "]";
+ }
+ return Float.toString(fValue);
+ }
+
@Override
public String toString() {
StringBuilder ret = new StringBuilder("\n");
@@ -164,7 +187,8 @@
switch (type) {
case TEXT_SIZE: {
- ret.append(" TextSize(" + Float.intBitsToFloat(mArray[i++]));
+ ret.append(" TextSize("
+ + asFloatStr(mArray[i++]));
}
break;
@@ -181,14 +205,18 @@
ret.append(" Color(" + colorInt(mArray[i++]));
}
break;
+ case COLOR_ID: {
+ ret.append(" ColorId([" + mArray[i++] + "]");
+ }
+ break;
case STROKE_WIDTH: {
ret.append(" StrokeWidth("
- + (Float.intBitsToFloat(mArray[i++])));
+ + (asFloatStr(mArray[i++])));
}
break;
case STROKE_MITER: {
ret.append(" StrokeMiter("
- + (Float.intBitsToFloat(mArray[i++])));
+ + (asFloatStr(mArray[i++])));
}
break;
case STROKE_CAP: {
@@ -207,11 +235,12 @@
}
break;
case SHADER: {
+ ret.append(" Shader(" + mArray[i++]);
}
break;
case ALPHA: {
ret.append(" Alpha("
- + (Float.intBitsToFloat(mArray[i++])));
+ + (asFloatStr(mArray[i++])));
}
break;
case IMAGE_FILTER_QUALITY: {
@@ -244,7 +273,6 @@
return ret.toString();
}
-
int callPrintGradient(int cmd, int[] array, int i, StringBuilder p) {
int ret = i;
int type = (cmd >> 16);
@@ -258,26 +286,25 @@
colors = new int[len];
for (int j = 0; j < colors.length; j++) {
colors[j] = array[ret++];
-
}
}
len = array[ret++];
- float[] stops = null;
+ String[] stops = null;
if (len > 0) {
- stops = new float[len];
+ stops = new String[len];
for (int j = 0; j < stops.length; j++) {
- stops[j] = Float.intBitsToFloat(array[ret++]);
+ stops[j] = asFloatStr(array[ret++]);
}
}
p.append(" colors = " + colorInt(colors) + ",\n");
p.append(" stops = " + Arrays.toString(stops) + ",\n");
p.append(" start = ");
- p.append("[" + Float.intBitsToFloat(array[ret++]));
- p.append(", " + Float.intBitsToFloat(array[ret++]) + "],\n");
+ p.append("[" + asFloatStr(array[ret++]));
+ p.append(", " + asFloatStr(array[ret++]) + "],\n");
p.append(" end = ");
- p.append("[" + Float.intBitsToFloat(array[ret++]));
- p.append(", " + Float.intBitsToFloat(array[ret++]) + "],\n");
+ p.append("[" + asFloatStr(array[ret++]));
+ p.append(", " + asFloatStr(array[ret++]) + "],\n");
int tileMode = array[ret++];
p.append(" tileMode = " + tileMode + "\n ");
}
@@ -295,21 +322,21 @@
}
}
len = array[ret++];
- float[] stops = null;
+ String[] stops = null;
if (len > 0) {
- stops = new float[len];
+ stops = new String[len];
for (int j = 0; j < stops.length; j++) {
- stops[j] = Float.intBitsToFloat(array[ret++]);
+ stops[j] = asFloatStr(array[ret++]);
}
}
p.append(" colors = " + colorInt(colors) + ",\n");
p.append(" stops = " + Arrays.toString(stops) + ",\n");
p.append(" center = ");
- p.append("[" + Float.intBitsToFloat(array[ret++]));
- p.append(", " + Float.intBitsToFloat(array[ret++]) + "],\n");
+ p.append("[" + asFloatStr(array[ret++]));
+ p.append(", " + asFloatStr(array[ret++]) + "],\n");
p.append(" radius =");
- p.append(" " + Float.intBitsToFloat(array[ret++]) + ",\n");
+ p.append(" " + asFloatStr(array[ret++]) + ",\n");
int tileMode = array[ret++];
p.append(" tileMode = " + tileMode + "\n ");
}
@@ -327,20 +354,19 @@
}
}
len = array[ret++];
- float[] stops = null;
+ String[] stops = null;
if (len > 0) {
- stops = new float[len];
+ stops = new String[len];
for (int j = 0; j < stops.length; j++) {
- stops[j] = Float.intBitsToFloat(array[ret++]);
+ stops[j] = asFloatStr(array[ret++]);
}
}
-
p.append(" colors = " + colorInt(colors) + ",\n");
p.append(" stops = " + Arrays.toString(stops) + ",\n");
p.append(" center = ");
- p.append("[" + Float.intBitsToFloat(array[ret++]));
- p.append(", " + Float.intBitsToFloat(array[ret++]) + "],\n ");
-
+ p.append("[" + asFloatStr(array[ret++]));
+ p.append(", "
+ + asFloatStr(array[ret++]) + "],\n ");
}
break;
default: {
@@ -376,7 +402,6 @@
return ret;
}
-
switch (gradientType) {
case LINEAR_GRADIENT: {
@@ -433,7 +458,7 @@
public static final int COLOR = 4; // int
public static final int STROKE_WIDTH = 5; // float
public static final int STROKE_MITER = 6;
- public static final int STROKE_CAP = 7; // int
+ public static final int STROKE_CAP = 7; // int
public static final int STYLE = 8; // int
public static final int SHADER = 9; // int
public static final int IMAGE_FILTER_QUALITY = 10; // int
@@ -445,7 +470,7 @@
public static final int TYPEFACE = 16;
public static final int FILTER_BITMAP = 17;
public static final int BLEND_MODE = 18;
-
+ public static final int COLOR_ID = 19; // int
public static final int BLEND_MODE_CLEAR = 0;
public static final int BLEND_MODE_SRC = 1;
@@ -634,8 +659,8 @@
/**
* @param fontType 0 = default 1 = sans serif 2 = serif 3 = monospace
- * @param weight 100-1000
- * @param italic tur
+ * @param weight 100-1000
+ * @param italic tur
*/
public void setTextStyle(int fontType, int weight, boolean italic) {
int style = (weight & 0x3FF) | (italic ? 2048 : 0); // pack the weight and italic
@@ -658,6 +683,10 @@
mPos++;
}
+ /**
+ * Set the Color based on Color
+ * @param color
+ */
public void setColor(int color) {
mArray[mPos] = COLOR;
mPos++;
@@ -666,6 +695,18 @@
}
/**
+ * Set the Color based on ID
+ * @param color
+ */
+ public void setColorId(int color) {
+ mArray[mPos] = COLOR_ID;
+ mPos++;
+ mArray[mPos] = color;
+ mPos++;
+ }
+
+
+ /**
* Set the paint's Cap.
*
* @param cap set the paint's line cap style, used whenever the paint's
@@ -676,16 +717,29 @@
mPos++;
}
+ /**
+ * Set the style STROKE and/or FILL
+ * @param style
+ */
public void setStyle(int style) {
mArray[mPos] = STYLE | (style << 16);
mPos++;
}
- public void setShader(int shader, String shaderString) {
- mArray[mPos] = SHADER | (shader << 16);
+ /**
+ * Set the shader id to use
+ * @param shaderId
+ */
+ public void setShader(int shaderId) {
+ mArray[mPos] = SHADER;
+ mPos++;
+ mArray[mPos] = shaderId;
mPos++;
}
+ /**
+ * Set the Alpha value
+ */
public void setAlpha(float alpha) {
mArray[mPos] = ALPHA;
mPos++;
@@ -729,7 +783,6 @@
* destination pixels
* (content of the render target).
*
- *
* @param blendmode The blend mode to be installed in the paint
*/
public void setBlendMode(int blendmode) {
@@ -825,5 +878,216 @@
return "null";
}
-}
+ /**
+ * Check all the floats for Nan(id) floats and call listenTo
+ * @param context
+ * @param support
+ */
+ public void registerVars(RemoteContext context, VariableSupport support) {
+ int i = 0;
+ while (i < mPos) {
+ int cmd = mArray[i++];
+ int type = cmd & 0xFFFF;
+ switch (type) {
+ case STROKE_MITER:
+ case STROKE_WIDTH:
+ case ALPHA:
+ case TEXT_SIZE:
+ float v = Float.intBitsToFloat(mArray[i++]);
+ if (Float.isNaN(v)) {
+ context.listensTo(Utils.idFromNan(v), support);
+ }
+ break;
+ case COLOR_ID:
+ context.listensTo(mArray[i++], support);
+ break;
+ case COLOR:
+ case TYPEFACE:
+ case SHADER:
+ case COLOR_FILTER:
+ i++;
+ break;
+ case STROKE_JOIN:
+ case FILTER_BITMAP:
+ case STROKE_CAP:
+ case STYLE:
+ case IMAGE_FILTER_QUALITY:
+ case BLEND_MODE:
+ case ANTI_ALIAS:
+ break;
+
+ case GRADIENT: {
+ // TODO gradients should be handled correctly
+ i = callPrintGradient(cmd, mArray, i, new StringBuilder());
+ }
+ }
+ }
+ }
+
+ /**
+ * Update variables if any are float ids
+ * @param context
+ */
+ public void updateVariables(RemoteContext context) {
+ if (mOutArray == null) {
+ mOutArray = Arrays.copyOf(mArray, mArray.length);
+ } else {
+ System.arraycopy(mArray, 0, mOutArray, 0, mArray.length);
+ }
+ int i = 0;
+ while (i < mPos) {
+ int cmd = mArray[i++];
+ int type = cmd & 0xFFFF;
+ switch (type) {
+ case STROKE_MITER:
+ case STROKE_WIDTH:
+ case ALPHA:
+ case TEXT_SIZE:
+ mOutArray[i] = fixFloatVar(mArray[i], context);
+ i++;
+ break;
+ case COLOR_ID:
+ mOutArray[i] = fixColor(mArray[i], context);
+ i++;
+ break;
+ case COLOR:
+ case TYPEFACE:
+ case SHADER:
+ case COLOR_FILTER:
+ i++;
+ break;
+ case STROKE_JOIN:
+ case FILTER_BITMAP:
+ case STROKE_CAP:
+ case STYLE:
+ case IMAGE_FILTER_QUALITY:
+ case BLEND_MODE:
+ case ANTI_ALIAS:
+ break;
+
+ case GRADIENT: {
+ // TODO gradients should be handled correctly
+ i = updateFloatsInGradient(cmd, mOutArray, mArray, i, context);
+ }
+ }
+ }
+ }
+
+ private int fixFloatVar(int val, RemoteContext context) {
+ float v = Float.intBitsToFloat(val);
+ if (Float.isNaN(v)) {
+ int id = Utils.idFromNan(v);
+ return Float.floatToRawIntBits(context.getFloat(id));
+ }
+ return val;
+ }
+
+ private int fixColor(int colorId, RemoteContext context) {
+ int n = context.getColor(colorId);
+ return n;
+ }
+
+ int updateFloatsInGradient(int cmd, int[] out, int[] array,
+ int i,
+ RemoteContext context) {
+ int ret = i;
+ int type = (cmd >> 16);
+ switch (type) {
+ case 0: {
+ int len = array[ret++];
+ if (len > 0) {
+ for (int j = 0; j < len; j++) {
+ ret++;
+ }
+ }
+ len = array[ret++];
+
+ if (len > 0) {
+ for (int j = 0; j < len; j++) {
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ }
+ }
+
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+
+ // end
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ ret++; // tileMode
+ }
+
+ break;
+ case 1: {
+ // RadialGradient
+ int len = array[ret++];
+ if (len > 0) {
+ for (int j = 0; j < len; j++) {
+ ret++;
+ }
+ }
+ len = array[ret++];
+ if (len > 0) {
+ for (int j = 0; j < len; j++) {
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ }
+ }
+
+
+ // center
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ // radius
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ ret++; // tileMode
+
+ }
+
+ break;
+ case 2: {
+ // SweepGradient
+ int len = array[ret++];
+ int[] colors = null;
+ if (len > 0) {
+ colors = new int[len];
+ for (int j = 0; j < colors.length; j++) {
+ colors[j] = array[ret++];
+
+ }
+ }
+ len = array[ret++];
+ float[] stops = null;
+ if (len > 0) {
+ stops = new float[len];
+ for (int j = 0; j < stops.length; j++) {
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ }
+ }
+
+ // center
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ out[ret] = fixFloatVar(array[ret], context);
+ ret++;
+ }
+ break;
+ default: {
+ System.err.println("gradient type unknown");
+ }
+ }
+
+ return ret;
+ }
+
+}
\ No newline at end of file
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintChangeAdapter.java b/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintChangeAdapter.java
index 994bf6d..28fe63a 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintChangeAdapter.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintChangeAdapter.java
@@ -27,7 +27,6 @@
}
-
@Override
public void setStrokeWidth(float width) {
@@ -49,7 +48,7 @@
}
@Override
- public void setShader(int shader, String shaderString) {
+ public void setShader(int shader) {
}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintChanges.java b/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintChanges.java
index 87e58ac..d5dc388 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintChanges.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/paint/PaintChanges.java
@@ -15,9 +15,14 @@
*/
package com.android.internal.widget.remotecompose.core.operations.paint;
+/**
+ * Interface to a paint object
+ * For more details see Android Paint
+ */
public interface PaintChanges {
-
+ // MASK to be set/cleared
+ int CLEAR_TEXT_SIZE = 1 << (PaintBundle.TEXT_SIZE - 1);
int CLEAR_TEXT_STYLE = 1 << (PaintBundle.TYPEFACE - 1);
int CLEAR_COLOR = 1 << (PaintBundle.COLOR - 1);
int CLEAR_STROKE_WIDTH = 1 << (PaintBundle.STROKE_WIDTH - 1);
@@ -32,21 +37,101 @@
int CLEAR_COLOR_FILTER = 1 << (PaintBundle.COLOR_FILTER - 1);
int VALID_BITS = 0x1FFF; // only the first 13 bit are valid now
-
+ /**
+ * Set the size of text
+ * @param size
+ */
void setTextSize(float size);
+
+ /**
+ * Set the width of lines
+ * @param width
+ */
void setStrokeWidth(float width);
+
+ /**
+ * Set the color to use
+ * @param color
+ */
void setColor(int color);
+
+ /**
+ * Set the Stroke Cap
+ * @param cap
+ */
void setStrokeCap(int cap);
+
+ /**
+ * Set the Stroke style FILL and/or STROKE
+ * @param style
+ */
void setStyle(int style);
- void setShader(int shader, String shaderString);
+
+ /**
+ * Set the id of the shader to use
+ * @param shader
+ */
+ void setShader(int shader);
+
+ /**
+ * Set the way image is interpolated
+ * @param quality
+ */
void setImageFilterQuality(int quality);
+
+ /**
+ * Set the alpha to draw under
+ * @param a
+ */
void setAlpha(float a);
+
+ /**
+ * Set the Stroke Miter
+ * @param miter
+ */
void setStrokeMiter(float miter);
+
+ /**
+ * Set the Stroke Join
+ * @param join
+ */
void setStrokeJoin(int join);
+
+ /**
+ * Should bitmaps be interpolated
+ * @param filter
+ */
void setFilterBitmap(boolean filter);
+
+ /**
+ * Set the blend mode can be porterduff + others
+ * @param mode
+ */
void setBlendMode(int mode);
+
+ /**
+ * Set the AntiAlias. Typically true
+ * Set to off when you need pixilated look (e.g. QR codes)
+ * @param aa
+ */
void setAntiAlias(boolean aa);
+
+ /**
+ * Clear some sub set of the settings
+ * @param mask
+ */
void clear(long mask);
+
+ /**
+ * Set a linear gradient fill
+ * @param colorsArray
+ * @param stopsArray
+ * @param startX
+ * @param startY
+ * @param endX
+ * @param endY
+ * @param tileMode
+ */
void setLinearGradient(
int[] colorsArray,
float[] stopsArray,
@@ -57,6 +142,15 @@
int tileMode
);
+ /**
+ * Set a radial gradient fill
+ * @param colorsArray
+ * @param stopsArray
+ * @param centerX
+ * @param centerY
+ * @param radius
+ * @param tileMode
+ */
void setRadialGradient(
int[] colorsArray,
float[] stopsArray,
@@ -66,6 +160,13 @@
int tileMode
);
+ /**
+ * Set a sweep gradient fill
+ * @param colorsArray
+ * @param stopsArray
+ * @param centerX
+ * @param centerY
+ */
void setSweepGradient(
int[] colorsArray,
float[] stopsArray,
@@ -73,9 +174,19 @@
float centerY
);
-
+ /**
+ * Set Color filter mod
+ * @param color
+ * @param mode
+ */
void setColorFilter(int color, int mode);
+ /**
+ * Set TypeFace 0,1,2
+ * TODO above should point to a string to be decoded
+ * @param fontType
+ * @param weight
+ * @param italic
+ */
void setTypeFace(int fontType, int weight, boolean italic);
-}
-
+}
\ No newline at end of file
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/AnimatedFloatExpression.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/AnimatedFloatExpression.java
new file mode 100644
index 0000000..616048d
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/AnimatedFloatExpression.java
@@ -0,0 +1,452 @@
+/*
+ * 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.utilities;
+
+/**
+ * high performance floating point expression evaluator used in animation
+ */
+public class AnimatedFloatExpression {
+ static IntMap<String> sNames = new IntMap<>();
+ public static final int OFFSET = 0x100;
+ public static final float ADD = asNan(OFFSET + 1);
+ public static final float SUB = asNan(OFFSET + 2);
+ public static final float MUL = asNan(OFFSET + 3);
+ public static final float DIV = asNan(OFFSET + 4);
+ public static final float MOD = asNan(OFFSET + 5);
+ public static final float MIN = asNan(OFFSET + 6);
+ public static final float MAX = asNan(OFFSET + 7);
+ public static final float POW = asNan(OFFSET + 8);
+ public static final float SQRT = asNan(OFFSET + 9);
+ public static final float ABS = asNan(OFFSET + 10);
+ public static final float SIGN = asNan(OFFSET + 11);
+ public static final float COPY_SIGN = asNan(OFFSET + 12);
+ public static final float EXP = asNan(OFFSET + 13);
+ public static final float FLOOR = asNan(OFFSET + 14);
+ public static final float LOG = asNan(OFFSET + 15);
+ public static final float LN = asNan(OFFSET + 16);
+ public static final float ROUND = asNan(OFFSET + 17);
+ public static final float SIN = asNan(OFFSET + 18);
+ public static final float COS = asNan(OFFSET + 19);
+ public static final float TAN = asNan(OFFSET + 20);
+ public static final float ASIN = asNan(OFFSET + 21);
+ public static final float ACOS = asNan(OFFSET + 22);
+
+ public static final float ATAN = asNan(OFFSET + 23);
+
+ public static final float ATAN2 = asNan(OFFSET + 24);
+ public static final float MAD = asNan(OFFSET + 25);
+ public static final float IFELSE = asNan(OFFSET + 26);
+
+ public static final float CLAMP = asNan(OFFSET + 27);
+ public static final float CBRT = asNan(OFFSET + 28);
+ public static final float DEG = asNan(OFFSET + 29);
+ public static final float RAD = asNan(OFFSET + 30);
+ public static final float CEIL = asNan(OFFSET + 31);
+
+
+ public static final float LAST_OP = 31;
+
+
+ public static final float VAR1 = asNan(OFFSET + 27);
+ public static final float VAR2 = asNan(OFFSET + 28);
+
+ // TODO CLAMP, CBRT, DEG, RAD, EXPM1, CEIL, FLOOR
+ private static final float FP_PI = (float) Math.PI;
+ private static final float FP_TO_RAD = 57.29577951f; // 180/PI
+ private static final float FP_TO_DEG = 0.01745329252f; // 180/PI
+
+ float[] mStack;
+ float[] mLocalStack = new float[128];
+ float[] mVar;
+
+ /**
+ * is float a math operator
+ * @param v
+ * @return
+ */
+ public static boolean isMathOperator(float v) {
+ if (Float.isNaN(v)) {
+ int pos = fromNaN(v);
+ return pos > OFFSET && pos <= OFFSET + LAST_OP;
+ }
+ return false;
+ }
+
+ interface Op {
+ int eval(int sp);
+ }
+
+ /**
+ * Evaluate a float expression
+ * @param exp
+ * @param var
+ * @return
+ */
+ public float eval(float[] exp, float... var) {
+ mStack = exp;
+ mVar = var;
+ int sp = -1;
+ for (int i = 0; i < mStack.length; i++) {
+ float v = mStack[i];
+ if (Float.isNaN(v)) {
+ sp = mOps[fromNaN(v) - OFFSET].eval(sp);
+ } else {
+ mStack[++sp] = v;
+ }
+ }
+ return mStack[sp];
+ }
+
+ /**
+ * Evaluate a float expression
+ * @param exp
+ * @param len
+ * @param var
+ * @return
+ */
+ public float eval(float[] exp, int len, float... var) {
+ System.arraycopy(exp, 0, mLocalStack, 0, len);
+ mStack = mLocalStack;
+ mVar = var;
+ int sp = -1;
+ for (int i = 0; i < len; i++) {
+ float v = mStack[i];
+ if (Float.isNaN(v)) {
+ sp = mOps[fromNaN(v) - OFFSET].eval(sp);
+ } else {
+ mStack[++sp] = v;
+ }
+ }
+ return mStack[sp];
+ }
+
+ /**
+ * Evaluate a float expression
+ * @param exp
+ * @param var
+ * @return
+ */
+ public float evalDB(float[] exp, float... var) {
+ mStack = exp;
+ mVar = var;
+ int sp = -1;
+ for (float v : exp) {
+ if (Float.isNaN(v)) {
+ System.out.print(" " + sNames.get((fromNaN(v) - OFFSET)));
+ sp = mOps[fromNaN(v) - OFFSET].eval(sp);
+ } else {
+ System.out.print(" " + v);
+ mStack[++sp] = v;
+ }
+ }
+ return mStack[sp];
+ }
+
+ Op[] mOps = {
+ null,
+ (sp) -> { // ADD
+ mStack[sp - 1] = mStack[sp - 1] + mStack[sp];
+ return sp - 1;
+ },
+ (sp) -> { // SUB
+ mStack[sp - 1] = mStack[sp - 1] - mStack[sp];
+ return sp - 1;
+ },
+ (sp) -> { // MUL
+ mStack[sp - 1] = mStack[sp - 1] * mStack[sp];
+ return sp - 1;
+ },
+ (sp) -> { // DIV
+ mStack[sp - 1] = mStack[sp - 1] / mStack[sp];
+ return sp - 1;
+ },
+ (sp) -> { // MOD
+ mStack[sp - 1] = mStack[sp - 1] % mStack[sp];
+ return sp - 1;
+ },
+ (sp) -> { // MIN
+ mStack[sp - 1] = (float) Math.min(mStack[sp - 1], mStack[sp]);
+ return sp - 1;
+ },
+ (sp) -> { // MAX
+ mStack[sp - 1] = (float) Math.max(mStack[sp - 1], mStack[sp]);
+ return sp - 1;
+ },
+ (sp) -> { // POW
+ mStack[sp - 1] = (float) Math.pow(mStack[sp - 1], mStack[sp]);
+ return sp - 1;
+ },
+ (sp) -> { // SQRT
+ mStack[sp] = (float) Math.sqrt(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // ABS
+ mStack[sp] = (float) Math.abs(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // SIGN
+ mStack[sp] = (float) Math.signum(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // copySign
+ mStack[sp - 1] = (float) Math.copySign(mStack[sp - 1], mStack[sp]);
+ return sp - 1;
+ },
+ (sp) -> { // EXP
+ mStack[sp] = (float) Math.exp(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // FLOOR
+ mStack[sp] = (float) Math.floor(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // LOG
+ mStack[sp] = (float) Math.log10(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // LN
+ mStack[sp] = (float) Math.log(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // ROUND
+ mStack[sp] = (float) Math.round(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // SIN
+ mStack[sp] = (float) Math.sin(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // COS
+ mStack[sp] = (float) Math.cos(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // TAN
+ mStack[sp] = (float) Math.tan(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // ASIN
+ mStack[sp] = (float) Math.asin(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // ACOS
+ mStack[sp] = (float) Math.acos(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // ATAN
+ mStack[sp] = (float) Math.atan(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // ATAN2
+ mStack[sp - 1] = (float) Math.atan2(mStack[sp - 1], mStack[sp]);
+ return sp - 1;
+ },
+ (sp) -> { // MAD
+ mStack[sp - 2] = mStack[sp] + mStack[sp - 1] * mStack[sp - 2];
+ return sp - 2;
+ },
+ (sp) -> { // Ternary conditional
+ mStack[sp - 2] = (mStack[sp] > 0)
+ ? mStack[sp - 1] : mStack[sp - 2];
+ return sp - 2;
+ },
+ (sp) -> { // CLAMP(min,max, val)
+ mStack[sp - 2] = Math.min(Math.max(mStack[sp - 2], mStack[sp]),
+ mStack[sp - 1]);
+ return sp - 2;
+ },
+ (sp) -> { // CBRT cuberoot
+ mStack[sp] = (float) Math.pow(mStack[sp], 1 / 3.);
+ return sp;
+ },
+ (sp) -> { // DEG
+ mStack[sp] = mStack[sp] * FP_TO_RAD;
+ return sp;
+ },
+ (sp) -> { // RAD
+ mStack[sp] = mStack[sp] * FP_TO_DEG;
+ return sp;
+ },
+ (sp) -> { // CEIL
+ mStack[sp] = (float) Math.ceil(mStack[sp]);
+ return sp;
+ },
+ (sp) -> { // first var =
+ mStack[sp] = mVar[0];
+ return sp;
+ },
+ (sp) -> { // second var y?
+ mStack[sp] = mVar[1];
+ return sp;
+ },
+ (sp) -> { // 3rd var z?
+ mStack[sp] = mVar[2];
+ return sp;
+ },
+ };
+
+ static {
+ int k = 0;
+ sNames.put(k++, "NOP");
+ sNames.put(k++, "+");
+ sNames.put(k++, "-");
+ sNames.put(k++, "*");
+ sNames.put(k++, "/");
+ sNames.put(k++, "%");
+ sNames.put(k++, "min");
+ sNames.put(k++, "max");
+ sNames.put(k++, "pow");
+ sNames.put(k++, "sqrt");
+ sNames.put(k++, "abs");
+ sNames.put(k++, "sign");
+ sNames.put(k++, "copySign");
+ sNames.put(k++, "exp");
+ sNames.put(k++, "floor");
+ sNames.put(k++, "log");
+ sNames.put(k++, "ln");
+ sNames.put(k++, "round");
+ sNames.put(k++, "sin");
+ sNames.put(k++, "cos");
+ sNames.put(k++, "tan");
+ sNames.put(k++, "asin");
+ sNames.put(k++, "acos");
+ sNames.put(k++, "atan");
+ sNames.put(k++, "atan2");
+ sNames.put(k++, "mad");
+ sNames.put(k++, "ifElse");
+ sNames.put(k++, "clamp");
+ sNames.put(k++, "cbrt");
+ sNames.put(k++, "deg");
+ sNames.put(k++, "rad");
+ sNames.put(k++, "ceil");
+ sNames.put(k++, "a[0]");
+ sNames.put(k++, "a[1]");
+ sNames.put(k++, "a[2]");
+ }
+
+ /**
+ * given a float command return its math name (e.g sin, cos etc.)
+ * @param f
+ * @return
+ */
+ public static String toMathName(float f) {
+ int id = fromNaN(f) - OFFSET;
+ return sNames.get(id);
+ }
+
+ /**
+ * Convert an expression encoded as an array of floats int ot a string
+ * @param exp
+ * @param labels
+ * @return
+ */
+ public static String toString(float[] exp, String[] labels) {
+ StringBuilder s = new StringBuilder();
+ for (int i = 0; i < exp.length; i++) {
+ float v = exp[i];
+ if (Float.isNaN(v)) {
+ if (isMathOperator(v)) {
+ s.append(toMathName(v));
+ } else {
+ s.append("[");
+ s.append(fromNaN(v));
+ s.append("]");
+ }
+ } else {
+ if (labels[i] != null) {
+ s.append(labels[i]);
+ }
+ s.append(v);
+ }
+ s.append(" ");
+ }
+ return s.toString();
+ }
+
+ static String toString(float[] exp, int sp) {
+ String[] str = new String[exp.length];
+ if (Float.isNaN(exp[sp])) {
+ int id = fromNaN(exp[sp]) - OFFSET;
+ switch (NO_OF_OPS[id]) {
+ case -1:
+ return "nop";
+ case 1:
+ return sNames.get(id) + "(" + toString(exp, sp + 1) + ") ";
+ case 2:
+ if (infix(id)) {
+ return "(" + toString(exp, sp + 1)
+ + sNames.get(id) + " "
+ + toString(exp, sp + 2) + ") ";
+ } else {
+ return sNames.get(id) + "("
+ + toString(exp, sp + 1) + ", "
+ + toString(exp, sp + 2) + ")";
+ }
+ case 3:
+ if (infix(id)) {
+ return "((" + toString(exp, sp + 1) + ") ? "
+ + toString(exp, sp + 2) + ":"
+ + toString(exp, sp + 3) + ")";
+ } else {
+ return sNames.get(id)
+ + "(" + toString(exp, sp + 1)
+ + ", " + toString(exp, sp + 2)
+ + ", " + toString(exp, sp + 3) + ")";
+ }
+ }
+ }
+ return Float.toString(exp[sp]);
+ }
+
+ static final int[] NO_OF_OPS = {
+ -1, // no op
+ 2, 2, 2, 2, 2, // + - * / %
+ 2, 2, 2, // min max, power
+ 1, 1, 1, 1, 1, 1, 1, 1, //sqrt,abs,CopySign,exp,floor,log,ln
+ 1, 1, 1, 1, 1, 1, 1, 2, // round,sin,cos,tan,asin,acos,atan,atan2
+ 3, 3, 3, 1, 1, 1, 1,
+ 0, 0, 0 // mad, ?:,
+ // a[0],a[1],a[2]
+ };
+
+ /**
+ * to be used by parser to determine if command is infix
+ * @param n
+ * @return
+ */
+ static boolean infix(int n) {
+ return ((n < 6) || (n == 25) || (n == 26));
+ }
+
+ /**
+ * Convert an id into a NaN object
+ * @param v
+ * @return
+ */
+ public static float asNan(int v) {
+ return Float.intBitsToFloat(v | -0x800000);
+ }
+
+ /**
+ * Get ID from a NaN float
+ * @param v
+ * @return
+ */
+ public static int fromNaN(float v) {
+ int b = Float.floatToRawIntBits(v);
+ return b & 0xFFFFF;
+ }
+
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/ColorUtils.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/ColorUtils.java
new file mode 100644
index 0000000..0ea28a8
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/ColorUtils.java
@@ -0,0 +1,68 @@
+/*
+ * 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.utilities;
+
+/**
+ * These are tools to use long Color as variables
+ * long colors are stored a 0xXXXXXXXX XXXXXX??
+ * in SRGB the colors are stored 0xAARRGGBB,00000000
+ * SRGB color sapce is color space 0
+ * Our Color will use color float with a
+ * Current android supports
+ * SRGB, LINEAR_SRGB, EXTENDED_SRGB, LINEAR_EXTENDED_SRGB, BT709, BT2020,
+ * DCI_P3, DISPLAY_P3, NTSC_1953, SMPTE_C, ADOBE_RGB, PRO_PHOTO_RGB, ACES,
+ * ACESCG, CIE_XYZ, CIE_LAB, BT2020_HLG, BT2020_PQ 0..17 respectively
+ *
+ * Our color space will be 62 (MAX_ID-1). (0x3E)
+ * Storing the default value in SRGB format and having the
+ * id of the color between the ARGB values and the 62 i.e.
+ * 0xAARRGGBB 00 00 00 3E
+ *
+ */
+public class ColorUtils {
+ public static int RC_COLOR = 62;
+
+ long packRCColor(int defaultARGB, int id) {
+ long l = defaultARGB;
+ return (l << 32) | id << 8 | RC_COLOR;
+ }
+
+ boolean isRCColor(long color) {
+ return ((color & 0x3F) == 62);
+ }
+
+ int getID(long color) {
+ if (isRCColor(color)) {
+ return (int) ((color & 0xFFFFFF00) >> 8);
+ }
+ return -1;
+ }
+
+ /**
+ * get default color from long color
+ * @param color
+ * @return
+ */
+ public int getDefaultColor(long color) {
+ if (isRCColor(color)) {
+ return (int) (color >> 32);
+ }
+ if (((color & 0xFF) == 0)) {
+ return (int) (color >> 32);
+ }
+ return 0;
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/IntMap.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/IntMap.java
index 8051ef1..0512fa6 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/IntMap.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/IntMap.java
@@ -50,7 +50,6 @@
return insert(key, value);
}
-
public T get(int key) {
int index = findKey(key);
if (index == -1) {
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/NanMap.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/NanMap.java
new file mode 100644
index 0000000..f4cd504
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/NanMap.java
@@ -0,0 +1,75 @@
+/*
+ * 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.utilities;
+
+import com.android.internal.widget.remotecompose.core.operations.Utils;
+
+/**
+ * This defines the major id maps and ranges used by remote compose
+ * Generally ids ranging from 0 ... FFF (4095) are for ids
+ * 0x1000-0x1100 are used for path operations in PathData
+ * 0x1100-0x1200 are used for math operations in Animated float
+ * 0x
+ */
+public class NanMap {
+
+ public static final int MOVE = 0x1000;
+ public static final int LINE = 0x1001;
+ public static final int QUADRATIC = 0x1002;
+ public static final int CONIC = 0x1003;
+ public static final int CUBIC = 0x1004;
+ public static final int CLOSE = 0x1005;
+ public static final int DONE = 0x1006;
+ public static final float MOVE_NAN = Utils.asNan(MOVE);
+ public static final float LINE_NAN = Utils.asNan(LINE);
+ public static final float QUADRATIC_NAN = Utils.asNan(QUADRATIC);
+ public static final float CONIC_NAN = Utils.asNan(CONIC);
+ public static final float CUBIC_NAN = Utils.asNan(CUBIC);
+ public static final float CLOSE_NAN = Utils.asNan(CLOSE);
+ public static final float DONE_NAN = Utils.asNan(DONE);
+
+ /**
+ *
+ */
+ public static final float ADD = asNan(0x1100);
+ public static final float SUB = asNan(0x1101);
+ public static final float MUL = asNan(0x1102);
+ public static final float DIV = asNan(0x1103);
+ public static final float MOD = asNan(0x1104);
+ public static final float MIN = asNan(0x1105);
+ public static final float MAX = asNan(0x1106);
+ public static final float POW = asNan(0x1107);
+
+
+ /**
+ * Get ID from Nan float
+ * @param v
+ * @return
+ */
+ public static int fromNaN(float v) {
+ int b = Float.floatToRawIntBits(v);
+ return b & 0xFFFFF;
+ }
+
+ /**
+ * Given id return as a Nan float
+ * @param v
+ * @return
+ */
+ public static float asNan(int v) {
+ return Float.intBitsToFloat(v | 0xFF800000);
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/StringUtils.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/StringUtils.java
new file mode 100644
index 0000000..8dd5405
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/StringUtils.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.widget.remotecompose.core.operations.utilities;
+
+import java.util.Arrays;
+
+/**
+ * Utilities for string manipulation
+ */
+public class StringUtils {
+ /**
+ * Converts a float into a string.
+ * Providing a defined number of characters before and after the
+ * decimal point.
+ *
+ * @param value The value to convert to string
+ * @param beforeDecimalPoint digits before the decimal point
+ * @param afterDecimalPoint digits after the decimal point
+ * @param pre character to pad width 0 = no pad typically ' ' or '0'
+ * @param post character to pad width 0 = no pad typically ' ' or '0'
+ * @return
+ */
+ public static String floatToString(float value,
+ int beforeDecimalPoint,
+ int afterDecimalPoint,
+ char pre, char post) {
+
+ int integerPart = (int) value;
+ float fractionalPart = value % 1;
+
+ // Convert integer part to string and pad with spaces
+ String integerPartString = String.valueOf(integerPart);
+ int iLen = integerPartString.length();
+ if (iLen < beforeDecimalPoint) {
+ int spacesToPad = beforeDecimalPoint - iLen;
+ if (pre != 0) {
+ char[] pad = new char[spacesToPad];
+ Arrays.fill(pad, pre);
+ integerPartString = new String(pad) + integerPartString;
+ }
+
+
+ } else if (iLen > beforeDecimalPoint) {
+ integerPartString = integerPartString.substring(iLen - beforeDecimalPoint);
+ }
+ if (afterDecimalPoint == 0) {
+ return integerPartString;
+ }
+ // Convert fractional part to string and pad with zeros
+
+ for (int i = 0; i < afterDecimalPoint; i++) {
+ fractionalPart *= 10;
+ }
+
+ fractionalPart = Math.round(fractionalPart);
+
+ for (int i = 0; i < afterDecimalPoint; i++) {
+ fractionalPart *= .1;
+ }
+
+ String fact = Float.toString(fractionalPart);
+ fact = fact.substring(2, Math.min(fact.length(), afterDecimalPoint + 2));
+ int trim = fact.length();
+ for (int i = fact.length() - 1; i >= 0; i--) {
+ if (fact.charAt(i) != '0') {
+ break;
+ }
+ trim--;
+ }
+ if (trim != fact.length()) {
+ fact = fact.substring(0, trim);
+ }
+ int len = fact.length();
+ if (post != 0 && len < afterDecimalPoint) {
+ char[] c = new char[afterDecimalPoint - len];
+ Arrays.fill(c, post);
+ fact = fact + new String(c);
+ }
+
+ return integerPartString + "." + fact;
+ }
+
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/BounceCurve.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/BounceCurve.java
new file mode 100644
index 0000000..c3cd5ae9
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/BounceCurve.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.widget.remotecompose.core.operations.utilities.easing;
+
+/**
+ * Provide a specific bouncing easing function
+ */
+public class BounceCurve extends Easing {
+ private static final float N1 = 7.5625f;
+ private static final float D1 = 2.75f;
+
+ BounceCurve(int type) {
+ mType = type;
+ }
+
+ @Override
+ public float get(float x) {
+ float t = x;
+ if (t < 0) {
+ return 0f;
+ }
+ if (t < 1 / D1) {
+ return 1 / (1 + 1 / D1) * (N1 * t * t + t);
+ } else if (t < 2 / D1) {
+ t -= 1.5f / D1;
+ return N1 * t * t + 0.75f;
+ } else if (t < 2.5 / D1) {
+ t -= 2.25f / D1;
+ return N1 * t * t + 0.9375f;
+ } else if (t <= 1) {
+ t -= 2.625f / D1;
+ return N1 * t * t + 0.984375f;
+ }
+ return 1f;
+ }
+
+ @Override
+ public float getDiff(float x) {
+ if (x < 0) {
+ return 0f;
+ }
+ if (x < 1 / D1) {
+ return 2 * N1 * x / (1 + 1 / D1) + 1 / (1 + 1 / D1);
+ } else if (x < 2 / D1) {
+ return 2 * N1 * (x - 1.5f / D1);
+ } else if (x < 2.5 / D1) {
+ return 2 * N1 * (x - 2.25f / D1);
+ } else if (x <= 1) {
+ return 2 * N1 * (x - 2.625f / D1);
+ }
+ return 0f;
+ }
+
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/CubicEasing.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/CubicEasing.java
new file mode 100644
index 0000000..fd1ee03
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/CubicEasing.java
@@ -0,0 +1,157 @@
+/*
+ * 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.utilities.easing;
+
+class CubicEasing extends Easing {
+ float mType = 0;
+ float mX1 = 0f;
+ float mY1 = 0f;
+ float mX2 = 0f;
+ float mY2 = 0f;
+
+ private static final float[] STANDARD = {0.4f, 0.0f, 0.2f, 1f};
+ private static final float[] ACCELERATE = {0.4f, 0.05f, 0.8f, 0.7f};
+ private static final float[] DECELERATE = {0.0f, 0.0f, 0.2f, 0.95f};
+ private static final float[] LINEAR = {1f, 1f, 0f, 0f};
+ private static final float[] ANTICIPATE = {0.36f, 0f, 0.66f, -0.56f};
+ private static final float[] OVERSHOOT = {0.34f, 1.56f, 0.64f, 1f};
+
+ CubicEasing(int type) {
+ mType = type;
+ config(type);
+ }
+
+ CubicEasing(float x1, float y1, float x2, float y2) {
+ setup(x1, y1, x2, y2);
+ }
+
+ public void config(int type) {
+
+ switch (type) {
+ case CUBIC_STANDARD:
+ setup(STANDARD);
+ break;
+ case CUBIC_ACCELERATE:
+ setup(ACCELERATE);
+ break;
+ case CUBIC_DECELERATE:
+ setup(DECELERATE);
+ break;
+ case CUBIC_LINEAR:
+ setup(LINEAR);
+ break;
+ case CUBIC_ANTICIPATE:
+ setup(ANTICIPATE);
+ break;
+ case CUBIC_OVERSHOOT:
+ setup(OVERSHOOT);
+ break;
+ }
+ mType = type;
+ }
+
+ void setup(float[] values) {
+ setup(values[0], values[1], values[2], values[3]);
+ }
+
+ void setup(float x1, float y1, float x2, float y2) {
+ mX1 = x1;
+ mY1 = y1;
+ mX2 = x2;
+ mY2 = y2;
+ }
+
+ private float getX(float t) {
+ float t1 = 1 - t;
+ // no need for because start at 0,0 float f0 = (1 - t) * (1 - t) * (1 - t)
+ float f1 = 3 * t1 * t1 * t;
+ float f2 = 3 * t1 * t * t;
+ float f3 = t * t * t;
+ return mX1 * f1 + mX2 * f2 + f3;
+ }
+
+ private float getY(float t) {
+ float t1 = 1 - t;
+ // no need for testing because start at 0,0 float f0 = (1 - t) * (1 - t) * (1 - t)
+ float f1 = 3 * t1 * t1 * t;
+ float f2 = 3 * t1 * t * t;
+ float f3 = t * t * t;
+ return mY1 * f1 + mY2 * f2 + f3;
+ }
+
+ private float getDiffX(float t) {
+ float t1 = 1 - t;
+ return 3 * t1 * t1 * mX1 + 6 * t1 * t * (mX2 - mX1) + 3 * t * t * (1 - mX2);
+ }
+
+ private float getDiffY(float t) {
+ float t1 = 1 - t;
+ return 3 * t1 * t1 * mY1 + 6 * t1 * t * (mY2 - mY1) + 3 * t * t * (1 - mY2);
+ }
+
+ /**
+ * binary search for the region and linear interpolate the answer
+ */
+ public float getDiff(float x) {
+ float t = 0.5f;
+ float range = 0.5f;
+ while (range > D_ERROR) {
+ float tx = getX(t);
+ range *= 0.5;
+ if (tx < x) {
+ t += range;
+ } else {
+ t -= range;
+ }
+ }
+ float x1 = getX(t - range);
+ float x2 = getX(t + range);
+ float y1 = getY(t - range);
+ float y2 = getY(t + range);
+ return (y2 - y1) / (x2 - x1);
+ }
+
+ /**
+ * binary search for the region and linear interpolate the answer
+ */
+ public float get(float x) {
+ if (x <= 0.0f) {
+ return 0f;
+ }
+ if (x >= 1.0f) {
+ return 1.0f;
+ }
+ float t = 0.5f;
+ float range = 0.5f;
+ while (range > ERROR) {
+ float tx = getX(t);
+ range *= 0.5f;
+ if (tx < x) {
+ t += range;
+ } else {
+ t -= range;
+ }
+ }
+ float x1 = getX(t - range);
+ float x2 = getX(t + range);
+ float y1 = getY(t - range);
+ float y2 = getY(t + range);
+ return (y2 - y1) * (x - x1) / (x2 - x1) + y1;
+ }
+
+ private static final float ERROR = 0.01f;
+ private static final float D_ERROR = 0.0001f;
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/Easing.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/Easing.java
new file mode 100644
index 0000000..4ed9550
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/Easing.java
@@ -0,0 +1,48 @@
+/*
+ * 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.utilities.easing;
+
+/**
+ * The standard interface to Easing functions
+ */
+public abstract class Easing {
+ int mType;
+ /**
+ * get the value at point x
+ */
+ public abstract float get(float x);
+
+ /**
+ * get the slope of the easing function at at x
+ */
+ public abstract float getDiff(float x);
+
+ public int getType() {
+ return mType;
+ }
+
+ public static final int CUBIC_STANDARD = 1;
+ public static final int CUBIC_ACCELERATE = 2;
+ public static final int CUBIC_DECELERATE = 3;
+ public static final int CUBIC_LINEAR = 4;
+ public static final int CUBIC_ANTICIPATE = 5;
+ public static final int CUBIC_OVERSHOOT = 6;
+ public static final int CUBIC_CUSTOM = 11;
+ public static final int SPLINE_CUSTOM = 12;
+ public static final int EASE_OUT_BOUNCE = 13;
+ public static final int EASE_OUT_ELASTIC = 14;
+
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/ElasticOutCurve.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/ElasticOutCurve.java
new file mode 100644
index 0000000..e269583
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/ElasticOutCurve.java
@@ -0,0 +1,49 @@
+/*
+ * 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.utilities.easing;
+
+/**
+ * Provide a bouncing Easing function
+ */
+public class ElasticOutCurve extends Easing {
+ private static final float F_PI = (float) Math.PI;
+ private static final float C4 = 2 * F_PI / 3;
+ private static final float TWENTY_PI = 20 * F_PI;
+ private static final float LOG_8 = (float) Math.log(8.0f);
+
+ @Override
+ public float get(float x) {
+ if (x <= 0) {
+ return 0.0f;
+ }
+ if (x >= 1) {
+ return 1.0f;
+ } else
+ return (float) (Math.pow(2.0f, -10 * x)
+ * Math.sin((x * 10 - 0.75f) * C4) + 1);
+ }
+
+ @Override
+ public float getDiff(float x) {
+ if (x < 0 || x > 1) {
+ return 0.0f;
+ } else
+ return (float) ((5 * Math.pow(2.0f, (1 - 10 * x))
+ * (LOG_8 * Math.cos(TWENTY_PI * x / 3) + 2
+ * F_PI * Math.sin(TWENTY_PI * x / 3))
+ / 3));
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/FloatAnimation.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/FloatAnimation.java
new file mode 100644
index 0000000..4f484de
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/FloatAnimation.java
@@ -0,0 +1,259 @@
+/*
+ * 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.utilities.easing;
+
+/**
+ * Support Animation of the FloatExpression
+ */
+public class FloatAnimation extends Easing {
+ float[] mSpec;
+ // mSpec[0] = duration
+ // int(mSpec[1]) = num_of_param << 16 | type
+ // mSpec[2..1+num_of_param] params
+ // mSpec[2+num_of_param] starting Value
+ Easing mEasingCurve;
+ private int mType = CUBIC_STANDARD;
+ private float mDuration = 1;
+ private float mWrap = Float.NaN;
+ private float mInitialValue = Float.NaN;
+ private float mTargetValue = Float.NaN;
+ private float mScale = 1;
+ float mOffset = 0;
+
+ @Override
+ public String toString() {
+
+ String str = "type " + mType;
+ if (!Float.isNaN(mInitialValue)) {
+ str += " " + mInitialValue;
+ }
+ if (!Float.isNaN(mTargetValue)) {
+ str += " -> " + mTargetValue;
+ }
+ if (!Float.isNaN(mWrap)) {
+ str += " % " + mWrap;
+ }
+
+ return str;
+ }
+
+ public FloatAnimation() {
+ }
+
+ public FloatAnimation(float... description) {
+ setAnimationDescription(description);
+ }
+
+ public FloatAnimation(int type,
+ float duration,
+ float[] description,
+ float initialValue,
+ float wrap) {
+ setAnimationDescription(packToFloatArray(duration,
+ type, description, initialValue, wrap));
+ }
+
+ /**
+ * packs spec into a float array
+ *
+ * @param duration
+ * @param type
+ * @param spec
+ * @param initialValue
+ * @return
+ */
+ public static float[] packToFloatArray(float duration,
+ int type,
+ float[] spec,
+ float initialValue,
+ float wrap) {
+ int count = 0;
+
+ if (!Float.isNaN(initialValue)) {
+ count++;
+ }
+ if (spec != null) {
+ count++;
+ }
+ if (spec != null || type != CUBIC_STANDARD) {
+ count++;
+ count += (spec == null) ? 0 : spec.length;
+ }
+ if (duration != 1 || count > 0) {
+ count++;
+ }
+ if (!Float.isNaN(initialValue)) {
+ count++;
+ }
+ if (!Float.isNaN(wrap)) {
+ count++;
+ }
+ float[] ret = new float[count];
+ int pos = 0;
+ int specLen = (spec == null) ? 0 : spec.length;
+
+ if (ret.length > 0) {
+ ret[pos++] = duration;
+
+ }
+ if (ret.length > 1) {
+ int wrapBit = (Float.isNaN(wrap)) ? 0 : 1;
+ int initBit = (Float.isNaN(initialValue)) ? 0 : 2;
+ int bits = type | ((wrapBit | initBit) << 8);
+ ret[pos++] = Float.intBitsToFloat(specLen << 16 | bits);
+ }
+
+ if (specLen > 0) {
+ System.arraycopy(spec, 0, ret, pos, spec.length);
+ pos += spec.length;
+ }
+ if (!Float.isNaN(initialValue)) {
+ ret[pos++] = initialValue;
+ }
+ if (!Float.isNaN(wrap)) {
+ ret[pos] = wrap;
+ }
+ return ret;
+ }
+
+ /**
+ * Create an animation based on a float encoding of the animation
+ * @param description
+ */
+ public void setAnimationDescription(float[] description) {
+ mSpec = description;
+ mDuration = (mSpec.length == 0) ? 1 : mSpec[0];
+ int len = 0;
+ if (mSpec.length > 1) {
+ int num_type = Float.floatToRawIntBits(mSpec[1]);
+ mType = num_type & 0xFF;
+ boolean wrap = ((num_type >> 8) & 0x1) > 0;
+ boolean init = ((num_type >> 8) & 0x2) > 0;
+ len = (num_type >> 16) & 0xFFFF;
+ int off = 2 + len;
+ if (init) {
+ mInitialValue = mSpec[off++];
+ }
+ if (wrap) {
+ mWrap = mSpec[off];
+ }
+ }
+ create(mType, description, 2, len);
+ }
+
+ private void create(int type, float[] params, int offset, int len) {
+ switch (type) {
+ case CUBIC_STANDARD:
+ case CUBIC_ACCELERATE:
+ case CUBIC_DECELERATE:
+ case CUBIC_LINEAR:
+ case CUBIC_ANTICIPATE:
+ case CUBIC_OVERSHOOT:
+ mEasingCurve = new CubicEasing(type);
+ break;
+ case CUBIC_CUSTOM:
+ mEasingCurve = new CubicEasing(params[offset + 0],
+ params[offset + 1],
+ params[offset + 2],
+ params[offset + 3]
+ );
+ break;
+ case EASE_OUT_BOUNCE:
+ mEasingCurve = new BounceCurve(type);
+ break;
+ case EASE_OUT_ELASTIC:
+ mEasingCurve = new ElasticOutCurve();
+ break;
+ case SPLINE_CUSTOM:
+ mEasingCurve = new StepCurve(params, offset, len);
+ break;
+ }
+ }
+
+ /**
+ * Get the duration the interpolate is to take
+ * @return duration in seconds
+ */
+ public float getDuration() {
+ return mDuration;
+ }
+
+ /**
+ * Set the initial Value
+ * @param value
+ */
+ public void setInitialValue(float value) {
+
+ if (Float.isNaN(mWrap)) {
+ mInitialValue = value;
+ } else {
+ mInitialValue = value % mWrap;
+ }
+ setScaleOffset();
+ }
+
+ /**
+ * Set the target value to interpolate to
+ * @param value
+ */
+ public void setTargetValue(float value) {
+ if (Float.isNaN(mWrap)) {
+ mTargetValue = value;
+ } else {
+ if (Math.abs((value % mWrap) + mWrap - mInitialValue)
+ < Math.abs((value % mWrap) - mInitialValue)) {
+ mTargetValue = (value % mWrap) + mWrap;
+
+ } else {
+ mTargetValue = value % mWrap;
+ }
+ }
+ setScaleOffset();
+ }
+
+ public float getTargetValue() {
+ return mTargetValue;
+ }
+
+ private void setScaleOffset() {
+ if (!Float.isNaN(mInitialValue) && !Float.isNaN(mTargetValue)) {
+ mScale = (mTargetValue - mInitialValue);
+ mOffset = mInitialValue;
+ } else {
+ mScale = 1;
+ mOffset = 0;
+ }
+ }
+
+ /**
+ * get the value at time t in seconds since start
+ */
+ public float get(float t) {
+ return mEasingCurve.get(t / mDuration)
+ * (mTargetValue - mInitialValue) + mInitialValue;
+ }
+
+ /**
+ * get the slope of the easing function at at x
+ */
+ public float getDiff(float t) {
+ return mEasingCurve.getDiff(t / mDuration) * (mTargetValue - mInitialValue);
+ }
+
+ public float getInitialValue() {
+ return mInitialValue;
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/GeneralEasing.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/GeneralEasing.java
new file mode 100644
index 0000000..693deaf
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/GeneralEasing.java
@@ -0,0 +1,81 @@
+/*
+ * 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.utilities.easing;
+
+/**
+ * Provides and interface to create easing functions
+ */
+public class GeneralEasing extends Easing{
+ float[] mEasingData = new float[0];
+ Easing mEasingCurve = new CubicEasing(CUBIC_STANDARD);
+
+ /**
+ * Set the curve based on the float encoding of it
+ * @param data
+ */
+ public void setCurveSpecification(float[] data) {
+ mEasingData = data;
+ createEngine();
+ }
+
+ public float[] getCurveSpecification() {
+ return mEasingData;
+ }
+
+ void createEngine() {
+ int type = Float.floatToRawIntBits(mEasingData[0]);
+ switch (type) {
+ case CUBIC_STANDARD:
+ case CUBIC_ACCELERATE:
+ case CUBIC_DECELERATE:
+ case CUBIC_LINEAR:
+ case CUBIC_ANTICIPATE:
+ case CUBIC_OVERSHOOT:
+ mEasingCurve = new CubicEasing(type);
+ break;
+ case CUBIC_CUSTOM:
+ mEasingCurve = new CubicEasing(mEasingData[1],
+ mEasingData[2],
+ mEasingData[3],
+ mEasingData[5]
+ );
+ break;
+ case EASE_OUT_BOUNCE:
+ mEasingCurve = new BounceCurve(type);
+ break;
+ }
+ }
+
+ /**
+ * get the value at point x
+ */
+ public float get(float x) {
+ return mEasingCurve.get(x);
+ }
+
+ /**
+ * get the slope of the easing function at at x
+ */
+ public float getDiff(float x) {
+ return mEasingCurve.getDiff(x);
+ }
+
+ public int getType() {
+ return mEasingCurve.getType();
+ }
+
+
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/MonotonicCurveFit.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/MonotonicCurveFit.java
new file mode 100644
index 0000000..23930b9
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/MonotonicCurveFit.java
@@ -0,0 +1,370 @@
+/*
+ * 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.utilities.easing;
+
+import java.util.Arrays;
+
+/**
+ * This performs a spline interpolation in multiple dimensions
+ *
+ *
+ */
+public class MonotonicCurveFit {
+ private static final String TAG = "MonotonicCurveFit";
+ private double[] mT;
+ private double[][] mY;
+ private double[][] mTangent;
+ private boolean mExtrapolate = true;
+ double[] mSlopeTemp;
+
+ /**
+ * create a collection of curves
+ * @param time the point along the curve
+ * @param y the parameter at those points
+ */
+ public MonotonicCurveFit(double[] time, double[][] y) {
+ final int n = time.length;
+ final int dim = y[0].length;
+ mSlopeTemp = new double[dim];
+ double[][] slope = new double[n - 1][dim]; // could optimize this out
+ double[][] tangent = new double[n][dim];
+ for (int j = 0; j < dim; j++) {
+ for (int i = 0; i < n - 1; i++) {
+ double dt = time[i + 1] - time[i];
+ slope[i][j] = (y[i + 1][j] - y[i][j]) / dt;
+ if (i == 0) {
+ tangent[i][j] = slope[i][j];
+ } else {
+ tangent[i][j] = (slope[i - 1][j] + slope[i][j]) * 0.5f;
+ }
+ }
+ tangent[n - 1][j] = slope[n - 2][j];
+ }
+
+ for (int i = 0; i < n - 1; i++) {
+ for (int j = 0; j < dim; j++) {
+ if (slope[i][j] == 0.) {
+ tangent[i][j] = 0.;
+ tangent[i + 1][j] = 0.;
+ } else {
+ double a = tangent[i][j] / slope[i][j];
+ double b = tangent[i + 1][j] / slope[i][j];
+ double h = Math.hypot(a, b);
+ if (h > 9.0) {
+ double t = 3. / h;
+ tangent[i][j] = t * a * slope[i][j];
+ tangent[i + 1][j] = t * b * slope[i][j];
+ }
+ }
+ }
+ }
+ mT = time;
+ mY = y;
+ mTangent = tangent;
+ }
+
+ /**
+ * Get the position of all curves at time t
+ * @param t
+ * @param v
+ */
+ public void getPos(double t, double[] v) {
+ final int n = mT.length;
+ final int dim = mY[0].length;
+ if (mExtrapolate) {
+ if (t <= mT[0]) {
+ getSlope(mT[0], mSlopeTemp);
+ for (int j = 0; j < dim; j++) {
+ v[j] = mY[0][j] + (t - mT[0]) * mSlopeTemp[j];
+ }
+ return;
+ }
+ if (t >= mT[n - 1]) {
+ getSlope(mT[n - 1], mSlopeTemp);
+ for (int j = 0; j < dim; j++) {
+ v[j] = mY[n - 1][j] + (t - mT[n - 1]) * mSlopeTemp[j];
+ }
+ return;
+ }
+ } else {
+ if (t <= mT[0]) {
+ for (int j = 0; j < dim; j++) {
+ v[j] = mY[0][j];
+ }
+ return;
+ }
+ if (t >= mT[n - 1]) {
+ for (int j = 0; j < dim; j++) {
+ v[j] = mY[n - 1][j];
+ }
+ return;
+ }
+ }
+
+ for (int i = 0; i < n - 1; i++) {
+ if (t == mT[i]) {
+ for (int j = 0; j < dim; j++) {
+ v[j] = mY[i][j];
+ }
+ }
+ if (t < mT[i + 1]) {
+ double h = mT[i + 1] - mT[i];
+ double x = (t - mT[i]) / h;
+ for (int j = 0; j < dim; j++) {
+ double y1 = mY[i][j];
+ double y2 = mY[i + 1][j];
+ double t1 = mTangent[i][j];
+ double t2 = mTangent[i + 1][j];
+ v[j] = interpolate(h, x, y1, y2, t1, t2);
+ }
+ return;
+ }
+ }
+ }
+
+ /**
+ * Get the position of all curves at time t
+ * @param t
+ * @param v
+ */
+ public void getPos(double t, float[] v) {
+ final int n = mT.length;
+ final int dim = mY[0].length;
+ if (mExtrapolate) {
+ if (t <= mT[0]) {
+ getSlope(mT[0], mSlopeTemp);
+ for (int j = 0; j < dim; j++) {
+ v[j] = (float) (mY[0][j] + (t - mT[0]) * mSlopeTemp[j]);
+ }
+ return;
+ }
+ if (t >= mT[n - 1]) {
+ getSlope(mT[n - 1], mSlopeTemp);
+ for (int j = 0; j < dim; j++) {
+ v[j] = (float) (mY[n - 1][j] + (t - mT[n - 1]) * mSlopeTemp[j]);
+ }
+ return;
+ }
+ } else {
+ if (t <= mT[0]) {
+ for (int j = 0; j < dim; j++) {
+ v[j] = (float) mY[0][j];
+ }
+ return;
+ }
+ if (t >= mT[n - 1]) {
+ for (int j = 0; j < dim; j++) {
+ v[j] = (float) mY[n - 1][j];
+ }
+ return;
+ }
+ }
+
+ for (int i = 0; i < n - 1; i++) {
+ if (t == mT[i]) {
+ for (int j = 0; j < dim; j++) {
+ v[j] = (float) mY[i][j];
+ }
+ }
+ if (t < mT[i + 1]) {
+ double h = mT[i + 1] - mT[i];
+ double x = (t - mT[i]) / h;
+ for (int j = 0; j < dim; j++) {
+ double y1 = mY[i][j];
+ double y2 = mY[i + 1][j];
+ double t1 = mTangent[i][j];
+ double t2 = mTangent[i + 1][j];
+ v[j] = (float) interpolate(h, x, y1, y2, t1, t2);
+ }
+ return;
+ }
+ }
+ }
+
+ /**
+ * Get the position of the jth curve at time t
+ * @param t
+ * @param j
+ * @return
+ */
+ public double getPos(double t, int j) {
+ final int n = mT.length;
+ if (mExtrapolate) {
+ if (t <= mT[0]) {
+ return mY[0][j] + (t - mT[0]) * getSlope(mT[0], j);
+ }
+ if (t >= mT[n - 1]) {
+ return mY[n - 1][j] + (t - mT[n - 1]) * getSlope(mT[n - 1], j);
+ }
+ } else {
+ if (t <= mT[0]) {
+ return mY[0][j];
+ }
+ if (t >= mT[n - 1]) {
+ return mY[n - 1][j];
+ }
+ }
+
+ for (int i = 0; i < n - 1; i++) {
+ if (t == mT[i]) {
+ return mY[i][j];
+ }
+ if (t < mT[i + 1]) {
+ double h = mT[i + 1] - mT[i];
+ double x = (t - mT[i]) / h;
+ double y1 = mY[i][j];
+ double y2 = mY[i + 1][j];
+ double t1 = mTangent[i][j];
+ double t2 = mTangent[i + 1][j];
+ return interpolate(h, x, y1, y2, t1, t2);
+
+ }
+ }
+ return 0; // should never reach here
+ }
+
+ /**
+ * Get the slope of all the curves at position t
+ * @param t
+ * @param v
+ */
+ public void getSlope(double t, double[] v) {
+ final int n = mT.length;
+ int dim = mY[0].length;
+ if (t <= mT[0]) {
+ t = mT[0];
+ } else if (t >= mT[n - 1]) {
+ t = mT[n - 1];
+ }
+
+ for (int i = 0; i < n - 1; i++) {
+ if (t <= mT[i + 1]) {
+ double h = mT[i + 1] - mT[i];
+ double x = (t - mT[i]) / h;
+ for (int j = 0; j < dim; j++) {
+ double y1 = mY[i][j];
+ double y2 = mY[i + 1][j];
+ double t1 = mTangent[i][j];
+ double t2 = mTangent[i + 1][j];
+ v[j] = diff(h, x, y1, y2, t1, t2) / h;
+ }
+ break;
+ }
+ }
+ return;
+ }
+
+ /**
+ * Get the slope of the j curve at position t
+ * @param t
+ * @param j
+ * @return
+ */
+ public double getSlope(double t, int j) {
+ final int n = mT.length;
+
+ if (t < mT[0]) {
+ t = mT[0];
+ } else if (t >= mT[n - 1]) {
+ t = mT[n - 1];
+ }
+ for (int i = 0; i < n - 1; i++) {
+ if (t <= mT[i + 1]) {
+ double h = mT[i + 1] - mT[i];
+ double x = (t - mT[i]) / h;
+ double y1 = mY[i][j];
+ double y2 = mY[i + 1][j];
+ double t1 = mTangent[i][j];
+ double t2 = mTangent[i + 1][j];
+ return diff(h, x, y1, y2, t1, t2) / h;
+ }
+ }
+ return 0; // should never reach here
+ }
+
+ public double[] getTimePoints() {
+ return mT;
+ }
+
+ /**
+ * Cubic Hermite spline
+ */
+ private static double interpolate(double h,
+ double x,
+ double y1,
+ double y2,
+ double t1,
+ double t2) {
+ double x2 = x * x;
+ double x3 = x2 * x;
+ return -2 * x3 * y2 + 3 * x2 * y2 + 2 * x3 * y1 - 3 * x2 * y1 + y1
+ + h * t2 * x3 + h * t1 * x3 - h * t2 * x2 - 2 * h * t1 * x2
+ + h * t1 * x;
+ }
+
+ /**
+ * Cubic Hermite spline slope differentiated
+ */
+ private static double diff(double h, double x, double y1, double y2, double t1, double t2) {
+ double x2 = x * x;
+ return -6 * x2 * y2 + 6 * x * y2 + 6 * x2 * y1 - 6 * x * y1 + 3 * h * t2 * x2
+ + 3 * h * t1 * x2 - 2 * h * t2 * x - 4 * h * t1 * x + h * t1;
+ }
+
+ /**
+ * This builds a monotonic spline to be used as a wave function
+ */
+ public static MonotonicCurveFit buildWave(String configString) {
+ // done this way for efficiency
+ String str = configString;
+ double[] values = new double[str.length() / 2];
+ int start = configString.indexOf('(') + 1;
+ int off1 = configString.indexOf(',', start);
+ int count = 0;
+ while (off1 != -1) {
+ String tmp = configString.substring(start, off1).trim();
+ values[count++] = Double.parseDouble(tmp);
+ off1 = configString.indexOf(',', start = off1 + 1);
+ }
+ off1 = configString.indexOf(')', start);
+ String tmp = configString.substring(start, off1).trim();
+ values[count++] = Double.parseDouble(tmp);
+
+ return buildWave(Arrays.copyOf(values, count));
+ }
+
+ private static MonotonicCurveFit buildWave(double[] values) {
+ int length = values.length * 3 - 2;
+ int len = values.length - 1;
+ double gap = 1.0 / len;
+ double[][] points = new double[length][1];
+ double[] time = new double[length];
+ for (int i = 0; i < values.length; i++) {
+ double v = values[i];
+ points[i + len][0] = v;
+ time[i + len] = i * gap;
+ if (i > 0) {
+ points[i + len * 2][0] = v + 1;
+ time[i + len * 2] = i * gap + 1;
+
+ points[i - 1][0] = v - 1 - gap;
+ time[i - 1] = i * gap + -1 - gap;
+ }
+ }
+
+ return new MonotonicCurveFit(time, points);
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/StepCurve.java b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/StepCurve.java
new file mode 100644
index 0000000..6ed6548
--- /dev/null
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/utilities/easing/StepCurve.java
@@ -0,0 +1,66 @@
+/*
+ * 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.utilities.easing;
+
+
+/**
+ * This class translates a series of floating point values into a continuous
+ * curve for use in an easing function including quantize functions
+ * it is used with the "spline(0,0.3,0.3,0.5,...0.9,1)" it should start at 0 and end at one 1
+ */
+public class StepCurve extends Easing {
+ private static final boolean DEBUG = false;
+ MonotonicCurveFit mCurveFit;
+
+ public StepCurve(float[] params, int offset, int len) {
+ mCurveFit = genSpline(params, offset, len);
+ }
+
+ private static MonotonicCurveFit genSpline(float[] values, int off, int arrayLen) {
+ int length = arrayLen * 3 - 2;
+ int len = arrayLen - 1;
+ double gap = 1.0 / len;
+ double[][] points = new double[length][1];
+ double[] time = new double[length];
+ for (int i = 0; i < arrayLen; i++) {
+ double v = values[i + off];
+ points[i + len][0] = v;
+ time[i + len] = i * gap;
+ if (i > 0) {
+ points[i + len * 2][0] = v + 1;
+ time[i + len * 2] = i * gap + 1;
+
+ points[i - 1][0] = v - 1 - gap;
+ time[i - 1] = i * gap + -1 - gap;
+ }
+ }
+
+ MonotonicCurveFit ms = new MonotonicCurveFit(time, points);
+
+ return ms;
+ }
+
+ @Override
+ public float getDiff(float x) {
+ return (float) mCurveFit.getSlope(x, 0);
+ }
+
+
+ @Override
+ public float get(float x) {
+ return (float) mCurveFit.getPos(x, 0);
+ }
+}
diff --git a/core/java/com/android/internal/widget/remotecompose/player/RemoteComposeDocument.java b/core/java/com/android/internal/widget/remotecompose/player/RemoteComposeDocument.java
index bcda27a..cb0d62e 100644
--- a/core/java/com/android/internal/widget/remotecompose/player/RemoteComposeDocument.java
+++ b/core/java/com/android/internal/widget/remotecompose/player/RemoteComposeDocument.java
@@ -79,6 +79,13 @@
}
/**
+ * The delay in milliseconds to next repaint -1 = not needed 0 = asap
+ * @return delay in milliseconds to next repaint or -1
+ */
+ public int needsRepaint() {
+ return mDocument.needsRepaint();
+ }
+ /**
* Returns true if the document can be displayed given this version of the player
*
* @param majorVersion the max major version supported by the player
@@ -89,5 +96,11 @@
return mDocument.canBeDisplayed(majorVersion, minorVersion, capabilities);
}
+ @Override
+ public String toString() {
+ return "Document{\n"
+ + mDocument
+ + '}';
+ }
}
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 7423a16..cc1f3dd 100644
--- a/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java
+++ b/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java
@@ -16,7 +16,6 @@
package com.android.internal.widget.remotecompose.player;
import android.content.Context;
-import android.graphics.Color;
import android.util.AttributeSet;
import android.util.Log;
import android.view.ViewGroup;
@@ -98,7 +97,6 @@
LayoutParams.MATCH_PARENT);
HorizontalScrollView horizontalScrollView =
new HorizontalScrollView(getContext());
- horizontalScrollView.setBackgroundColor(Color.TRANSPARENT);
horizontalScrollView.setFillViewport(true);
horizontalScrollView.addView(mInner, layoutParamsInner);
LayoutParams layoutParams = new LayoutParams(
@@ -115,7 +113,6 @@
LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT);
ScrollView scrollView = new ScrollView(getContext());
- scrollView.setBackgroundColor(Color.TRANSPARENT);
scrollView.setFillViewport(true);
scrollView.addView(mInner, layoutParamsInner);
LayoutParams layoutParams = new LayoutParams(
@@ -139,9 +136,7 @@
private void init(Context context, AttributeSet attrs, int defStyleAttr) {
LayoutParams layoutParams = new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT);
- setBackgroundColor(Color.TRANSPARENT);
mInner = new RemoteComposeCanvas(context, attrs, defStyleAttr);
- mInner.setBackgroundColor(Color.TRANSPARENT);
addView(mInner, layoutParams);
}
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 d0d6e69..ecb68bb 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
@@ -26,6 +26,7 @@
import android.graphics.RadialGradient;
import android.graphics.Rect;
import android.graphics.RectF;
+import android.graphics.RuntimeShader;
import android.graphics.Shader;
import android.graphics.SweepGradient;
import android.graphics.Typeface;
@@ -33,6 +34,8 @@
import com.android.internal.widget.remotecompose.core.PaintContext;
import com.android.internal.widget.remotecompose.core.RemoteContext;
import com.android.internal.widget.remotecompose.core.operations.ClipPath;
+import com.android.internal.widget.remotecompose.core.operations.ShaderData;
+import com.android.internal.widget.remotecompose.core.operations.Utils;
import com.android.internal.widget.remotecompose.core.operations.paint.PaintBundle;
import com.android.internal.widget.remotecompose.core.operations.paint.PaintChanges;
@@ -43,6 +46,7 @@
public class AndroidPaintContext extends PaintContext {
Paint mPaint = new Paint();
Canvas mCanvas;
+ Rect mTmpRect = new Rect(); // use in calculation of bounds
public AndroidPaintContext(RemoteContext context, Canvas canvas) {
super(context);
@@ -177,6 +181,22 @@
}
@Override
+ public void getTextBounds(int textId, int start, int end, boolean monospace, float[] bounds) {
+ String str = getText(textId);
+ if (end == -1) {
+ end = str.length();
+ }
+
+ mPaint.getTextBounds(str, start, end, mTmpRect);
+
+ bounds[0] = mTmpRect.left;
+ bounds[1] = mTmpRect.top;
+ bounds[2] = monospace ? (mPaint.measureText(str, start, end) - mTmpRect.left)
+ : mTmpRect.right;
+ bounds[3] = mTmpRect.bottom;
+ }
+
+ @Override
public void drawTextRun(int textID,
int start,
int end,
@@ -185,7 +205,16 @@
float x,
float y,
boolean rtl) {
- String textToPaint = getText(textID).substring(start, end);
+
+ String textToPaint = getText(textID);
+ if (end == -1) {
+ if (start != 0) {
+ textToPaint = textToPaint.substring(start);
+ }
+ } else {
+ textToPaint = textToPaint.substring(start, end);
+ }
+
mCanvas.drawText(textToPaint, x, y, mPaint);
}
@@ -308,7 +337,7 @@
@Override
public void applyPaint(PaintBundle mPaintData) {
- mPaintData.applyPaintChange(new PaintChanges() {
+ mPaintData.applyPaintChange((PaintContext) this, new PaintChanges() {
@Override
public void setTextSize(float size) {
mPaint.setTextSize(size);
@@ -361,10 +390,8 @@
}
}
-
}
-
@Override
public void setStrokeWidth(float width) {
mPaint.setStrokeWidth(width);
@@ -386,13 +413,37 @@
}
@Override
- public void setShader(int shader, String shaderString) {
-
+ public void setShader(int shaderId) {
+ // TODO this stuff should check the shader creation
+ if (shaderId == 0) {
+ mPaint.setShader(null);
+ return;
+ }
+ ShaderData data = getShaderData(shaderId);
+ RuntimeShader shader = new RuntimeShader(getText(data.getShaderTextId()));
+ String[] names = data.getUniformFloatNames();
+ for (int i = 0; i < names.length; i++) {
+ String name = names[i];
+ float[] val = data.getUniformFloats(name);
+ shader.setFloatUniform(name, val);
+ }
+ names = data.getUniformIntegerNames();
+ for (int i = 0; i < names.length; i++) {
+ String name = names[i];
+ int[] val = data.getUniformInts(name);
+ shader.setIntUniform(name, val);
+ }
+ names = data.getUniformBitmapNames();
+ for (int i = 0; i < names.length; i++) {
+ String name = names[i];
+ int val = data.getUniformBitmapId(name);
+ }
+ mPaint.setShader(shader);
}
@Override
public void setImageFilterQuality(int quality) {
- System.out.println(">>>>>>>>>>>> ");
+ Utils.log(" quality =" + quality);
}
@Override
@@ -420,7 +471,6 @@
mPaint.setFilterBitmap(filter);
}
-
@Override
public void setAntiAlias(boolean aa) {
mPaint.setAntiAlias(aa);
@@ -437,7 +487,6 @@
case PaintBundle.COLOR_FILTER:
mPaint.setColorFilter(null);
- System.out.println(">>>>>>>>>>>>> CLEAR!!!!");
break;
}
}
@@ -446,12 +495,11 @@
}
}
- Shader.TileMode[] mTilesModes = new Shader.TileMode[]{
+ Shader.TileMode[] mTileModes = new Shader.TileMode[]{
Shader.TileMode.CLAMP,
Shader.TileMode.REPEAT,
Shader.TileMode.MIRROR};
-
@Override
public void setLinearGradient(int[] colors,
float[] stops,
@@ -463,7 +511,7 @@
mPaint.setShader(new LinearGradient(startX,
startY,
endX,
- endY, colors, stops, mTilesModes[tileMode]));
+ endY, colors, stops, mTileModes[tileMode]));
}
@@ -475,7 +523,7 @@
float radius,
int tileMode) {
mPaint.setShader(new RadialGradient(centerX, centerY, radius,
- colors, stops, mTilesModes[tileMode]));
+ colors, stops, mTileModes[tileMode]));
}
@Override
@@ -490,7 +538,6 @@
@Override
public void setColorFilter(int color, int mode) {
PorterDuff.Mode pmode = origamiToPorterDuffMode(mode);
- System.out.println("setting color filter to " + pmode.name());
if (pmode != null) {
mPaint.setColorFilter(
new PorterDuffColorFilter(color, pmode));
@@ -500,10 +547,10 @@
}
@Override
- public void mtrixScale(float scaleX,
- float scaleY,
- float centerX,
- float centerY) {
+ public void matrixScale(float scaleX,
+ float scaleY,
+ float centerX,
+ float centerY) {
if (Float.isNaN(centerX)) {
mCanvas.scale(scaleX, scaleY);
} else {
@@ -556,6 +603,11 @@
}
}
+ @Override
+ public void reset() {
+ mPaint.reset();
+ }
+
private Path getPath(int path1Id,
int path2Id,
float tween,
@@ -599,5 +651,9 @@
private String getText(int id) {
return (String) mContext.mRemoteComposeState.getFromId(id);
}
+
+ private ShaderData getShaderData(int id) {
+ return (ShaderData) mContext.mRemoteComposeState.getFromId(id);
+ }
}
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 270e96f..6e4893b 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
@@ -20,10 +20,15 @@
import android.graphics.Canvas;
import com.android.internal.widget.remotecompose.core.RemoteContext;
+import com.android.internal.widget.remotecompose.core.VariableSupport;
+import com.android.internal.widget.remotecompose.core.operations.FloatExpression;
+import com.android.internal.widget.remotecompose.core.operations.ShaderData;
+
+import java.util.HashMap;
/**
* An implementation of Context for Android.
- *
+ * <p>
* This is used to play the RemoteCompose operations on Android.
*/
class AndroidRemoteContext extends RemoteContext {
@@ -33,6 +38,7 @@
mPaintContext = new AndroidPaintContext(this, canvas);
} else {
// need to make sure to update the canvas for the current one
+ mPaintContext.reset();
((AndroidPaintContext) mPaintContext).setCanvas(canvas);
}
mWidth = canvas.getWidth();
@@ -50,13 +56,32 @@
}
}
+ static class VarName {
+ String mName;
+ int mId;
+ int mType;
+
+ VarName(String name, int id, int type) {
+ mName = name;
+ mId = id;
+ mType = type;
+ }
+ }
+
+ HashMap<String, VarName> mVarNameHashMap = new HashMap<>();
+
+ @Override
+ public void loadVariableName(String varName, int varId, int varType) {
+ mVarNameHashMap.put(varName, new VarName(varName, varId, varType));
+ }
+
/**
* Decode a byte array into an image and cache it using the given imageId
*
- * @oaram imageId the id of the image
- * @param width with of image to be loaded
+ * @param width with of image to be loaded
* @param height height of image to be loaded
* @param bitmap a byte array containing the image information
+ * @oaram imageId the id of the image
*/
@Override
public void loadBitmap(int imageId, int width, int height, byte[] bitmap) {
@@ -70,14 +95,66 @@
public void loadText(int id, String text) {
if (!mRemoteComposeState.containsId(id)) {
mRemoteComposeState.cache(id, text);
+ } else {
+ mRemoteComposeState.update(id, text);
}
}
+ @Override
+ public String getText(int id) {
+ return (String) mRemoteComposeState.getFromId(id);
+ }
+
+ @Override
+ public void loadFloat(int id, float value) {
+ mRemoteComposeState.updateFloat(id, value);
+ }
+
+
+ @Override
+ public void loadColor(int id, int color) {
+ mRemoteComposeState.updateColor(id, color);
+ }
+
+ @Override
+ public void loadAnimatedFloat(int id, FloatExpression animatedFloat) {
+ mRemoteComposeState.cache(id, animatedFloat);
+ }
+
+ @Override
+ public void loadShader(int id, ShaderData value) {
+ mRemoteComposeState.cache(id, value);
+ }
+
+ @Override
+ public float getFloat(int id) {
+ return (float) mRemoteComposeState.getFloat(id);
+ }
+
+ @Override
+ public int getColor(int id) {
+ return mRemoteComposeState.getColor(id);
+ }
+
+ @Override
+ public void listensTo(int id, VariableSupport variableSupport) {
+ mRemoteComposeState.listenToVar(id, variableSupport);
+ }
+
+ @Override
+ public int updateOps() {
+ return mRemoteComposeState.getOpsToUpdate(this);
+ }
+
+ @Override
+ public ShaderData getShader(int id) {
+ return (ShaderData) mRemoteComposeState.getFromId(id);
+ }
+
///////////////////////////////////////////////////////////////////////////////////////////////
// Click handling
///////////////////////////////////////////////////////////////////////////////////////////////
-
@Override
public void addClickArea(int id,
int contentDescriptionId,
@@ -87,7 +164,7 @@
float bottom,
int metadataId) {
String contentDescription = (String) mRemoteComposeState.getFromId(contentDescriptionId);
- String metadata = (String) mRemoteComposeState.getFromId(metadataId);
+ String metadata = (String) mRemoteComposeState.getFromId(metadataId);
mDocument.addClickArea(id, contentDescription, left, top, right, bottom, metadata);
}
}
diff --git a/core/java/com/android/internal/widget/remotecompose/player/platform/ClickAreaView.java b/core/java/com/android/internal/widget/remotecompose/player/platform/ClickAreaView.java
index 672dae3..329178a 100644
--- a/core/java/com/android/internal/widget/remotecompose/player/platform/ClickAreaView.java
+++ b/core/java/com/android/internal/widget/remotecompose/player/platform/ClickAreaView.java
@@ -20,7 +20,6 @@
import android.graphics.Paint;
import android.view.View;
-
/**
* Implementation for the click handling
*/
@@ -40,7 +39,6 @@
setContentDescription(contentDescription);
}
-
public void setDebug(boolean value) {
if (mDebug != value) {
mDebug = value;
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 a3bb73e..97d23c8 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
@@ -85,6 +85,7 @@
mDocument.initializeContext(mARContext);
setContentDescription(mDocument.getDocument().getContentDescription());
requestLayout();
+ invalidate();
}
AndroidRemoteContext mARContext = new AndroidRemoteContext();
@@ -119,8 +120,7 @@
removeAllViews();
}
-
- public interface ClickCallbacks {
+ public interface ClickCallbacks {
void click(int id, String metadata);
}
@@ -213,6 +213,9 @@
setMeasuredDimension(w, h);
}
+ private int mCount;
+ private long mTime = System.nanoTime();
+
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
@@ -224,6 +227,17 @@
mARContext.mWidth = getWidth();
mARContext.mHeight = getHeight();
mDocument.paint(mARContext, mTheme);
+ if (mDebug) {
+ mCount++;
+ if (System.nanoTime() - mTime > 1000000000L) {
+ System.out.println(" count " + mCount + " fps");
+ mCount = 0;
+ mTime = System.nanoTime();
+ }
+ }
+ if (mDocument.needsRepaint() > 0) {
+ invalidate();
+ }
}
}
diff --git a/core/jni/android_database_SQLiteRawStatement.cpp b/core/jni/android_database_SQLiteRawStatement.cpp
index 8fc13a8..9614864 100644
--- a/core/jni/android_database_SQLiteRawStatement.cpp
+++ b/core/jni/android_database_SQLiteRawStatement.cpp
@@ -83,6 +83,16 @@
}
}
+// If the last operation failed, throw an exception and return true. Otherwise return false.
+static bool throwIfError(JNIEnv *env, jlong stmtPtr) {
+ switch (sqlite3_errcode(db(stmtPtr))) {
+ case SQLITE_OK:
+ case SQLITE_DONE:
+ case SQLITE_ROW: return false;
+ }
+ throw_sqlite3_exception(env, db(stmtPtr), nullptr);
+ return true;
+}
static jint bindParameterCount(JNIEnv* env, jclass, jlong stmtPtr) {
return sqlite3_bind_parameter_count(stmt(stmtPtr));
@@ -223,17 +233,24 @@
static jint columnBytes(JNIEnv* env, jclass, jlong stmtPtr, jint col) {
throwIfInvalidColumn(env, stmtPtr, col);
- return sqlite3_column_bytes16(stmt(stmtPtr), col);
+ int r = sqlite3_column_bytes16(stmt(stmtPtr), col);
+ throwIfError(env, stmtPtr);
+ return r;
}
-
static jbyteArray columnBlob(JNIEnv* env, jclass, jlong stmtPtr, jint col) {
throwIfInvalidColumn(env, stmtPtr, col);
const void* blob = sqlite3_column_blob(stmt(stmtPtr), col);
if (blob == nullptr) {
+ if (throwIfError(env, stmtPtr)) {
+ return NULL;
+ }
return (sqlite3_column_type(stmt(stmtPtr), col) == SQLITE_NULL) ? NULL : emptyArray;
}
size_t size = sqlite3_column_bytes(stmt(stmtPtr), col);
+ if (throwIfError(env, stmtPtr)) {
+ return NULL;
+ }
jbyteArray result = env->NewByteArray(size);
if (result == nullptr) {
// An OutOfMemory exception will have been thrown.
@@ -248,9 +265,13 @@
throwIfInvalidColumn(env, stmtPtr, col);
const void* blob = sqlite3_column_blob(stmt(stmtPtr), col);
if (blob == nullptr) {
+ throwIfError(env, stmtPtr);
return 0;
}
jsize bsize = sqlite3_column_bytes(stmt(stmtPtr), col);
+ if (throwIfError(env, stmtPtr)) {
+ return 0;
+ }
if (bsize == 0 || bsize <= srcOffset) {
return 0;
}
@@ -278,9 +299,13 @@
throwIfInvalidColumn(env, stmtPtr, col);
const jchar* text = static_cast<const jchar*>(sqlite3_column_text16(stmt(stmtPtr), col));
if (text == nullptr) {
+ throwIfError(env, stmtPtr);
return NULL;
}
size_t length = sqlite3_column_bytes16(stmt(stmtPtr), col) / sizeof(jchar);
+ if (throwIfError(env, stmtPtr)) {
+ return NULL;
+ }
return env->NewString(text, length);
}
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index 8e4addd..0eb7c4a 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -49,6 +49,9 @@
"/dev/dri/renderD129", // Fixes b/31172436
"/dev/stune/foreground/tasks",
"/dev/blkio/tasks",
+ "/metadata/aconfig/maps/system.package.map",
+ "/metadata/aconfig/maps/system.flag.map",
+ "/metadata/aconfig/boot/system.val"
};
static const char kFdPath[] = "/proc/self/fd";
diff --git a/core/proto/android/nfc/apdu_service_info.proto b/core/proto/android/nfc/apdu_service_info.proto
index fd110c4..9efdfcb 100644
--- a/core/proto/android/nfc/apdu_service_info.proto
+++ b/core/proto/android/nfc/apdu_service_info.proto
@@ -27,6 +27,20 @@
message ApduServiceInfoProto {
option (.android.msg_privacy).dest = DEST_EXPLICIT;
+ message AutoTransactMapping {
+ option (.android.msg_privacy).dest = DEST_EXPLICIT;
+
+ optional string aid = 1;
+ optional bool should_auto_transact = 2;
+ }
+
+ message AutoTransactPattern {
+ option (.android.msg_privacy).dest = DEST_EXPLICIT;
+
+ optional string regexp_pattern = 1;
+ optional bool should_auto_transact = 2;
+ }
+
optional .android.content.ComponentNameProto component_name = 1;
optional string description = 2;
optional bool on_host = 3;
@@ -35,4 +49,7 @@
repeated AidGroupProto static_aid_groups = 6;
repeated AidGroupProto dynamic_aid_groups = 7;
optional string settings_activity_name = 8;
+ optional bool should_default_to_observe_mode = 9;
+ repeated AutoTransactMapping auto_transact_mapping = 10;
+ repeated AutoTransactPattern auto_transact_patterns = 11;
}
diff --git a/core/proto/android/nfc/card_emulation.proto b/core/proto/android/nfc/card_emulation.proto
index 9c3c6d7..81da30d 100644
--- a/core/proto/android/nfc/card_emulation.proto
+++ b/core/proto/android/nfc/card_emulation.proto
@@ -59,6 +59,7 @@
optional .android.content.ComponentNameProto foreground_requested = 5;
optional .android.content.ComponentNameProto settings_default = 6;
optional bool prefer_foreground = 7;
+ optional .android.content.ComponentNameProto wallet_role_holder_payment_service = 8;
}
// Debugging information for com.android.nfc.cardemulation.EnabledNfcFServices
diff --git a/core/proto/android/providers/settings/system.proto b/core/proto/android/providers/settings/system.proto
index 5fc2a59..1233069 100644
--- a/core/proto/android/providers/settings/system.proto
+++ b/core/proto/android/providers/settings/system.proto
@@ -122,6 +122,12 @@
}
optional Notification notification = 17;
+ message Pointer {
+ option (android.msg_privacy).dest = DEST_EXPLICIT;
+
+ optional SettingProto pointer_fill_style = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
+ }
+ optional Pointer pointer = 37;
optional SettingProto pointer_speed = 18 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Ringtone {
@@ -268,5 +274,5 @@
// Please insert fields in alphabetical order and group them into messages
// if possible (to avoid reaching the method limit).
- // Next tag = 37;
+ // Next tag = 38;
}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 6dbe44b..09ffdf3 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -8351,7 +8351,7 @@
<activity android:name="android.accounts.GrantCredentialsPermissionActivity"
android:excludeFromRecents="true"
android:exported="true"
- android:theme="@style/Theme.DeviceDefault.Light.DialogWhenLarge"
+ android:theme="@style/GrantCredentialsPermissionActivity"
android:process=":ui"
android:visibleToInstantApps="true">
</activity>
diff --git a/core/res/res/drawable/pointer_alias_vector.xml b/core/res/res/drawable/pointer_alias_vector.xml
index 74dd6a0..035a099 100644
--- a/core/res/res/drawable/pointer_alias_vector.xml
+++ b/core/res/res/drawable/pointer_alias_vector.xml
@@ -28,6 +28,6 @@
android:fillColor="#FFFFFF"
android:pathData="M15.313 12.177a3 3 0 0 0-.416-.633l-.459-.534-.353.609a4.2 4.2 0 0 1-1.801 1.675 4.2 4.2 0 0 1-1.977.429l-.704-.02.213.671q.066.208.164.409l.975 1.995a2.967 2.967 0 1 0 5.332-2.606zm-.827 5.066a1.97 1.97 0 0 1-2.632-.904l-.81-1.658a5.2 5.2 0 0 0 1.68-.489 5.2 5.2 0 0 0 1.771-1.414l.896 1.833a1.97 1.97 0 0 1-.905 2.632m-3.697-7.565a4.2 4.2 0 0 1 1.977-.429l.704.02-.213-.671a3 3 0 0 0-.164-.409l-.975-1.995A2.967 2.967 0 1 0 6.785 8.8l.975 1.995q.172.35.416.633l.459.534.353-.609a4.2 4.2 0 0 1 1.801-1.675m-2.21.516-.895-1.833a1.968 1.968 0 1 1 3.536-1.728l.81 1.658a5.2 5.2 0 0 0-1.68.489 5.2 5.2 0 0 0-1.771 1.414m3.151 1.965a3 3 0 0 0 1.02-.818l.755-.95-1.205.142a2.97 2.97 0 0 0-1.975 1.1l-.755.95 1.205-.142c.324-.039.646-.132.955-.282" />
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M16.449 11.622a4.2 4.2 0 0 0-1.555-1.728l-.234-.146-.001-.276a4.2 4.2 0 0 0-.431-1.838l-.975-1.995a4.232 4.232 0 1 0-7.604 3.716l.975 1.995a4.2 4.2 0 0 0 1.555 1.729l.234.146.001.276c.002.617.141 1.244.431 1.838l.975 1.995a4.232 4.232 0 1 0 7.604-3.716zm-7.814.34-.459-.534a3 3 0 0 1-.416-.633L6.785 8.8a2.967 2.967 0 1 1 5.332-2.606l.975 1.995q.098.202.164.409l.214.672-.704-.02a4.2 4.2 0 0 0-1.977.429 4.2 4.2 0 0 0-1.801 1.675zm1.689-.33a2.97 2.97 0 0 1 1.975-1.1l1.205-.142-.755.95a2.95 2.95 0 0 1-1.02.818 3 3 0 0 1-.955.281l-1.204.143zm4.601 6.51a2.967 2.967 0 0 1-3.969-1.363l-.975-1.995a3 3 0 0 1-.164-.409l-.213-.671.704.02a4.2 4.2 0 0 0 1.977-.429 4.2 4.2 0 0 0 1.801-1.675l.353-.609.459.534q.245.284.416.633l.975 1.995a2.97 2.97 0 0 1-1.364 3.969" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_all_scroll_vector.xml b/core/res/res/drawable/pointer_all_scroll_vector.xml
index 1692e5e..45ad98c 100644
--- a/core/res/res/drawable/pointer_all_scroll_vector.xml
+++ b/core/res/res/drawable/pointer_all_scroll_vector.xml
@@ -21,7 +21,7 @@
android:viewportHeight="24">
<path
android:pathData="M12.93 4.54a1.06 1.06 0 0 0-1.85 0L9.32 7.6c-.4.71.1 1.6.92 1.6h.82v1.86H9.2v-.84c0-.82-.88-1.33-1.6-.93l-3.06 1.76c-.7.41-.7 1.44 0 1.85l3.07 1.76c.7.4 1.6-.1 1.6-.93v-.79h1.86v1.87h-.82c-.81 0-1.33.88-.92 1.6l1.76 3.06c.4.71 1.44.71 1.85 0l1.75-3.07c.41-.7-.1-1.6-.92-1.6h-.82v-1.86h1.86v.8c0 .81.89 1.32 1.6.92l3.07-1.76c.7-.41.7-1.44 0-1.85L16.4 9.3c-.71-.4-1.6.1-1.6.93v.84h-1.86V9.2h.82c.82 0 1.33-.89.92-1.6l-1.75-3.06z"
- android:fillColor="#000000"/>
+ android:fillColor="?attr/pointerIconVectorFill"/>
<path
android:pathData="M12 4c.36 0 .72.18.93.54l1.75 3.06c.41.71-.1 1.6-.92 1.6h-.82v1.86h1.86v-.84a1.07 1.07 0 0 1 1.6-.92l3.06 1.75c.72.41.72 1.44 0 1.85l-3.06 1.76a1.07 1.07 0 0 1-1.6-.92v-.8h-1.86v1.87h.82c.82 0 1.33.88.92 1.6l-1.75 3.06a1.07 1.07 0 0 1-1.85 0L9.32 16.4c-.4-.7.1-1.6.93-1.6h.81v-1.86H9.2v.8a1.07 1.07 0 0 1-1.6.92L4.54 12.9a1.06 1.06 0 0 1 0-1.85L7.6 9.3a1.07 1.07 0 0 1 1.6.92v.85h1.86V9.2h-.82c-.81 0-1.33-.89-.92-1.6l1.76-3.06c.2-.36.56-.54.92-.54m0-1c-.74 0-1.41.39-1.79 1.04L8.45 7.1c-.18.33-.28.7-.27 1.05h-.05c-.36 0-.71.1-1.03.28l-3.06 1.76a2.05 2.05 0 0 0 0 3.58l3.06 1.75c.32.18.67.28 1.03.28h.05c-.01.38.08.76.28 1.1l1.75 3.07c.38.65 1.05 1.03 1.8 1.03s1.41-.38 1.78-1.03l1.76-3.07c.2-.34.3-.72.28-1.1h.04c.36 0 .71-.1 1.03-.28l3.06-1.75a2.07 2.07 0 0 0 0-3.58L16.9 8.43a2.07 2.07 0 0 0-1.03-.28h-.04c0-.36-.09-.72-.28-1.05L13.8 4.04A2.04 2.04 0 0 0 12 3z"
android:fillColor="#FFFFFF"/>
diff --git a/core/res/res/drawable/pointer_arrow_vector.xml b/core/res/res/drawable/pointer_arrow_vector.xml
index 562f0c0..2614170 100644
--- a/core/res/res/drawable/pointer_arrow_vector.xml
+++ b/core/res/res/drawable/pointer_arrow_vector.xml
@@ -21,7 +21,7 @@
android:viewportHeight="24">
<path
android:pathData="M16.34 11.18 6.77 4.02a1.78 1.78 0 0 0-1.88-.17c-.63.31-1 .91-1 1.6l.01 11.96c0 .9.6 1.46 1.15 1.67a1.74 1.74 0 0 0 1.98-.45l2.96-3.19c.3-.32.7-.52 1.13-.56l4.33-.47a1.8 1.8 0 0 0 .89-3.23z"
- android:fillColor="#000000"/>
+ android:fillColor="?attr/pointerIconVectorFill"/>
<path
android:pathData="M16.94 10.38 7.37 3.22a2.77 2.77 0 0 0-2.93-.27 2.75 2.75 0 0 0-1.55 2.51l.01 11.95a2.78 2.78 0 0 0 2.82 2.8c.77 0 1.5-.32 2.03-.9l2.97-3.19a.8.8 0 0 1 .5-.25l4.34-.46a2.76 2.76 0 0 0 2.4-2.05 2.8 2.8 0 0 0-1.02-2.98zM17 13.1a1.77 1.77 0 0 1-1.55 1.31l-4.33.47a1.8 1.8 0 0 0-1.13.56l-2.97 3.2c-.4.42-.86.57-1.3.57-.24 0-.48-.05-.68-.13a1.77 1.77 0 0 1-1.14-1.67V5.46a1.81 1.81 0 0 1 1.8-1.8c.38 0 .75.11 1.07.36l9.57 7.16c.72.54.81 1.35.66 1.92z"
android:fillColor="#FFFFFF"/>
diff --git a/core/res/res/drawable/pointer_cell_vector.xml b/core/res/res/drawable/pointer_cell_vector.xml
index 044a4f4..cead1c4 100644
--- a/core/res/res/drawable/pointer_cell_vector.xml
+++ b/core/res/res/drawable/pointer_cell_vector.xml
@@ -22,6 +22,6 @@
android:fillColor="#FFFFFF"
android:pathData="M19 9.667h-4.668V5a2 2 0 0 0-2-2h-.667a2 2 0 0 0-2 2v4.667H5a2 2 0 0 0-2 2v.667a2 2 0 0 0 2 2h4.665V19a2 2 0 0 0 2 2h.667a2 2 0 0 0 2-2v-4.666H19a2 2 0 0 0 2-2v-.667a2 2 0 0 0-2-2m1 2.667a1 1 0 0 1-1 1h-5.668V19a1 1 0 0 1-1 1h-.667a1 1 0 0 1-1-1v-5.666H5a1 1 0 0 1-1-1v-.667a1 1 0 0 1 1-1h5.665V5a1 1 0 0 1 1-1h.667a1 1 0 0 1 1 1v5.667H19a1 1 0 0 1 1 1z" />
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M19 10.667h-5.668V5a1 1 0 0 0-1-1h-.667a1 1 0 0 0-1 1v5.667H5a1 1 0 0 0-1 1v.667a1 1 0 0 0 1 1h5.665V19a1 1 0 0 0 1 1h.667a1 1 0 0 0 1-1v-5.666H19a1 1 0 0 0 1-1v-.667a1 1 0 0 0-1-1" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_context_menu_vector.xml b/core/res/res/drawable/pointer_context_menu_vector.xml
index 8e954d2..fb2af43 100644
--- a/core/res/res/drawable/pointer_context_menu_vector.xml
+++ b/core/res/res/drawable/pointer_context_menu_vector.xml
@@ -26,9 +26,9 @@
android:fillColor="#FFFFFF"
android:pathData="M16.938 10.38 7.372 3.216a2.77 2.77 0 0 0-2.931-.262A2.75 2.75 0 0 0 2.894 5.46l.009 11.951a2.785 2.785 0 0 0 1.776 2.604c.33.129.691.197 1.044.197a2.75 2.75 0 0 0 2.031-.897l2.969-3.193a.8.8 0 0 1 .5-.25l4.336-.467c1.397-.15 2.157-1.153 2.401-2.041a2.785 2.785 0 0 0-1.022-2.984m.058 2.718c-.157.571-.645 1.216-1.544 1.312l-4.335.467a1.8 1.8 0 0 0-1.126.563l-2.97 3.193a1.74 1.74 0 0 1-1.298.578 1.9 1.9 0 0 1-.678-.128c-.551-.217-1.141-.771-1.142-1.674l-.009-11.95c0-.697.371-1.299.994-1.611.262-.131.538-.196.813-.196.377 0 .75.123 1.072.365l9.566 7.163c.723.542.814 1.346.657 1.918" />
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M16.339 11.18 6.773 4.017a1.78 1.78 0 0 0-1.072-.365c-.274 0-.551.065-.813.196a1.77 1.77 0 0 0-.994 1.611l.009 11.951c0 .903.59 1.457 1.142 1.674.2.078.433.128.678.128.434 0 .906-.155 1.298-.578l2.97-3.193a1.8 1.8 0 0 1 1.126-.563l4.335-.467c.899-.097 1.387-.741 1.544-1.312.157-.573.066-1.377-.657-1.919" />
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M19.475 3.461h-2.66c-.37 0-.67.3-.67.67v2.66c0 .37.3.67.67.67h2.66c.37 0 .67-.3.67-.67v-2.66a.67.67 0 0 0-.67-.67m-.3 3.062h-2.067a.3.3 0 1 1 0-.6h2.067a.3.3 0 1 1 0 .6m0-.868h-2.067a.3.3 0 1 1 0-.6h2.067a.3.3 0 1 1 0 .6m0-.885h-2.067a.3.3 0 1 1 0-.6h2.067a.3.3 0 1 1 0 .6" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_copy_vector.xml b/core/res/res/drawable/pointer_copy_vector.xml
index b1e8995..3f13868 100644
--- a/core/res/res/drawable/pointer_copy_vector.xml
+++ b/core/res/res/drawable/pointer_copy_vector.xml
@@ -19,8 +19,8 @@
android:viewportHeight="24"
android:viewportWidth="24">
<group>
- <path android:fillColor="#FFFFFF" android:pathData="M17.5 2c-2.104 0-3.861 1.457-4.351 3.41A4.5 4.5 0 0 0 13 6.5c0 .344.047.675.12.997-.062-.002-.122-.009-.185-.009q-.225 0-.446.018V6.484a1 1 0 0 0-2 0v1.57a5.7 5.7 0 0 0-.997.625V7.583a1 1 0 0 0-2 0v4.205l-.697-.713c-.482-.494-1.265-.494-1.747 0s-.482 1.294 0 1.787l3.847 3.936q.056.057.117.106a5.58 5.58 0 0 0 3.922 1.613c3.045 0 5.563-2.469 5.563-5.514q0-.192-.013-.38v-1.739a4.4 4.4 0 0 0 1-.37C20.969 9.778 22 8.265 22 6.5 22 4.019 19.981 2 17.5 2m1.985 7.364a3.6 3.6 0 0 1-1 .478A3.5 3.5 0 0 1 17.5 10a3.5 3.5 0 0 1-3.486-3.358C14.012 6.594 14 6.549 14 6.5c0-.328.06-.639.145-.941C14.559 4.088 15.898 3 17.5 3 19.43 3 21 4.57 21 6.5a3.47 3.47 0 0 1-1.515 2.864" />
- <path android:fillColor="#FFFFFF" android:pathData="M19.299 6H18V4.7a.5.5 0 0 0-1 0V6h-1.301a.5.5 0 0 0 0 1H17v1.3a.5.5 0 0 0 1 0V7h1.299a.5.5 0 0 0 0-1" />
+ <path android:fillColor="?attr/pointerIconVectorFillInverse" android:pathData="M17.5 2c-2.104 0-3.861 1.457-4.351 3.41A4.5 4.5 0 0 0 13 6.5c0 .344.047.675.12.997-.062-.002-.122-.009-.185-.009q-.225 0-.446.018V6.484a1 1 0 0 0-2 0v1.57a5.7 5.7 0 0 0-.997.625V7.583a1 1 0 0 0-2 0v4.205l-.697-.713c-.482-.494-1.265-.494-1.747 0s-.482 1.294 0 1.787l3.847 3.936q.056.057.117.106a5.58 5.58 0 0 0 3.922 1.613c3.045 0 5.563-2.469 5.563-5.514q0-.192-.013-.38v-1.739a4.4 4.4 0 0 0 1-.37C20.969 9.778 22 8.265 22 6.5 22 4.019 19.981 2 17.5 2m1.985 7.364a3.6 3.6 0 0 1-1 .478A3.5 3.5 0 0 1 17.5 10a3.5 3.5 0 0 1-3.486-3.358C14.012 6.594 14 6.549 14 6.5c0-.328.06-.639.145-.941C14.559 4.088 15.898 3 17.5 3 19.43 3 21 4.57 21 6.5a3.47 3.47 0 0 1-1.515 2.864" />
+ <path android:fillColor="?attr/pointerIconVectorFillInverse" android:pathData="M19.299 6H18V4.7a.5.5 0 0 0-1 0V6h-1.301a.5.5 0 0 0 0 1H17v1.3a.5.5 0 0 0 1 0V7h1.299a.5.5 0 0 0 0-1" />
</group>
<path
android:fillColor="#000000"
diff --git a/core/res/res/drawable/pointer_crosshair_vector.xml b/core/res/res/drawable/pointer_crosshair_vector.xml
index b2e7e8a..8a50d1b 100644
--- a/core/res/res/drawable/pointer_crosshair_vector.xml
+++ b/core/res/res/drawable/pointer_crosshair_vector.xml
@@ -23,6 +23,6 @@
android:pathData="M19.25 10.25h-5.5v-5.5a1.75 1.75 0 0 0-3.5 0v5.5h-5.5a1.75 1.75 0 0 0 0 3.5h5.5v5.5a1.75 1.75 0 0 0 3.5 0v-5.5h5.5a1.75 1.75 0 0 0 0-3.5m0 2.5h-6.5v6.5a.75.75 0 0 1-1.5 0v-6.5h-6.5a.75.75 0 0 1 0-1.5h6.5v-6.5a.75.75 0 0 1 1.5 0v6.5h6.5a.75.75 0 0 1 0 1.5" />
<path
android:fillType="evenOdd"
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M19.25 11.25h-6.5v-6.5a.75.75 0 0 0-1.5 0v6.5h-6.5a.75.75 0 0 0 0 1.5h6.5v6.5a.75.75 0 0 0 1.5 0v-6.5h6.5a.75.75 0 0 0 0-1.5" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_grab_vector.xml b/core/res/res/drawable/pointer_grab_vector.xml
index 7d9f048..48c01ce 100644
--- a/core/res/res/drawable/pointer_grab_vector.xml
+++ b/core/res/res/drawable/pointer_grab_vector.xml
@@ -22,6 +22,6 @@
android:fillColor="#000000"
android:pathData="M20.442 7.562a2 2 0 0 0-2-2c-.366 0-.705.106-1 .277V4.686a2 2 0 0 0-2-2 2 2 0 0 0-1.004.279 1.995 1.995 0 0 0-3.986-.06 2 2 0 0 0-1.006-.28 2 2 0 0 0-2 2v6.501l-.247-.253a2.216 2.216 0 0 0-3.178 0 2.286 2.286 0 0 0 0 3.186l5.106 5.224q.063.061.131.118l-.001.001a6.58 6.58 0 0 0 4.624 1.901c3.587 0 6.565-2.906 6.565-6.516q0-.105-.004-.21m-6.561 5.727a5.58 5.58 0 0 1-3.922-1.613 1 1 0 0 1-.117-.106l-5.106-5.224a1.286 1.286 0 0 1 0-1.788 1.215 1.215 0 0 1 1.747 0l1.962 2.008V4.625a1 1 0 0 1 2 0v5.833q.463-.362.996-.623V3a1 1 0 0 1 2 0v6.29a6 6 0 0 1 1 .011V4.686a1 1 0 0 1 2 0v5.21c.357.185.693.408 1 .663V7.562a1 1 0 0 1 2 0v7.019h.001-.001q.004.104.004.207c.001 3.046-2.518 5.516-5.564 5.516" />
<path
- android:fillColor="#FFFFFF"
+ android:fillColor="?attr/pointerIconVectorFillInverse"
android:pathData="M19.442 14.581V7.562a1 1 0 0 0-2 0v2.997a5.7 5.7 0 0 0-1-.663v-5.21a1 1 0 0 0-2 0v4.615a5.5 5.5 0 0 0-1-.011V3a1 1 0 0 0-2 0v6.835a5.6 5.6 0 0 0-.996.623V4.625a1 1 0 0 0-2 0v8.955l-1.962-2.008a1.215 1.215 0 0 0-1.747 0 1.286 1.286 0 0 0 0 1.788l5.106 5.224q.056.057.117.106a5.58 5.58 0 0 0 3.922 1.613c3.046 0 5.565-2.469 5.565-5.516z" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_grabbing_vector.xml b/core/res/res/drawable/pointer_grabbing_vector.xml
index 9c96103..ad9f86c 100644
--- a/core/res/res/drawable/pointer_grabbing_vector.xml
+++ b/core/res/res/drawable/pointer_grabbing_vector.xml
@@ -22,6 +22,6 @@
android:fillColor="#000000"
android:pathData="M19.485 12.622V8.508a2 2 0 0 0-3.12-1.657 1.993 1.993 0 0 0-2.99-1.006 1.99 1.99 0 0 0-1.886-1.361c-.903 0-1.658.603-1.906 1.425a2 2 0 0 0-3.09 1.674v2.206a2.2 2.2 0 0 0-2.159.586 2.285 2.285 0 0 0 0 3.185l3.847 3.936q.063.061.13.118l-.001.001a6.58 6.58 0 0 0 4.624 1.902c3.586 0 6.563-2.905 6.563-6.514a5 5 0 0 0-.012-.381m-6.55 5.895a5.58 5.58 0 0 1-3.922-1.613 1 1 0 0 1-.117-.106l-3.847-3.936c-.482-.494-.482-1.294 0-1.787s1.265-.494 1.747 0l.697.713V7.583a1 1 0 0 1 2 0v1.096q.463-.364.997-.625v-1.57a1 1 0 0 1 2 0v1.022a5.5 5.5 0 0 1 .996.009v-.007a1 1 0 0 1 2 0v.599q.537.277 1 .66v-.259a1 1 0 0 1 2 0v4.115q.013.189.013.38c-.001 3.045-2.518 5.514-5.564 5.514" />
<path
- android:fillColor="#FFFFFF"
+ android:fillColor="?attr/pointerIconVectorFillInverse"
android:pathData="M18.485 12.622V8.508a1 1 0 0 0-2 0v.259a5.6 5.6 0 0 0-1-.66v-.599a1 1 0 0 0-2 0v.008a5.6 5.6 0 0 0-.996-.009V6.484a1 1 0 0 0-2 0v1.57a5.7 5.7 0 0 0-.997.625V7.583a1 1 0 0 0-2 0v4.205l-.697-.713c-.482-.494-1.265-.494-1.747 0s-.482 1.294 0 1.787l3.847 3.936q.056.057.117.106a5.58 5.58 0 0 0 3.922 1.613c3.045 0 5.563-2.469 5.563-5.514a5 5 0 0 0-.012-.381" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_hand_vector.xml b/core/res/res/drawable/pointer_hand_vector.xml
index 79792f8..a06dc08 100644
--- a/core/res/res/drawable/pointer_hand_vector.xml
+++ b/core/res/res/drawable/pointer_hand_vector.xml
@@ -22,6 +22,6 @@
android:fillColor="#000000"
android:pathData="M20.492 15.197v-4.198A1.995 1.995 0 0 0 18.5 9.001c-.413 0-.797.126-1.115.342a1.99 1.99 0 0 0-1.873-1.341c-.411 0-.792.125-1.109.339a1.99 1.99 0 0 0-1.879-1.361c-.363 0-.699.105-.992.275V3.998A1.99 1.99 0 0 0 9.542 2c-1.1 0-1.992.895-1.992 1.998v7.831l-.242-.249a2.2 2.2 0 0 0-3.164 0 2.29 2.29 0 0 0 0 3.183l5.084 5.219q.063.061.13.118l-.001.001A6.54 6.54 0 0 0 13.963 22c3.572 0 6.537-2.903 6.537-6.509q0-.148-.008-.294m-6.529 5.804a5.55 5.55 0 0 1-3.906-1.611 1 1 0 0 1-.117-.106l-5.084-5.219a1.286 1.286 0 0 1 0-1.786 1.21 1.21 0 0 1 1.74 0l1.95 2.002V3.998c0-.552.446-.999.996-.999s.996.447.996.999v7.17l.011-.007a.495.495 0 0 0 .989-.037V8.939a.992.992 0 0 1 1.984.039v.796l-.007 1.386a.5.5 0 0 0 .495.502h.003a.5.5 0 0 0 .498-.497l.006-1.157h.001V10a.997.997 0 1 1 1.991 0v.601l.004.003v1.02q.001.107.042.199a.5.5 0 0 0 .153.187l.031.021a.5.5 0 0 0 .231.083c.014.001.026.008.04.008a.5.5 0 0 0 .498-.5v-.642a.996.996 0 0 1 .993-.98c.55 0 .996.447.996.999v4.199a6 6 0 0 1 .008.293c-.001 3.043-2.509 5.51-5.542 5.51" />
<path
- android:fillColor="#FFFFFF"
+ android:fillColor="?attr/pointerIconVectorFillInverse"
android:pathData="M19.496 10.999A.997.997 0 0 0 18.5 10a.995.995 0 0 0-.992.98v.644a.5.5 0 0 1-.498.5c-.014 0-.026-.007-.04-.008a.493.493 0 0 1-.457-.491v-1.02l-.004-.003V10c0-.552-.446-.999-.996-.999s-.996.447-.996.999v.008h-.001l-.005 1.003-.001.154a.5.5 0 0 1-.498.497h-.003a.5.5 0 0 1-.495-.502l.001-.159.006-1.227v-.796a.997.997 0 0 0-.996-.999.993.993 0 0 0-.988.96v2.185a.496.496 0 0 1-.989.037l-.011.007v-7.17a.997.997 0 0 0-.996-.999.997.997 0 0 0-.996.999V14.28l-1.95-2.002a1.21 1.21 0 0 0-1.74 0 1.286 1.286 0 0 0 0 1.786l5.084 5.219q.056.057.117.106A5.54 5.54 0 0 0 13.962 21c3.033 0 5.541-2.467 5.541-5.51a6 6 0 0 0-.008-.293z" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_handwriting_vector.xml b/core/res/res/drawable/pointer_handwriting_vector.xml
index 09f3e31..8497592 100644
--- a/core/res/res/drawable/pointer_handwriting_vector.xml
+++ b/core/res/res/drawable/pointer_handwriting_vector.xml
@@ -23,6 +23,6 @@
<path android:fillColor="#FFFFFF" android:pathData="m16.431 7.64-6.29 6.29 1.43 1.43 6.29-6.29-1.42-1.43z" />
</group>
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M5 4c-.55 0-1 .45-1 1v14c0 .55.45 1 1 1s1-.45 1-1V5c0-.55-.45-1-1-1m14.41 3.51-1.42-1.42c-.39-.39-.9-.59-1.41-.59h-.01c-.51 0-1.02.2-1.41.59L8 13.25v4.25h4.25l7.16-7.16c.78-.78.78-2.05 0-2.83m-7.839 7.85-1.43-1.43 6.29-6.29h.01l1.42 1.43z" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_help_vector.xml b/core/res/res/drawable/pointer_help_vector.xml
index 6b7fd9f..07970fb 100644
--- a/core/res/res/drawable/pointer_help_vector.xml
+++ b/core/res/res/drawable/pointer_help_vector.xml
@@ -19,12 +19,12 @@
android:viewportHeight="24"
android:viewportWidth="24">
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M16.339 11.18 6.773 4.017a1.78 1.78 0 0 0-1.072-.365c-.274 0-.551.065-.813.196a1.77 1.77 0 0 0-.994 1.611l.009 11.951c0 .903.59 1.457 1.142 1.674.2.078.433.128.678.128.434 0 .906-.155 1.298-.578l2.97-3.193a1.8 1.8 0 0 1 1.126-.563l4.335-.467c.899-.097 1.387-.741 1.544-1.312.157-.573.066-1.377-.657-1.919" />
<path
android:fillColor="#FFFFFF"
android:pathData="M16.94 10.38 7.37 3.22a2.77 2.77 0 0 0-2.93-.27A2.75 2.75 0 0 0 2.9 5.46l.01 11.95a2.79 2.79 0 0 0 2.82 2.8c.78 0 1.5-.32 2.03-.9l2.97-3.19a.8.8 0 0 1 .5-.25l4.34-.46a2.76 2.76 0 0 0 2.4-2.05 2.8 2.8 0 0 0-1.02-2.98zM17 13.1a1.77 1.77 0 0 1-1.55 1.31l-4.33.47a1.8 1.8 0 0 0-1.13.56l-2.97 3.2c-.4.42-.86.57-1.3.57-.24 0-.48-.05-.68-.13a1.77 1.77 0 0 1-1.14-1.67V5.46a1.81 1.81 0 0 1 1.8-1.8c.38 0 .75.11 1.07.36l9.57 7.16c.72.54.81 1.35.66 1.92zm2.64-10.83a2.5 2.5 0 0 0-1.84-.72 3 3 0 0 0-2.83 1.93l-.39.94.96.37.86.32.12.05-.02.03c-.22.4-.3.82-.3 1.33v.94a1.56 1.56 0 0 0 .4 1.47 1.54 1.54 0 0 0 2.24.01 1.55 1.55 0 0 0 .28-1.84v-.52c0-.1.02-.17.03-.25l.16-.15c.32-.25.6-.56.78-.93.18-.37.26-.76.26-1.16 0-.68-.21-1.32-.7-1.82zm-1.5 5.96a.55.55 0 0 1-.82 0 .56.56 0 0 1-.17-.4c0-.16.06-.3.17-.4a.55.55 0 0 1 .41-.18c.15 0 .28.06.4.17a.55.55 0 0 1 0 .81zm1.05-3.42c-.1.22-.28.42-.52.6-.26.22-.42.42-.47.6-.05.18-.08.37-.08.57l-.93-.06c0-.38.07-.62.19-.86.13-.24.3-.46.54-.66.17-.13.3-.28.4-.43s.14-.3.14-.46c0-.2-.08-.37-.22-.5s-.31-.17-.52-.17c-.2 0-.39.06-.56.18-.17.13-.3.31-.4.56l-.87-.33a2.03 2.03 0 0 1 1.91-1.3c.48 0 .86.14 1.13.42.28.28.41.65.41 1.12 0 .26-.05.5-.15.72z" />
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M17.73 7.254a.55.55 0 0 0-.407.169.55.55 0 0 0-.169.407q0 .225.169.401a.55.55 0 0 0 .808 0 .56.56 0 0 0 .175-.413.53.53 0 0 0-.175-.394.56.56 0 0 0-.401-.17m1.202-4.288q-.413-.42-1.126-.419-.651 0-1.164.357a2.1 2.1 0 0 0-.751.945l.864.326q.15-.363.407-.551a.93.93 0 0 1 .557-.188q.313 0 .526.182c.213.182.213.286.213.495q0 .226-.144.457a1.4 1.4 0 0 1-.394.432q-.35.3-.538.657c-.125.238-.187.485-.187.86l.926.06q0-.3.081-.57t.469-.595q.363-.276.519-.601t.156-.726q-.002-.701-.414-1.121" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_horizontal_double_arrow_vector.xml b/core/res/res/drawable/pointer_horizontal_double_arrow_vector.xml
index d1aea9e..32c56b6 100644
--- a/core/res/res/drawable/pointer_horizontal_double_arrow_vector.xml
+++ b/core/res/res/drawable/pointer_horizontal_double_arrow_vector.xml
@@ -22,6 +22,6 @@
android:fillColor="#FFFFFF"
android:pathData="m19.963 10.185-3.065-1.758c-1.327-.761-2.96.14-3.072 1.633h-3.651c-.113-1.492-1.746-2.394-3.072-1.633l-3.065 1.758c-1.383.793-1.383 2.786 0 3.579l3.065 1.758c1.311.752 2.918-.12 3.065-1.581h3.666c.147 1.46 1.754 2.333 3.065 1.581l3.065-1.758c1.382-.793 1.382-2.786-.001-3.579m-.498 2.712L16.4 14.655a1.065 1.065 0 0 1-1.596-.922v-.791H9.195v.791c0 .818-.886 1.33-1.596.922l-3.065-1.758a1.063 1.063 0 0 1 0-1.845l3.065-1.758a1.065 1.065 0 0 1 1.596.922v.843h5.609v-.843c0-.818.886-1.33 1.596-.922l3.065 1.758a1.063 1.063 0 0 1 0 1.845" />
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M19.465 11.052 16.4 9.294a1.065 1.065 0 0 0-1.596.922v.843H9.195v-.843c0-.818-.886-1.33-1.596-.922l-3.065 1.758a1.063 1.063 0 0 0 0 1.845l3.065 1.758a1.065 1.065 0 0 0 1.596-.922v-.791h5.609v.791c0 .818.886 1.33 1.596.922l3.065-1.758a1.063 1.063 0 0 0 0-1.845" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_nodrop_vector.xml b/core/res/res/drawable/pointer_nodrop_vector.xml
index 3a38bab..6108e96 100644
--- a/core/res/res/drawable/pointer_nodrop_vector.xml
+++ b/core/res/res/drawable/pointer_nodrop_vector.xml
@@ -19,8 +19,8 @@
android:viewportHeight="24"
android:viewportWidth="24">
<group>
- <path android:fillColor="#FFFFFF" android:pathData="M17.5 1.953c-2.108 0-3.869 1.449-4.382 3.398a4.5 4.5 0 0 0-.165 1.148c0 .343.045.674.117.995-.045-.001-.09-.007-.135-.007q-.225 0-.446.018V6.484a1 1 0 0 0-2 0v1.57a5.7 5.7 0 0 0-.997.625V7.583a1 1 0 0 0-2 0v4.205l-.697-.713c-.482-.494-1.265-.494-1.747 0s-.482 1.294 0 1.787l3.847 3.936q.056.057.117.106a5.58 5.58 0 0 0 3.922 1.613c3.045 0 5.563-2.469 5.563-5.514q0-.192-.013-.38v-1.69a4.5 4.5 0 0 0 1-.366c1.51-.739 2.562-2.275 2.562-4.066A4.55 4.55 0 0 0 17.5 1.953m0 8.047C15.57 10 14 8.43 14 6.5S15.57 3 17.5 3 21 4.57 21 6.5 19.43 10 17.5 10" />
- <path android:fillColor="#FFFFFF" android:pathData="M17.5 4c-.493 0-.95.148-1.337.395l3.442 3.442C19.852 7.45 20 6.993 20 6.5 20 5.121 18.879 4 17.5 4M15 6.5C15 7.879 16.121 9 17.5 9c.525 0 1.011-.164 1.413-.441l-3.472-3.472A2.5 2.5 0 0 0 15 6.5" />
+ <path android:fillColor="?attr/pointerIconVectorFillInverse" android:pathData="M17.5 1.953c-2.108 0-3.869 1.449-4.382 3.398a4.5 4.5 0 0 0-.165 1.148c0 .343.045.674.117.995-.045-.001-.09-.007-.135-.007q-.225 0-.446.018V6.484a1 1 0 0 0-2 0v1.57a5.7 5.7 0 0 0-.997.625V7.583a1 1 0 0 0-2 0v4.205l-.697-.713c-.482-.494-1.265-.494-1.747 0s-.482 1.294 0 1.787l3.847 3.936q.056.057.117.106a5.58 5.58 0 0 0 3.922 1.613c3.045 0 5.563-2.469 5.563-5.514q0-.192-.013-.38v-1.69a4.5 4.5 0 0 0 1-.366c1.51-.739 2.562-2.275 2.562-4.066A4.55 4.55 0 0 0 17.5 1.953m0 8.047C15.57 10 14 8.43 14 6.5S15.57 3 17.5 3 21 4.57 21 6.5 19.43 10 17.5 10" />
+ <path android:fillColor="?attr/pointerIconVectorFillInverse" android:pathData="M17.5 4c-.493 0-.95.148-1.337.395l3.442 3.442C19.852 7.45 20 6.993 20 6.5 20 5.121 18.879 4 17.5 4M15 6.5C15 7.879 16.121 9 17.5 9c.525 0 1.011-.164 1.413-.441l-3.472-3.472A2.5 2.5 0 0 0 15 6.5" />
</group>
<path
android:fillColor="#000000"
diff --git a/core/res/res/drawable/pointer_text_vector.xml b/core/res/res/drawable/pointer_text_vector.xml
index 9e44f28..a147273 100644
--- a/core/res/res/drawable/pointer_text_vector.xml
+++ b/core/res/res/drawable/pointer_text_vector.xml
@@ -19,7 +19,7 @@
android:viewportHeight="24"
android:viewportWidth="24">
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M12 3c-.551 0-1 .448-1 1v14a1.001 1.001 0 0 0 2 0V4c0-.552-.449-1-1-1" />
<path
android:fillColor="#FFFFFF"
diff --git a/core/res/res/drawable/pointer_top_left_diagonal_double_arrow_vector.xml b/core/res/res/drawable/pointer_top_left_diagonal_double_arrow_vector.xml
index e5d5301..7f95207 100644
--- a/core/res/res/drawable/pointer_top_left_diagonal_double_arrow_vector.xml
+++ b/core/res/res/drawable/pointer_top_left_diagonal_double_arrow_vector.xml
@@ -23,6 +23,6 @@
android:pathData="m18.896 16.365-.924-3.41c-.398-1.467-2.169-1.985-3.305-1.035L12.08 9.333c.952-1.136.434-2.908-1.034-3.306l-3.41-.924c-1.539-.416-2.948.993-2.532 2.532l.924 3.41c.398 1.468 2.17 1.986 3.306 1.034l2.586 2.586c-.953 1.136-.435 2.91 1.033 3.307l3.41.924c1.54.417 2.949-.992 2.533-2.531m-2.27 1.566-3.41-.924a1.065 1.065 0 0 1-.476-1.781l.579-.579-3.966-3.966-.579.579a1.066 1.066 0 0 1-1.781-.476L6.07 7.373a1.063 1.063 0 0 1 1.304-1.304l3.41.924a1.065 1.065 0 0 1 .476 1.781l-.578.578 3.966 3.966.577-.577a1.066 1.066 0 0 1 1.781.477l.924 3.41a1.062 1.062 0 0 1-1.304 1.303" />
<path
android:fillType="evenOdd"
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M6.07 7.373a1.063 1.063 0 0 1 1.304-1.304l3.41.924a1.065 1.065 0 0 1 .476 1.781l-.578.578 3.966 3.966.577-.577a1.066 1.066 0 0 1 1.781.476l.924 3.41a1.063 1.063 0 0 1-1.304 1.304l-3.41-.924a1.065 1.065 0 0 1-.476-1.781l.579-.579-3.966-3.966-.579.579a1.066 1.066 0 0 1-1.781-.476z" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_top_right_diagonal_double_arrow_vector.xml b/core/res/res/drawable/pointer_top_right_diagonal_double_arrow_vector.xml
index e6f7aaf..8a33715 100644
--- a/core/res/res/drawable/pointer_top_right_diagonal_double_arrow_vector.xml
+++ b/core/res/res/drawable/pointer_top_right_diagonal_double_arrow_vector.xml
@@ -22,6 +22,6 @@
android:fillColor="#FFFFFF"
android:pathData="m16.365 5.104-3.41.924c-1.468.398-1.986 2.171-1.033 3.307l-2.586 2.586c-1.136-.952-2.909-.434-3.306 1.034l-.924 3.41c-.417 1.539.992 2.948 2.531 2.531l3.41-.924c1.468-.398 1.986-2.17 1.034-3.306l2.587-2.587c1.136.951 2.908.432 3.305-1.035l.924-3.41c.415-1.538-.994-2.947-2.532-2.53m1.565 2.269-.924 3.41a1.065 1.065 0 0 1-1.781.476l-.577-.577-3.966 3.966.578.578a1.066 1.066 0 0 1-.476 1.781l-3.41.924a1.063 1.063 0 0 1-1.304-1.304l.924-3.41a1.066 1.066 0 0 1 1.781-.477l.578.578 3.966-3.966-.579-.579a1.066 1.066 0 0 1 .476-1.781l3.41-.924a1.063 1.063 0 0 1 1.304 1.305" />
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="m16.626 6.069-3.41.924a1.065 1.065 0 0 0-.476 1.781l.579.579-3.966 3.966-.579-.579a1.066 1.066 0 0 0-1.781.477l-.924 3.41a1.063 1.063 0 0 0 1.304 1.304l3.41-.924a1.065 1.065 0 0 0 .476-1.781l-.578-.578 3.966-3.966.577.577a1.066 1.066 0 0 0 1.781-.476l.924-3.41a1.062 1.062 0 0 0-1.303-1.304" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_vertical_double_arrow_vector.xml b/core/res/res/drawable/pointer_vertical_double_arrow_vector.xml
index 6ffcfef..889372c 100644
--- a/core/res/res/drawable/pointer_vertical_double_arrow_vector.xml
+++ b/core/res/res/drawable/pointer_vertical_double_arrow_vector.xml
@@ -22,6 +22,6 @@
android:fillColor="#FFFFFF"
android:pathData="M13.945 13.829V10.17c1.476-.131 2.363-1.75 1.606-3.069l-1.758-3.065c-.793-1.383-2.786-1.383-3.579 0L8.455 7.102c-.757 1.319.131 2.939 1.607 3.069v3.658c-1.477.13-2.364 1.75-1.607 3.069l1.758 3.065c.793 1.383 2.786 1.383 3.579 0l1.758-3.065c.758-1.319-.129-2.938-1.605-3.069m.739 2.572-1.758 3.065a1.063 1.063 0 0 1-1.845 0l-1.758-3.065a1.065 1.065 0 0 1 .922-1.596h.818v-5.61h-.818c-.818 0-1.33-.886-.922-1.596l1.758-3.065a1.063 1.063 0 0 1 1.845 0l1.758 3.065a1.065 1.065 0 0 1-.922 1.596h-.817v5.609h.817c.817.001 1.329.886.922 1.597" />
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M13.761 14.805h-.817v-5.61h.817c.818 0 1.33-.886.922-1.596l-1.758-3.065a1.063 1.063 0 0 0-1.845 0L9.323 7.599c-.407.71.104 1.596.922 1.596h.818v5.609h-.818c-.818 0-1.33.886-.922 1.596l1.758 3.065a1.063 1.063 0 0 0 1.845 0l1.758-3.065a1.065 1.065 0 0 0-.923-1.595" />
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_vertical_text_vector.xml b/core/res/res/drawable/pointer_vertical_text_vector.xml
index 72f40cc..9238f94 100644
--- a/core/res/res/drawable/pointer_vertical_text_vector.xml
+++ b/core/res/res/drawable/pointer_vertical_text_vector.xml
@@ -19,7 +19,7 @@
android:viewportHeight="24"
android:viewportWidth="24">
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/pointerIconVectorFill"
android:pathData="M19 11H5a1 1 0 0 0 0 2h14a1 1 0 0 0 0-2" />
<path
android:fillColor="#FFFFFF"
diff --git a/core/res/res/drawable/pointer_zoom_in_vector.xml b/core/res/res/drawable/pointer_zoom_in_vector.xml
index 8921666..a7f56c2 100644
--- a/core/res/res/drawable/pointer_zoom_in_vector.xml
+++ b/core/res/res/drawable/pointer_zoom_in_vector.xml
@@ -23,7 +23,7 @@
<path android:fillColor="#FFFFFF" android:pathData="M10.55 5a4.546 4.546 0 1 0 0 9.093 4.546 4.546 0 0 0 0-9.093m2.462 5h-2v2a.5.5 0 0 1-1 0v-2h-2a.5.5 0 0 1 0-1h2V7a.5.5 0 0 1 1 0v2h2a.5.5 0 0 1 0 1" />
</group>
<group>
- <path android:fillColor="#000000" android:pathData="m19.736 18.003-4.194-4.22a6.547 6.547 0 1 0-1.382 1.226l4.268 4.294a.923.923 0 0 0 1.308-1.3m-9.186-3.91A4.546 4.546 0 1 1 10.549 5a4.546 4.546 0 0 1 .001 9.093" />
- <path android:fillColor="#000000" android:pathData="M13.012 9h-2V7a.5.5 0 0 0-1 0v2h-2a.5.5 0 0 0 0 1h2v2a.5.5 0 0 0 1 0v-2h2a.5.5 0 0 0 0-1" />
+ <path android:fillColor="?attr/pointerIconVectorFill" android:pathData="m19.736 18.003-4.194-4.22a6.547 6.547 0 1 0-1.382 1.226l4.268 4.294a.923.923 0 0 0 1.308-1.3m-9.186-3.91A4.546 4.546 0 1 1 10.549 5a4.546 4.546 0 0 1 .001 9.093" />
+ <path android:fillColor="?attr/pointerIconVectorFill" android:pathData="M13.012 9h-2V7a.5.5 0 0 0-1 0v2h-2a.5.5 0 0 0 0 1h2v2a.5.5 0 0 0 1 0v-2h2a.5.5 0 0 0 0-1" />
</group>
</vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/pointer_zoom_out_vector.xml b/core/res/res/drawable/pointer_zoom_out_vector.xml
index 815ce0e..e46b978 100644
--- a/core/res/res/drawable/pointer_zoom_out_vector.xml
+++ b/core/res/res/drawable/pointer_zoom_out_vector.xml
@@ -23,7 +23,7 @@
<path android:fillColor="#FFFFFF" android:pathData="M10.55 5a4.546 4.546 0 1 0 0 9.093 4.546 4.546 0 0 0 0-9.093m2.462 5h-5a.5.5 0 0 1 0-1h5a.5.5 0 0 1 0 1" />
</group>
<group>
- <path android:fillColor="#000000" android:pathData="m19.736 18.003-4.194-4.22a6.547 6.547 0 1 0-1.382 1.226l4.268 4.294a.923.923 0 0 0 1.308-1.3m-9.186-3.91A4.546 4.546 0 1 1 10.549 5a4.546 4.546 0 0 1 .001 9.093" />
- <path android:fillColor="#000000" android:pathData="M13.012 9h-5a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1" />
+ <path android:fillColor="?attr/pointerIconVectorFill" android:pathData="m19.736 18.003-4.194-4.22a6.547 6.547 0 1 0-1.382 1.226l4.268 4.294a.923.923 0 0 0 1.308-1.3m-9.186-3.91A4.546 4.546 0 1 1 10.549 5a4.546 4.546 0 0 1 .001 9.093" />
+ <path android:fillColor="?attr/pointerIconVectorFill" android:pathData="M13.012 9h-5a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1" />
</group>
</vector>
\ No newline at end of file
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index ca6a384..704d442 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privaat ruimte"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Kloon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Gemeenskaplik"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Sensitiewe kennisgewinginhoud is versteek"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Appinhoud is weens sekuriteit van skermdeling verberg"</string>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index 218b13a..d1e18da 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"የግል ቦታ"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"አባዛ"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"የጋራ"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"አደገኛ የማሳወቂያ ይዘት ተደብቋል"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"ለደኅንነት ሲባል የመተግበሪያ ይዘት ከማያ ገጽ ማጋራት ተደብቋል"</string>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index d0e28b7..5ef18af 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -2411,6 +2411,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"المساحة الخاصة"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"نسخة طبق الأصل"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"ملف شخصي مشترك"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"تم إخفاء المحتوى الحساس في الإشعار"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"تم إخفاء محتوى التطبيق بعد تفعيل ميزة \"مشاركة الشاشة\" للحفاظ على أمانك"</string>
diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml
index 42b0af9..5443f12 100644
--- a/core/res/res/values-as/strings.xml
+++ b/core/res/res/values-as/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"প্ৰাইভেট স্পে’চ"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ক্ল’ন"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"সম্প্ৰদায়ৰ সৈতে জড়িত"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"সংবেদনশীল জাননী লুকুওৱা হৈছে"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"সুৰক্ষাৰ বাবে এপৰ সমল স্ক্ৰীণ শ্বেয়াৰ কৰাৰ পৰা লুকুৱাই ৰখা হৈছে"</string>
diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml
index 5633c06..b9ec742 100644
--- a/core/res/res/values-az/strings.xml
+++ b/core/res/res/values-az/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Məxfi sahə"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Kommunal"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Həssas bildiriş kontenti gizlədildi"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Güvənlik üçün tətbiq kontenti ekran paylaşımından gizlədildi"</string>
diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml
index e38706e..858075b 100644
--- a/core/res/res/values-b+sr+Latn/strings.xml
+++ b/core/res/res/values-b+sr+Latn/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privatan prostor"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klonirano"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Zajedničko"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Osetljiv sadržaj obaveštenja je skriven"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Sadržaj aplikacije je skriven za deljenje sadržaja ekrana zbog bezbednosti"</string>
diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml
index 25ae5a7..2739cb2 100644
--- a/core/res/res/values-be/strings.xml
+++ b/core/res/res/values-be/strings.xml
@@ -2409,6 +2409,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Прыватная прастора"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клон"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Супольны"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Канфідэнцыяльнае змесціва ў апавяшчэннях схавана"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Змесціва праграмы выключана з абагульвання экрана ў мэтах бяспекі"</string>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index 6b388d8..0d4cadc 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Частно пространство"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клониране"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Общи"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Деликатното съдържание в известието е скрито"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Съдържанието на приложението е скрито от функцията за споделяне на екрана от съображения за сигурност"</string>
diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml
index 3f338cc..03fba4b 100644
--- a/core/res/res/values-bn/strings.xml
+++ b/core/res/res/values-bn/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"প্রাইভেট স্পেস"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ক্লোন"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"কমিউনাল"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"সংবেদনশীল বিজ্ঞপ্তির কন্টেন্ট লুকানো আছে"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"নিরাপত্তার জন্য স্ক্রিন শেয়ার করা থেকে লুকানো অ্যাপের কন্টেন্ট"</string>
diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml
index 0438302..6ce10c0 100644
--- a/core/res/res/values-bs/strings.xml
+++ b/core/res/res/values-bs/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privatni prostor"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Opće"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Sakriven je osjetljiv sadržaj obavještenja"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Sadržaj aplikacije je sakriven od dijeljenja ekrana radi sigurnosti"</string>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index 0287a27..4b1af34 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espai privat"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Comunitari"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"S\'ha amagat contingut sensible de les notificacions"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Contingut de l\'aplicació amagat de la compartició de pantalla per motius de seguretat"</string>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index 4013a03..cc4bd3c 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -2409,6 +2409,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Soukromý prostor"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Komunální"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Obsah citlivých oznámení je skrytý"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Obsah aplikace je z bezpečnostních důvodů při sdílení obrazovky skryt"</string>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index 5226d56..665ea17 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privat område"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Fælles"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Følsomt indhold i notifikationen er skjult"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Af sikkerhedsmæssige årsager vises appindhold ikke ved skærmdeling"</string>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index 949150a..cd637e1 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Vertrauliches Profil"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Gemeinsam genutzt"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Vertrauliche Benachrichtigungsinhalte ausgeblendet"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"App-Inhalte werden aus Sicherheitsgründen bei der Bildschirmfreigabe ausgeblendet"</string>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 11dac6c..09ecc2c 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Ιδιωτικός χώρος"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Κλώνος"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Κοινόχρηστο"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Έγινε απόκρυψη της ειδοποίησης ευαίσθητου περιεχομένου"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Για λόγους ασφάλειας, έγινε απόκρυψη του περιεχομένου της εφαρμογής από την κοινή χρήση οθόνης"</string>
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml
index 1effe7c..20e391d 100644
--- a/core/res/res/values-en-rAU/strings.xml
+++ b/core/res/res/values-en-rAU/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Private space"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Communal"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Sensitive notification content hidden"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"App content hidden from screen share for security"</string>
diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml
index 4abc581..7f33f6a 100644
--- a/core/res/res/values-en-rCA/strings.xml
+++ b/core/res/res/values-en-rCA/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Private space"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Communal"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Sensitive notification content hidden"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"App content hidden from screen share for security"</string>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 425d88c..b7fedbe 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Private space"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Communal"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Sensitive notification content hidden"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"App content hidden from screen share for security"</string>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index 56ff14a..b83a7cf 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Private space"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Communal"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Sensitive notification content hidden"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"App content hidden from screen share for security"</string>
diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml
index e599c03..d358e5e 100644
--- a/core/res/res/values-en-rXC/strings.xml
+++ b/core/res/res/values-en-rXC/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Private space"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Communal"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Sensitive notification content hidden"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"App content hidden from screen share for security"</string>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index f5859bf..45ea7ee 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espacio privado"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Compartido"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Se ocultó contenido sensible de la notificación"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Se ocultó el contenido de la app durante el uso compartido de la pantalla por motivos de seguridad"</string>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index d8b1f59..19c5f84 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -273,7 +273,7 @@
<string name="bugreport_option_full_title" msgid="7681035745950045690">"Informe completo"</string>
<string name="bugreport_option_full_summary" msgid="1975130009258435885">"Utiliza esta opción para que la interferencia del sistema sea mínima cuando el dispositivo no responda o funcione demasiado lento, o bien cuando necesites todas las secciones del informe. No permite introducir más detalles ni hacer más capturas de pantalla."</string>
<string name="bugreport_countdown" msgid="6418620521782120755">"{count,plural, =1{La captura de pantalla para el informe de errores se hará en # segundo.}many{La captura de pantalla para el informe de errores se hará en # segundos.}other{La captura de pantalla para el informe de errores se hará en # segundos.}}"</string>
- <string name="bugreport_screenshot_success_toast" msgid="7986095104151473745">"Se ha hecho la captura de pantalla con el informe de errores"</string>
+ <string name="bugreport_screenshot_success_toast" msgid="7986095104151473745">"Captura de pantalla generada con el informe de errores"</string>
<string name="bugreport_screenshot_failure_toast" msgid="6736320861311294294">"No se ha podido hacer la captura de pantalla con el informe de errores"</string>
<string name="global_action_toggle_silent_mode" msgid="8464352592860372188">"Modo Silencio"</string>
<string name="global_action_silent_mode_on_status" msgid="2371892537738632013">"El sonido está desactivado. Activar"</string>
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espacio privado"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Común"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Contenido sensible de la notificación oculto"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Contenido de la aplicación oculto en pantalla compartida por motivos de seguridad"</string>
diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml
index 77e665a..46c7341 100644
--- a/core/res/res/values-et/strings.xml
+++ b/core/res/res/values-et/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privaatne ruum"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Kloon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Ühine"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Märguande delikaatne sisu peideti"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Rakenduse sisu on ekraani jagamises turvalisuse huvides peidetud"</string>
diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml
index 9bf2a4d..3c47f68 100644
--- a/core/res/res/values-eu/strings.xml
+++ b/core/res/res/values-eu/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Eremu pribatua"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klona"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Partekatua"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Jakinarazpenaren kontuzko edukia ezkutatu da"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Aplikazioko edukia ezkutatu egin da pantaila partekatzeko eginbidetik, segurtasuna bermatzeko"</string>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index 308260f..3c50b07 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"فضای خصوصی"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"همسانهسازی"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"همگانی"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"محتوای اعلان حساس پنهان شده است"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"بهدلایل امنیتی، محتوای برنامه از دید همرسانی صفحهنمایش پنهان شد"</string>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index db579f2..0e159f2 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Yksityinen tila"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klooni"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Yhteinen"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Arkaluontoisen ilmoituksen sisältö piilotettu"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Sovelluksen sisältö piilotettu näytön jakamiselta turvallisuussyistä"</string>
diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml
index a2443d7..7fca5e6 100644
--- a/core/res/res/values-fr-rCA/strings.xml
+++ b/core/res/res/values-fr-rCA/strings.xml
@@ -717,7 +717,7 @@
<string name="face_acquired_too_right" msgid="6245286514593540859">"Déplacez le téléphone vers la gauche"</string>
<string name="face_acquired_too_left" msgid="9201762240918405486">"Déplacez le téléphone vers la droite"</string>
<string name="face_acquired_poor_gaze" msgid="4427153558773628020">"Veuillez regarder plus directement votre appareil."</string>
- <string name="face_acquired_not_detected" msgid="1057966913397548150">"Visage non détecté. Tenez votre téléphone à hauteur des yeux."</string>
+ <string name="face_acquired_not_detected" msgid="1057966913397548150">"Visage non détecté. Tenez le téléphone au niveau des yeux."</string>
<string name="face_acquired_too_much_motion" msgid="8199691445085189528">"Trop de mouvement. Tenez le téléphone immobile."</string>
<string name="face_acquired_recalibrate" msgid="8724013080976469746">"Veuillez inscrire votre visage à nouveau."</string>
<string name="face_acquired_too_different" msgid="4505278456634706967">"Visage non reconnu. Réessayez."</string>
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espace privé"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Commun"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Le contenu confidentiel de la notification est masqué"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Le contenu de l\'application est masqué du Partage d\'écran par mesure de sécurité"</string>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index c69af7c..e08f426 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espace privé"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Commun"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Le contenu sensible de la notification a été masqué"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Le contenu de l\'appli est masqué lors du partage d\'écran pour des raisons de sécurité"</string>
diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml
index 0ffd299..1eec828 100644
--- a/core/res/res/values-gl/strings.xml
+++ b/core/res/res/values-gl/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espazo privado"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clonado"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Compartido"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Contido confidencial da notificación oculto"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Por motivos de seguranza, ocultouse o contido da aplicación para que no se mostre na pantalla compartida"</string>
diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml
index 55032c9..303f001 100644
--- a/core/res/res/values-gu/strings.xml
+++ b/core/res/res/values-gu/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"ખાનગી સ્પેસ"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ક્લોન"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"કૉમ્યુનલ"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"સંવેદનશીલ માહિતીવાળા નોટિફિકેશનનું કન્ટેન્ટ છુપાવ્યું"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"સુરક્ષા માટે સ્ક્રીન શેર કરતી વખતે ઍપનું કન્ટેન્ટ છુપાવેલું છે"</string>
diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml
index e47715a..14d2bf7 100644
--- a/core/res/res/values-hi/strings.xml
+++ b/core/res/res/values-hi/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"प्राइवेट स्पेस"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"क्लोन"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"कम्यूनिटी"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"संवेदनशील जानकारी वाली सूचना का कॉन्टेंट छिपा है"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"स्क्रीन शेयर करने के दौरान सुरक्षा के लिए, ऐप्लिकेशन का कॉन्टेंट छिपाया गया"</string>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index 0b9b662..e69a59d 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -1413,7 +1413,7 @@
<string name="test_harness_mode_notification_title" msgid="2282785860014142511">"Omogućen je način testnog okvira"</string>
<string name="test_harness_mode_notification_message" msgid="3039123743127958420">"Vratite na tvorničke postavke da biste onemogućili način testnog okvira."</string>
<string name="console_running_notification_title" msgid="6087888939261635904">"Serijska konzola omogućena"</string>
- <string name="console_running_notification_message" msgid="7892751888125174039">"Izvedba je otežana. Provjerite početni program za pokretanje da biste onemogućili konzolu."</string>
+ <string name="console_running_notification_message" msgid="7892751888125174039">"Izvedba je otežana. Provjerite pokretač operativnog sustava da biste onemogućili konzolu."</string>
<string name="mte_override_notification_title" msgid="4731115381962792944">"Omogućen je eksperimentalni MTE"</string>
<string name="mte_override_notification_message" msgid="2441170442725738942">"To može utjecati na izvedbu i stabilnost. Ponovno pokrenite da biste onemogućili. Ako je omogućeno pomoću arm64.memtag.bootctl, prethodno postavite na \"none\"."</string>
<string name="usb_contaminant_detected_title" msgid="4359048603069159678">"Tekućina ili prljavština u USB priključku"</string>
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privatni prostor"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Zajedničko"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Skriven je osjetljiv sadržaj obavijesti"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Sadržaj aplikacije sakriven je od dijeljenja zaslona radi sigurnosti"</string>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index de6777e..f1ff236 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privát terület"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klón"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Közös"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Bizalmas értesítéstartalom elrejtve"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"A biztonság érdekében a képernyőmegosztástól elrejtett alkalmazástartalom"</string>
diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml
index 58331c7..40812068 100644
--- a/core/res/res/values-hy/strings.xml
+++ b/core/res/res/values-hy/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Մասնավոր տարածք"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Կլոն"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Ընդհանուր"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Ծանուցման զգայուն բովանդակությունը թաքցված է"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Անվտանգության նկատառումներից ելնելով՝ հավելվածի բովանդակությունը թաքցվել է էկրանի ցուցադրումից"</string>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index eeaf2b6..866e946 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Ruang privasi"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Umum"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Konten notifikasi sensitif disembunyikan"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Konten aplikasi disembunyikan dari berbagi layar untuk alasan keamanan"</string>
diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml
index 7e68a06..76ba64b 100644
--- a/core/res/res/values-is/strings.xml
+++ b/core/res/res/values-is/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Leynirými"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Afrit"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Sameiginlegt"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Viðkvæmt tilkynningaefni falið"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Efni forrits falið í skjádeilingu af öryggisástæðum"</string>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index 5ed3706..5e87dce 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -2037,7 +2037,7 @@
<string name="usb_mtp_launch_notification_description" msgid="6942535713629852684">"Tocca per visualizzare i file"</string>
<string name="pin_target" msgid="8036028973110156895">"Fissa"</string>
<string name="pin_specific_target" msgid="7824671240625957415">"Blocca <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="unpin_target" msgid="3963318576590204447">"Sgancia"</string>
+ <string name="unpin_target" msgid="3963318576590204447">"Sblocca"</string>
<string name="unpin_specific_target" msgid="3859828252160908146">"Sblocca <xliff:g id="LABEL">%1$s</xliff:g>"</string>
<string name="app_info" msgid="6113278084877079851">"Informazioni app"</string>
<string name="negative_duration" msgid="1938335096972945232">"−<xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Spazio privato"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Condiviso"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Contenuti sensibili della notifica nascosti"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Contenuti dell\'app nascosti dalla condivisione schermo per sicurezza"</string>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index a1e72da..439565d 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"המרחב הפרטי"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"שכפול"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"שיתופי"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"יש תוכן רגיש בהתראה שהוסתר"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"תוכן האפליקציה מוסתר משיתוף המסך מטעמי אבטחה"</string>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index 04e47a7..fcaef68 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -716,7 +716,7 @@
<string name="face_acquired_too_right" msgid="6245286514593540859">"スマートフォンを左に動かしてください"</string>
<string name="face_acquired_too_left" msgid="9201762240918405486">"スマートフォンを右に動かしてください"</string>
<string name="face_acquired_poor_gaze" msgid="4427153558773628020">"もっとまっすぐデバイスに顔を向けてください。"</string>
- <string name="face_acquired_not_detected" msgid="1057966913397548150">"顔を確認できません。スマートフォンを目の高さに合わせます。"</string>
+ <string name="face_acquired_not_detected" msgid="1057966913397548150">"顔を確認できません。目の高さに合わせてください"</string>
<string name="face_acquired_too_much_motion" msgid="8199691445085189528">"あまり動かさないでください。安定させてください。"</string>
<string name="face_acquired_recalibrate" msgid="8724013080976469746">"顔を登録し直してください。"</string>
<string name="face_acquired_too_different" msgid="4505278456634706967">"顔を認識できません。もう一度お試しください。"</string>
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"プライベート スペース"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"複製"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"共用"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"プライベートな通知内容は表示されません"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"セキュリティ上、画面共有ではアプリの内容は非表示となります"</string>
diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml
index ef37d4f..2b98c58 100644
--- a/core/res/res/values-ka/strings.xml
+++ b/core/res/res/values-ka/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"კერძო სივრცე"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"კლონის შექმნა"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"საერთო"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"სენსიტიური შეტყობინების კონტენტი დამალულია"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"ეკრანის გაზიარებიდან აპის კონტენტი დამალულია უსაფრთხოების მიზნით"</string>
diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml
index f36d9fc..6e9eb12 100644
--- a/core/res/res/values-kk/strings.xml
+++ b/core/res/res/values-kk/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Құпия кеңістік"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клон"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Жалпы"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Хабарландырудың құпия контенті жасырылған."</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Қауіпсіздік мақсатында қолданба контенті экранды көрсету кезінде жасырылды."</string>
diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml
index 195eb13..70f59c1 100644
--- a/core/res/res/values-km/strings.xml
+++ b/core/res/res/values-km/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"លំហឯកជន"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ក្លូន"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"ទូទៅ"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"បានលាក់ខ្លឹមសារជូនដំណឹងដែលមានលក្ខណៈរសើប"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"បានលាក់ខ្លឹមសារកម្មវិធីពីការបង្ហាញអេក្រង់ដើម្បីសុវត្ថិភាព"</string>
diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml
index 073e448..f22c43a 100644
--- a/core/res/res/values-kn/strings.xml
+++ b/core/res/res/values-kn/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ಕ್ಲೋನ್"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"ಸಮುದಾಯ"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"ಸೂಕ್ಷ್ಮ ನೋಟಿಫಿಕೇಶನ್ ಕಂಟೆಂಟ್ ಅನ್ನು ಮರೆಮಾಡಲಾಗಿದೆ"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"ಭದ್ರತೆಗಾಗಿ ಸ್ಕ್ರೀನ್ ಹಂಚಿಕೊಳ್ಳುವಿಕೆಯಲ್ಲಿ ಆ್ಯಪ್ ಕಂಟೆಂಟ್ ಅನ್ನು ಮರೆಮಾಡಲಾಗಿದೆ"</string>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index bbe8aef..99b8715 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"비공개 스페이스"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"클론"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"공동"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"민감한 알림 콘텐츠 숨김"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"보안을 위해 화면 공유에서 앱 콘텐츠가 숨겨집니다."</string>
diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml
index 9686a14..427010b 100644
--- a/core/res/res/values-ky/strings.xml
+++ b/core/res/res/values-ky/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Жеке мейкиндик"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клон"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Жалпы"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Купуя билдирменин мазмуну жашырылган"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Коопсуздук үчүн колдонмодогу контент бөлүшүлгөн экрандан жашырылды"</string>
diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml
index b6bd4b2..4682bb0 100644
--- a/core/res/res/values-lo/strings.xml
+++ b/core/res/res/values-lo/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"ພື້ນທີ່ສ່ວນບຸກຄົນ"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ໂຄລນ"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"ສ່ວນກາງ"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"ເນື້ອຫາການແຈ້ງເຕືອນທີ່ລະອຽດອ່ອນເຊື່ອງຢູ່"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"ເນື້ອຫາແອັບຖືກເຊື່ອງໄວ້ຈາກການແບ່ງປັນໜ້າຈໍເພື່ອຄວາມປອດໄພ"</string>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 2b4f370..6fbb9b8 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -2409,6 +2409,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privati erdvė"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klonuoti"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Bendruomenės"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Neskelbtinos informacijos pranešimo turinys paslėptas"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Programos turinys paslėptas bendrinant ekraną saugumo sumetimais"</string>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index 3669f04..0bea4ff 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privātā telpa"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klons"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Kopīgs"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Sensitīvs paziņojuma saturs ir paslēpts"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Drošības nolūkos lietotnes saturs kopīgotajā ekrānā ir paslēpts"</string>
diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml
index 8902619..d7a6dd2 100644
--- a/core/res/res/values-mk/strings.xml
+++ b/core/res/res/values-mk/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Приватен простор"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клониран профил"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Профил на заедницата"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Содржината на чувствителните известувања е скриена"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Од безбедносни причини, содржините на апликацијата се скриени од споделувањето екран"</string>
diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml
index 005d7cb..4023336 100644
--- a/core/res/res/values-ml/strings.xml
+++ b/core/res/res/values-ml/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"സ്വകാര്യ സ്പേസ്"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ക്ലോൺ ചെയ്യുക"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"കമ്മ്യൂണൽ"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"സൂക്ഷ്മമായി കൈകാര്യം ചെയ്യേണ്ട അറിയിപ്പ് ഉള്ളടക്കം മറച്ചിരിക്കുന്നു"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"ആപ്പ് ഉള്ളടക്കം, അതിന്റെ സുരക്ഷയ്ക്കായി സ്ക്രീൻ പങ്കിടലിൽ നിന്ന് മറച്ചിരിക്കുന്നു"</string>
diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml
index f7bf6ca..9aa18e2 100644
--- a/core/res/res/values-mn/strings.xml
+++ b/core/res/res/values-mn/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Хаалттай орон зай"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клон"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Нийтийн"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Эмзэг мэдэгдлийн контентыг нуусан"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Аюулгүй байдлын улмаас аппын контентыг дэлгэц хуваалцахаас нуусан"</string>
diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml
index 77a58af..a115e2c 100644
--- a/core/res/res/values-mr/strings.xml
+++ b/core/res/res/values-mr/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"खाजगी स्पेस"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"क्लोन"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"सामुदायिक"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"संवेदनशील नोटिफिकेशनचा आशय लपवलेला आहे"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"स्क्रीन शेअर करताना सुरक्षेसाठी अॅपमधील आशय लपवला आहे"</string>
diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml
index 96691f6..2fa571c 100644
--- a/core/res/res/values-ms/strings.xml
+++ b/core/res/res/values-ms/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Ruang persendirian"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Umum"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Kandungan pemberitahuan yang sensitif disembunyikan"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Kandungan apl disembunyikan daripada perkongsian skrin untuk keselamatan"</string>
diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml
index c1b7822..364a7b1 100644
--- a/core/res/res/values-my/strings.xml
+++ b/core/res/res/values-my/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"သီးသန့်နေရာ"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ပုံတူပွားရန်"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"အများသုံး"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"သတိထားရမည့် အကြောင်းကြားချက်ပါ အချက်အလက်ကို ဖျောက်ထားသည်"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"အက်ပ်အကြောင်းအရာသည် လုံခြုံရေးအတွက် မျက်နှာပြင် မျှဝေခြင်းမှ ဖျောက်ထားသည်"</string>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index 23f675e..e2de428 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -342,7 +342,7 @@
<string name="permgrouplab_calllog" msgid="7926834372073550288">"Samtalelogger"</string>
<string name="permgroupdesc_calllog" msgid="2026996642917801803">"lese og skrive samtaleloggen"</string>
<string name="permgrouplab_phone" msgid="570318944091926620">"Telefon"</string>
- <string name="permgroupdesc_phone" msgid="270048070781478204">"ring og administrer anrop"</string>
+ <string name="permgroupdesc_phone" msgid="270048070781478204">"ringe og administrere anrop"</string>
<string name="permgrouplab_sensors" msgid="9134046949784064495">"Kroppssensorer"</string>
<string name="permgroupdesc_sensors" msgid="2610631290633747752">"få tilgang til sensordata om de vitale tegnene dine"</string>
<string name="permgrouplab_notifications" msgid="5472972361980668884">"Varsler"</string>
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privat område"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Felles"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Sensitivt varselinnhold er skjult"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Av sikkerhetsgrunner er appinnholdet skjult for skjermdelingen"</string>
diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml
index d25a7a3..8d5f560 100644
--- a/core/res/res/values-ne/strings.xml
+++ b/core/res/res/values-ne/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"निजी स्पेस"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"क्लोन"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"सामुदायिक"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"संवेदनशील सूचनासम्बन्धी सामग्री लुकाइएको छ"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"स्क्रिन सेयर गर्दा सुरक्षाका लागि एपमा भएको सामग्री लुकाइएको छ"</string>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index 0b2c507..5bc6c44 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privégedeelte"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Kloon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Gemeenschappelijk"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Content van gevoelige meldingen verborgen"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"App-content verborgen voor scherm delen vanwege beveiligingsrisico\'s"</string>
diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml
index f3cd70e..4c7868d 100644
--- a/core/res/res/values-or/strings.xml
+++ b/core/res/res/values-or/strings.xml
@@ -1751,7 +1751,7 @@
<string name="color_correction_feature_name" msgid="7975133554160979214">"ରଙ୍ଗ ସଂଶୋଧନ"</string>
<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>
+ <string name="hearing_aids_feature_name" msgid="1125892105105852542">"ଶ୍ରବଣ ଡିଭାଇସଗୁଡ଼ିକ"</string>
<string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"ଭଲ୍ୟୁମ୍ କୀ\'ଗୁଡ଼ିକୁ ଧରି ରଖାଯାଇଛି। <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ଚାଲୁ ହୋଇଛି।"</string>
<string name="accessibility_shortcut_disabling_service" msgid="8675244165062700619">"ଭଲ୍ୟୁମ୍ କୀ\'ଗୁଡ଼ିକୁ ଧରି ରଖାଯାଇଛି। <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ବନ୍ଦ ହୋଇଛି।"</string>
<string name="accessibility_shortcut_spoken_feedback" msgid="3760999147597564314">"ଭଲ୍ୟୁମ କୀ\'ଗୁଡ଼ିକୁ ରିଲିଜ କରନ୍ତୁ। <xliff:g id="SERVICE_NAME">%1$s</xliff:g>କୁ ଚାଲୁ କରିବା ପାଇଁ ଉଭୟ ଭଲ୍ୟୁମ କୀ\'କୁ ପୁଣି 3 ସେକେଣ୍ଡ ପାଇଁ ଦବାଇ ଧରି ରଖନ୍ତୁ।"</string>
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"ପ୍ରାଇଭେଟ ସ୍ପେସ"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"କ୍ଲୋନ"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"କମ୍ୟୁନାଲ"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"ସମ୍ୱେଦନଶୀଳ ବିଜ୍ଞପ୍ତି ବିଷୟବସ୍ତୁକୁ ଲୁଚାଯାଇଛି"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"ସୁରକ୍ଷା ପାଇଁ ସ୍କ୍ରିନ ସେୟାରରୁ ଆପ ବିଷୟବସ୍ତୁକୁ ଲୁଚାଯାଇଛି"</string>
diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml
index 60d8737..38780b6 100644
--- a/core/res/res/values-pa/strings.xml
+++ b/core/res/res/values-pa/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ਕਲੋਨ"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"ਭਾਈਚਾਰਕ"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"ਲੁਕੀ ਹੋਈ ਸੰਵੇਦਨਸ਼ੀਲ ਸੂਚਨਾ ਸਮੱਗਰੀ"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"ਐਪ ਸਮੱਗਰੀ ਨੂੰ ਸੁਰੱਖਿਆ ਲਈ ਸਕ੍ਰੀਨ ਸਾਂਝਾਕਰਨ ਤੋਂ ਲੁਕਾਇਆ ਗਿਆ ਹੈ"</string>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index ec5fee7..95e1a30 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -2409,6 +2409,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Przestrzeń prywatna"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Wspólny"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Treść poufnego powiadomienia została ukryta"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Ze względów bezpieczeństwa zawartość aplikacji jest niewidoczna podczas udostępniania ekranu"</string>
diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml
index 807c4ce..c9d36b1 100644
--- a/core/res/res/values-pt-rBR/strings.xml
+++ b/core/res/res/values-pt-rBR/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espaço privado"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Público"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Conteúdo de notificação sensível oculto"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Conteúdo do app oculto no compartilhamento de tela por motivos de segurança"</string>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index 0dcf4c5..f1b2bd0 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espaço privado"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Comum"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Conteúdo das notificações sensíveis ocultado"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Conteúdo da app ocultado da partilha de ecrã por motivos de segurança"</string>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index 807c4ce..c9d36b1 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Espaço privado"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Público"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Conteúdo de notificação sensível oculto"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Conteúdo do app oculto no compartilhamento de tela por motivos de segurança"</string>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index bf82cd8c..e14aec7 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Spațiu privat"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clonă"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Comun"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Conținutul sensibil din notificări a fost ascuns"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Conținutul aplicației este ascuns de permiterea accesului la ecran din motive de securitate"</string>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index c1900a8..79b0daa 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -2409,6 +2409,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Частное пространство"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клонированный"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Совместный"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Конфиденциальная информация в уведомлении скрыта"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Содержимое приложения исключено из демонстрации экрана в целях безопасности."</string>
diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml
index f216ce2..1e69e0b 100644
--- a/core/res/res/values-si/strings.xml
+++ b/core/res/res/values-si/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"රහසිගත අවකාශය"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"ක්ලෝන කරන්න"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"වාර්ගික"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"සංවේදී දැනුම්දීම් අන්තර්ගතය සැඟවී ඇත"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"ආරක්ෂාව සඳහා යෙදුම් අන්තර්ගතය තිරය බෙදා ගැනීමෙන් සඟවා ඇත"</string>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index 9c2a875..c7ca9f4 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -2409,6 +2409,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Súkromný priestor"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Spoločný"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Obsah citlivého upozornenia je skrytý"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Obsah aplikácie bol na účely zabezpečenia skrytý v zdieľaní obrazovky"</string>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index b3530e7..4f23a54 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -2409,6 +2409,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Zasebni prostor"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Skupno"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Občutljiva vsebina obvestila je bila skrita"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Pri deljenju zaslona je vsebina aplikacije skrita zaradi varnosti"</string>
diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml
index d577e7b..c49402b 100644
--- a/core/res/res/values-sq/strings.xml
+++ b/core/res/res/values-sq/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Hapësira private"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"I përbashkët"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Përmbajtjet delikate të njoftimeve janë fshehur"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Përmbajtja e aplikacionit është fshehur nga ndarja e ekranit për arsye sigurie"</string>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index 301fe24..2b3f75a 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -2408,6 +2408,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Приватан простор"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Клонирано"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Заједничко"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Осетљив садржај обавештења је скривен"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Садржај апликације је скривен за дељење садржаја екрана због безбедности"</string>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index b3c2063..2833381 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Privat område"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klona"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Allmän"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Känsligt aviseringsinnehåll dolt"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Av säkerhetsskäl döljs appinnehållet vid skärmdelning"</string>
diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml
index f15796e..d3af99f 100644
--- a/core/res/res/values-sw/strings.xml
+++ b/core/res/res/values-sw/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Sehemu ya faragha"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Nakala"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Wasifu wa pamoja"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Maudhui nyeti kwenye arifa yamefichwa"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Maudhui ya programu yamefichwa ili yasionekane kwenye skrini ya pamoja kwa sababu za kiusalama"</string>
diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml
index 0f2805d..37abcef 100644
--- a/core/res/res/values-ta/strings.xml
+++ b/core/res/res/values-ta/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"ரகசிய இடம்"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"குளோன்"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"பொது"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"உணர்வுபூர்வமான அறிவிப்பு உள்ளடக்கம் மறைக்கப்பட்டது"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"பாதுகாப்பிற்காக, திரைப் பகிர்வில் இருந்து ஆப்ஸ் உள்ளடக்கம் மறைக்கப்பட்டுள்ளது"</string>
diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml
index b448413..2766248 100644
--- a/core/res/res/values-te/strings.xml
+++ b/core/res/res/values-te/strings.xml
@@ -1301,7 +1301,7 @@
<string name="heavy_weight_switcher_title" msgid="3861984210040100886">"గేమ్ను ఎంచుకోండి"</string>
<string name="heavy_weight_switcher_text" msgid="6814316627367160126">"మెరుగైన పనితీరు పొందడానికి, ఈ గేమ్లలో ఒకసారికి ఒక్కటి మాత్రమే తెరవగలరు."</string>
<string name="old_app_action" msgid="725331621042848590">"<xliff:g id="OLD_APP">%1$s</xliff:g>కి తిరిగి వెళ్లు"</string>
- <string name="new_app_action" msgid="547772182913269801">"<xliff:g id="NEW_APP">%1$s</xliff:g>ని తెరువు"</string>
+ <string name="new_app_action" msgid="547772182913269801">"<xliff:g id="NEW_APP">%1$s</xliff:g>ను తెరవండి"</string>
<string name="new_app_description" msgid="1958903080400806644">"<xliff:g id="OLD_APP">%1$s</xliff:g> సేవ్ చేయకుండానే మూసివేయబడుతుంది"</string>
<string name="dump_heap_notification" msgid="5316644945404825032">"<xliff:g id="PROC">%1$s</xliff:g> మెమరీ పరిమితిని మించిపోయింది"</string>
<string name="dump_heap_ready_notification" msgid="2302452262927390268">"<xliff:g id="PROC">%1$s</xliff:g> హీప్ డంప్ సిద్ధంగా ఉంది"</string>
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"ప్రైవేట్ స్పేస్"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"క్లోన్"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"కమ్యూనల్"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"గోప్యమైన నోటిఫికేషన్ కంటెంట్ దాచబడింది"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"సెక్యూరిటీ కోసం స్క్రీన్ షేర్ నుండి యాప్ కంటెంట్ దాచబడింది"</string>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index e34b526..1f2a091 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"พื้นที่ส่วนตัว"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"โคลน"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"ส่วนกลาง"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"เนื้อหาการแจ้งเตือนที่ละเอียดอ่อนซ่อนอยู่"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"ซ่อนเนื้อหาแอปจากการแชร์หน้าจอเพื่อความปลอดภัย"</string>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index 4288460..7bce4b7 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Pribadong space"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Communal"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Nakatago ang content ng sensitibong notification"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Nakatago ang content ng app mula sa pagbabahagi ng screen para sa seguridad"</string>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index 906ccbc..cbfb770 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Özel alan"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Klon"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Paylaşılan"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Hassas bildirim içerikleri gizlendi"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Uygulama içerikleri, güvenlik nedeniyle ekran paylaşımında gizlendi"</string>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index cc9df2e..5266acd 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -2409,6 +2409,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Приватний простір"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Копія профілю"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Спільний профіль"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Чутливий вміст сповіщення приховано"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"З міркувань безпеки вміст додатка приховано під час показу екрана"</string>
diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml
index c0be641..2fe52f8 100644
--- a/core/res/res/values-ur/strings.xml
+++ b/core/res/res/values-ur/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"پرائیویٹ اسپیس"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"کلون"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"کمیونل"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"حساس اطلاعی مواد چھپا ہوا ہے"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"سیکیورٹی کے مد نظر ایپ کا مواد اسکرین کے اشتراک سے چھپا ہوا ہے"</string>
diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml
index 517176b..d40f383 100644
--- a/core/res/res/values-uz/strings.xml
+++ b/core/res/res/values-uz/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Maxfiy makon"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Nusxalash"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Umumiy"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Bildirishnomadagi maxfiy axborot berkitildi"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Ekran namoyishida xavfsizlik maqsadida ilova kontenti berkitildi"</string>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index e6db9dd..1051cda 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -306,7 +306,7 @@
<string name="notification_channel_foreground_service" msgid="7102189948158885178">"Các ứng dụng tiêu thụ pin"</string>
<string name="notification_channel_accessibility_magnification" msgid="1707913872219798098">"Phóng to"</string>
<string name="notification_channel_accessibility_security_policy" msgid="1727787021725251912">"Việc sử dụng tính năng hỗ trợ tiếp cận"</string>
- <string name="notification_channel_display" msgid="6905032605735615090">"Màn hình"</string>
+ <string name="notification_channel_display" msgid="6905032605735615090">"Hiển thị"</string>
<string name="foreground_service_app_in_background" msgid="1439289699671273555">"<xliff:g id="APP_NAME">%1$s</xliff:g> đang sử dụng pin"</string>
<string name="foreground_service_apps_in_background" msgid="7340037176412387863">"<xliff:g id="NUMBER">%1$d</xliff:g> ứng dụng đang sử dụng pin"</string>
<string name="foreground_service_tap_for_details" msgid="9078123626015586751">"Nhấn để biết chi tiết về mức sử dụng dữ liệu và pin"</string>
@@ -1098,8 +1098,8 @@
<string name="js_dialog_before_unload_negative_button" msgid="3873765747622415310">"Ở lại trang này"</string>
<string name="js_dialog_before_unload" msgid="7213364985774778744">"<xliff:g id="MESSAGE">%s</xliff:g>\n\nBạn có chắc chắn muốn điều hướng khỏi trang này không?"</string>
<string name="autofill_window_title" msgid="4379134104008111961">"Tự động điền với <xliff:g id="SERVICENAME">%1$s</xliff:g>"</string>
- <string name="permlab_setAlarm" msgid="1158001610254173567">"đặt báo thức"</string>
- <string name="permdesc_setAlarm" msgid="2185033720060109640">"Cho phép ứng dụng đặt báo thức trong ứng dụng đồng hồ báo thức được cài đặt. Một số ứng dụng đồng hồ báo thức có thể không thực thi tính năng này."</string>
+ <string name="permlab_setAlarm" msgid="1158001610254173567">"đặt chuông báo"</string>
+ <string name="permdesc_setAlarm" msgid="2185033720060109640">"Cho phép ứng dụng đặt chuông báo trong ứng dụng đồng hồ được cài đặt. Một số ứng dụng đồng hồ có thể không có năng này."</string>
<string name="permlab_addVoicemail" msgid="4770245808840814471">"thêm thư thoại"</string>
<string name="permdesc_addVoicemail" msgid="5470312139820074324">"Cho phép ứng dụng thêm thông báo vào hộp thư thoại đến của bạn."</string>
<string name="pasted_from_clipboard" msgid="7355790625710831847">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> đã dán dữ liệu từ bảng nhớ tạm của bạn"</string>
@@ -1329,7 +1329,7 @@
<string name="ringtone_default_with_actual" msgid="2709686194556159773">"Mặc định (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string>
<string name="ringtone_silent" msgid="397111123930141876">"Không"</string>
<string name="ringtone_picker_title" msgid="667342618626068253">"Nhạc chuông"</string>
- <string name="ringtone_picker_title_alarm" msgid="7438934548339024767">"Âm thanh báo thức"</string>
+ <string name="ringtone_picker_title_alarm" msgid="7438934548339024767">"Âm thanh chuông báo"</string>
<string name="ringtone_picker_title_notification" msgid="6387191794719608122">"Âm thanh thông báo"</string>
<string name="ringtone_unknown" msgid="5059495249862816475">"Không xác định"</string>
<string name="wifi_available_sign_in" msgid="381054692557675237">"Đăng nhập vào mạng Wi-Fi"</string>
@@ -2407,6 +2407,8 @@
<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>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Dùng chung"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Đã ẩn nội dung thông báo nhạy cảm"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Nội dung ứng dụng bị ẩn khỏi tính năng chia sẻ màn hình vì lý do bảo mật"</string>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 4b04940..d16a353 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"私密空间"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"克隆"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"共用"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"已隐藏敏感通知内容"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"为安全起见而在屏幕共享画面中处于隐藏状态的应用内容"</string>
diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml
index 1aa9c72..672a638 100644
--- a/core/res/res/values-zh-rHK/strings.xml
+++ b/core/res/res/values-zh-rHK/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"私人空間"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"複製"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"共用"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"已隱藏敏感通知內容"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"為安全起見，應用程式內容已從分享螢幕畫面隱藏"</string>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index eaed7d2..8a224ed 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"私人空間"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"複製"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"共通"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"系統已隱藏含有私密資訊的通知內容"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"為安全起見，分享螢幕畫面未顯示應用程式內容"</string>
diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml
index ba3ae9f..27bd3c9 100644
--- a/core/res/res/values-zu/strings.xml
+++ b/core/res/res/values-zu/strings.xml
@@ -2407,6 +2407,8 @@
<string name="accessibility_label_private_profile" msgid="1436459319135548969">"Indawo engasese"</string>
<string name="accessibility_label_clone_profile" msgid="7579118375042398784">"Yenza i-Clone"</string>
<string name="accessibility_label_communal_profile" msgid="1437173163111334791">"Okomphakathi"</string>
+ <!-- no translation found for private_space_biometric_prompt_title (5777592909271728154) -->
+ <skip />
<string name="redacted_notification_message" msgid="1520587845842228816">"Okuqukethwe kwesaziso esizwelayo kufihliwe"</string>
<string name="redacted_notification_action_title" msgid="6942924973335920935"></string>
<string name="screen_not_shared_sensitive_content" msgid="7058419185079565001">"Okuqukethwe kwe-app kufihliwe kusuka ekwabelaneni kwesikrini ngokuvikelwa"</string>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 405324b..c74bc9b 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -9702,6 +9702,12 @@
<attr name="hotSpotY" format="dimension" />
</declare-styleable>
+ <!-- @hide -->
+ <declare-styleable name="PointerIconVectorTheme">
+ <attr name="pointerIconVectorFill" format="color" />
+ <attr name="pointerIconVectorFillInverse" format="color" />
+ </declare-styleable>
+
<declare-styleable name="Storage">
<!-- path to mount point for the storage. -->
<attr name="mountPoint" format="string" />
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4dfe000..c6d4f3a 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4840,7 +4840,7 @@
See android.credentials.CredentialManager
-->
<string name="config_defaultCredentialManagerHybridService" translatable="false"></string>
-
+
<!-- The component name, flattened to a string, for the system's credential manager
autofill service. This service allows interceding autofill requests and routing
them to credential manager.
@@ -6503,9 +6503,6 @@
<string-array name="config_sharedLibrariesLoadedAfterApp" translatable="false">
</string-array>
- <!-- the number of the max cached processes in the system. -->
- <integer name="config_customizedMaxCachedProcesses">32</integer>
-
<!-- Whether this device should support taking app snapshots on closure -->
<bool name="config_disableTaskSnapshots">false</bool>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 87141c7..b547a7a 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -6473,6 +6473,9 @@
<!-- Accessibility label for clone profile user type [CHAR LIMIT=30] -->
<string name="accessibility_label_communal_profile">Communal</string>
+ <!-- Label for private space biometric prompt logo description [CHAR LIMIT=30] -->
+ <string name="private_space_biometric_prompt_title">Private space</string>
+
<!-- Notification message used when a notification's normal message contains sensitive information [CHAR_LIMIT=NOTIF_BODY] -->
<string name="redacted_notification_message">Sensitive notification content hidden</string>
<!-- Notification action title used instead of a notification's normal title sensitive [CHAR_LIMIT=NOTIF_BODY] -->
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index a46dc04..50c3b1a 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1497,6 +1497,36 @@
</style>
<!-- @hide -->
+ <style name="PointerIconVectorStyleFillBlack">
+ <item name="pointerIconVectorFill">@color/black</item>
+ <item name="pointerIconVectorFillInverse">@color/white</item>
+ </style>
+
+ <!-- @hide -->
+ <style name="PointerIconVectorStyleFillGreen">
+ <item name="pointerIconVectorFill">#6DD58C</item>
+ <item name="pointerIconVectorFillInverse">#6DD58C</item>
+ </style>
+
+ <!-- @hide -->
+ <style name="PointerIconVectorStyleFillYellow">
+ <item name="pointerIconVectorFill">#FDD663</item>
+ <item name="pointerIconVectorFillInverse">#FDD663</item>
+ </style>
+
+ <!-- @hide -->
+ <style name="PointerIconVectorStyleFillPink">
+ <item name="pointerIconVectorFill">#F2B8B5</item>
+ <item name="pointerIconVectorFillInverse">#F2B8B5</item>
+ </style>
+
+ <!-- @hide -->
+ <style name="PointerIconVectorStyleFillBlue">
+ <item name="pointerIconVectorFill">#8AB4F8</item>
+ <item name="pointerIconVectorFillInverse">#8AB4F8</item>
+ </style>
+
+ <!-- @hide -->
<style name="aerr_list_item" parent="Widget.Material.Light.Button.Borderless">
<item name="minHeight">?attr/listPreferredItemHeightSmall</item>
<item name="textAppearance">?attr/textAppearanceListItemSmall</item>
@@ -1690,4 +1720,12 @@
parent="@style/Theme.DeviceDefault.Resolver">
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
</style>
+
+ <!--
+ TODO(b/309578419): Make activities go edge-to-edge properly and then remove this.
+ -->
+ <style name="GrantCredentialsPermissionActivity"
+ parent="@style/Theme.DeviceDefault.Light.DialogWhenLarge">
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+ </style>
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index bb73934..4442b5e 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1116,6 +1116,7 @@
<java-symbol type="string" name="accessibility_label_private_profile" />
<java-symbol type="string" name="accessibility_label_clone_profile" />
<java-symbol type="string" name="accessibility_label_communal_profile" />
+ <java-symbol type="string" name="private_space_biometric_prompt_title" />
<java-symbol type="string" name="mediasize_unknown_portrait" />
<java-symbol type="string" name="mediasize_unknown_landscape" />
<java-symbol type="string" name="mediasize_iso_a0" />
@@ -1694,6 +1695,12 @@
<java-symbol type="style" name="Pointer" />
<java-symbol type="style" name="LargePointer" />
<java-symbol type="style" name="VectorPointer" />
+ <java-symbol type="style" name="PointerIconVectorStyleFillBlack" />
+ <java-symbol type="style" name="PointerIconVectorStyleFillGreen" />
+ <java-symbol type="style" name="PointerIconVectorStyleFillYellow" />
+ <java-symbol type="style" name="PointerIconVectorStyleFillPink" />
+ <java-symbol type="style" name="PointerIconVectorStyleFillBlue" />
+ <java-symbol type="attr" name="pointerIconVectorFill" />
<java-symbol type="style" name="TextAppearance.DeviceDefault.Notification.Title" />
<java-symbol type="style" name="TextAppearance.DeviceDefault.Notification.Info" />
@@ -5060,8 +5067,6 @@
code and resources provided by applications. -->
<java-symbol type="array" name="config_sharedLibrariesLoadedAfterApp" />
- <java-symbol type="integer" name="config_customizedMaxCachedProcesses" />
-
<java-symbol type="color" name="overview_background"/>
<java-symbol type="bool" name="config_disableTaskSnapshots" />
diff --git a/core/tests/coretests/src/android/view/ViewFrameRateTest.java b/core/tests/coretests/src/android/view/ViewFrameRateTest.java
index 1491d77..35b984a 100644
--- a/core/tests/coretests/src/android/view/ViewFrameRateTest.java
+++ b/core/tests/coretests/src/android/view/ViewFrameRateTest.java
@@ -499,12 +499,9 @@
toolkitFrameRateDefaultNormalReadOnly() ? FRAME_RATE_CATEGORY_NORMAL
: FRAME_RATE_CATEGORY_HIGH;
} else {
- // intermittent
- // Even though this is not a small View, step 3 is triggered by this flag, which
- // brings intermittent to LOW
- expectedCategory = toolkitFrameRateBySizeReadOnly()
- ? FRAME_RATE_CATEGORY_LOW
- : FRAME_RATE_CATEGORY_NORMAL;
+ // intermittent.
+ // The expected category is normal.
+ expectedCategory = FRAME_RATE_CATEGORY_NORMAL;
}
mActivityRule.runOnUiThread(() -> {
mMovingView.invalidate();
diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java
index 5a6824b..b5c264c 100644
--- a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java
+++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java
@@ -146,10 +146,6 @@
public void setMagnificationCallbackEnabled(int displayId, boolean enabled) {}
- public boolean isMagnificationSystemUIConnected() {
- return false;
- }
-
public boolean setSoftKeyboardShowMode(int showMode) {
return false;
}
diff --git a/core/tests/coretests/src/android/window/WindowOnBackInvokedDispatcherTest.java b/core/tests/coretests/src/android/window/WindowOnBackInvokedDispatcherTest.java
index 50d7f59..d4482f2 100644
--- a/core/tests/coretests/src/android/window/WindowOnBackInvokedDispatcherTest.java
+++ b/core/tests/coretests/src/android/window/WindowOnBackInvokedDispatcherTest.java
@@ -28,6 +28,7 @@
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -111,7 +112,7 @@
doReturn(mApplicationInfo).when(mContext).getApplicationInfo();
mDispatcher = new WindowOnBackInvokedDispatcher(mContext, Looper.getMainLooper());
- mDispatcher.attachToWindow(mWindowSession, mWindow, mImeBackAnimationController);
+ mDispatcher.attachToWindow(mWindowSession, mWindow, null, mImeBackAnimationController);
}
private void waitForIdle() {
@@ -368,7 +369,7 @@
callbackInfo.getCallback().onBackInvoked();
waitForIdle();
- verify(mCallback1).onBackInvoked();
+ verify(mCallback1, timeout(/*millis*/ 1000)).onBackInvoked();
verify(mCallback1, never()).onBackCancelled();
}
@@ -454,25 +455,26 @@
@Test
public void registerImeCallbacks_onBackInvokedCallbackEnabled() throws RemoteException {
- mDispatcher.registerOnBackInvokedCallback(PRIORITY_DEFAULT, mDefaultImeCallback);
+ verifyImeCallackRegistrations();
+ }
+
+ @Test
+ public void registerImeCallbacks_onBackInvokedCallbackDisabled() throws RemoteException {
+ doReturn(false).when(mApplicationInfo).isOnBackInvokedCallbackEnabled();
+ verifyImeCallackRegistrations();
+ }
+
+ private void verifyImeCallackRegistrations() throws RemoteException {
+ // verify default callback is replaced with ImeBackAnimationController
+ mDispatcher.registerOnBackInvokedCallbackUnchecked(mDefaultImeCallback, PRIORITY_DEFAULT);
assertCallbacksSize(/* default */ 1, /* overlay */ 0);
assertSetCallbackInfo();
assertTopCallback(mImeBackAnimationController);
- mDispatcher.registerOnBackInvokedCallback(PRIORITY_DEFAULT, mImeCallback);
+ // verify regular ime callback is successfully registered
+ mDispatcher.registerOnBackInvokedCallbackUnchecked(mImeCallback, PRIORITY_DEFAULT);
assertCallbacksSize(/* default */ 2, /* overlay */ 0);
assertSetCallbackInfo();
assertTopCallback(mImeCallback);
}
-
- @Test
- public void registerImeCallbacks_legacyBack() throws RemoteException {
- doReturn(false).when(mApplicationInfo).isOnBackInvokedCallbackEnabled();
-
- mDispatcher.registerOnBackInvokedCallback(PRIORITY_DEFAULT, mDefaultImeCallback);
- assertNoSetCallbackInfo();
-
- mDispatcher.registerOnBackInvokedCallback(PRIORITY_DEFAULT, mImeCallback);
- assertNoSetCallbackInfo();
- }
}
diff --git a/core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java b/core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java
index f79ba28..af2a2bb 100644
--- a/core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java
+++ b/core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java
@@ -48,7 +48,8 @@
final String dumyIconKey = "dummyIcon1";
final ArrayMap<String, StatusBarIcon> iconMap = new ArrayMap<>();
iconMap.put(dumyIconKey, new StatusBarIcon("com.android.internal.statusbar.test",
- UserHandle.of(100), 123, 1, 2, "dummyIconDescription"));
+ UserHandle.of(100), 123, 1, 2, "dummyIconDescription",
+ StatusBarIcon.Type.SystemIcon));
final LetterboxDetails letterboxDetails = new LetterboxDetails(
/* letterboxInnerBounds= */ new Rect(1, 2, 3, 4),
/* letterboxFullBounds= */ new Rect(5, 6, 7, 8),
diff --git a/core/tests/coretests/src/com/android/internal/statusbar/StatusBarIconTest.java b/core/tests/coretests/src/com/android/internal/statusbar/StatusBarIconTest.java
index fe552a0..a895378 100644
--- a/core/tests/coretests/src/com/android/internal/statusbar/StatusBarIconTest.java
+++ b/core/tests/coretests/src/com/android/internal/statusbar/StatusBarIconTest.java
@@ -44,7 +44,8 @@
final int dummyIconNumber = 2;
final CharSequence dummyIconContentDescription = "dummyIcon";
final StatusBarIcon original = new StatusBarIcon(dummyIconPackageName, dummyUserHandle,
- dummyIconId, dummyIconLevel, dummyIconNumber, dummyIconContentDescription);
+ dummyIconId, dummyIconLevel, dummyIconNumber, dummyIconContentDescription,
+ StatusBarIcon.Type.SystemIcon);
final StatusBarIcon copy = clone(original);
diff --git a/keystore/OWNERS b/keystore/OWNERS
index 913f655..6891777 100644
--- a/keystore/OWNERS
+++ b/keystore/OWNERS
@@ -1,4 +1,5 @@
# Bug component: 189335
+drysdale@google.com
eranm@google.com
jbires@google.com
swillden@google.com
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java
index e8f01c2..d92d24d 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java
@@ -16,6 +16,9 @@
package androidx.window.extensions.embedding;
+import static android.content.pm.ActivityInfo.CONFIG_DENSITY;
+import static android.content.pm.ActivityInfo.CONFIG_LAYOUT_DIRECTION;
+import static android.content.pm.ActivityInfo.CONFIG_WINDOW_CONFIGURATION;
import static android.util.TypedValue.COMPLEX_UNIT_DIP;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
@@ -40,7 +43,6 @@
import android.app.Activity;
import android.app.ActivityThread;
import android.content.Context;
-import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.graphics.Color;
import android.graphics.PixelFormat;
@@ -959,7 +961,7 @@
@VisibleForTesting
static class Properties {
private static final int CONFIGURATION_MASK_FOR_DIVIDER =
- ActivityInfo.CONFIG_DENSITY | ActivityInfo.CONFIG_WINDOW_CONFIGURATION;
+ CONFIG_DENSITY | CONFIG_WINDOW_CONFIGURATION | CONFIG_LAYOUT_DIRECTION;
@NonNull
private final Configuration mConfiguration;
@NonNull
@@ -1228,6 +1230,12 @@
FLAG_NOT_FOCUSABLE | FLAG_NOT_TOUCH_MODAL | FLAG_SLIPPERY,
PixelFormat.TRANSLUCENT);
lp.setTitle(WINDOW_NAME);
+
+ // Ensure that the divider layout is always LTR regardless of the locale, because we
+ // already considered the locale when determining the split layout direction and the
+ // computed divider line position always starts from the left. This only affects the
+ // horizontal layout and does not have any effect on the top-to-bottom layout.
+ mDividerLayout.setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
mViewHost.setView(mDividerLayout, lp);
mViewHost.relayout(lp);
}
diff --git a/libs/WindowManager/Shell/res/values-de/strings.xml b/libs/WindowManager/Shell/res/values-de/strings.xml
index bcdc2a9..7b91559 100644
--- a/libs/WindowManager/Shell/res/values-de/strings.xml
+++ b/libs/WindowManager/Shell/res/values-de/strings.xml
@@ -48,8 +48,8 @@
<string name="accessibility_action_divider_top_50" msgid="8649582798829048946">"50 % oben"</string>
<string name="accessibility_action_divider_top_30" msgid="3572788224908570257">"30 % oben"</string>
<string name="accessibility_action_divider_bottom_full" msgid="2831868345092314060">"Vollbild unten"</string>
- <string name="accessibility_split_left" msgid="1713683765575562458">"Links teilen"</string>
- <string name="accessibility_split_right" msgid="8441001008181296837">"Rechts teilen"</string>
+ <string name="accessibility_split_left" msgid="1713683765575562458">"Links positionieren"</string>
+ <string name="accessibility_split_right" msgid="8441001008181296837">"Rechts positionieren"</string>
<string name="accessibility_split_top" msgid="2789329702027147146">"Oben teilen"</string>
<string name="accessibility_split_bottom" msgid="8694551025220868191">"Unten teilen"</string>
<string name="one_handed_tutorial_title" msgid="4583241688067426350">"Einhandmodus wird verwendet"</string>
diff --git a/libs/WindowManager/Shell/res/values-ko/strings.xml b/libs/WindowManager/Shell/res/values-ko/strings.xml
index e8b5522..caa114f 100644
--- a/libs/WindowManager/Shell/res/values-ko/strings.xml
+++ b/libs/WindowManager/Shell/res/values-ko/strings.xml
@@ -95,7 +95,7 @@
<string name="letterbox_education_reposition_text" msgid="4589957299813220661">"앱 위치를 조정하려면 앱 외부를 두 번 탭합니다."</string>
<string name="letterbox_education_got_it" msgid="4057634570866051177">"확인"</string>
<string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"추가 정보는 펼쳐서 확인하세요."</string>
- <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"화면에 맞게 보도록 다시 시작할까요?"</string>
+ <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"화면에 맞게 보이도록 다시 시작할까요?"</string>
<string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"앱을 다시 시작하면 화면에 더 잘 맞게 볼 수는 있지만 진행 상황 또는 저장되지 않은 변경사항을 잃을 수도 있습니다."</string>
<string name="letterbox_restart_cancel" msgid="1342209132692537805">"취소"</string>
<string name="letterbox_restart_restart" msgid="8529976234412442973">"다시 시작"</string>
diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/DesktopModeStatus.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/DesktopModeStatus.java
index 8d8655a..4876f32 100644
--- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/DesktopModeStatus.java
+++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/DesktopModeStatus.java
@@ -67,6 +67,10 @@
private static final boolean ENFORCE_DEVICE_RESTRICTIONS = SystemProperties.getBoolean(
"persist.wm.debug.desktop_mode_enforce_device_restrictions", true);
+ /** Whether the desktop density override is enabled. */
+ public static final boolean DESKTOP_DENSITY_OVERRIDE_ENABLED =
+ SystemProperties.getBoolean("persist.wm.debug.desktop_mode_density_enabled", false);
+
/** Override density for tasks when they're inside the desktop. */
public static final int DESKTOP_DENSITY_OVERRIDE =
SystemProperties.getInt("persist.wm.debug.desktop_mode_density", 284);
@@ -157,9 +161,23 @@
}
/**
- * Return {@code true} if the override desktop density is set.
+ * Return {@code true} if the override desktop density is enabled and valid.
*/
- public static boolean isDesktopDensityOverrideSet() {
+ public static boolean useDesktopOverrideDensity() {
+ return isDesktopDensityOverrideEnabled() && isValidDesktopDensityOverrideSet();
+ }
+
+ /**
+ * Return {@code true} if the override desktop density is enabled.
+ */
+ private static boolean isDesktopDensityOverrideEnabled() {
+ return DESKTOP_DENSITY_OVERRIDE_ENABLED;
+ }
+
+ /**
+ * Return {@code true} if the override desktop density is set and within a valid range.
+ */
+ private static boolean isValidDesktopDensityOverrideSet() {
return DESKTOP_DENSITY_OVERRIDE >= DESKTOP_DENSITY_MIN
&& DESKTOP_DENSITY_OVERRIDE <= DESKTOP_DENSITY_MAX;
}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
index 8c36554..0119289 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
@@ -40,7 +40,6 @@
import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings.Global;
-import android.util.DisplayMetrics;
import android.util.Log;
import android.view.IRemoteAnimationRunner;
import android.view.InputDevice;
@@ -62,7 +61,6 @@
import com.android.internal.util.LatencyTracker;
import com.android.internal.view.AppearanceRegion;
import com.android.wm.shell.R;
-import com.android.wm.shell.animation.FlingAnimationUtils;
import com.android.wm.shell.common.ExternalInterfaceBinder;
import com.android.wm.shell.common.RemoteCallable;
import com.android.wm.shell.common.ShellExecutor;
@@ -87,15 +85,6 @@
public static final boolean IS_ENABLED =
SystemProperties.getInt("persist.wm.debug.predictive_back",
SETTING_VALUE_ON) == SETTING_VALUE_ON;
- public static final float FLING_MAX_LENGTH_SECONDS = 0.1f; // 100ms
- public static final float FLING_SPEED_UP_FACTOR = 0.6f;
-
- /**
- * The maximum additional progress in case of fling gesture.
- * The end animation starts after the user lifts the finger from the screen, we continue to
- * fire {@link BackEvent}s until the velocity reaches 0.
- */
- private static final float MAX_FLING_PROGRESS = 0.3f; /* 30% of the screen */
/** Predictive back animation developer option */
private final AtomicBoolean mEnableAnimations = new AtomicBoolean(false);
@@ -118,8 +107,6 @@
private boolean mPointersPilfered = false;
private final boolean mRequirePointerPilfer;
- private final FlingAnimationUtils mFlingAnimationUtils;
-
/** Registry for the back animations */
private final ShellBackAnimationRegistry mShellBackAnimationRegistry;
@@ -232,11 +219,6 @@
mBgHandler = bgHandler;
shellInit.addInitCallback(this::onInit, this);
mAnimationBackground = backAnimationBackground;
- DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
- mFlingAnimationUtils = new FlingAnimationUtils.Builder(displayMetrics)
- .setMaxLengthSeconds(FLING_MAX_LENGTH_SECONDS)
- .setSpeedUpFactor(FLING_SPEED_UP_FACTOR)
- .build();
mShellBackAnimationRegistry = shellBackAnimationRegistry;
mLatencyTracker = LatencyTracker.getInstance(mContext);
mShellCommandHandler = shellCommandHandler;
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 861e32d..6449073 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
@@ -1458,8 +1458,9 @@
SynchronousScreenCaptureListener screenCaptureListener) {
try {
ScreenCapture.CaptureArgs args = null;
- if (mStackView != null) {
- ViewRootImpl viewRoot = mStackView.getViewRootImpl();
+ View viewToUse = mStackView != null ? mStackView : mLayerView;
+ if (viewToUse != null) {
+ ViewRootImpl viewRoot = viewToUse.getViewRootImpl();
if (viewRoot != null) {
SurfaceControl bubbleLayer = viewRoot.getSurfaceControl();
if (bubbleLayer != null) {
@@ -1551,6 +1552,12 @@
Log.w(TAG, "Tried to add a bubble to the stack but the stack is null");
}
};
+ } else if (mBubbleData.isExpanded() && mBubbleData.getSelectedBubble() != null) {
+ callback = b -> {
+ if (b.getKey().equals(mBubbleData.getSelectedBubbleKey())) {
+ mLayerView.showExpandedView(b);
+ }
+ };
}
for (int i = mBubbleData.getBubbles().size() - 1; i >= 0; i--) {
Bubble bubble = mBubbleData.getBubbles().get(i);
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java
index 874102c..32873d9 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java
@@ -256,11 +256,15 @@
}
/**
- * Returns a bubble bar update populated with the current list of active bubbles.
+ * Returns a bubble bar update populated with the current list of active bubbles, expanded,
+ * and selected state.
*/
public BubbleBarUpdate getInitialStateForBubbleBar() {
BubbleBarUpdate initialState = mStateChange.getInitialState();
initialState.bubbleBarLocation = mPositioner.getBubbleBarLocation();
+ initialState.expanded = mExpanded;
+ initialState.expandedChanged = mExpanded; // only matters if we're expanded
+ initialState.selectedBubbleKey = getSelectedBubbleKey();
return initialState;
}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java
index 4e8afcc..c7ccd50 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java
@@ -482,31 +482,38 @@
mPointerWidth, mPointerHeight, true /* pointLeft */));
mRightPointer = new ShapeDrawable(TriangleShape.createHorizontal(
mPointerWidth, mPointerHeight, false /* pointLeft */));
- if (mPointerView != null) {
- updatePointerView();
- }
+ updatePointerViewIfExists();
+ updateManageButtonIfExists();
+ }
- if (mManageButton != null) {
- int visibility = mManageButton.getVisibility();
- removeView(mManageButton);
- ContextThemeWrapper ctw = new ContextThemeWrapper(getContext(),
- com.android.internal.R.style.Theme_DeviceDefault_DayNight);
- mManageButton = (AlphaOptimizedButton) LayoutInflater.from(ctw).inflate(
- R.layout.bubble_manage_button, this /* parent */, false /* attach */);
- addView(mManageButton);
- mManageButton.setVisibility(visibility);
- post(() -> {
- int touchAreaHeight =
- getResources().getDimensionPixelSize(
- R.dimen.bubble_manage_button_touch_area_height);
- Rect r = new Rect();
- mManageButton.getHitRect(r);
- int extraTouchArea = (touchAreaHeight - r.height()) / 2;
- r.top -= extraTouchArea;
- r.bottom += extraTouchArea;
- setTouchDelegate(new TouchDelegate(r, mManageButton));
- });
+
+ /**
+ * Reinflate manage button if {@link #mManageButton} is initialized.
+ * Does nothing otherwise.
+ */
+ private void updateManageButtonIfExists() {
+ if (mManageButton == null) {
+ return;
}
+ int visibility = mManageButton.getVisibility();
+ removeView(mManageButton);
+ ContextThemeWrapper ctw = new ContextThemeWrapper(getContext(),
+ com.android.internal.R.style.Theme_DeviceDefault_DayNight);
+ mManageButton = (AlphaOptimizedButton) LayoutInflater.from(ctw).inflate(
+ R.layout.bubble_manage_button, this /* parent */, false /* attach */);
+ addView(mManageButton);
+ mManageButton.setVisibility(visibility);
+ post(() -> {
+ int touchAreaHeight =
+ getResources().getDimensionPixelSize(
+ R.dimen.bubble_manage_button_touch_area_height);
+ Rect r = new Rect();
+ mManageButton.getHitRect(r);
+ int extraTouchArea = (touchAreaHeight - r.height()) / 2;
+ r.top -= extraTouchArea;
+ r.bottom += extraTouchArea;
+ setTouchDelegate(new TouchDelegate(r, mManageButton));
+ });
}
void updateFontSize() {
@@ -548,11 +555,18 @@
if (mTaskView != null) {
mTaskView.setCornerRadius(mCornerRadius);
}
- updatePointerView();
+ updatePointerViewIfExists();
+ updateManageButtonIfExists();
}
- /** Updates the size and visuals of the pointer. **/
- private void updatePointerView() {
+ /**
+ * Updates the size and visuals of the pointer if {@link #mPointerView} is initialized.
+ * Does nothing otherwise.
+ */
+ private void updatePointerViewIfExists() {
+ if (mPointerView == null) {
+ return;
+ }
LayoutParams lp = (LayoutParams) mPointerView.getLayoutParams();
if (mCurrentPointer == mLeftPointer || mCurrentPointer == mRightPointer) {
lp.width = mPointerHeight;
@@ -1055,7 +1069,7 @@
// Post because we need the width of the view
post(() -> {
mCurrentPointer = showVertically ? onLeft ? mLeftPointer : mRightPointer : mTopPointer;
- updatePointerView();
+ updatePointerViewIfExists();
if (showVertically) {
mPointerPos.y = bubbleCenter - (mPointerWidth / 2f);
if (!isRtl) {
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java
index 21b70b8..0b66bcb 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java
@@ -161,6 +161,11 @@
// The taskId is saved to use for removeTask, preventing appearance in recent tasks.
mTaskId = taskId;
+ if (mBubble != null && mBubble.isAppBubble()) {
+ // Let the controller know sooner what the taskId is.
+ mExpandedViewManager.setAppBubbleTaskId(mBubble.getKey(), mTaskId);
+ }
+
// With the task org, the taskAppeared callback will only happen once the task has
// already drawn
mListener.onTaskCreated();
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 0cdd181..0807f75 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
@@ -75,7 +75,7 @@
import com.android.wm.shell.recents.RecentsTransitionStateListener
import com.android.wm.shell.shared.DesktopModeStatus
import com.android.wm.shell.shared.DesktopModeStatus.DESKTOP_DENSITY_OVERRIDE
-import com.android.wm.shell.shared.DesktopModeStatus.isDesktopDensityOverrideSet
+import com.android.wm.shell.shared.DesktopModeStatus.useDesktopOverrideDensity
import com.android.wm.shell.shared.annotations.ExternalThread
import com.android.wm.shell.shared.annotations.ShellMainThread
import com.android.wm.shell.splitscreen.SplitScreenController
@@ -960,8 +960,8 @@
}
}
val wct = WindowContainerTransaction()
- if (isDesktopDensityOverrideSet()) {
- // TODO(344599474) reintroduce density changes behind a disabled flag
+ if (useDesktopOverrideDensity()) {
+ wct.setDensityDpi(task.token, DESKTOP_DENSITY_OVERRIDE)
}
// Desktop Mode is showing and we're launching a new Task - we might need to minimize
// a Task.
@@ -1035,7 +1035,7 @@
}
wct.setWindowingMode(taskInfo.token, targetWindowingMode)
wct.reorder(taskInfo.token, true /* onTop */)
- if (isDesktopDensityOverrideSet()) {
+ if (useDesktopOverrideDensity()) {
wct.setDensityDpi(taskInfo.token, DESKTOP_DENSITY_OVERRIDE)
}
}
@@ -1055,7 +1055,7 @@
}
wct.setWindowingMode(taskInfo.token, targetWindowingMode)
wct.setBounds(taskInfo.token, Rect())
- if (isDesktopDensityOverrideSet()) {
+ if (useDesktopOverrideDensity()) {
wct.setDensityDpi(taskInfo.token, getDefaultDensityDpi())
}
}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java
index eb845db..57c0732 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java
@@ -583,7 +583,7 @@
}
static PipTransitionAnimator<Rect> ofBounds(TaskInfo taskInfo, SurfaceControl leash,
- Rect baseValue, Rect startValue, Rect endValue, Rect sourceHintRect,
+ Rect baseValue, Rect startValue, Rect endValue, Rect sourceRectHint,
@PipAnimationController.TransitionDirection int direction, float startingAngle,
@Surface.Rotation int rotationDelta) {
final boolean isOutPipDirection = isOutPipDirection(direction);
@@ -613,14 +613,36 @@
initialContainerRect = initialSourceValue;
}
- final Rect sourceHintRectInsets;
- if (sourceHintRect == null) {
- sourceHintRectInsets = null;
+ final Rect adjustedSourceRectHint = new Rect();
+ if (sourceRectHint == null || sourceRectHint.isEmpty()) {
+ // Crop a Rect matches the aspect ratio and pivots at the center point.
+ // This is done for entering case only.
+ if (isInPipDirection(direction)) {
+ final float aspectRatio = endValue.width() / (float) endValue.height();
+ if ((startValue.width() / (float) startValue.height()) > aspectRatio) {
+ // use the full height.
+ adjustedSourceRectHint.set(0, 0,
+ (int) (startValue.height() * aspectRatio), startValue.height());
+ adjustedSourceRectHint.offset(
+ (startValue.width() - adjustedSourceRectHint.width()) / 2, 0);
+ } else {
+ // use the full width.
+ adjustedSourceRectHint.set(0, 0,
+ startValue.width(), (int) (startValue.width() / aspectRatio));
+ adjustedSourceRectHint.offset(
+ 0, (startValue.height() - adjustedSourceRectHint.height()) / 2);
+ }
+ }
} else {
- sourceHintRectInsets = new Rect(sourceHintRect.left - initialContainerRect.left,
- sourceHintRect.top - initialContainerRect.top,
- initialContainerRect.right - sourceHintRect.right,
- initialContainerRect.bottom - sourceHintRect.bottom);
+ adjustedSourceRectHint.set(sourceRectHint);
+ }
+ final Rect sourceHintRectInsets = new Rect();
+ if (!adjustedSourceRectHint.isEmpty()) {
+ sourceHintRectInsets.set(
+ adjustedSourceRectHint.left - initialContainerRect.left,
+ adjustedSourceRectHint.top - initialContainerRect.top,
+ initialContainerRect.right - adjustedSourceRectHint.right,
+ initialContainerRect.bottom - adjustedSourceRectHint.bottom);
}
final Rect zeroInsets = new Rect(0, 0, 0, 0);
@@ -648,7 +670,7 @@
}
float angle = (1.0f - fraction) * startingAngle;
setCurrentValue(bounds);
- if (inScaleTransition() || sourceHintRect == null) {
+ if (inScaleTransition() || adjustedSourceRectHint.isEmpty()) {
if (isOutPipDirection) {
getSurfaceTransactionHelper().crop(tx, leash, end)
.scale(tx, leash, end, bounds);
@@ -661,7 +683,7 @@
} else {
final Rect insets = computeInsets(fraction);
getSurfaceTransactionHelper().scaleAndCrop(tx, leash,
- sourceHintRect, initialSourceValue, bounds, insets,
+ adjustedSourceRectHint, initialSourceValue, bounds, insets,
isInPipDirection, fraction);
if (shouldApplyCornerRadius()) {
final Rect sourceBounds = new Rect(initialContainerRect);
@@ -729,9 +751,6 @@
}
private Rect computeInsets(float fraction) {
- if (sourceHintRectInsets == null) {
- return zeroInsets;
- }
final Rect startRect = isOutPipDirection ? sourceHintRectInsets : zeroInsets;
final Rect endRect = isOutPipDirection ? zeroInsets : sourceHintRectInsets;
return mInsetsEvaluator.evaluate(fraction, startRect, endRect);
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java
index e11e859..ff2d46e 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java
@@ -226,11 +226,10 @@
appBoundsCenterX - mOverlayHalfSize,
appBoundsCenterY - mOverlayHalfSize);
// Scale back the bitmap with the pivot point at center.
- mTmpTransform.postScale(
+ final float scale = Math.min(
(float) mAppBounds.width() / currentBounds.width(),
- (float) mAppBounds.height() / currentBounds.height(),
- appBoundsCenterX,
- appBoundsCenterY);
+ (float) mAppBounds.height() / currentBounds.height());
+ mTmpTransform.postScale(scale, scale, appBoundsCenterX, appBoundsCenterY);
atomicTx.setMatrix(mLeash, mTmpTransform, mTmpFloat9)
.setAlpha(mLeash, fraction < 0.5f ? 0 : (fraction - 0.5f) * 2);
}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java
index a58d94e..202f60d 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java
@@ -137,7 +137,7 @@
mTmpDestinationRect.inset(insets);
// Scale to the bounds no smaller than the destination and offset such that the top/left
// of the scaled inset source rect aligns with the top/left of the destination bounds
- final float scale;
+ final float scale, left, top;
if (isInPipDirection
&& sourceRectHint != null && sourceRectHint.width() < sourceBounds.width()) {
// scale by sourceRectHint if it's not edge-to-edge, for entering PiP transition only.
@@ -148,12 +148,15 @@
? (float) destinationBounds.width() / sourceBounds.width()
: (float) destinationBounds.height() / sourceBounds.height();
scale = (1 - fraction) * startScale + fraction * endScale;
+ left = destinationBounds.left - insets.left * scale;
+ top = destinationBounds.top - insets.top * scale;
} else {
scale = Math.max((float) destinationBounds.width() / sourceBounds.width(),
(float) destinationBounds.height() / sourceBounds.height());
+ // Work around the rounding error by fix the position at very beginning.
+ left = scale == 1 ? 0 : destinationBounds.left - insets.left * scale;
+ top = scale == 1 ? 0 : destinationBounds.top - insets.top * scale;
}
- final float left = destinationBounds.left - insets.left * scale;
- final float top = destinationBounds.top - insets.top * scale;
mTmpTransform.setScale(scale, scale);
tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
.setCrop(leash, mTmpDestinationRect)
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
index b52b0d8..5ee6f6b 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
@@ -200,9 +200,6 @@
animator.cancel();
}
mExitTransition = mTransitions.startTransition(type, out, this);
- if (mPipOrganizer.getOutPipWindowingMode() == WINDOWING_MODE_UNDEFINED) {
- mHomeTransitionObserver.notifyHomeVisibilityChanged(false /* isVisible */);
- }
}
@Override
@@ -659,6 +656,9 @@
startTransaction.remove(mPipOrganizer.mPipOverlay);
mPipOrganizer.clearContentOverlay();
}
+ if (mPipOrganizer.getOutPipWindowingMode() == WINDOWING_MODE_UNDEFINED) {
+ mHomeTransitionObserver.notifyHomeVisibilityChanged(false /* isVisible */);
+ }
if (pipChange == null) {
ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
"%s: No window of exiting PIP is found. Can't play expand animation", TAG);
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
index b2180db..f257e20 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
@@ -53,6 +53,7 @@
import android.os.RemoteException;
import android.os.SystemProperties;
import android.provider.Settings;
+import android.util.ArrayMap;
import android.util.Log;
import android.util.Pair;
import android.view.SurfaceControl;
@@ -226,7 +227,8 @@
private boolean mDisableForceSync = false;
private static final class ActiveTransition {
- IBinder mToken;
+ final IBinder mToken;
+
TransitionHandler mHandler;
boolean mAborted;
TransitionInfo mInfo;
@@ -236,6 +238,10 @@
/** Ordered list of transitions which have been merged into this one. */
private ArrayList<ActiveTransition> mMerged;
+ ActiveTransition(IBinder token) {
+ mToken = token;
+ }
+
boolean isSync() {
return (mInfo.getFlags() & TransitionInfo.FLAG_SYNC) != 0;
}
@@ -265,6 +271,9 @@
}
}
+ /** All transitions that we have created, but not yet finished. */
+ private final ArrayMap<IBinder, ActiveTransition> mKnownTransitions = new ArrayMap<>();
+
/** Keeps track of transitions which have been started, but aren't ready yet. */
private final ArrayList<ActiveTransition> mPendingTransitions = new ArrayList<>();
@@ -689,7 +698,7 @@
info.getDebugId(), transitionToken, info);
int activeIdx = findByToken(mPendingTransitions, transitionToken);
if (activeIdx < 0) {
- final ActiveTransition existing = getKnownTransition(transitionToken);
+ final ActiveTransition existing = mKnownTransitions.get(transitionToken);
if (existing != null) {
Log.e(TAG, "Got duplicate transitionReady for " + transitionToken);
// The transition is already somewhere else in the pipeline, so just return here.
@@ -704,8 +713,8 @@
+ transitionToken + ". expecting one of "
+ Arrays.toString(mPendingTransitions.stream().map(
activeTransition -> activeTransition.mToken).toArray()));
- final ActiveTransition fallback = new ActiveTransition();
- fallback.mToken = transitionToken;
+ final ActiveTransition fallback = new ActiveTransition(transitionToken);
+ mKnownTransitions.put(transitionToken, fallback);
mPendingTransitions.add(fallback);
activeIdx = mPendingTransitions.size() - 1;
}
@@ -745,7 +754,7 @@
// Sleep starts a process of forcing all prior transitions to finish immediately
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,
"Start finish-for-sync track %d", i);
- finishForSync(active, i, null /* forceFinish */);
+ finishForSync(active.mToken, i, null /* forceFinish */);
}
if (hadPreceding) {
return false;
@@ -863,6 +872,7 @@
} else if (mPendingTransitions.isEmpty()) {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "All active transition "
+ "animations finished");
+ mKnownTransitions.clear();
// Run all runnables from the run-when-idle queue.
for (int i = 0; i < mRunWhenIdleQueue.size(); i++) {
mRunWhenIdleQueue.get(i).run();
@@ -883,7 +893,7 @@
ready.mStartT.apply();
}
// finish now since there's nothing to animate. Calls back into processReadyQueue
- onFinish(ready, null);
+ onFinish(ready.mToken, null);
return;
}
playTransition(ready);
@@ -942,8 +952,10 @@
private void playTransition(@NonNull ActiveTransition active) {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Playing animation for %s", active);
+ final var token = active.mToken;
+
for (int i = 0; i < mObservers.size(); ++i) {
- mObservers.get(i).onTransitionStarting(active.mToken);
+ mObservers.get(i).onTransitionStarting(token);
}
setupAnimHierarchy(active.mInfo, active.mStartT, active.mFinishT);
@@ -952,8 +964,8 @@
if (active.mHandler != null) {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " try firstHandler %s",
active.mHandler);
- boolean consumed = active.mHandler.startAnimation(active.mToken, active.mInfo,
- active.mStartT, active.mFinishT, (wct) -> onFinish(active, wct));
+ boolean consumed = active.mHandler.startAnimation(token, active.mInfo,
+ active.mStartT, active.mFinishT, (wct) -> onFinish(token, wct));
if (consumed) {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " animated by firstHandler");
mTransitionTracer.logDispatched(active.mInfo.getDebugId(), active.mHandler);
@@ -961,8 +973,8 @@
}
}
// Otherwise give every other handler a chance
- active.mHandler = dispatchTransition(active.mToken, active.mInfo, active.mStartT,
- active.mFinishT, (wct) -> onFinish(active, wct), active.mHandler);
+ active.mHandler = dispatchTransition(token, active.mInfo, active.mStartT,
+ active.mFinishT, (wct) -> onFinish(token, wct), active.mHandler);
}
/**
@@ -1038,10 +1050,15 @@
info.releaseAnimSurfaces();
}
- private void onFinish(ActiveTransition active,
+ private void onFinish(IBinder token,
@Nullable WindowContainerTransaction wct) {
+ final ActiveTransition active = mKnownTransitions.get(token);
+ if (active == null) {
+ Log.e(TAG, "Trying to finish a non-existent transition: " + token);
+ return;
+ }
final Track track = mTracks.get(active.getTrack());
- if (track.mActiveTransition != active) {
+ if (track == null || track.mActiveTransition != active) {
Log.e(TAG, "Trying to finish a non-running transition. Either remote crashed or "
+ " a handler didn't properly deal with a merge. " + active,
new RuntimeException());
@@ -1094,54 +1111,25 @@
ActiveTransition merged = active.mMerged.get(iM);
mOrganizer.finishTransition(merged.mToken, null /* wct */);
releaseSurfaces(merged.mInfo);
+ mKnownTransitions.remove(merged.mToken);
}
active.mMerged.clear();
}
+ mKnownTransitions.remove(token);
// Now that this is done, check the ready queue for more work.
processReadyQueue(track);
}
- /**
- * Checks to see if the transition specified by `token` is already known. If so, it will be
- * returned.
- */
- @Nullable
- private ActiveTransition getKnownTransition(IBinder token) {
- for (int i = 0; i < mPendingTransitions.size(); ++i) {
- final ActiveTransition active = mPendingTransitions.get(i);
- if (active.mToken == token) return active;
- }
- for (int i = 0; i < mReadyDuringSync.size(); ++i) {
- final ActiveTransition active = mReadyDuringSync.get(i);
- if (active.mToken == token) return active;
- }
- for (int t = 0; t < mTracks.size(); ++t) {
- final Track tr = mTracks.get(t);
- for (int i = 0; i < tr.mReadyTransitions.size(); ++i) {
- final ActiveTransition active = tr.mReadyTransitions.get(i);
- if (active.mToken == token) return active;
- }
- final ActiveTransition active = tr.mActiveTransition;
- if (active == null) continue;
- if (active.mToken == token) return active;
- if (active.mMerged == null) continue;
- for (int m = 0; m < active.mMerged.size(); ++m) {
- final ActiveTransition merged = active.mMerged.get(m);
- if (merged.mToken == token) return merged;
- }
- }
- return null;
- }
-
void requestStartTransition(@NonNull IBinder transitionToken,
@Nullable TransitionRequestInfo request) {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Transition requested (#%d): %s %s",
request.getDebugId(), transitionToken, request);
- if (getKnownTransition(transitionToken) != null) {
+ if (mKnownTransitions.containsKey(transitionToken)) {
throw new RuntimeException("Transition already started " + transitionToken);
}
- final ActiveTransition active = new ActiveTransition();
+ final ActiveTransition active = new ActiveTransition(transitionToken);
+ mKnownTransitions.put(transitionToken, active);
WindowContainerTransaction wct = null;
// If we have sleep, we use a special handler and we try to finish everything ASAP.
@@ -1181,7 +1169,6 @@
wct.setBounds(request.getTriggerTask().token, null);
}
mOrganizer.startTransition(transitionToken, wct != null && wct.isEmpty() ? null : wct);
- active.mToken = transitionToken;
// Currently, WMCore only does one transition at a time. If it makes a requestStart, it
// is already collecting that transition on core-side, so it will be the next one to
// become ready. There may already be pending transitions added as part of direct
@@ -1200,9 +1187,10 @@
@NonNull WindowContainerTransaction wct, @Nullable TransitionHandler handler) {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Directly starting a new transition "
+ "type=%d wct=%s handler=%s", type, wct, handler);
- final ActiveTransition active = new ActiveTransition();
+ final ActiveTransition active =
+ new ActiveTransition(mOrganizer.startNewTransition(type, wct));
active.mHandler = handler;
- active.mToken = mOrganizer.startNewTransition(type, wct);
+ mKnownTransitions.put(active.mToken, active);
mPendingTransitions.add(active);
return active.mToken;
}
@@ -1242,14 +1230,14 @@
*
* This is then repeated until there are no more pending sleep transitions.
*
- * @param reason The SLEEP transition that triggered this round of finishes. We will continue
- * looping round finishing transitions as long as this is still waiting.
+ * @param reason The token for the SLEEP transition that triggered this round of finishes.
+ * We will continue looping round finishing transitions until this is ready.
* @param forceFinish When non-null, this is the transition that we last sent the SLEEP merge
* signal to -- so it will be force-finished if it's still running.
*/
- private void finishForSync(ActiveTransition reason,
+ private void finishForSync(IBinder reason,
int trackIdx, @Nullable ActiveTransition forceFinish) {
- if (getKnownTransition(reason.mToken) == null) {
+ if (!mKnownTransitions.containsKey(reason)) {
Log.d(TAG, "finishForSleep: already played sync transition " + reason);
return;
}
@@ -1269,7 +1257,7 @@
forceFinish.mHandler.onTransitionConsumed(
forceFinish.mToken, true /* aborted */, null /* finishTransaction */);
}
- onFinish(forceFinish, null);
+ onFinish(forceFinish.mToken, null);
}
}
if (track.isIdle() || mReadyDuringSync.isEmpty()) {
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 d822dfd..a4ade1b 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
@@ -386,7 +386,7 @@
// Should match the density of the task. The task may have had its density overridden
// to be different that SysUI's.
windowDecorConfig.setTo(taskInfo.configuration);
- } else if (DesktopModeStatus.isDesktopDensityOverrideSet()) {
+ } else if (DesktopModeStatus.useDesktopOverrideDensity()) {
// The task has had its density overridden, but keep using the system's density to
// layout the header.
windowDecorConfig.setTo(context.getResources().getConfiguration());
@@ -516,8 +516,8 @@
private void createResizeVeilIfNeeded() {
if (mResizeVeil != null) return;
loadAppInfoIfNeeded();
- mResizeVeil = new ResizeVeil(mContext, mDisplayController, mResizeVeilBitmap, mTaskInfo,
- mTaskSurface, mSurfaceControlTransactionSupplier);
+ mResizeVeil = new ResizeVeil(mContext, mDisplayController, mResizeVeilBitmap,
+ mTaskSurface, mSurfaceControlTransactionSupplier, mTaskInfo);
}
/**
@@ -525,7 +525,7 @@
*/
public void showResizeVeil(Rect taskBounds) {
createResizeVeilIfNeeded();
- mResizeVeil.showVeil(mTaskSurface, taskBounds);
+ mResizeVeil.showVeil(mTaskSurface, taskBounds, mTaskInfo);
}
/**
@@ -533,7 +533,7 @@
*/
public void showResizeVeil(SurfaceControl.Transaction tx, Rect taskBounds) {
createResizeVeilIfNeeded();
- mResizeVeil.showVeil(tx, mTaskSurface, taskBounds, false /* fadeIn */);
+ mResizeVeil.showVeil(tx, mTaskSurface, taskBounds, mTaskInfo, false /* fadeIn */);
}
/**
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java
index badce6e..635f96b 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java
@@ -285,6 +285,9 @@
private boolean mShouldHandleEvents;
private int mLastCursorType = PointerIcon.TYPE_DEFAULT;
private Rect mDragStartTaskBounds;
+ // The id of the particular pointer in a MotionEvent that we are listening to for drag
+ // resize events. For example, if multiple fingers are touching the screen, then each one
+ // has a separate pointer id, but we only accept drag input from one.
private int mDragPointerId = -1;
private TaskResizeInputEventReceiver(@NonNull Context context,
@@ -395,6 +398,8 @@
mShouldHandleEvents = mDragResizeWindowGeometry.shouldHandleEvent(e, isTouch,
new Point() /* offset */);
if (mShouldHandleEvents) {
+ // Save the id of the pointer for this drag interaction; we will use the
+ // same pointer for all subsequent MotionEvents in this interaction.
mDragPointerId = e.getPointerId(0);
float x = e.getX(0);
float y = e.getY(0);
@@ -420,9 +425,16 @@
break;
}
mInputManager.pilferPointers(mInputChannel.getToken());
- int dragPointerIndex = e.findPointerIndex(mDragPointerId);
- float rawX = e.getRawX(dragPointerIndex);
- float rawY = e.getRawY(dragPointerIndex);
+ final int dragPointerIndex = e.findPointerIndex(mDragPointerId);
+ if (dragPointerIndex < 0) {
+ ProtoLog.d(WM_SHELL_DESKTOP_MODE,
+ "%s: Handling action move, but ignore event due to invalid "
+ + "pointer index",
+ TAG);
+ break;
+ }
+ final float rawX = e.getRawX(dragPointerIndex);
+ final float rawY = e.getRawY(dragPointerIndex);
final Rect taskBounds = mCallback.onDragPositioningMove(rawX, rawY);
updateInputSinkRegionForDrag(taskBounds);
result = true;
@@ -431,7 +443,14 @@
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL: {
if (mShouldHandleEvents) {
- int dragPointerIndex = e.findPointerIndex(mDragPointerId);
+ final int dragPointerIndex = e.findPointerIndex(mDragPointerId);
+ if (dragPointerIndex < 0) {
+ ProtoLog.d(WM_SHELL_DESKTOP_MODE,
+ "%s: Handling action %d, but ignore event due to invalid "
+ + "pointer index",
+ TAG, e.getActionMasked());
+ break;
+ }
final Rect taskBounds = mCallback.onDragPositioningEnd(
e.getRawX(dragPointerIndex), e.getRawY(dragPointerIndex));
// If taskBounds has changed, setGeometry will be called and update the
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.kt
index 4f2d945..cd2dac8 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.kt
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.kt
@@ -20,7 +20,6 @@
import android.animation.ValueAnimator
import android.app.ActivityManager.RunningTaskInfo
import android.content.Context
-import android.content.res.Configuration
import android.graphics.Bitmap
import android.graphics.Color
import android.graphics.PixelFormat
@@ -36,10 +35,15 @@
import android.view.WindowlessWindowManager
import android.widget.ImageView
import android.window.TaskConstants
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.ui.graphics.toArgb
import com.android.wm.shell.R
import com.android.wm.shell.common.DisplayController
import com.android.wm.shell.common.DisplayController.OnDisplaysChangedListener
import com.android.wm.shell.windowdecor.WindowDecoration.SurfaceControlViewHostFactory
+import com.android.wm.shell.windowdecor.common.DecorThemeUtil
+import com.android.wm.shell.windowdecor.common.Theme
import java.util.function.Supplier
/**
@@ -49,14 +53,18 @@
private val context: Context,
private val displayController: DisplayController,
private val appIcon: Bitmap,
- private val taskInfo: RunningTaskInfo,
private var parentSurface: SurfaceControl,
private val surfaceControlTransactionSupplier: Supplier<SurfaceControl.Transaction>,
private val surfaceControlBuilderFactory: SurfaceControlBuilderFactory =
object : SurfaceControlBuilderFactory {},
private val surfaceControlViewHostFactory: SurfaceControlViewHostFactory =
- object : SurfaceControlViewHostFactory {}
+ object : SurfaceControlViewHostFactory {},
+ taskInfo: RunningTaskInfo,
) {
+ private val decorThemeUtil = DecorThemeUtil(context)
+ private val lightColors = dynamicLightColorScheme(context)
+ private val darkColors = dynamicDarkColorScheme(context)
+
private val surfaceSession = SurfaceSession()
private lateinit var iconView: ImageView
private var iconSize = 0
@@ -86,21 +94,10 @@
return
}
displayController.removeDisplayWindowListener(this)
- setupResizeVeil()
+ setupResizeVeil(taskInfo)
}
}
- private val backgroundColorId: Int
- get() {
- val configuration = context.resources.configuration
- return if (configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
- == Configuration.UI_MODE_NIGHT_YES) {
- R.color.desktop_mode_resize_veil_dark
- } else {
- R.color.desktop_mode_resize_veil_light
- }
- }
-
/**
* Whether the resize veil is ready to be shown.
*/
@@ -108,14 +105,14 @@
get() = viewHost != null
init {
- setupResizeVeil()
+ setupResizeVeil(taskInfo)
}
/**
* Create the veil in its default invisible state.
*/
- private fun setupResizeVeil() {
- if (!obtainDisplayOrRegisterListener()) {
+ private fun setupResizeVeil(taskInfo: RunningTaskInfo) {
+ if (!obtainDisplayOrRegisterListener(taskInfo.displayId)) {
// Display may not be available yet, skip this until then.
return
}
@@ -162,8 +159,8 @@
Trace.endSection()
}
- private fun obtainDisplayOrRegisterListener(): Boolean {
- display = displayController.getDisplay(taskInfo.displayId)
+ private fun obtainDisplayOrRegisterListener(displayId: Int): Boolean {
+ display = displayController.getDisplay(displayId)
if (display == null) {
displayController.addDisplayWindowListener(onDisplaysChangedListener)
return false
@@ -184,7 +181,8 @@
t: SurfaceControl.Transaction,
parent: SurfaceControl,
taskBounds: Rect,
- fadeIn: Boolean
+ taskInfo: RunningTaskInfo,
+ fadeIn: Boolean,
) {
if (!isReady || isVisible) {
t.apply()
@@ -202,13 +200,15 @@
parentSurface = parent
}
-
+ val backgroundColor = when (decorThemeUtil.getAppTheme(taskInfo)) {
+ Theme.LIGHT -> lightColors.surfaceContainer
+ Theme.DARK -> darkColors.surfaceContainer
+ }
t.show(veil)
.setLayer(veil, VEIL_CONTAINER_LAYER)
.setLayer(icon, VEIL_ICON_LAYER)
.setLayer(background, VEIL_BACKGROUND_LAYER)
- .setColor(background,
- Color.valueOf(context.getColor(backgroundColorId)).components)
+ .setColor(background, Color.valueOf(backgroundColor.toArgb()).components)
relayout(taskBounds, t)
if (fadeIn) {
cancelAnimation()
@@ -270,12 +270,12 @@
/**
* Animate veil's alpha to 1, fading it in.
*/
- fun showVeil(parentSurface: SurfaceControl, taskBounds: Rect) {
+ fun showVeil(parentSurface: SurfaceControl, taskBounds: Rect, taskInfo: RunningTaskInfo) {
if (!isReady || isVisible) {
return
}
val t = surfaceControlTransactionSupplier.get()
- showVeil(t, parentSurface, taskBounds, true /* fadeIn */)
+ showVeil(t, parentSurface, taskBounds, taskInfo, true /* fadeIn */)
}
/**
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java
index 8932e60..4d0348b 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java
@@ -19,6 +19,7 @@
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 android.os.Handler;
import android.os.Looper;
@@ -95,16 +96,33 @@
// Trigger animation cancel, the target progress should be 0.
mTargetProgress = 0;
mTargetProgressCalled = new CountDownLatch(1);
- CountDownLatch cancelCallbackCalled = new CountDownLatch(1);
+ CountDownLatch finishCallbackCalled = new CountDownLatch(1);
mMainThreadHandler.post(
- () -> mProgressAnimator.onBackCancelled(() -> cancelCallbackCalled.countDown()));
- cancelCallbackCalled.await(1, TimeUnit.SECONDS);
+ () -> mProgressAnimator.onBackCancelled(finishCallbackCalled::countDown));
+ finishCallbackCalled.await(1, TimeUnit.SECONDS);
mTargetProgressCalled.await(1, TimeUnit.SECONDS);
assertNotNull(mReceivedBackEvent);
assertEquals(mReceivedBackEvent.getProgress(), mTargetProgress, 0 /* delta */);
}
@Test
+ public void testBackInvoked() throws InterruptedException {
+ // Give the animator some progress.
+ final BackMotionEvent backEvent = backMotionEventFrom(100, mTargetProgress);
+ mMainThreadHandler.post(
+ () -> mProgressAnimator.onBackProgressed(backEvent));
+ mTargetProgressCalled.await(1, TimeUnit.SECONDS);
+ assertNotNull(mReceivedBackEvent);
+
+ // Trigger back invoked animation
+ CountDownLatch finishCallbackCalled = new CountDownLatch(1);
+ mMainThreadHandler.post(
+ () -> mProgressAnimator.onBackInvoked(finishCallbackCalled::countDown));
+ assertTrue("onBackInvoked finishCallback never called",
+ finishCallbackCalled.await(1, TimeUnit.SECONDS));
+ }
+
+ @Test
public void testResetCallsCancelCallbackImmediately() throws InterruptedException {
// Give the animator some progress.
final BackMotionEvent backEvent = backMotionEventFrom(100, mTargetProgress);
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java
index 0f43377..f55c96c 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java
@@ -1203,6 +1203,25 @@
assertThat(update.currentBubbleList.get(0).getKey()).isEqualTo(mEntryA2.getKey());
assertThat(update.currentBubbleList.get(1).getKey()).isEqualTo(mEntryA1.getKey());
assertThat(update.bubbleBarLocation).isEqualTo(BubbleBarLocation.LEFT);
+ assertThat(update.expandedChanged).isFalse();
+ assertThat(update.selectedBubbleKey).isEqualTo(mEntryA2.getKey());
+ }
+
+ @Test
+ public void test_getInitialStateForBubbleBar_includesExpandedState() {
+ sendUpdatedEntryAtTime(mEntryA1, 1000);
+ sendUpdatedEntryAtTime(mEntryA2, 2000);
+ mPositioner.setBubbleBarLocation(BubbleBarLocation.LEFT);
+ mBubbleData.setExpanded(true);
+
+ BubbleBarUpdate update = mBubbleData.getInitialStateForBubbleBar();
+ assertThat(update.currentBubbleList).hasSize(2);
+ assertThat(update.currentBubbleList.get(0).getKey()).isEqualTo(mEntryA2.getKey());
+ assertThat(update.currentBubbleList.get(1).getKey()).isEqualTo(mEntryA1.getKey());
+ assertThat(update.bubbleBarLocation).isEqualTo(BubbleBarLocation.LEFT);
+ assertThat(update.expandedChanged).isTrue();
+ assertThat(update.expanded).isTrue();
+ assertThat(update.selectedBubbleKey).isEqualTo(mEntryA2.getKey());
}
@Test
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 b526838..748ad31 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
@@ -1113,10 +1113,8 @@
@Test
fun handleRequest_freeformTask_alreadyInDesktop_noOverrideDensity_noConfigDensityChange() {
- // TODO(344599474) enable the test once the density change is behind a flag
- assumeTrue(false)
assumeTrue(ENABLE_SHELL_TRANSITIONS)
- whenever(DesktopModeStatus.isDesktopDensityOverrideSet()).thenReturn(false)
+ whenever(DesktopModeStatus.useDesktopOverrideDensity()).thenReturn(false)
val freeformTask1 = setUpFreeformTask()
markTaskVisible(freeformTask1)
@@ -1129,10 +1127,8 @@
@Test
fun handleRequest_freeformTask_alreadyInDesktop_overrideDensity_hasConfigDensityChange() {
- // TODO(344599474) enable the test once the density change is behind a flag
- assumeTrue(false)
assumeTrue(ENABLE_SHELL_TRANSITIONS)
- whenever(DesktopModeStatus.isDesktopDensityOverrideSet()).thenReturn(true)
+ whenever(DesktopModeStatus.useDesktopOverrideDensity()).thenReturn(true)
val freeformTask1 = setUpFreeformTask()
markTaskVisible(freeformTask1)
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java
index a731e53..1b223cf 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java
@@ -22,6 +22,8 @@
import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;
import static android.view.WindowInsetsController.APPEARANCE_TRANSPARENT_CAPTION_BAR_BACKGROUND;
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.any;
@@ -54,6 +56,7 @@
import androidx.test.filters.SmallTest;
+import com.android.dx.mockito.inline.extended.StaticMockitoSession;
import com.android.internal.R;
import com.android.window.flags.Flags;
import com.android.wm.shell.RootTaskDisplayAreaOrganizer;
@@ -62,14 +65,17 @@
import com.android.wm.shell.TestRunningTaskInfoBuilder;
import com.android.wm.shell.common.DisplayController;
import com.android.wm.shell.common.SyncTransactionQueue;
+import com.android.wm.shell.shared.DesktopModeStatus;
import com.android.wm.shell.windowdecor.WindowDecoration.RelayoutParams;
+import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.mockito.quality.Strictness;
import java.util.function.Supplier;
@@ -118,6 +124,7 @@
private final Configuration mConfiguration = new Configuration();
+ private StaticMockitoSession mMockitoSession;
private TestableContext mTestableContext;
/** Set up run before test class. */
@@ -131,6 +138,11 @@
@Before
public void setUp() {
+ mMockitoSession = mockitoSession()
+ .strictness(Strictness.LENIENT)
+ .spyStatic(DesktopModeStatus.class)
+ .startMocking();
+ when(DesktopModeStatus.useDesktopOverrideDensity()).thenReturn(false);
doReturn(mMockSurfaceControlViewHost).when(mMockSurfaceControlViewHostFactory).create(
any(), any(), any());
doReturn(mMockTransaction).when(mMockTransactionSupplier).get();
@@ -138,6 +150,11 @@
mTestableContext.ensureTestableResources();
}
+ @After
+ public void tearDown() {
+ mMockitoSession.finishMocking();
+ }
+
@Test
public void testMenusClosedWhenTaskIsInvisible() {
doReturn(mMockTransaction).when(mMockTransaction).hide(any());
@@ -206,6 +223,7 @@
@Test
@DisableFlags(Flags.FLAG_ENABLE_APP_HEADER_WITH_TASK_DENSITY)
public void updateRelayoutParams_appHeader_usesSystemDensity() {
+ when(DesktopModeStatus.useDesktopOverrideDensity()).thenReturn(true);
final int systemDensity = mTestableContext.getOrCreateTestableResources().getResources()
.getConfiguration().densityDpi;
final int customTaskDensity = systemDensity + 300;
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/ResizeVeilTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/ResizeVeilTest.kt
index 5da57c5..a07be79 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/ResizeVeilTest.kt
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/ResizeVeilTest.kt
@@ -150,7 +150,7 @@
fun showVeil() {
val veil = createResizeVeil()
- veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)
+ veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), taskInfo, false /* fadeIn */)
verify(mockTransaction).show(mockResizeVeilSurface)
verify(mockTransaction).show(mockBackgroundSurface)
@@ -162,7 +162,7 @@
fun showVeil_displayUnavailable_doesNotShow() {
val veil = createResizeVeil(withDisplayAvailable = false)
- veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)
+ veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), taskInfo, false /* fadeIn */)
verify(mockTransaction, never()).show(mockResizeVeilSurface)
verify(mockTransaction, never()).show(mockBackgroundSurface)
@@ -174,8 +174,8 @@
fun showVeil_alreadyVisible_doesNotShowAgain() {
val veil = createResizeVeil()
- veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)
- veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), false /* fadeIn */)
+ veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), taskInfo, false /* fadeIn */)
+ veil.showVeil(mockTransaction, mock(), Rect(0, 0, 100, 100), taskInfo, false /* fadeIn */)
verify(mockTransaction, times(1)).show(mockResizeVeilSurface)
verify(mockTransaction, times(1)).show(mockBackgroundSurface)
@@ -188,7 +188,13 @@
val veil = createResizeVeil(parent = mock())
val newParent = mock<SurfaceControl>()
- veil.showVeil(mockTransaction, newParent, Rect(0, 0, 100, 100), false /* fadeIn */)
+ veil.showVeil(
+ mockTransaction,
+ newParent,
+ Rect(0, 0, 100, 100),
+ taskInfo,
+ false /* fadeIn */
+ )
verify(mockTransaction).reparent(mockResizeVeilSurface, newParent)
}
@@ -212,11 +218,11 @@
context,
mockDisplayController,
mockAppIcon,
- taskInfo,
parent,
{ mockTransaction },
mockSurfaceControlBuilderFactory,
- mockSurfaceControlViewHostFactory
+ mockSurfaceControlViewHostFactory,
+ taskInfo
)
}
}
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 7c1c5b4..341599e 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -115,6 +115,7 @@
"libharfbuzz_ng",
"libminikin",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc"
],
static_libs: [
diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp
index 325bdd6..5d3bc89 100644
--- a/libs/hwui/Properties.cpp
+++ b/libs/hwui/Properties.cpp
@@ -39,6 +39,9 @@
constexpr bool hdr_10bit_plus() {
return false;
}
+constexpr bool initialize_gl_always() {
+ return false;
+}
} // namespace hwui_flags
#endif
@@ -257,5 +260,9 @@
return drawingEnabled == DrawingEnabled::On;
}
+bool Properties::initializeGlAlways() {
+ return base::GetBoolProperty(PROPERTY_INITIALIZE_GL_ALWAYS, hwui_flags::initialize_gl_always());
+}
+
} // namespace uirenderer
} // namespace android
diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h
index c1510d9..d3176f6 100644
--- a/libs/hwui/Properties.h
+++ b/libs/hwui/Properties.h
@@ -229,6 +229,11 @@
#define PROPERTY_8BIT_HDR_HEADROOM "debug.hwui.8bit_hdr_headroom"
+/**
+ * Whether to initialize GL even when HWUI is running Vulkan.
+ */
+#define PROPERTY_INITIALIZE_GL_ALWAYS "debug.hwui.initialize_gl_always"
+
///////////////////////////////////////////////////////////////////////////////
// Misc
///////////////////////////////////////////////////////////////////////////////
@@ -368,6 +373,8 @@
static bool isDrawingEnabled();
static void setDrawingEnabled(bool enable);
+ static bool initializeGlAlways();
+
private:
static StretchEffectBehavior stretchEffectBehavior;
static ProfileType sProfileType;
diff --git a/libs/hwui/aconfig/hwui_flags.aconfig b/libs/hwui/aconfig/hwui_flags.aconfig
index 50f8b39..cd3ae53 100644
--- a/libs/hwui/aconfig/hwui_flags.aconfig
+++ b/libs/hwui/aconfig/hwui_flags.aconfig
@@ -90,3 +90,10 @@
description: "Add canvas#drawRegion API"
bug: "318612129"
}
+
+flag {
+ name: "initialize_gl_always"
+ namespace: "core_graphics"
+ description: "Initialize GL even when HWUI is set to use Vulkan. This improves app startup time for apps using GL."
+ bug: "335172671"
+}
diff --git a/libs/hwui/apex/jni_runtime.cpp b/libs/hwui/apex/jni_runtime.cpp
index 6ace396..15b2bac 100644
--- a/libs/hwui/apex/jni_runtime.cpp
+++ b/libs/hwui/apex/jni_runtime.cpp
@@ -192,5 +192,14 @@
// Preload Vulkan driver if HWUI renders with Vulkan backend.
uint32_t apiVersion;
vkEnumerateInstanceVersion(&apiVersion);
+
+ if (Properties::initializeGlAlways()) {
+ // Even though HWUI is rendering with Vulkan, some apps still use
+ // GL. Preload GL driver just in case. Since this happens prior to
+ // forking from the zygote, apps that do not use GL are unaffected.
+ // Any memory that (E)GL uses for this call is in shared memory,
+ // and this call only happens once.
+ eglGetDisplay(EGL_DEFAULT_DISPLAY);
+ }
}
}
diff --git a/libs/hwui/effects/GainmapRenderer.cpp b/libs/hwui/effects/GainmapRenderer.cpp
index 0a30c6c..eac0360 100644
--- a/libs/hwui/effects/GainmapRenderer.cpp
+++ b/libs/hwui/effects/GainmapRenderer.cpp
@@ -96,6 +96,7 @@
#ifdef __ANDROID__
static constexpr char gGainmapSKSL[] = R"SKSL(
+ uniform shader linearBase;
uniform shader base;
uniform shader gainmap;
uniform colorFilter workingSpaceToLinearSrgb;
@@ -117,7 +118,11 @@
}
half4 main(float2 coord) {
- half4 S = base.eval(coord);
+ if (W == 0.0) {
+ return base.eval(coord);
+ }
+
+ half4 S = linearBase.eval(coord);
half4 G = gainmap.eval(coord);
if (gainmapIsAlpha == 1) {
G = half4(G.a, G.a, G.a, 1.0);
@@ -186,8 +191,10 @@
SkColorFilterPriv::MakeColorSpaceXform(baseColorSpace, gainmapMathColorSpace);
// The base image shader will convert into the color space in which the gainmap is applied.
- auto baseImageShader = baseImage->makeRawShader(tileModeX, tileModeY, samplingOptions)
- ->makeWithColorFilter(colorXformSdrToGainmap);
+ auto linearBaseImageShader = baseImage->makeRawShader(tileModeX, tileModeY, samplingOptions)
+ ->makeWithColorFilter(colorXformSdrToGainmap);
+
+ auto baseImageShader = baseImage->makeShader(tileModeX, tileModeY, samplingOptions);
// The gainmap image shader will ignore any color space that the gainmap has.
const SkMatrix gainmapRectToDstRect =
@@ -201,6 +208,7 @@
auto colorXformGainmapToDst = SkColorFilterPriv::MakeColorSpaceXform(
gainmapMathColorSpace, SkColorSpace::MakeSRGBLinear());
+ mBuilder.child("linearBase") = std::move(linearBaseImageShader);
mBuilder.child("base") = std::move(baseImageShader);
mBuilder.child("gainmap") = std::move(gainmapImageShader);
mBuilder.child("workingSpaceToLinearSrgb") = std::move(colorXformGainmapToDst);
diff --git a/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java b/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java
index a470f93..3cf0a4d 100644
--- a/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java
+++ b/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java
@@ -412,7 +412,7 @@
false);
if (!mOnHost && !autoTransact) {
Log.e(TAG, "Ignoring polling-loop-filter " + plf
- + " for offhost service that isn't autoTranact");
+ + " for offhost service that isn't autoTransact");
} else {
mAutoTransact.put(plf, autoTransact);
}
@@ -429,7 +429,7 @@
false);
if (!mOnHost && !autoTransact) {
Log.e(TAG, "Ignoring polling-loop-filter " + plf
- + " for offhost service that isn't autoTranact");
+ + " for offhost service that isn't autoTransact");
} else {
mAutoTransactPatterns.put(Pattern.compile(plf), autoTransact);
}
@@ -1028,6 +1028,9 @@
pw.println(" Settings Activity: " + mSettingsActivityName);
pw.println(" Requires Device Unlock: " + mRequiresDeviceUnlock);
pw.println(" Requires Device ScreenOn: " + mRequiresDeviceScreenOn);
+ pw.println(" Should Default to Observe Mode: " + mShouldDefaultToObserveMode);
+ pw.println(" Auto-Transact Mapping: " + mAutoTransact);
+ pw.println(" Auto-Transact Patterns: " + mAutoTransactPatterns);
}
@@ -1081,6 +1084,27 @@
proto.end(token);
}
proto.write(ApduServiceInfoProto.SETTINGS_ACTIVITY_NAME, mSettingsActivityName);
+ proto.write(ApduServiceInfoProto.SHOULD_DEFAULT_TO_OBSERVE_MODE,
+ mShouldDefaultToObserveMode);
+ {
+ long token = proto.start(ApduServiceInfoProto.AUTO_TRANSACT_MAPPING);
+ for (Map.Entry<String, Boolean> entry : mAutoTransact.entrySet()) {
+ proto.write(ApduServiceInfoProto.AutoTransactMapping.AID, entry.getKey());
+ proto.write(ApduServiceInfoProto.AutoTransactMapping.SHOULD_AUTO_TRANSACT,
+ entry.getValue());
+ }
+ proto.end(token);
+ }
+ {
+ long token = proto.start(ApduServiceInfoProto.AUTO_TRANSACT_PATTERNS);
+ for (Map.Entry<Pattern, Boolean> entry : mAutoTransactPatterns.entrySet()) {
+ proto.write(ApduServiceInfoProto.AutoTransactPattern.REGEXP_PATTERN,
+ entry.getKey().pattern());
+ proto.write(ApduServiceInfoProto.AutoTransactPattern.SHOULD_AUTO_TRANSACT,
+ entry.getValue());
+ }
+ proto.end(token);
+ }
}
private static final Pattern AID_PATTERN = Pattern.compile("[0-9A-Fa-f]{10,32}\\*?\\#?");
diff --git a/packages/CompanionDeviceManager/res/values-it/strings.xml b/packages/CompanionDeviceManager/res/values-it/strings.xml
index 40d3be5..3575ff3 100644
--- a/packages/CompanionDeviceManager/res/values-it/strings.xml
+++ b/packages/CompanionDeviceManager/res/values-it/strings.xml
@@ -59,7 +59,7 @@
<string name="permission_microphone" msgid="2152206421428732949">"Microfono"</string>
<string name="permission_call_logs" msgid="5546761417694586041">"Registri chiamate"</string>
<string name="permission_nearby_devices" msgid="7530973297737123481">"Dispositivi nelle vicinanze"</string>
- <string name="permission_media_routing_control" msgid="5498639511586715253">"Cambia uscita conten. multim."</string>
+ <string name="permission_media_routing_control" msgid="5498639511586715253">"Cambia uscita multimediale"</string>
<string name="permission_storage" msgid="6831099350839392343">"Foto e contenuti multimediali"</string>
<string name="permission_notifications" msgid="4099418516590632909">"Notifiche"</string>
<string name="permission_app_streaming" msgid="6009695219091526422">"App"</string>
diff --git a/packages/CredentialManager/res/values-kn/strings.xml b/packages/CredentialManager/res/values-kn/strings.xml
index bfc31a1..897f444 100644
--- a/packages/CredentialManager/res/values-kn/strings.xml
+++ b/packages/CredentialManager/res/values-kn/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="4539824758261855508">"ರುಜುವಾತು ನಿರ್ವಾಹಕ"</string>
<string name="string_cancel" msgid="6369133483981306063">"ರದ್ದುಗೊಳಿಸಿ"</string>
<string name="string_continue" msgid="1346732695941131882">"ಮುಂದುವರಿಸಿ"</string>
- <string name="string_more_options" msgid="2763852250269945472">"ಬೇರೆ ವಿಧಾನದಲ್ಲಿ ಉಳಿಸಿ"</string>
+ <string name="string_more_options" msgid="2763852250269945472">"ಬೇರೆ ವಿಧಾನದಲ್ಲಿ ಸೇವ್ ಮಾಡಿ"</string>
<string name="string_learn_more" msgid="4541600451688392447">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
<string name="content_description_show_password" msgid="3283502010388521607">"ಪಾಸ್ವರ್ಡ್ ತೋರಿಸಿ"</string>
<string name="content_description_hide_password" msgid="6841375971631767996">"ಪಾಸ್ವರ್ಡ್ ಅನ್ನು ಮರೆಮಾಡಿ"</string>
@@ -48,7 +48,7 @@
<string name="passwords" msgid="5419394230391253816">"ಪಾಸ್ವರ್ಡ್ಗಳು"</string>
<string name="sign_ins" msgid="4710739369149469208">"ಸೈನ್-ಇನ್ಗಳು"</string>
<string name="sign_in_info" msgid="2627704710674232328">"ಸೈನ್-ಇನ್ ಮಾಹಿತಿ"</string>
- <string name="save_credential_to_title" msgid="3172811692275634301">"ಇಲ್ಲಿಗೆ <xliff:g id="CREDENTIALTYPES">%1$s</xliff:g> ಅನ್ನು ಉಳಿಸಿ"</string>
+ <string name="save_credential_to_title" msgid="3172811692275634301">"ಇಲ್ಲಿಗೆ <xliff:g id="CREDENTIALTYPES">%1$s</xliff:g> ಅನ್ನು ಸೇವ್ ಮಾಡಿ"</string>
<string name="create_passkey_in_other_device_title" msgid="2360053098931886245">"ಇನ್ನೊಂದು ಸಾಧನದಲ್ಲಿ ಪಾಸ್ಕೀ ಅನ್ನು ರಚಿಸಬೇಕೆ?"</string>
<string name="save_password_on_other_device_title" msgid="5829084591948321207">"ಇನ್ನೊಂದು ಸಾಧನದಲ್ಲಿ ಪಾಸ್ವರ್ಡ್ ಉಳಿಸಬೇಕೆ?"</string>
<string name="save_sign_in_on_other_device_title" msgid="2827990118560134692">"ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಸೈನ್-ಇನ್ ಅನ್ನು ಉಳಿಸಬೇಕೆ?"</string>
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
index c477f30..08846f0 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
@@ -45,8 +45,8 @@
import androidx.credentials.CreateCustomCredentialRequest
import androidx.credentials.CreatePasswordRequest
import androidx.credentials.CreatePublicKeyCredentialRequest
+import androidx.credentials.CredentialOption
import androidx.credentials.PasswordCredential
-import androidx.credentials.PriorityHints
import androidx.credentials.PublicKeyCredential
import androidx.credentials.provider.CreateEntry
import androidx.credentials.provider.RemoteEntry
@@ -177,9 +177,9 @@
"androidx.credentials.BUNDLE_KEY_TYPE_PRIORITY_VALUE",
when (option.type) {
PasswordCredential.TYPE_PASSWORD_CREDENTIAL ->
- PriorityHints.PRIORITY_PASSWORD_OR_SIMILAR
+ CredentialOption.PRIORITY_PASSWORD_OR_SIMILAR
PublicKeyCredential.TYPE_PUBLIC_KEY_CREDENTIAL -> 100
- else -> PriorityHints.PRIORITY_DEFAULT
+ else -> CredentialOption.PRIORITY_DEFAULT
}
)
typePriorityMap[option.type] = priority
@@ -349,8 +349,8 @@
}
is CreateCustomCredentialRequest -> {
// TODO: directly use the display info once made public
- val displayInfo = CreateCredentialRequest.DisplayInfo
- .parseFromCredentialDataBundle(createCredentialRequest.credentialData)
+ val displayInfo = CreateCredentialRequest.DisplayInfo.createFrom(
+ createCredentialRequest.credentialData)
?: return null
RequestDisplayInfo(
title = displayInfo.userId.toString(),
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt
index 19f5a99..314cc05 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetModel.kt
@@ -19,7 +19,7 @@
import android.credentials.flags.Flags.selectorUiImprovementsEnabled
import android.credentials.flags.Flags.credmanBiometricApiEnabled
import android.graphics.drawable.Drawable
-import androidx.credentials.PriorityHints
+import androidx.credentials.CredentialOption
import com.android.credentialmanager.R
import com.android.credentialmanager.model.CredentialType
import com.android.credentialmanager.model.get.ProviderInfo
@@ -322,10 +322,10 @@
// First rank by priorities of each credential type.
if (p0.rawCredentialType != p1.rawCredentialType) {
val p0Priority = typePriorityMap.getOrDefault(
- p0.rawCredentialType, PriorityHints.PRIORITY_DEFAULT
+ p0.rawCredentialType, CredentialOption.PRIORITY_DEFAULT
)
val p1Priority = typePriorityMap.getOrDefault(
- p1.rawCredentialType, PriorityHints.PRIORITY_DEFAULT
+ p1.rawCredentialType, CredentialOption.PRIORITY_DEFAULT
)
if (p0Priority < p1Priority) {
return -1
diff --git a/packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java b/packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java
index ea3dbd9..0e71a1b 100644
--- a/packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java
+++ b/packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java
@@ -38,8 +38,9 @@
import java.util.regex.Pattern;
/**
- * Progres bar preference with a usage summary and a total summary.
- * This preference shows number in usage summary with enlarged font size.
+ * Progress bar preference with a usage summary and a total summary.
+ *
+ * <p>This preference shows number in usage summary with enlarged font size.
*/
public class UsageProgressBarPreference extends Preference {
@@ -48,18 +49,18 @@
private CharSequence mUsageSummary;
private CharSequence mTotalSummary;
private CharSequence mBottomSummary;
+ private CharSequence mBottomSummaryContentDescription;
private ImageView mCustomImageView;
private int mPercent = -1;
/**
* Perform inflation from XML and apply a class-specific base style.
*
- * @param context The {@link Context} this is associated with, through which it can
- * access the current theme, resources, {@link SharedPreferences}, etc.
- * @param attrs The attributes of the XML tag that is inflating the preference
+ * @param context The {@link Context} this is associated with, through which it can access the
+ * current theme, resources, {@link SharedPreferences}, etc.
+ * @param attrs The attributes of the XML tag that is inflating the preference
* @param defStyle An attribute in the current theme that contains a reference to a style
- * resource that supplies default values for the view. Can be 0 to not
- * look for defaults.
+ * resource that supplies default values for the view. Can be 0 to not look for defaults.
*/
public UsageProgressBarPreference(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
@@ -69,9 +70,9 @@
/**
* Perform inflation from XML and apply a class-specific base style.
*
- * @param context The {@link Context} this is associated with, through which it can
- * access the current theme, resources, {@link SharedPreferences}, etc.
- * @param attrs The attributes of the XML tag that is inflating the preference
+ * @param context The {@link Context} this is associated with, through which it can access the
+ * current theme, resources, {@link SharedPreferences}, etc.
+ * @param attrs The attributes of the XML tag that is inflating the preference
*/
public UsageProgressBarPreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -114,9 +115,17 @@
notifyChanged();
}
+ /** Set content description for the bottom summary. */
+ public void setBottomSummaryContentDescription(CharSequence contentDescription) {
+ if (!TextUtils.equals(mBottomSummaryContentDescription, contentDescription)) {
+ mBottomSummaryContentDescription = contentDescription;
+ notifyChanged();
+ }
+ }
+
/** Set percentage of the progress bar. */
public void setPercent(long usage, long total) {
- if (usage > total) {
+ if (usage > total) {
return;
}
if (total == 0L) {
@@ -146,14 +155,13 @@
/**
* Binds the created View to the data for this preference.
*
- * <p>This is a good place to grab references to custom Views in the layout and set
- * properties on them.
+ * <p>This is a good place to grab references to custom Views in the layout and set properties
+ * on them.
*
* <p>Make sure to call through to the superclass's implementation.
*
* @param holder The ViewHolder that provides references to the views to fill in. These views
- * will be recycled, so you should not hold a reference to them after this method
- * returns.
+ * will be recycled, so you should not hold a reference to them after this method returns.
*/
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
@@ -177,6 +185,9 @@
bottomSummary.setVisibility(View.VISIBLE);
bottomSummary.setMovementMethod(LinkMovementMethod.getInstance());
bottomSummary.setText(mBottomSummary);
+ if (!TextUtils.isEmpty(mBottomSummaryContentDescription)) {
+ bottomSummary.setContentDescription(mBottomSummaryContentDescription);
+ }
}
final ProgressBar progressBar = (ProgressBar) holder.findViewById(android.R.id.progress);
@@ -205,9 +216,12 @@
final Matcher matcher = mNumberPattern.matcher(summary);
if (matcher.find()) {
- final SpannableString spannableSummary = new SpannableString(summary);
- spannableSummary.setSpan(new AbsoluteSizeSpan(64, true /* dip */), matcher.start(),
- matcher.end(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ final SpannableString spannableSummary = new SpannableString(summary);
+ spannableSummary.setSpan(
+ new AbsoluteSizeSpan(64, true /* dip */),
+ matcher.start(),
+ matcher.end(),
+ Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannableSummary;
}
return summary;
diff --git a/packages/SettingsLib/res/values-be/strings.xml b/packages/SettingsLib/res/values-be/strings.xml
index a723223..95586ea 100644
--- a/packages/SettingsLib/res/values-be/strings.xml
+++ b/packages/SettingsLib/res/values-be/strings.xml
@@ -84,7 +84,7 @@
<string name="preference_summary_default_combination" msgid="2644094566845577901">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
<string name="bluetooth_disconnected" msgid="7739366554710388701">"Адключана"</string>
<string name="bluetooth_disconnecting" msgid="7638892134401574338">"Адключэнне..."</string>
- <string name="bluetooth_connecting" msgid="5871702668260192755">"Злучэнне..."</string>
+ <string name="bluetooth_connecting" msgid="5871702668260192755">"Падключэнне..."</string>
<string name="bluetooth_connected" msgid="8065345572198502293">"Падключана прылада <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string>
<string name="bluetooth_pairing" msgid="4269046942588193600">"Спалучэнне..."</string>
<string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Падключана прылада <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (без званкоў)"</string>
diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml
index 3c63119..0b96faa 100644
--- a/packages/SettingsLib/res/values-es/strings.xml
+++ b/packages/SettingsLib/res/values-es/strings.xml
@@ -127,7 +127,7 @@
<string name="bluetooth_profile_opp" msgid="6692618568149493430">"Transferencia de archivos"</string>
<string name="bluetooth_profile_hid" msgid="2969922922664315866">"Dispositivo de entrada"</string>
<string name="bluetooth_profile_pan" msgid="1006235139308318188">"Acceso a Internet"</string>
- <string name="bluetooth_profile_pbap" msgid="2103406516858653017">"Acceso a contactos e historial de llamadas"</string>
+ <string name="bluetooth_profile_pbap" msgid="2103406516858653017">"Permitir acceso a contactos e historial de llamadas"</string>
<string name="bluetooth_profile_pbap_summary" msgid="402819589201138227">"La información se usará para avisos de llamada y más"</string>
<string name="bluetooth_profile_pan_nap" msgid="7871974753822470050">"Compartir conexión a Internet"</string>
<string name="bluetooth_profile_map" msgid="8907204701162107271">"Mensajes de texto"</string>
diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml
index 647309b..a0dc830 100644
--- a/packages/SettingsLib/res/values-fi/strings.xml
+++ b/packages/SettingsLib/res/values-fi/strings.xml
@@ -632,7 +632,7 @@
<string name="profile_info_settings_title" msgid="105699672534365099">"Profiilin tiedot"</string>
<string name="user_need_lock_message" msgid="4311424336209509301">"Ennen kuin voit luoda rajoitetun profiilin, määritä näytön lukitus, joka suojelee sovelluksiasi ja henkilökohtaisia tietojasi."</string>
<string name="user_set_lock_button" msgid="1427128184982594856">"Aseta lukitus"</string>
- <string name="user_switch_to_user" msgid="6975428297154968543">"Vaihda tähän käyttäjään: <xliff:g id="USER_NAME">%s</xliff:g>"</string>
+ <string name="user_switch_to_user" msgid="6975428297154968543">"Vaihda käyttäjään: <xliff:g id="USER_NAME">%s</xliff:g>"</string>
<string name="creating_new_user_dialog_message" msgid="7232880257538970375">"Luodaan uutta käyttäjää…"</string>
<string name="creating_new_guest_dialog_message" msgid="1114905602181350690">"Luodaan uutta vierasta…"</string>
<string name="add_user_failed" msgid="4809887794313944872">"Uuden käyttäjän luominen epäonnistui"</string>
diff --git a/packages/SettingsLib/res/values-pa/strings.xml b/packages/SettingsLib/res/values-pa/strings.xml
index bfec96c..f80ec8d 100644
--- a/packages/SettingsLib/res/values-pa/strings.xml
+++ b/packages/SettingsLib/res/values-pa/strings.xml
@@ -422,7 +422,7 @@
<string name="show_notification_channel_warnings_summary" msgid="68031143745094339">"ਐਪ ਵੱਲੋਂ ਵੈਧ ਚੈਨਲ ਤੋਂ ਬਿਨਾਂ ਸੂਚਨਾ ਪੋਸਟ ਕਰਨ \'ਤੇ ਸਕ੍ਰੀਨ \'ਤੇ ਚਿਤਾਵਨੀ ਦਿਖਾਉਂਦੀ ਹੈ"</string>
<string name="force_allow_on_external" msgid="9187902444231637880">"ਐਪਾਂ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਬਾਹਰੀ ਸਟੋਰੇਜ \'ਤੇ ਆਗਿਆ ਦਿਓ"</string>
<string name="force_allow_on_external_summary" msgid="8525425782530728238">"ਮੈਨੀਫੈਸਟ ਮੁੱਲਾਂ ਦੀ ਪਰਵਾਹ ਕੀਤੇ ਬਿਨਾਂ, ਕਿਸੇ ਵੀ ਐਪ ਨੂੰ ਬਾਹਰੀ ਸਟੋਰੇਜ \'ਤੇ ਲਿਖਣ ਦੇ ਯੋਗ ਬਣਾਉਂਦੀ ਹੈ"</string>
- <string name="force_resizable_activities" msgid="7143612144399959606">"ਵਿੰਡੋ ਮੁਤਾਬਕ ਸਰਗਰਮੀਆਂ ਦਾ ਆਕਾਰ ਬਦਲਣ ਦਿਓ"</string>
+ <string name="force_resizable_activities" msgid="7143612144399959606">"ਸਰਗਰਮੀਆਂ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਆਕਾਰ ਬਦਲਣਯੋਗ ਬਣਾਓ"</string>
<string name="force_resizable_activities_summary" msgid="2490382056981583062">"ਮੈਨੀਫ਼ੈਸਟ ਮੁੱਲਾਂ ਦੀ ਪਰਵਾਹ ਕੀਤੇ ਬਿਨਾਂ, ਮਲਟੀ-ਵਿੰਡੋ ਲਈ ਸਾਰੀਆਂ ਸਰਗਰਮੀਆਂ ਨੂੰ ਆਕਾਰ ਬਦਲਣਯੋਗ ਬਣਾਓ।"</string>
<string name="enable_freeform_support" msgid="7599125687603914253">"ਫ੍ਰੀਫਾਰਮ ਵਿੰਡੋਜ਼ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
<string name="enable_freeform_support_summary" msgid="1822862728719276331">"ਪ੍ਰਯੋਗਮਈ ਫ੍ਰੀਫਾਰਮ ਵਿੰਡੋਜ਼ ਲਈ ਸਮਰਥਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml
index e76be70..8babb8b 100644
--- a/packages/SettingsLib/res/values-pl/strings.xml
+++ b/packages/SettingsLib/res/values-pl/strings.xml
@@ -288,7 +288,7 @@
<string name="confirm_enable_oem_unlock_title" msgid="8249318129774367535">"Zezwolić na zdjęcie blokady OEM?"</string>
<string name="confirm_enable_oem_unlock_text" msgid="854131050791011970">"UWAGA: gdy to ustawienie jest włączone, na urządzeniu nie będą działać funkcje ochrony."</string>
<string name="mock_location_app" msgid="6269380172542248304">"Aplikacja do pozorowania lokalizacji"</string>
- <string name="mock_location_app_not_set" msgid="6972032787262831155">"Nie wybrano aplikacji do pozorowania lokalizacji"</string>
+ <string name="mock_location_app_not_set" msgid="6972032787262831155">"Nie wybrano aplikacji"</string>
<string name="mock_location_app_set" msgid="4706722469342913843">"Aplikacja do pozorowania lokalizacji: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="debug_networking_category" msgid="6829757985772659599">"Sieci"</string>
<string name="wifi_display_certification" msgid="1805579519992520381">"Certyfikacja wyświetlacza bezprzewodowego"</string>
diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml
index 1c76fdd..4bddeb9a 100644
--- a/packages/SettingsLib/res/values-ro/strings.xml
+++ b/packages/SettingsLib/res/values-ro/strings.xml
@@ -94,7 +94,7 @@
<string name="bluetooth_connected_no_headset_battery_level" msgid="2661863370509206428">"Conectat (fără telefon), baterie <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string>
<string name="bluetooth_connected_no_a2dp_battery_level" msgid="6499078454894324287">"Conectat (fără conținut media), baterie <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string>
<string name="bluetooth_connected_no_headset_no_a2dp_battery_level" msgid="8477440576953067242">"Conectat (fără telefon sau conținut media), baterie <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g><xliff:g id="ACTIVE_DEVICE">%2$s</xliff:g>"</string>
- <string name="bluetooth_active_battery_level" msgid="2685517576209066008">"Activ. Nivelul bateriei <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>."</string>
+ <string name="bluetooth_active_battery_level" msgid="2685517576209066008">"Activ. Nivelul bateriei: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>."</string>
<string name="bluetooth_active_battery_level_untethered" msgid="4961338936672922617">"Activ. Nivelul bateriei din stânga: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE_0">%1$s</xliff:g>, dreapta: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE_1">%2$s</xliff:g>."</string>
<string name="bluetooth_active_battery_level_untethered_left" msgid="2895644748625343977">"Activ. Nivelul bateriei din stânga: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>."</string>
<string name="bluetooth_active_battery_level_untethered_right" msgid="7407517998880370179">"Activ. Nivelul bateriei din dreapta: <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>."</string>
diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml
index 5a4d3ce..38ad560 100644
--- a/packages/SettingsLib/res/values/arrays.xml
+++ b/packages/SettingsLib/res/values/arrays.xml
@@ -494,26 +494,6 @@
<item>show_deuteranomaly</item>
</string-array>
- <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
- <string-array name="app_process_limit_entries">
- <item>Standard limit</item>
- <item>No background processes</item>
- <item>At most 1 process</item>
- <item>At most 2 processes</item>
- <item>At most 3 processes</item>
- <item>At most 4 processes</item>
- </string-array>
-
- <!-- Values for app process limit preference. -->
- <string-array name="app_process_limit_values" translatable="false" >
- <item>-1</item>
- <item>0</item>
- <item>1</item>
- <item>2</item>
- <item>3</item>
- <item>4</item>
- </string-array>
-
<!-- USB configuration names for Developer Settings.
This can be overridden by devices with additional USB configurations. -->
<string-array name="usb_configuration_titles">
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 363045e..927aa69 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -975,9 +975,6 @@
<string name="immediately_destroy_activities_summary">Destroy every activity as soon as
the user leaves it</string>
- <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
- <string name="app_process_limit_title">Background process limit</string>
-
<!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
<string name="show_all_anrs">Show background ANRs</string>
<!-- UI debug setting: show all ANRs summary [CHAR LIMIT=100] -->
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java
index cdb8740..063807a 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java
@@ -17,6 +17,8 @@
import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothHearingAid;
@@ -37,21 +39,14 @@
private static final String TAG = "BluetoothMediaDevice";
- private CachedBluetoothDevice mCachedDevice;
+ private final CachedBluetoothDevice mCachedDevice;
private final AudioManager mAudioManager;
BluetoothMediaDevice(
- Context context,
- CachedBluetoothDevice device,
- MediaRoute2Info info) {
- this(context, device, info, null);
- }
-
- BluetoothMediaDevice(
- Context context,
- CachedBluetoothDevice device,
- MediaRoute2Info info,
- RouteListingPreference.Item item) {
+ @NonNull Context context,
+ @NonNull CachedBluetoothDevice device,
+ @Nullable MediaRoute2Info info,
+ @Nullable RouteListingPreference.Item item) {
super(context, info, item);
mCachedDevice = device;
mAudioManager = context.getSystemService(AudioManager.class);
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/ComplexMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/ComplexMediaDevice.java
index 338fb87..a87daf9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/ComplexMediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/ComplexMediaDevice.java
@@ -16,6 +16,8 @@
package com.android.settingslib.media;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.media.MediaRoute2Info;
@@ -32,9 +34,9 @@
private final String mSummary = "";
ComplexMediaDevice(
- Context context,
- MediaRoute2Info info,
- RouteListingPreference.Item item) {
+ @NonNull Context context,
+ @NonNull MediaRoute2Info info,
+ @Nullable RouteListingPreference.Item item) {
super(context, info, item);
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java
index 1347dd1..21873ef 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java
@@ -26,6 +26,8 @@
import static android.media.MediaRoute2Info.TYPE_REMOTE_TABLET_DOCKED;
import static android.media.MediaRoute2Info.TYPE_REMOTE_TV;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.media.MediaRoute2Info;
@@ -43,17 +45,13 @@
private static final String TAG = "InfoMediaDevice";
InfoMediaDevice(
- Context context,
- MediaRoute2Info info,
- RouteListingPreference.Item item) {
+ @NonNull Context context,
+ @NonNull MediaRoute2Info info,
+ @Nullable RouteListingPreference.Item item) {
super(context, info, item);
initDeviceRecord();
}
- InfoMediaDevice(Context context, MediaRoute2Info info) {
- this(context, info, null);
- }
-
@Override
public String getName() {
return mRouteInfo.getName().toString();
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
index cfa825b..72a60fb 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
@@ -570,7 +570,7 @@
final CachedBluetoothDevice cachedDevice =
cachedDeviceManager.findDevice(device);
if (isBondedMediaDevice(cachedDevice) && isMutingExpectedDevice(cachedDevice)) {
- return new BluetoothMediaDevice(mContext, cachedDevice, null);
+ return new BluetoothMediaDevice(mContext, cachedDevice, null, /* item */ null);
}
}
return null;
@@ -617,7 +617,7 @@
mDisconnectedMediaDevices.clear();
for (CachedBluetoothDevice cachedDevice : cachedBluetoothDeviceList) {
final MediaDevice mediaDevice =
- new BluetoothMediaDevice(mContext, cachedDevice, null);
+ new BluetoothMediaDevice(mContext, cachedDevice, null, /* item */ null);
if (!mMediaDevices.contains(mediaDevice)) {
cachedDevice.registerCallback(mDeviceAttributeChangeCallback);
mDisconnectedMediaDevices.add(mediaDevice);
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
index 0c4cf76..ce1f297 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
@@ -49,6 +49,8 @@
import static com.android.settingslib.media.LocalMediaManager.MediaDeviceState.STATE_SELECTED;
import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -123,9 +125,9 @@
protected final RouteListingPreference.Item mItem;
MediaDevice(
- Context context,
- MediaRoute2Info info,
- RouteListingPreference.Item item) {
+ @NonNull Context context,
+ @Nullable MediaRoute2Info info,
+ @Nullable RouteListingPreference.Item item) {
mContext = context;
mRouteInfo = info;
mItem = item;
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
index ba9180d..9eaf8d3 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
@@ -29,6 +29,8 @@
import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER;
import android.Manifest;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
@@ -40,7 +42,6 @@
import android.os.SystemProperties;
import android.util.Log;
-import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import com.android.settingslib.R;
@@ -100,17 +101,6 @@
R.string.media_transfer_external_device_name);
break;
case TYPE_HDMI_ARC:
- if (isTv) {
- String deviceName = getHdmiOutDeviceName(context);
- if (deviceName != null) {
- name = deviceName;
- } else {
- name = context.getString(R.string.tv_media_transfer_arc_fallback_title);
- }
- } else {
- name = context.getString(R.string.media_transfer_external_device_name);
- }
- break;
case TYPE_HDMI_EARC:
if (isTv) {
String deviceName = getHdmiOutDeviceName(context);
@@ -130,14 +120,10 @@
return name.toString();
}
- PhoneMediaDevice(Context context, MediaRoute2Info info) {
- this(context, info, null);
- }
-
PhoneMediaDevice(
- Context context,
- MediaRoute2Info info,
- RouteListingPreference.Item item) {
+ @NonNull Context context,
+ @NonNull MediaRoute2Info info,
+ @Nullable RouteListingPreference.Item item) {
super(context, info, item);
mDeviceIconUtil = new DeviceIconUtil(mContext);
initDeviceRecord();
diff --git a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt
index 8204569..20b949f4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt
+++ b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt
@@ -37,6 +37,7 @@
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.filterIsInstance
@@ -161,6 +162,7 @@
},
volumeSettingChanges(audioStream),
)
+ .conflate()
.map { getCurrentAudioStream(audioStream) }
.onStart { emit(getCurrentAudioStream(audioStream)) }
.flowOn(backgroundCoroutineContext)
@@ -184,10 +186,11 @@
}
}
- override suspend fun setVolume(audioStream: AudioStream, volume: Int) =
+ override suspend fun setVolume(audioStream: AudioStream, volume: Int) {
withContext(backgroundCoroutineContext) {
audioManager.setStreamVolume(audioStream.value, volume, 0)
}
+ }
override suspend fun setMuted(audioStream: AudioStream, isMuted: Boolean): Boolean {
return withContext(backgroundCoroutineContext) {
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaDeviceTest.java
index 0665308..6647a27 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaDeviceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaDeviceTest.java
@@ -65,7 +65,7 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mInfoMediaDevice = new InfoMediaDevice(mContext, mRouteInfo);
+ mInfoMediaDevice = new InfoMediaDevice(mContext, mRouteInfo, /* item */ null);
}
@Test
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java
index ce07fe9..c9b35a0a 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java
@@ -559,7 +559,7 @@
routingSessionInfos.add(info);
final MediaRoute2Info route2Info = mock(MediaRoute2Info.class);
- final MediaDevice device = new InfoMediaDevice(mContext, route2Info);
+ final MediaDevice device = new InfoMediaDevice(mContext, route2Info, /* item */ null);
final List<String> list = new ArrayList<>();
list.add(TEST_ID);
@@ -580,7 +580,7 @@
routingSessionInfos.add(info);
final MediaRoute2Info route2Info = mock(MediaRoute2Info.class);
- final MediaDevice device = new InfoMediaDevice(mContext, route2Info);
+ final MediaDevice device = new InfoMediaDevice(mContext, route2Info, /* item */ null);
final List<String> list = new ArrayList<>();
list.add("fake_id");
@@ -602,7 +602,7 @@
routingSessionInfos.add(info);
final MediaRoute2Info route2Info = mock(MediaRoute2Info.class);
- final MediaDevice device = new InfoMediaDevice(mContext, route2Info);
+ final MediaDevice device = new InfoMediaDevice(mContext, route2Info, /* item */ null);
final List<String> list = new ArrayList<>();
list.add(TEST_ID);
@@ -623,7 +623,7 @@
routingSessionInfos.add(info);
final MediaRoute2Info route2Info = mock(MediaRoute2Info.class);
- final MediaDevice device = new InfoMediaDevice(mContext, route2Info);
+ final MediaDevice device = new InfoMediaDevice(mContext, route2Info, /* item */ null);
final List<String> list = new ArrayList<>();
list.add("fake_id");
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java
index 12541bb..a30d6a7 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java
@@ -135,8 +135,8 @@
.when(mInfoMediaManager)
.getRoutingSessionsForPackage();
- mInfoMediaDevice1 = spy(new InfoMediaDevice(mContext, mRouteInfo1));
- mInfoMediaDevice2 = new InfoMediaDevice(mContext, mRouteInfo2);
+ mInfoMediaDevice1 = spy(new InfoMediaDevice(mContext, mRouteInfo1, /* item */ null));
+ mInfoMediaDevice2 = new InfoMediaDevice(mContext, mRouteInfo2, /* item */ null);
mLocalMediaManager =
new LocalMediaManager(
mContext, mLocalBluetoothManager, mInfoMediaManager, TEST_PACKAGE_NAME);
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java
index 098ab16..3d16d6f 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java
@@ -171,17 +171,17 @@
mBluetoothMediaDevice1 =
new BluetoothMediaDevice(
- mContext, mCachedDevice1, mBluetoothRouteInfo1);
+ mContext, mCachedDevice1, mBluetoothRouteInfo1, /* item */ null);
mBluetoothMediaDevice2 =
new BluetoothMediaDevice(
- mContext, mCachedDevice2, mBluetoothRouteInfo2);
+ mContext, mCachedDevice2, mBluetoothRouteInfo2, /* item */ null);
mBluetoothMediaDevice3 =
new BluetoothMediaDevice(
- mContext, mCachedDevice3, mBluetoothRouteInfo3);
- mInfoMediaDevice1 = new InfoMediaDevice(mContext, mRouteInfo1);
- mInfoMediaDevice2 = new InfoMediaDevice(mContext, mRouteInfo2);
- mInfoMediaDevice3 = new InfoMediaDevice(mContext, mRouteInfo3);
- mPhoneMediaDevice = new PhoneMediaDevice(mContext, mPhoneRouteInfo);
+ mContext, mCachedDevice3, mBluetoothRouteInfo3, /* item */ null);
+ mInfoMediaDevice1 = new InfoMediaDevice(mContext, mRouteInfo1, /* item */ null);
+ mInfoMediaDevice2 = new InfoMediaDevice(mContext, mRouteInfo2, /* item */ null);
+ mInfoMediaDevice3 = new InfoMediaDevice(mContext, mRouteInfo3, /* item */ null);
+ mPhoneMediaDevice = new PhoneMediaDevice(mContext, mPhoneRouteInfo, /* item */ null);
}
@Test
@@ -316,7 +316,7 @@
when(phoneRouteInfo.getType()).thenReturn(TYPE_WIRED_HEADPHONES);
final PhoneMediaDevice phoneMediaDevice =
- new PhoneMediaDevice(mContext, phoneRouteInfo);
+ new PhoneMediaDevice(mContext, phoneRouteInfo, /* item */ null);
mMediaDevices.add(mBluetoothMediaDevice1);
mMediaDevices.add(phoneMediaDevice);
@@ -332,7 +332,7 @@
when(phoneRouteInfo.getType()).thenReturn(TYPE_WIRED_HEADPHONES);
final PhoneMediaDevice phoneMediaDevice =
- new PhoneMediaDevice(mContext, phoneRouteInfo);
+ new PhoneMediaDevice(mContext, phoneRouteInfo, /* item */ null);
mMediaDevices.add(mInfoMediaDevice1);
mMediaDevices.add(phoneMediaDevice);
@@ -483,7 +483,7 @@
public void getFeatures_noRouteInfo_returnEmptyList() {
mBluetoothMediaDevice1 =
new BluetoothMediaDevice(
- mContext, mCachedDevice1, /* MediaRoute2Info */ null);
+ mContext, mCachedDevice1, /* MediaRoute2Info */ null, /* item */ null);
assertThat(mBluetoothMediaDevice1.getFeatures().size()).isEqualTo(0);
}
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
index 11fa8f4..5245456 100644
--- a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
+++ b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
@@ -79,6 +79,7 @@
Settings.System.SIP_CALL_OPTIONS,
Settings.System.SIP_RECEIVE_CALLS,
Settings.System.POINTER_SPEED,
+ Settings.System.POINTER_FILL_STYLE,
Settings.System.VIBRATE_ON,
Settings.System.VIBRATE_WHEN_RINGING,
Settings.System.RINGTONE,
diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
index 011b42f..2c3be4c 100644
--- a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
+++ b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
@@ -26,6 +26,8 @@
import static android.provider.settings.validators.SettingsValidators.NON_NEGATIVE_INTEGER_VALIDATOR;
import static android.provider.settings.validators.SettingsValidators.URI_VALIDATOR;
import static android.provider.settings.validators.SettingsValidators.VIBRATION_INTENSITY_VALIDATOR;
+import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_FILL_BEGIN;
+import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_FILL_END;
import android.annotation.Nullable;
import android.compat.annotation.UnsupportedAppUsage;
@@ -206,6 +208,9 @@
VALIDATORS.put(System.SIP_ADDRESS_ONLY, BOOLEAN_VALIDATOR);
VALIDATORS.put(System.SIP_ASK_ME_EACH_TIME, BOOLEAN_VALIDATOR);
VALIDATORS.put(System.POINTER_SPEED, new InclusiveFloatRangeValidator(-7, 7));
+ VALIDATORS.put(System.POINTER_FILL_STYLE,
+ new InclusiveIntegerRangeValidator(POINTER_ICON_VECTOR_STYLE_FILL_BEGIN,
+ POINTER_ICON_VECTOR_STYLE_FILL_END));
VALIDATORS.put(System.TOUCHPAD_POINTER_SPEED, new InclusiveIntegerRangeValidator(-7, 7));
VALIDATORS.put(System.TOUCHPAD_NATURAL_SCROLLING, BOOLEAN_VALIDATOR);
VALIDATORS.put(System.TOUCHPAD_TAP_TO_CLICK, BOOLEAN_VALIDATOR);
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index 70ce202..625b8e4 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -2911,6 +2911,11 @@
// Settings.System.NOTIFICATIONS_USE_RING_VOLUME intentionally excluded since it's deprecated.
p.end(notificationToken);
+ final long pointerToken = p.start(SystemSettingsProto.POINTER);
+ dumpSetting(s, p,
+ Settings.System.POINTER_FILL_STYLE,
+ SystemSettingsProto.Pointer.POINTER_FILL_STYLE);
+ p.end(pointerToken);
dumpSetting(s, p,
Settings.System.POINTER_SPEED,
SystemSettingsProto.POINTER_SPEED);
diff --git a/packages/SoundPicker/res/values-vi/strings.xml b/packages/SoundPicker/res/values-vi/strings.xml
index bed0e96..b6f8793 100644
--- a/packages/SoundPicker/res/values-vi/strings.xml
+++ b/packages/SoundPicker/res/values-vi/strings.xml
@@ -20,7 +20,7 @@
<string name="notification_sound_default" msgid="8133121186242636840">"Âm thanh thông báo mặc định"</string>
<string name="alarm_sound_default" msgid="4787646764557462649">"Âm thanh chuông báo mặc định"</string>
<string name="add_ringtone_text" msgid="6642389991738337529">"Thêm nhạc chuông"</string>
- <string name="add_alarm_text" msgid="3545497316166999225">"Thêm báo thức"</string>
+ <string name="add_alarm_text" msgid="3545497316166999225">"Thêm chuông báo"</string>
<string name="add_notification_text" msgid="4431129543300614788">"Thêm thông báo"</string>
<string name="delete_ringtone_text" msgid="201443984070732499">"Xóa"</string>
<string name="unable_to_add_ringtone" msgid="4583511263449467326">"Không thể thêm nhạc chuông tùy chỉnh"</string>
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 07a00fb..c2c334b 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -483,6 +483,7 @@
"androidx.compose.material_material-icons-extended",
"androidx.activity_activity-compose",
"androidx.compose.animation_animation-graphics",
+ "androidx.lifecycle_lifecycle-viewmodel-compose",
"device_policy_aconfig_flags_lib",
],
libs: [
@@ -644,6 +645,7 @@
"androidx.compose.material_material-icons-extended",
"androidx.activity_activity-compose",
"androidx.compose.animation_animation-graphics",
+ "androidx.lifecycle_lifecycle-viewmodel-compose",
"TraceurCommon",
],
}
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 9c58371..a9c4399 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -475,6 +475,15 @@
android:exported="false"
android:noHistory="true" />
+ <activity android:name=".touchpad.tutorial.ui.view.TouchpadTutorialActivity"
+ android:exported="true"
+ android:theme="@style/Theme.AppCompat.NoActionBar">
+ <intent-filter>
+ <action android:name="com.android.systemui.action.TOUCHPAD_TUTORIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+ </activity>
+
<service android:name=".screenshot.appclips.AppClipsScreenshotHelperService"
android:exported="false"
android:singleUser="true"
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig
index f84f627..4311e79 100644
--- a/packages/SystemUI/aconfig/systemui.aconfig
+++ b/packages/SystemUI/aconfig/systemui.aconfig
@@ -1064,3 +1064,23 @@
purpose: PURPOSE_BUGFIX
}
}
+
+flag {
+ name: "dozeui_scheduling_alarms_background_execution"
+ namespace: "systemui"
+ description: "Decide whether to execute binder calls to schedule alarms in background thread"
+ bug: "330492575"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
+
+flag {
+ name: "notification_pulsing_fix"
+ namespace: "systemui"
+ description: "Allow showing new pulsing notifications when the device is already pulsing."
+ bug: "335560575"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QSMediaMeasurePolicy.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QSMediaMeasurePolicy.kt
new file mode 100644
index 0000000..8fe8703
--- /dev/null
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QSMediaMeasurePolicy.kt
@@ -0,0 +1,61 @@
+/*
+ * 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.ui.composable
+
+import androidx.compose.ui.layout.Measurable
+import androidx.compose.ui.layout.MeasurePolicy
+import androidx.compose.ui.layout.MeasureResult
+import androidx.compose.ui.layout.MeasureScope
+import androidx.compose.ui.layout.layoutId
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.util.fastFirst
+import kotlin.math.max
+
+/*
+ This layout puts QS taking all horizontal space and media taking the right half of the space.
+ However, QS (in QSPanel) puts an empty view taking half the horizontal space so that it can be
+ covered by media.
+*/
+class QSMediaMeasurePolicy(
+ val qsHeight: () -> Int,
+ val mediaVerticalOffset: Density.() -> Int = { 0 },
+) : MeasurePolicy {
+ override fun MeasureScope.measure(
+ measurables: List<Measurable>,
+ constraints: Constraints
+ ): MeasureResult {
+ val qsMeasurable = measurables.fastFirst { it.layoutId == LayoutId.QS }
+ val mediaMeasurable = measurables.fastFirst { it.layoutId == LayoutId.Media }
+
+ val qsPlaceable = qsMeasurable.measure(constraints)
+ val mediaPlaceable =
+ mediaMeasurable.measure(constraints.copy(maxWidth = constraints.maxWidth / 2))
+
+ val width = qsPlaceable.width
+ val height = max(qsHeight(), mediaPlaceable.height)
+ return layout(width, height) {
+ qsPlaceable.placeRelative(0, 0)
+ mediaPlaceable.placeRelative(width / 2, mediaVerticalOffset())
+ }
+ }
+
+ enum class LayoutId {
+ QS,
+ Media,
+ }
+}
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt
index 8195df3..8058dcd 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt
@@ -29,6 +29,7 @@
import androidx.compose.ui.draw.drawWithContent
import androidx.compose.ui.layout.layout
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.compose.animation.scene.ElementKey
@@ -62,11 +63,21 @@
object SharedValues {
val TilesSquishiness = ValueKey("QuickSettingsTileSquishiness")
+
object SquishinessValues {
val Default = 1f
val LockscreenSceneStarting = 0f
val GoneSceneStarting = 0.3f
}
+
+ val MediaLandscapeTopOffset = ValueKey("MediaLandscapeTopOffset")
+
+ object MediaOffset {
+ val InQQS = 0.dp
+ // Brightness + padding
+ val InQS = 92.dp
+ val Default = 0.dp
+ }
}
}
@@ -77,8 +88,8 @@
return when (val transitionState = layoutState.transitionState) {
is TransitionState.Idle -> {
when (transitionState.currentScene) {
- Scenes.Shade -> QSSceneAdapter.State.QQS.takeUnless { isSplitShade }
- ?: QSSceneAdapter.State.QS
+ Scenes.Shade ->
+ QSSceneAdapter.State.QQS.takeUnless { isSplitShade } ?: QSSceneAdapter.State.QS
Scenes.QuickSettings -> QSSceneAdapter.State.QS
else -> QSSceneAdapter.State.CLOSED
}
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt
index 0ee485c..1b49b67 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt
@@ -46,6 +46,7 @@
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
@@ -56,6 +57,8 @@
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.CompositingStrategy
import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.layout.layoutId
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.res.colorResource
@@ -63,6 +66,7 @@
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.compose.animation.scene.SceneScope
import com.android.compose.animation.scene.TransitionState
+import com.android.compose.animation.scene.animateSceneDpAsState
import com.android.compose.animation.scene.animateSceneFloatAsState
import com.android.compose.modifiers.thenIf
import com.android.compose.windowsizeclass.LocalWindowSizeClass
@@ -79,6 +83,8 @@
import com.android.systemui.media.dagger.MediaModule
import com.android.systemui.notifications.ui.composable.HeadsUpNotificationSpace
import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility
+import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaLandscapeTopOffset
+import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaOffset.InQS
import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneViewModel
import com.android.systemui.res.R
import com.android.systemui.scene.session.ui.composable.SaveableSession
@@ -258,6 +264,14 @@
}
}
+ // ############# Media ###############
+ val isMediaVisible by viewModel.isMediaVisible.collectAsStateWithLifecycle()
+ val mediaInRow =
+ isMediaVisible &&
+ LocalWindowSizeClass.current.heightSizeClass == WindowHeightSizeClass.Compact
+ val mediaOffset by
+ animateSceneDpAsState(value = InQS, key = MediaLandscapeTopOffset, canOverflow = false)
+
// This is the background for the whole scene, as the elements don't necessarily provide
// a background that extends to the edges.
Spacer(
@@ -337,21 +351,37 @@
}
Spacer(modifier = Modifier.height(16.dp))
// This view has its own horizontal padding
- QuickSettings(
- viewModel.qsSceneAdapter,
- { viewModel.qsSceneAdapter.qsHeight },
- isSplitShade = false,
- modifier = Modifier
- )
+ val content: @Composable () -> Unit = {
+ QuickSettings(
+ viewModel.qsSceneAdapter,
+ { viewModel.qsSceneAdapter.qsHeight },
+ isSplitShade = false,
+ modifier = Modifier.layoutId(QSMediaMeasurePolicy.LayoutId.QS)
+ )
- val isMediaVisible by viewModel.isMediaVisible.collectAsStateWithLifecycle()
-
- MediaCarousel(
- isVisible = isMediaVisible,
- mediaHost = mediaHost,
- modifier = Modifier.fillMaxWidth(),
- carouselController = mediaCarouselController,
- )
+ MediaCarousel(
+ isVisible = isMediaVisible,
+ mediaHost = mediaHost,
+ modifier =
+ Modifier.fillMaxWidth()
+ .layoutId(QSMediaMeasurePolicy.LayoutId.Media),
+ carouselController = mediaCarouselController,
+ )
+ }
+ val landscapeQsMediaMeasurePolicy = remember {
+ QSMediaMeasurePolicy(
+ { viewModel.qsSceneAdapter.qsHeight },
+ { mediaOffset.roundToPx() },
+ )
+ }
+ if (mediaInRow) {
+ Layout(
+ content = content,
+ measurePolicy = landscapeQsMediaMeasurePolicy,
+ )
+ } else {
+ content()
+ }
}
}
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt
index efda4cd..4e334c2 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt
@@ -28,11 +28,14 @@
import com.android.compose.animation.scene.SceneScope
import com.android.compose.animation.scene.UserAction
import com.android.compose.animation.scene.UserActionResult
+import com.android.compose.animation.scene.animateSceneDpAsState
import com.android.compose.animation.scene.animateSceneFloatAsState
import com.android.internal.policy.SystemBarUtils
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.notifications.ui.composable.HeadsUpNotificationSpace
import com.android.systemui.qs.ui.composable.QuickSettings
+import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaLandscapeTopOffset
+import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaOffset.Default
import com.android.systemui.res.R
import com.android.systemui.scene.shared.model.Scenes
import com.android.systemui.scene.ui.viewmodel.GoneSceneViewModel
@@ -67,6 +70,7 @@
value = QuickSettings.SharedValues.SquishinessValues.GoneSceneStarting,
key = QuickSettings.SharedValues.TilesSquishiness,
)
+ animateSceneDpAsState(value = Default, key = MediaLandscapeTopOffset, canOverflow = false)
Spacer(modifier.fillMaxSize())
HeadsUpNotificationStack(
stackScrollView = notificationStackScrolLView.get(),
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt
index 312890e..d51cdd3 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt
@@ -25,7 +25,6 @@
import androidx.compose.foundation.clipScrollableContainer
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -35,7 +34,6 @@
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
@@ -54,6 +52,7 @@
import androidx.compose.ui.graphics.CompositingStrategy
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.layout.layoutId
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.res.colorResource
@@ -65,6 +64,7 @@
import com.android.compose.animation.scene.TransitionState
import com.android.compose.animation.scene.UserAction
import com.android.compose.animation.scene.UserActionResult
+import com.android.compose.animation.scene.animateSceneDpAsState
import com.android.compose.animation.scene.animateSceneFloatAsState
import com.android.compose.modifiers.padding
import com.android.compose.modifiers.thenIf
@@ -84,7 +84,10 @@
import com.android.systemui.notifications.ui.composable.NotificationScrollingStack
import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility
import com.android.systemui.qs.ui.composable.BrightnessMirror
+import com.android.systemui.qs.ui.composable.QSMediaMeasurePolicy
import com.android.systemui.qs.ui.composable.QuickSettings
+import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaLandscapeTopOffset
+import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaOffset.InQQS
import com.android.systemui.res.R
import com.android.systemui.scene.session.ui.composable.SaveableSession
import com.android.systemui.scene.shared.model.Scenes
@@ -241,6 +244,8 @@
val mediaInRow =
isMediaVisible &&
LocalWindowSizeClass.current.heightSizeClass == WindowHeightSizeClass.Compact
+ val mediaOffset by
+ animateSceneDpAsState(value = InQQS, key = MediaLandscapeTopOffset, canOverflow = false)
Box(
modifier =
@@ -281,10 +286,10 @@
statusBarIconController = statusBarIconController,
)
- val content: @Composable (Modifier) -> Unit = { modifier ->
+ val content: @Composable () -> Unit = {
Box(
Modifier.element(QuickSettings.Elements.QuickQuickSettings)
- .then(modifier)
+ .layoutId(QSMediaMeasurePolicy.LayoutId.QS)
) {
QuickSettings(
viewModel.qsSceneAdapter,
@@ -297,21 +302,25 @@
MediaCarousel(
isVisible = isMediaVisible,
mediaHost = mediaHost,
- modifier = Modifier.fillMaxWidth().then(modifier),
+ modifier =
+ Modifier.fillMaxWidth()
+ .layoutId(QSMediaMeasurePolicy.LayoutId.Media),
carouselController = mediaCarouselController,
)
}
-
- if (!mediaInRow) {
- content(Modifier)
+ val landscapeQsMediaMeasurePolicy = remember {
+ QSMediaMeasurePolicy(
+ { viewModel.qsSceneAdapter.qqsHeight },
+ { mediaOffset.roundToPx() },
+ )
+ }
+ if (mediaInRow) {
+ Layout(
+ content = content,
+ measurePolicy = landscapeQsMediaMeasurePolicy,
+ )
} else {
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = spacedBy(16.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- content(Modifier.weight(1f))
- }
+ content()
}
}
},
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
index 11d3841..edf8943 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
@@ -66,6 +66,9 @@
*/
var lastTransition: TransitionState.Transition? = null
+ /** Whether this element was ever drawn in a scene. */
+ var wasDrawnInAnyScene = false
+
override fun toString(): String {
return "Element(key=$key)"
}
@@ -299,19 +302,98 @@
val placeable =
measure(layoutImpl, scene, element, transition, sceneState, measurable, constraints)
sceneState.lastSize = placeable.size()
- return layout(placeable.width, placeable.height) {
- place(
- layoutImpl,
- scene,
- element,
- transition,
- sceneState,
- placeable,
- )
+ return layout(placeable.width, placeable.height) { place(transition, placeable) }
+ }
+
+ @OptIn(ExperimentalComposeUiApi::class)
+ private fun Placeable.PlacementScope.place(
+ transition: TransitionState.Transition?,
+ placeable: Placeable,
+ ) {
+ with(layoutImpl.lookaheadScope) {
+ // Update the offset (relative to the SceneTransitionLayout) this element has in this
+ // scene when idle.
+ val coords =
+ coordinates ?: error("Element ${element.key} does not have any coordinates")
+ val targetOffsetInScene = lookaheadScopeCoordinates.localLookaheadPositionOf(coords)
+
+ // No need to place the element in this scene if we don't want to draw it anyways.
+ if (!shouldPlaceElement(layoutImpl, scene, element, transition)) {
+ sceneState.lastOffset = Offset.Unspecified
+ sceneState.lastScale = Scale.Unspecified
+ sceneState.lastAlpha = Element.AlphaUnspecified
+
+ sceneState.clearValuesBeforeInterruption()
+ sceneState.clearInterruptionDeltas()
+ return
+ }
+
+ val currentOffset = lookaheadScopeCoordinates.localPositionOf(coords, Offset.Zero)
+ val targetOffset =
+ computeValue(
+ layoutImpl,
+ scene,
+ element,
+ transition,
+ sceneValue = { it.targetOffset },
+ transformation = { it.offset },
+ idleValue = targetOffsetInScene,
+ currentValue = { currentOffset },
+ isSpecified = { it != Offset.Unspecified },
+ ::lerp,
+ )
+
+ val interruptedOffset =
+ computeInterruptedValue(
+ layoutImpl,
+ transition,
+ value = targetOffset,
+ unspecifiedValue = Offset.Unspecified,
+ zeroValue = Offset.Zero,
+ getValueBeforeInterruption = { sceneState.offsetBeforeInterruption },
+ setValueBeforeInterruption = { sceneState.offsetBeforeInterruption = it },
+ getInterruptionDelta = { sceneState.offsetInterruptionDelta },
+ setInterruptionDelta = { sceneState.offsetInterruptionDelta = it },
+ diff = { a, b -> a - b },
+ add = { a, b, bProgress -> a + b * bProgress },
+ )
+
+ sceneState.lastOffset = interruptedOffset
+
+ val offset = (interruptedOffset - currentOffset).round()
+ if (
+ isElementOpaque(scene, element, transition) &&
+ interruptedAlpha(layoutImpl, transition, sceneState, alpha = 1f) == 1f
+ ) {
+ sceneState.lastAlpha = 1f
+
+ // TODO(b/291071158): Call placeWithLayer() if offset != IntOffset.Zero and size is
+ // not animated once b/305195729 is fixed. Test that drawing is not invalidated in
+ // that case.
+ placeable.place(offset)
+ } else {
+ placeable.placeWithLayer(offset) {
+ // This layer might still run on its own (outside of the placement phase) even
+ // if this element is not placed anymore, so we need to double check again here
+ // before calling [elementAlpha] (which will update [SceneState.lastAlpha]). We
+ // also need to recompute the current transition to make sure that we are using
+ // the current transition and not a reference to an old one. See b/343138966 for
+ // details.
+ val transition = elementTransition(element, currentTransitions)
+ if (!shouldPlaceElement(layoutImpl, scene, element, transition)) {
+ return@placeWithLayer
+ }
+
+ alpha = elementAlpha(layoutImpl, scene, element, transition, sceneState)
+ compositingStrategy = CompositingStrategy.ModulateAlpha
+ }
+ }
}
}
override fun ContentDrawScope.draw() {
+ element.wasDrawnInAnyScene = true
+
val transition = elementTransition(element, currentTransitions)
val drawScale = getDrawScale(layoutImpl, scene, element, transition, sceneState)
if (drawScale == Scale.Default) {
@@ -514,12 +596,9 @@
return false
}
- // Place the element if it is not shared or if the current scene is the one that is currently
- // overscrolling with [OverscrollSpec].
+ // Place the element if it is not shared.
if (
- transition.fromScene !in element.sceneStates ||
- transition.toScene !in element.sceneStates ||
- transition.currentOverscrollSpec?.scene == scene.key
+ transition.fromScene !in element.sceneStates || transition.toScene !in element.sceneStates
) {
return true
}
@@ -529,7 +608,7 @@
return true
}
- return shouldDrawOrComposeSharedElement(
+ return shouldPlaceOrComposeSharedElement(
layoutImpl,
scene.key,
element.key,
@@ -537,12 +616,18 @@
)
}
-internal fun shouldDrawOrComposeSharedElement(
+internal fun shouldPlaceOrComposeSharedElement(
layoutImpl: SceneTransitionLayoutImpl,
scene: SceneKey,
element: ElementKey,
transition: TransitionState.Transition,
): Boolean {
+ // If we are overscrolling, only place/compose the element in the overscrolling scene.
+ val overscrollScene = transition.currentOverscrollSpec?.scene
+ if (overscrollScene != null) {
+ return scene == overscrollScene
+ }
+
val scenePicker = element.scenePicker
val fromScene = transition.fromScene
val toScene = transition.toScene
@@ -555,7 +640,7 @@
toSceneZIndex = layoutImpl.scenes.getValue(toScene).zIndex,
) ?: return false
- return pickedScene == scene || transition.currentOverscrollSpec?.scene == scene
+ return pickedScene == scene
}
private fun isSharedElementEnabled(
@@ -649,6 +734,12 @@
)
.fastCoerceIn(0f, 1f)
+ // If the element is fading during this transition and that it is drawn for the first time, make
+ // sure that it doesn't instantly appear on screen.
+ if (!element.wasDrawnInAnyScene && alpha > 0f) {
+ element.sceneStates.forEach { it.value.alphaBeforeInterruption = 0f }
+ }
+
val interruptedAlpha = interruptedAlpha(layoutImpl, transition, sceneState, alpha)
sceneState.lastAlpha = interruptedAlpha
return interruptedAlpha
@@ -807,84 +898,6 @@
return interruptedScale
}
-@OptIn(ExperimentalComposeUiApi::class)
-private fun Placeable.PlacementScope.place(
- layoutImpl: SceneTransitionLayoutImpl,
- scene: Scene,
- element: Element,
- transition: TransitionState.Transition?,
- sceneState: Element.SceneState,
- placeable: Placeable,
-) {
- with(layoutImpl.lookaheadScope) {
- // Update the offset (relative to the SceneTransitionLayout) this element has in this scene
- // when idle.
- val coords = coordinates ?: error("Element ${element.key} does not have any coordinates")
- val targetOffsetInScene = lookaheadScopeCoordinates.localLookaheadPositionOf(coords)
-
- // No need to place the element in this scene if we don't want to draw it anyways.
- if (!shouldPlaceElement(layoutImpl, scene, element, transition)) {
- sceneState.lastOffset = Offset.Unspecified
- sceneState.lastScale = Scale.Unspecified
- sceneState.lastAlpha = Element.AlphaUnspecified
-
- sceneState.clearValuesBeforeInterruption()
- sceneState.clearInterruptionDeltas()
- return
- }
-
- val currentOffset = lookaheadScopeCoordinates.localPositionOf(coords, Offset.Zero)
- val targetOffset =
- computeValue(
- layoutImpl,
- scene,
- element,
- transition,
- sceneValue = { it.targetOffset },
- transformation = { it.offset },
- idleValue = targetOffsetInScene,
- currentValue = { currentOffset },
- isSpecified = { it != Offset.Unspecified },
- ::lerp,
- )
-
- val interruptedOffset =
- computeInterruptedValue(
- layoutImpl,
- transition,
- value = targetOffset,
- unspecifiedValue = Offset.Unspecified,
- zeroValue = Offset.Zero,
- getValueBeforeInterruption = { sceneState.offsetBeforeInterruption },
- setValueBeforeInterruption = { sceneState.offsetBeforeInterruption = it },
- getInterruptionDelta = { sceneState.offsetInterruptionDelta },
- setInterruptionDelta = { sceneState.offsetInterruptionDelta = it },
- diff = { a, b -> a - b },
- add = { a, b, bProgress -> a + b * bProgress },
- )
-
- sceneState.lastOffset = interruptedOffset
-
- val offset = (interruptedOffset - currentOffset).round()
- if (
- isElementOpaque(scene, element, transition) &&
- interruptedAlpha(layoutImpl, transition, sceneState, alpha = 1f) == 1f
- ) {
- sceneState.lastAlpha = 1f
-
- // TODO(b/291071158): Call placeWithLayer() if offset != IntOffset.Zero and size is not
- // animated once b/305195729 is fixed. Test that drawing is not invalidated in that
- // case.
- placeable.place(offset)
- } else {
- placeable.placeWithLayer(offset) {
- alpha = elementAlpha(layoutImpl, scene, element, transition, sceneState)
- compositingStrategy = CompositingStrategy.ModulateAlpha
- }
- }
- }
-}
-
/**
* Return the value that should be used depending on the current layout state and transition.
*
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt
index be005ea..32eadde 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MovableElement.kt
@@ -187,7 +187,7 @@
} ?: return false
// Always compose movable elements in the scene picked by their scene picker.
- return shouldDrawOrComposeSharedElement(
+ return shouldPlaceOrComposeSharedElement(
layoutImpl,
scene,
element,
diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt
index beb74bc..47c9b9c 100644
--- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt
+++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/ElementTest.kt
@@ -32,6 +32,7 @@
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.PagerState
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.SideEffect
@@ -46,9 +47,12 @@
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.layout.approachLayout
import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotDisplayed
import androidx.compose.ui.test.assertPositionInRootIsEqualTo
import androidx.compose.ui.test.assertTopPositionInRootIsEqualTo
+import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onRoot
@@ -1418,4 +1422,214 @@
assertThat(bState.targetSize).isNotEqualTo(Element.SizeUnspecified)
assertThat(bState.targetOffset).isNotEqualTo(Offset.Unspecified)
}
+
+ @Test
+ fun lastAlphaIsNotSetByOutdatedLayer() = runTest {
+ val state =
+ rule.runOnUiThread {
+ MutableSceneTransitionLayoutStateImpl(
+ SceneA,
+ transitions { from(SceneA, to = SceneB) { fade(TestElements.Foo) } }
+ )
+ }
+
+ lateinit var layoutImpl: SceneTransitionLayoutImpl
+ rule.setContent {
+ SceneTransitionLayoutForTesting(state, onLayoutImpl = { layoutImpl = it }) {
+ scene(SceneA) {}
+ scene(SceneB) { Box(Modifier.element(TestElements.Foo)) }
+ scene(SceneC) { Box(Modifier.element(TestElements.Foo)) }
+ }
+ }
+
+ // Start A => B at 0.5f.
+ var aToBProgress by mutableStateOf(0.5f)
+ rule.runOnUiThread {
+ state.startTransition(
+ transition(
+ from = SceneA,
+ to = SceneB,
+ progress = { aToBProgress },
+ onFinish = neverFinish(),
+ )
+ )
+ }
+ rule.waitForIdle()
+
+ val foo = checkNotNull(layoutImpl.elements[TestElements.Foo])
+ assertThat(foo.sceneStates[SceneA]).isNull()
+
+ val fooInB = foo.sceneStates[SceneB]
+ assertThat(fooInB).isNotNull()
+ assertThat(fooInB!!.lastAlpha).isEqualTo(0.5f)
+
+ // Move the progress of A => B to 0.7f.
+ aToBProgress = 0.7f
+ rule.waitForIdle()
+ assertThat(fooInB.lastAlpha).isEqualTo(0.7f)
+
+ // Start B => C at 0.3f.
+ rule.runOnUiThread {
+ state.startTransition(transition(from = SceneB, to = SceneC, progress = { 0.3f }))
+ }
+ rule.waitForIdle()
+ val fooInC = foo.sceneStates[SceneC]
+ assertThat(fooInC).isNotNull()
+ assertThat(fooInC!!.lastAlpha).isEqualTo(1f)
+ assertThat(fooInB.lastAlpha).isEqualTo(Element.AlphaUnspecified)
+
+ // Move the progress of A => B to 0.9f. This shouldn't change anything given that B => C is
+ // now the transition applied to Foo.
+ aToBProgress = 0.9f
+ rule.waitForIdle()
+ assertThat(fooInC.lastAlpha).isEqualTo(1f)
+ assertThat(fooInB.lastAlpha).isEqualTo(Element.AlphaUnspecified)
+ }
+
+ @Test
+ fun fadingElementsDontAppearInstantly() {
+ val state =
+ rule.runOnUiThread {
+ MutableSceneTransitionLayoutStateImpl(
+ SceneA,
+ transitions { from(SceneA, to = SceneB) { fade(TestElements.Foo) } }
+ )
+ }
+
+ lateinit var layoutImpl: SceneTransitionLayoutImpl
+ rule.setContent {
+ SceneTransitionLayoutForTesting(state, onLayoutImpl = { layoutImpl = it }) {
+ scene(SceneA) {}
+ scene(SceneB) { Box(Modifier.element(TestElements.Foo)) }
+ }
+ }
+
+ // Start A => B at 60%.
+ var interruptionProgress by mutableStateOf(1f)
+ rule.runOnUiThread {
+ state.startTransition(
+ transition(
+ from = SceneA,
+ to = SceneB,
+ progress = { 0.6f },
+ interruptionProgress = { interruptionProgress },
+ ),
+ transitionKey = null
+ )
+ }
+ rule.waitForIdle()
+
+ // Alpha of Foo should be 0f at interruption progress 100%.
+ val fooInB = layoutImpl.elements.getValue(TestElements.Foo).sceneStates.getValue(SceneB)
+ assertThat(fooInB.lastAlpha).isEqualTo(0f)
+
+ // Alpha of Foo should be 0.6f at interruption progress 0%.
+ interruptionProgress = 0f
+ rule.waitForIdle()
+ assertThat(fooInB.lastAlpha).isEqualTo(0.6f)
+
+ // Alpha of Foo should be 0.3f at interruption progress 50%.
+ interruptionProgress = 0.5f
+ rule.waitForIdle()
+ assertThat(fooInB.lastAlpha).isEqualTo(0.3f)
+ }
+
+ @Test
+ fun sharedElementIsOnlyPlacedInOverscrollingScene() {
+ val state =
+ rule.runOnUiThread {
+ MutableSceneTransitionLayoutStateImpl(
+ SceneA,
+ transitions {
+ overscroll(SceneA, Orientation.Horizontal)
+ overscroll(SceneB, Orientation.Horizontal)
+ }
+ )
+ }
+
+ @Composable
+ fun SceneScope.Foo() {
+ Box(Modifier.element(TestElements.Foo).size(10.dp))
+ }
+
+ rule.setContent {
+ SceneTransitionLayout(state) {
+ scene(SceneA) { Foo() }
+ scene(SceneB) { Foo() }
+ }
+ }
+
+ rule.onNode(isElement(TestElements.Foo, SceneA)).assertIsDisplayed()
+ rule.onNode(isElement(TestElements.Foo, SceneB)).assertDoesNotExist()
+
+ // A => B while overscrolling at scene B.
+ var progress by mutableStateOf(2f)
+ rule.runOnUiThread {
+ state.startTransition(transition(from = SceneA, to = SceneB, progress = { progress }))
+ }
+ rule.waitForIdle()
+
+ // Foo should only be placed in scene B.
+ rule.onNode(isElement(TestElements.Foo, SceneA)).assertExists().assertIsNotDisplayed()
+ rule.onNode(isElement(TestElements.Foo, SceneB)).assertIsDisplayed()
+
+ // Overscroll at scene A.
+ progress = -1f
+ rule.waitForIdle()
+
+ // Foo should only be placed in scene A.
+ rule.onNode(isElement(TestElements.Foo, SceneA)).assertIsDisplayed()
+ rule.onNode(isElement(TestElements.Foo, SceneB)).assertExists().assertIsNotDisplayed()
+ }
+
+ @Test
+ fun sharedMovableElementIsOnlyComposedInOverscrollingScene() {
+ val state =
+ rule.runOnUiThread {
+ MutableSceneTransitionLayoutStateImpl(
+ SceneA,
+ transitions {
+ overscroll(SceneA, Orientation.Horizontal)
+ overscroll(SceneB, Orientation.Horizontal)
+ }
+ )
+ }
+
+ val fooInA = "fooInA"
+ val fooInB = "fooInB"
+
+ @Composable
+ fun SceneScope.MovableFoo(text: String, modifier: Modifier = Modifier) {
+ MovableElement(TestElements.Foo, modifier) { content { Text(text) } }
+ }
+
+ rule.setContent {
+ SceneTransitionLayout(state) {
+ scene(SceneA) { MovableFoo(text = fooInA) }
+ scene(SceneB) { MovableFoo(text = fooInB) }
+ }
+ }
+
+ rule.onNode(hasText(fooInA)).assertIsDisplayed()
+ rule.onNode(hasText(fooInB)).assertDoesNotExist()
+
+ // A => B while overscrolling at scene B.
+ var progress by mutableStateOf(2f)
+ rule.runOnUiThread {
+ state.startTransition(transition(from = SceneA, to = SceneB, progress = { progress }))
+ }
+ rule.waitForIdle()
+
+ // Foo content should only be composed in scene B.
+ rule.onNode(hasText(fooInA)).assertDoesNotExist()
+ rule.onNode(hasText(fooInB)).assertIsDisplayed()
+
+ // Overscroll at scene A.
+ progress = -1f
+ rule.waitForIdle()
+
+ // Foo content should only be composed in scene A.
+ rule.onNode(hasText(fooInA)).assertIsDisplayed()
+ rule.onNode(hasText(fooInB)).assertDoesNotExist()
+ }
}
diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/Transition.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/Transition.kt
index e6fa69d..322b035 100644
--- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/Transition.kt
+++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/Transition.kt
@@ -30,7 +30,7 @@
current: () -> SceneKey = { from },
progress: () -> Float = { 0f },
progressVelocity: () -> Float = { 0f },
- interruptionProgress: () -> Float = { 100f },
+ interruptionProgress: () -> Float = { 0f },
isInitiatedByUserInput: Boolean = false,
isUserInputOngoing: Boolean = false,
isUpOrLeft: Boolean = false,
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/ShadeTouchHandlerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/ShadeTouchHandlerTest.java
index 27bffd0..04b930e 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/ShadeTouchHandlerTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/ShadeTouchHandlerTest.java
@@ -18,9 +18,13 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.DreamManager;
import android.view.GestureDetector;
import android.view.MotionEvent;
@@ -36,6 +40,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -52,63 +57,104 @@
ShadeViewController mShadeViewController;
@Mock
+ DreamManager mDreamManager;
+
+ @Mock
TouchHandler.TouchSession mTouchSession;
ShadeTouchHandler mTouchHandler;
+ @Captor
+ ArgumentCaptor<GestureDetector.OnGestureListener> mGestureListenerCaptor;
+ @Captor
+ ArgumentCaptor<InputChannelCompat.InputEventListener> mInputListenerCaptor;
+
private static final int TOUCH_HEIGHT = 20;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
+
mTouchHandler = new ShadeTouchHandler(Optional.of(mCentralSurfaces), mShadeViewController,
- TOUCH_HEIGHT);
+ mDreamManager, TOUCH_HEIGHT);
+ }
+
+ // Verifies that a swipe down in the gesture region is captured by the shade touch handler.
+ @Test
+ public void testSwipeDown_captured() {
+ final boolean captured = swipe(Direction.DOWN);
+
+ assertThat(captured).isTrue();
+ }
+
+ // Verifies that a swipe in the upward direction is not catpured.
+ @Test
+ public void testSwipeUp_notCaptured() {
+ final boolean captured = swipe(Direction.UP);
+
+ // Motion events not captured as the swipe is going in the wrong direction.
+ assertThat(captured).isFalse();
+ }
+
+ // Verifies that a swipe down forwards captured touches to central surfaces for handling.
+ @Test
+ public void testSwipeDown_sentToCentralSurfaces() {
+ swipe(Direction.DOWN);
+
+ // Both motion events are sent for the shade window to process.
+ verify(mCentralSurfaces, times(2)).handleExternalShadeWindowTouch(any());
+ }
+
+ // Verifies that a swipe down forwards captured touches to central surfaces for handling.
+ @Test
+ public void testSwipeDown_dreaming_sentToShadeView() {
+ when(mDreamManager.isDreaming()).thenReturn(true);
+
+ swipe(Direction.DOWN);
+
+ // Both motion events are sent for the shade window to process.
+ verify(mShadeViewController, times(2)).handleExternalTouch(any());
+ }
+
+ // Verifies that a swipe down is not forwarded to the shade window.
+ @Test
+ public void testSwipeUp_touchesNotSent() {
+ swipe(Direction.UP);
+
+ // Motion events are not sent for the shade window to process as the swipe is going in the
+ // wrong direction.
+ verify(mCentralSurfaces, never()).handleExternalShadeWindowTouch(any());
}
/**
- * Verify that touches aren't handled when the bouncer is showing.
+ * Simulates a swipe in the given direction and returns true if the touch was intercepted by the
+ * touch handler's gesture listener.
+ * <p>
+ * Swipe down starts from a Y coordinate of 0 and goes downward. Swipe up starts from the edge
+ * of the gesture region, {@link #TOUCH_HEIGHT}, and goes upward to 0.
*/
- @Test
- public void testInactiveOnBouncer() {
- when(mCentralSurfaces.isBouncerShowing()).thenReturn(true);
+ private boolean swipe(Direction direction) {
+ Mockito.clearInvocations(mTouchSession);
mTouchHandler.onSessionStart(mTouchSession);
- verify(mTouchSession).pop();
+
+ verify(mTouchSession).registerGestureListener(mGestureListenerCaptor.capture());
+ verify(mTouchSession).registerInputListener(mInputListenerCaptor.capture());
+
+ final float startY = direction == Direction.UP ? TOUCH_HEIGHT : 0;
+ final float endY = direction == Direction.UP ? 0 : TOUCH_HEIGHT;
+
+ // Send touches to the input and gesture listener.
+ final MotionEvent event1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE, 0, startY, 0);
+ final MotionEvent event2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE, 0, endY, 0);
+ mInputListenerCaptor.getValue().onInputEvent(event1);
+ mInputListenerCaptor.getValue().onInputEvent(event2);
+ final boolean captured = mGestureListenerCaptor.getValue().onScroll(event1, event2, 0,
+ startY - endY);
+
+ return captured;
}
- /**
- * Make sure {@link ShadeTouchHandler}
- */
- @Test
- public void testTouchPilferingOnScroll() {
- final MotionEvent motionEvent1 = Mockito.mock(MotionEvent.class);
- final MotionEvent motionEvent2 = Mockito.mock(MotionEvent.class);
-
- final ArgumentCaptor<GestureDetector.OnGestureListener> gestureListenerArgumentCaptor =
- ArgumentCaptor.forClass(GestureDetector.OnGestureListener.class);
-
- mTouchHandler.onSessionStart(mTouchSession);
- verify(mTouchSession).registerGestureListener(gestureListenerArgumentCaptor.capture());
-
- assertThat(gestureListenerArgumentCaptor.getValue()
- .onScroll(motionEvent1, motionEvent2, 1, 1))
- .isTrue();
+ private enum Direction {
+ DOWN, UP,
}
-
- /**
- * Ensure touches are propagated to the {@link ShadeViewController}.
- */
- @Test
- public void testEventPropagation() {
- final MotionEvent motionEvent = Mockito.mock(MotionEvent.class);
-
- final ArgumentCaptor<InputChannelCompat.InputEventListener>
- inputEventListenerArgumentCaptor =
- ArgumentCaptor.forClass(InputChannelCompat.InputEventListener.class);
-
- mTouchHandler.onSessionStart(mTouchSession);
- verify(mTouchSession).registerInputListener(inputEventListenerArgumentCaptor.capture());
- inputEventListenerArgumentCaptor.getValue().onInputEvent(motionEvent);
- verify(mShadeViewController).handleExternalTouch(motionEvent);
- }
-
}
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterImplTest.kt
index 7388d51..b35b7bc 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterImplTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/adapter/QSSceneAdapterImplTest.kt
@@ -164,25 +164,16 @@
with(qsImpl!!) {
verify(this).setQsVisible(false)
- verify(this, never())
+ verify(this)
.setQsExpansion(
- /* expansion= */ anyFloat(),
- /* panelExpansionFraction= */ anyFloat(),
- /* proposedTranslation= */ anyFloat(),
- /* squishinessFraction= */ anyFloat(),
+ /* expansion= */ 0f,
+ /* panelExpansionFraction= */ 1f,
+ /* proposedTranslation= */ 0f,
+ /* squishinessFraction= */ 1f,
)
verify(this).setListening(false)
verify(this).setExpanded(false)
}
-
- underTest.applyLatestExpansionAndSquishiness()
- verify(qsImpl!!)
- .setQsExpansion(
- /* expansion= */ 0f,
- /* panelExpansionFraction= */ 1f,
- /* proposedTranslation= */ 0f,
- /* squishinessFraction= */ 1f,
- )
}
@Test
diff --git a/packages/SystemUI/res/drawable/audio_bars_playing.xml b/packages/SystemUI/res/drawable/audio_bars_playing.xml
new file mode 100644
index 0000000..6a6706a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/audio_bars_playing.xml
@@ -0,0 +1,457 @@
+<!--
+ ~ 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.
+ -->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt">
+ <target android:name="_R_G_L_4_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="283"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueTo="M-37.16 -13.39 C-33.94,-13.39 -31.32,-10.83 -31.2,-7.64 C-31.2,-7.57 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,6.79 -31.2,6.86 C-31.31,10.05 -33.94,12.61 -37.16,12.61 C-40.39,12.61 -43.01,10.05 -43.12,6.85 C-43.12,6.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-7.58 -43.12,-7.66 C-42.99,-10.84 -40.37,-13.39 -37.16,-13.39c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="433"
+ android:propertyName="pathData"
+ android:startOffset="283"
+ android:valueFrom="M-37.16 -13.39 C-33.94,-13.39 -31.32,-10.83 -31.2,-7.64 C-31.2,-7.57 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,6.79 -31.2,6.86 C-31.31,10.05 -33.94,12.61 -37.16,12.61 C-40.39,12.61 -43.01,10.05 -43.12,6.85 C-43.12,6.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-7.58 -43.12,-7.66 C-42.99,-10.84 -40.37,-13.39 -37.16,-13.39c "
+ android:valueTo="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="417"
+ android:propertyName="pathData"
+ android:startOffset="717"
+ android:valueFrom="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueTo="M-37.16 -13.39 C-33.94,-13.39 -31.32,-10.83 -31.2,-7.64 C-31.2,-7.57 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,6.79 -31.2,6.86 C-31.31,10.05 -33.94,12.61 -37.16,12.61 C-40.39,12.61 -43.01,10.05 -43.12,6.85 C-43.12,6.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-7.58 -43.12,-7.66 C-42.99,-10.84 -40.37,-13.39 -37.16,-13.39c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="467"
+ android:propertyName="pathData"
+ android:startOffset="1133"
+ android:valueFrom="M-37.16 -13.39 C-33.94,-13.39 -31.32,-10.83 -31.2,-7.64 C-31.2,-7.57 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,6.79 -31.2,6.86 C-31.31,10.05 -33.94,12.61 -37.16,12.61 C-40.39,12.61 -43.01,10.05 -43.12,6.85 C-43.12,6.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-7.58 -43.12,-7.66 C-42.99,-10.84 -40.37,-13.39 -37.16,-13.39c "
+ android:valueTo="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="433"
+ android:propertyName="pathData"
+ android:startOffset="1600"
+ android:valueFrom="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueTo="M-37.16 -13.39 C-33.94,-13.39 -31.32,-10.83 -31.2,-7.64 C-31.2,-7.57 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,6.79 -31.2,6.86 C-31.31,10.05 -33.94,12.61 -37.16,12.61 C-40.39,12.61 -43.01,10.05 -43.12,6.85 C-43.12,6.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-7.58 -43.12,-7.66 C-42.99,-10.84 -40.37,-13.39 -37.16,-13.39c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="517"
+ android:propertyName="pathData"
+ android:startOffset="2033"
+ android:valueFrom="M-37.16 -13.39 C-33.94,-13.39 -31.32,-10.83 -31.2,-7.64 C-31.2,-7.57 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,6.79 -31.2,6.86 C-31.31,10.05 -33.94,12.61 -37.16,12.61 C-40.39,12.61 -43.01,10.05 -43.12,6.85 C-43.12,6.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-7.58 -43.12,-7.66 C-42.99,-10.84 -40.37,-13.39 -37.16,-13.39c "
+ android:valueTo="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_3_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="367"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueTo="M-37.16 -18.51 C-33.94,-18.51 -31.32,-15.96 -31.2,-12.77 C-31.2,-12.7 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.16 -31.2,13.23 C-31.31,16.43 -33.94,18.99 -37.16,18.99 C-40.39,18.99 -43.01,16.43 -43.12,13.23 C-43.12,13.16 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-12.71 -43.12,-12.78 C-42.99,-15.97 -40.37,-18.51 -37.16,-18.51c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="433"
+ android:propertyName="pathData"
+ android:startOffset="367"
+ android:valueFrom="M-37.16 -18.51 C-33.94,-18.51 -31.32,-15.96 -31.2,-12.77 C-31.2,-12.7 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.16 -31.2,13.23 C-31.31,16.43 -33.94,18.99 -37.16,18.99 C-40.39,18.99 -43.01,16.43 -43.12,13.23 C-43.12,13.16 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-12.71 -43.12,-12.78 C-42.99,-15.97 -40.37,-18.51 -37.16,-18.51c "
+ android:valueTo="M-37.16 -9.14 C-33.94,-9.14 -31.32,-6.58 -31.2,-3.39 C-31.2,-3.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,3.79 -31.2,3.86 C-31.31,7.05 -33.94,9.61 -37.16,9.61 C-40.39,9.61 -43.01,7.05 -43.12,3.85 C-43.12,3.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-3.33 -43.12,-3.41 C-42.99,-6.59 -40.37,-9.14 -37.16,-9.14c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="417"
+ android:propertyName="pathData"
+ android:startOffset="800"
+ android:valueFrom="M-37.16 -9.14 C-33.94,-9.14 -31.32,-6.58 -31.2,-3.39 C-31.2,-3.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,3.79 -31.2,3.86 C-31.31,7.05 -33.94,9.61 -37.16,9.61 C-40.39,9.61 -43.01,7.05 -43.12,3.85 C-43.12,3.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-3.33 -43.12,-3.41 C-42.99,-6.59 -40.37,-9.14 -37.16,-9.14c "
+ android:valueTo="M-37.16 -18.51 C-33.94,-18.51 -31.32,-15.96 -31.2,-12.77 C-31.2,-12.7 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.16 -31.2,13.23 C-31.31,16.43 -33.94,18.99 -37.16,18.99 C-40.39,18.99 -43.01,16.43 -43.12,13.23 C-43.12,13.16 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-12.71 -43.12,-12.78 C-42.99,-15.97 -40.37,-18.51 -37.16,-18.51c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="467"
+ android:propertyName="pathData"
+ android:startOffset="1217"
+ android:valueFrom="M-37.16 -18.51 C-33.94,-18.51 -31.32,-15.96 -31.2,-12.77 C-31.2,-12.7 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.16 -31.2,13.23 C-31.31,16.43 -33.94,18.99 -37.16,18.99 C-40.39,18.99 -43.01,16.43 -43.12,13.23 C-43.12,13.16 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-12.71 -43.12,-12.78 C-42.99,-15.97 -40.37,-18.51 -37.16,-18.51c "
+ android:valueTo="M-37.16 -9.14 C-33.94,-9.14 -31.32,-6.58 -31.2,-3.39 C-31.2,-3.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,3.79 -31.2,3.86 C-31.31,7.05 -33.94,9.61 -37.16,9.61 C-40.39,9.61 -43.01,7.05 -43.12,3.85 C-43.12,3.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-3.33 -43.12,-3.41 C-42.99,-6.59 -40.37,-9.14 -37.16,-9.14c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="450"
+ android:propertyName="pathData"
+ android:startOffset="1683"
+ android:valueFrom="M-37.16 -9.14 C-33.94,-9.14 -31.32,-6.58 -31.2,-3.39 C-31.2,-3.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,3.79 -31.2,3.86 C-31.31,7.05 -33.94,9.61 -37.16,9.61 C-40.39,9.61 -43.01,7.05 -43.12,3.85 C-43.12,3.79 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-3.33 -43.12,-3.41 C-42.99,-6.59 -40.37,-9.14 -37.16,-9.14c "
+ android:valueTo="M-37.16 -18.51 C-33.94,-18.51 -31.32,-15.96 -31.2,-12.77 C-31.2,-12.7 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.16 -31.2,13.23 C-31.31,16.43 -33.94,18.99 -37.16,18.99 C-40.39,18.99 -43.01,16.43 -43.12,13.23 C-43.12,13.16 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-12.71 -43.12,-12.78 C-42.99,-15.97 -40.37,-18.51 -37.16,-18.51c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="417"
+ android:propertyName="pathData"
+ android:startOffset="2133"
+ android:valueFrom="M-37.16 -18.51 C-33.94,-18.51 -31.32,-15.96 -31.2,-12.77 C-31.2,-12.7 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.16 -31.2,13.23 C-31.31,16.43 -33.94,18.99 -37.16,18.99 C-40.39,18.99 -43.01,16.43 -43.12,13.23 C-43.12,13.16 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-12.71 -43.12,-12.78 C-42.99,-15.97 -40.37,-18.51 -37.16,-18.51c "
+ android:valueTo="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="433"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueTo="M-37.16 -25.01 C-33.94,-25.01 -31.32,-22.46 -31.2,-19.27 C-31.2,-19.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,19.54 -31.2,19.6 C-31.31,22.8 -33.94,25.36 -37.16,25.36 C-40.39,25.36 -43.01,22.8 -43.12,19.6 C-43.12,19.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-19.21 -43.12,-19.28 C-42.99,-22.47 -40.37,-25.01 -37.16,-25.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="450"
+ android:propertyName="pathData"
+ android:startOffset="433"
+ android:valueFrom="M-37.16 -25.01 C-33.94,-25.01 -31.32,-22.46 -31.2,-19.27 C-31.2,-19.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,19.54 -31.2,19.6 C-31.31,22.8 -33.94,25.36 -37.16,25.36 C-40.39,25.36 -43.01,22.8 -43.12,19.6 C-43.12,19.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-19.21 -43.12,-19.28 C-42.99,-22.47 -40.37,-25.01 -37.16,-25.01c "
+ android:valueTo="M-37.16 -15.76 C-33.94,-15.76 -31.32,-13.21 -31.2,-10.02 C-31.2,-9.95 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,10.54 -31.2,10.61 C-31.31,13.8 -33.94,16.36 -37.16,16.36 C-40.39,16.36 -43.01,13.8 -43.12,10.6 C-43.12,10.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-9.96 -43.12,-10.03 C-42.99,-13.22 -40.37,-15.76 -37.16,-15.76c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="417"
+ android:propertyName="pathData"
+ android:startOffset="883"
+ android:valueFrom="M-37.16 -15.76 C-33.94,-15.76 -31.32,-13.21 -31.2,-10.02 C-31.2,-9.95 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,10.54 -31.2,10.61 C-31.31,13.8 -33.94,16.36 -37.16,16.36 C-40.39,16.36 -43.01,13.8 -43.12,10.6 C-43.12,10.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-9.96 -43.12,-10.03 C-42.99,-13.22 -40.37,-15.76 -37.16,-15.76c "
+ android:valueTo="M-37.16 -25.01 C-33.94,-25.01 -31.32,-22.46 -31.2,-19.27 C-31.2,-19.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,19.54 -31.2,19.6 C-31.31,22.8 -33.94,25.36 -37.16,25.36 C-40.39,25.36 -43.01,22.8 -43.12,19.6 C-43.12,19.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-19.21 -43.12,-19.28 C-42.99,-22.47 -40.37,-25.01 -37.16,-25.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="467"
+ android:propertyName="pathData"
+ android:startOffset="1300"
+ android:valueFrom="M-37.16 -25.01 C-33.94,-25.01 -31.32,-22.46 -31.2,-19.27 C-31.2,-19.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,19.54 -31.2,19.6 C-31.31,22.8 -33.94,25.36 -37.16,25.36 C-40.39,25.36 -43.01,22.8 -43.12,19.6 C-43.12,19.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-19.21 -43.12,-19.28 C-42.99,-22.47 -40.37,-25.01 -37.16,-25.01c "
+ android:valueTo="M-37.16 -15.76 C-33.94,-15.76 -31.32,-13.21 -31.2,-10.02 C-31.2,-9.95 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,10.54 -31.2,10.61 C-31.31,13.8 -33.94,16.36 -37.16,16.36 C-40.39,16.36 -43.01,13.8 -43.12,10.6 C-43.12,10.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-9.96 -43.12,-10.03 C-42.99,-13.22 -40.37,-15.76 -37.16,-15.76c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="433"
+ android:propertyName="pathData"
+ android:startOffset="1767"
+ android:valueFrom="M-37.16 -15.76 C-33.94,-15.76 -31.32,-13.21 -31.2,-10.02 C-31.2,-9.95 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,10.54 -31.2,10.61 C-31.31,13.8 -33.94,16.36 -37.16,16.36 C-40.39,16.36 -43.01,13.8 -43.12,10.6 C-43.12,10.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-9.96 -43.12,-10.03 C-42.99,-13.22 -40.37,-15.76 -37.16,-15.76c "
+ android:valueTo="M-37.16 -25.01 C-33.94,-25.01 -31.32,-22.46 -31.2,-19.27 C-31.2,-19.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,19.54 -31.2,19.6 C-31.31,22.8 -33.94,25.36 -37.16,25.36 C-40.39,25.36 -43.01,22.8 -43.12,19.6 C-43.12,19.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-19.21 -43.12,-19.28 C-42.99,-22.47 -40.37,-25.01 -37.16,-25.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="350"
+ android:propertyName="pathData"
+ android:startOffset="2200"
+ android:valueFrom="M-37.16 -25.01 C-33.94,-25.01 -31.32,-22.46 -31.2,-19.27 C-31.2,-19.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,19.54 -31.2,19.6 C-31.31,22.8 -33.94,25.36 -37.16,25.36 C-40.39,25.36 -43.01,22.8 -43.12,19.6 C-43.12,19.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-19.21 -43.12,-19.28 C-42.99,-22.47 -40.37,-25.01 -37.16,-25.01c "
+ android:valueTo="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="500"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueTo="M-37.16 -38.14 C-33.94,-38.14 -31.32,-35.58 -31.2,-32.39 C-31.2,-32.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,32.04 -31.2,32.1 C-31.31,35.3 -33.94,37.86 -37.16,37.86 C-40.39,37.86 -43.01,35.3 -43.12,32.1 C-43.12,32.04 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-32.33 -43.12,-32.41 C-42.99,-35.59 -40.37,-38.14 -37.16,-38.14c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="467"
+ android:propertyName="pathData"
+ android:startOffset="500"
+ android:valueFrom="M-37.16 -38.14 C-33.94,-38.14 -31.32,-35.58 -31.2,-32.39 C-31.2,-32.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,32.04 -31.2,32.1 C-31.31,35.3 -33.94,37.86 -37.16,37.86 C-40.39,37.86 -43.01,35.3 -43.12,32.1 C-43.12,32.04 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-32.33 -43.12,-32.41 C-42.99,-35.59 -40.37,-38.14 -37.16,-38.14c "
+ android:valueTo="M-37.16 -19.01 C-33.94,-19.01 -31.32,-16.46 -31.2,-13.27 C-31.2,-13.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.66 -31.2,13.73 C-31.31,16.93 -33.94,19.49 -37.16,19.49 C-40.39,19.49 -43.01,16.93 -43.12,13.73 C-43.12,13.66 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-13.21 -43.12,-13.28 C-42.99,-16.47 -40.37,-19.01 -37.16,-19.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="383"
+ android:propertyName="pathData"
+ android:startOffset="967"
+ android:valueFrom="M-37.16 -19.01 C-33.94,-19.01 -31.32,-16.46 -31.2,-13.27 C-31.2,-13.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.66 -31.2,13.73 C-31.31,16.93 -33.94,19.49 -37.16,19.49 C-40.39,19.49 -43.01,16.93 -43.12,13.73 C-43.12,13.66 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-13.21 -43.12,-13.28 C-42.99,-16.47 -40.37,-19.01 -37.16,-19.01c "
+ android:valueTo="M-37.16 -38.14 C-33.94,-38.14 -31.32,-35.58 -31.2,-32.39 C-31.2,-32.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,32.04 -31.2,32.1 C-31.31,35.3 -33.94,37.86 -37.16,37.86 C-40.39,37.86 -43.01,35.3 -43.12,32.1 C-43.12,32.04 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-32.33 -43.12,-32.41 C-42.99,-35.59 -40.37,-38.14 -37.16,-38.14c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="467"
+ android:propertyName="pathData"
+ android:startOffset="1350"
+ android:valueFrom="M-37.16 -38.14 C-33.94,-38.14 -31.32,-35.58 -31.2,-32.39 C-31.2,-32.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,32.04 -31.2,32.1 C-31.31,35.3 -33.94,37.86 -37.16,37.86 C-40.39,37.86 -43.01,35.3 -43.12,32.1 C-43.12,32.04 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-32.33 -43.12,-32.41 C-42.99,-35.59 -40.37,-38.14 -37.16,-38.14c "
+ android:valueTo="M-37.16 -19.01 C-33.94,-19.01 -31.32,-16.46 -31.2,-13.27 C-31.2,-13.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.66 -31.2,13.73 C-31.31,16.93 -33.94,19.49 -37.16,19.49 C-40.39,19.49 -43.01,16.93 -43.12,13.73 C-43.12,13.66 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-13.21 -43.12,-13.28 C-42.99,-16.47 -40.37,-19.01 -37.16,-19.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="433"
+ android:propertyName="pathData"
+ android:startOffset="1817"
+ android:valueFrom="M-37.16 -19.01 C-33.94,-19.01 -31.32,-16.46 -31.2,-13.27 C-31.2,-13.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,13.66 -31.2,13.73 C-31.31,16.93 -33.94,19.49 -37.16,19.49 C-40.39,19.49 -43.01,16.93 -43.12,13.73 C-43.12,13.66 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-13.21 -43.12,-13.28 C-42.99,-16.47 -40.37,-19.01 -37.16,-19.01c "
+ android:valueTo="M-37.16 -38.14 C-33.94,-38.14 -31.32,-35.58 -31.2,-32.39 C-31.2,-32.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,32.04 -31.2,32.1 C-31.31,35.3 -33.94,37.86 -37.16,37.86 C-40.39,37.86 -43.01,35.3 -43.12,32.1 C-43.12,32.04 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-32.33 -43.12,-32.41 C-42.99,-35.59 -40.37,-38.14 -37.16,-38.14c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="300"
+ android:propertyName="pathData"
+ android:startOffset="2250"
+ android:valueFrom="M-37.16 -38.14 C-33.94,-38.14 -31.32,-35.58 -31.2,-32.39 C-31.2,-32.32 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,32.04 -31.2,32.1 C-31.31,35.3 -33.94,37.86 -37.16,37.86 C-40.39,37.86 -43.01,35.3 -43.12,32.1 C-43.12,32.04 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-32.33 -43.12,-32.41 C-42.99,-35.59 -40.37,-38.14 -37.16,-38.14c "
+ android:valueTo="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="533"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueTo="M-37.16 -22.64 C-33.94,-22.64 -31.32,-20.08 -31.2,-16.89 C-31.2,-16.82 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,17.41 -31.2,17.48 C-31.31,20.68 -33.94,23.24 -37.16,23.24 C-40.39,23.24 -43.01,20.68 -43.12,17.48 C-43.12,17.41 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-16.83 -43.12,-16.91 C-42.99,-20.09 -40.37,-22.64 -37.16,-22.64c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="433"
+ android:propertyName="pathData"
+ android:startOffset="533"
+ android:valueFrom="M-37.16 -22.64 C-33.94,-22.64 -31.32,-20.08 -31.2,-16.89 C-31.2,-16.82 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,17.41 -31.2,17.48 C-31.31,20.68 -33.94,23.24 -37.16,23.24 C-40.39,23.24 -43.01,20.68 -43.12,17.48 C-43.12,17.41 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-16.83 -43.12,-16.91 C-42.99,-20.09 -40.37,-22.64 -37.16,-22.64c "
+ android:valueTo="M-37.18 -14.01 C-33.96,-14.01 -31.33,-11.46 -31.22,-8.27 C-31.22,-8.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,8.54 -31.2,8.61 C-31.31,11.8 -33.94,14.36 -37.16,14.36 C-40.39,14.36 -43.01,11.8 -43.12,8.6 C-43.12,8.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.14,-8.21 -43.13,-8.28 C-43.01,-11.47 -40.39,-14.01 -37.18,-14.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="417"
+ android:propertyName="pathData"
+ android:startOffset="967"
+ android:valueFrom="M-37.18 -14.01 C-33.96,-14.01 -31.33,-11.46 -31.22,-8.27 C-31.22,-8.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,8.54 -31.2,8.61 C-31.31,11.8 -33.94,14.36 -37.16,14.36 C-40.39,14.36 -43.01,11.8 -43.12,8.6 C-43.12,8.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.14,-8.21 -43.13,-8.28 C-43.01,-11.47 -40.39,-14.01 -37.18,-14.01c "
+ android:valueTo="M-37.16 -22.64 C-33.94,-22.64 -31.32,-20.08 -31.2,-16.89 C-31.2,-16.82 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,17.41 -31.2,17.48 C-31.31,20.68 -33.94,23.24 -37.16,23.24 C-40.39,23.24 -43.01,20.68 -43.12,17.48 C-43.12,17.41 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-16.83 -43.12,-16.91 C-42.99,-20.09 -40.37,-22.64 -37.16,-22.64c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="483"
+ android:propertyName="pathData"
+ android:startOffset="1383"
+ android:valueFrom="M-37.16 -22.64 C-33.94,-22.64 -31.32,-20.08 -31.2,-16.89 C-31.2,-16.82 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,17.41 -31.2,17.48 C-31.31,20.68 -33.94,23.24 -37.16,23.24 C-40.39,23.24 -43.01,20.68 -43.12,17.48 C-43.12,17.41 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-16.83 -43.12,-16.91 C-42.99,-20.09 -40.37,-22.64 -37.16,-22.64c "
+ android:valueTo="M-37.18 -14.01 C-33.96,-14.01 -31.33,-11.46 -31.22,-8.27 C-31.22,-8.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,8.54 -31.2,8.61 C-31.31,11.8 -33.94,14.36 -37.16,14.36 C-40.39,14.36 -43.01,11.8 -43.12,8.6 C-43.12,8.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.14,-8.21 -43.13,-8.28 C-43.01,-11.47 -40.39,-14.01 -37.18,-14.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.833,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="417"
+ android:propertyName="pathData"
+ android:startOffset="1867"
+ android:valueFrom="M-37.18 -14.01 C-33.96,-14.01 -31.33,-11.46 -31.22,-8.27 C-31.22,-8.2 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,8.54 -31.2,8.61 C-31.31,11.8 -33.94,14.36 -37.16,14.36 C-40.39,14.36 -43.01,11.8 -43.12,8.6 C-43.12,8.54 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.14,-8.21 -43.13,-8.28 C-43.01,-11.47 -40.39,-14.01 -37.18,-14.01c "
+ android:valueTo="M-37.16 -22.64 C-33.94,-22.64 -31.32,-20.08 -31.2,-16.89 C-31.2,-16.82 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,17.41 -31.2,17.48 C-31.31,20.68 -33.94,23.24 -37.16,23.24 C-40.39,23.24 -43.01,20.68 -43.12,17.48 C-43.12,17.41 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-16.83 -43.12,-16.91 C-42.99,-20.09 -40.37,-22.64 -37.16,-22.64c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="267"
+ android:propertyName="pathData"
+ android:startOffset="2283"
+ android:valueFrom="M-37.16 -22.64 C-33.94,-22.64 -31.32,-20.08 -31.2,-16.89 C-31.2,-16.82 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,17.41 -31.2,17.48 C-31.31,20.68 -33.94,23.24 -37.16,23.24 C-40.39,23.24 -43.01,20.68 -43.12,17.48 C-43.12,17.41 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-16.83 -43.12,-16.91 C-42.99,-20.09 -40.37,-22.64 -37.16,-22.64c "
+ android:valueTo="M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="time_group">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="2567"
+ android:propertyName="translateX"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+ <aapt:attr name="android:drawable">
+ <vector
+ android:width="168dp"
+ android:height="168dp"
+ android:viewportHeight="168"
+ android:viewportWidth="168">
+ <group android:name="_R_G">
+ <group
+ android:name="_R_G_L_4_G"
+ android:translateX="84.411"
+ android:translateY="83.911">
+ <path
+ android:name="_R_G_L_4_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="#ffffff"
+ android:fillType="nonZero"
+ android:pathData=" M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c " />
+ </group>
+ <group
+ android:name="_R_G_L_3_G"
+ android:translateX="121.161"
+ android:translateY="83.911">
+ <path
+ android:name="_R_G_L_3_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="#ffffff"
+ android:fillType="nonZero"
+ android:pathData=" M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c " />
+ </group>
+ <group
+ android:name="_R_G_L_2_G"
+ android:translateX="102.911"
+ android:translateY="83.911">
+ <path
+ android:name="_R_G_L_2_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="#ffffff"
+ android:fillType="nonZero"
+ android:pathData=" M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c " />
+ </group>
+ <group
+ android:name="_R_G_L_1_G"
+ android:translateX="139.661"
+ android:translateY="83.911">
+ <path
+ android:name="_R_G_L_1_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="#ffffff"
+ android:fillType="nonZero"
+ android:pathData=" M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c " />
+ </group>
+ <group
+ android:name="_R_G_L_0_G"
+ android:translateX="157.911"
+ android:translateY="83.911">
+ <path
+ android:name="_R_G_L_0_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="#ffffff"
+ android:fillType="nonZero"
+ android:pathData=" M-37.16 -5.87 C-33.94,-5.87 -31.32,-3.32 -31.2,-0.13 C-31.2,-0.06 -31.2,0.02 -31.2,0.09 C-31.2,0.16 -31.2,0.23 -31.2,0.29 C-31.31,3.49 -33.94,6.05 -37.16,6.05 C-40.39,6.05 -43.01,3.49 -43.12,0.29 C-43.12,0.23 -43.12,0.16 -43.12,0.09 C-43.12,0.01 -43.12,-0.07 -43.12,-0.15 C-42.99,-3.33 -40.37,-5.87 -37.16,-5.87c " />
+ </group>
+ </group>
+ <group android:name="time_group" />
+ </vector>
+ </aapt:attr>
+</animated-vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/auth_container_view.xml b/packages/SystemUI/res/layout/auth_container_view.xml
index 2a1ce1f..cc5a27d 100644
--- a/packages/SystemUI/res/layout/auth_container_view.xml
+++ b/packages/SystemUI/res/layout/auth_container_view.xml
@@ -28,9 +28,9 @@
<View
android:id="@+id/panel"
+ style="@style/AuthNonCredentialPanelStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?androidprv:attr/materialColorSurfaceContainer"
android:elevation="@dimen/biometric_dialog_elevation"/>
<ScrollView
diff --git a/packages/SystemUI/res/layout/screenshot_shelf.xml b/packages/SystemUI/res/layout/screenshot_shelf.xml
index f3f472b..84ab0f1 100644
--- a/packages/SystemUI/res/layout/screenshot_shelf.xml
+++ b/packages/SystemUI/res/layout/screenshot_shelf.xml
@@ -18,6 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:theme="@style/FloatingOverlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml
index 39a1f1f..ad56216 100644
--- a/packages/SystemUI/res/layout/volume_dialog.xml
+++ b/packages/SystemUI/res/layout/volume_dialog.xml
@@ -13,9 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:sysui="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/volume_dialog_container"
android:layout_width="wrap_content"
@@ -96,16 +94,18 @@
android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding"
android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
+
<com.android.keyguard.AlphaOptimizedImageButton
android:id="@+id/settings"
- android:src="@drawable/horizontal_ellipsis"
android:layout_width="@dimen/volume_dialog_tap_target_size"
android:layout_height="@dimen/volume_dialog_tap_target_size"
android:layout_gravity="center"
- android:contentDescription="@string/accessibility_volume_settings"
android:background="@drawable/ripple_drawable_20dp"
- android:tint="?androidprv:attr/colorAccent"
- android:soundEffectsEnabled="false" />
+ android:contentDescription="@string/accessibility_volume_settings"
+ android:scaleType="centerInside"
+ android:soundEffectsEnabled="false"
+ android:src="@drawable/horizontal_ellipsis"
+ android:tint="?androidprv:attr/colorAccent" />
</FrameLayout>
</LinearLayout>
diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml
index a737ec7..c25d8cb 100644
--- a/packages/SystemUI/res/values-af/strings.xml
+++ b/packages/SystemUI/res/values-af/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Watter deel van jou toestelervaring is geraak?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Kies soort kwessie"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Skermopname"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Werkverrigting"</item>
- <item msgid="1627504621139124393">"Gebruikerkoppelvlak"</item>
- <item msgid="8309220355268900335">"Battery"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Eenhandmodus"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Gehoortoestelle"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Gehoortoestelle"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Bind nuwe toestel saam"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Klik om nuwe toestel saam te bind"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Knoppie <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Oppyl"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Afpyl"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Linkspyl"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Regspyl"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Middel"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Spasie"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"gevou"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"oopgevou"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> batterykrag oor"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Koppel jou stilus aan ’n laaier"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Stilus se battery is amper pap"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Onlangs gebruik deur <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Word gebruik deur <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Onlangs gebruik deur <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Stelsel"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Verrigting van veelvuldige take"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Invoer"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Appkortpaaie"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Toeganklikheid"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Kortpadsleutels"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Soekkortpaaie"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Vou ikoon in"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Vou ikoon uit"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Sleutelbordlig"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Vlak %1$d van %2$d"</string>
diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml
index 0d15f6d..ed6a3e1 100644
--- a/packages/SystemUI/res/values-am/strings.xml
+++ b/packages/SystemUI/res/values-am/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"የትኛው የመሣሪያዎ ተሞክሮ ክፍል ተጎድቷል?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"የችግሩን አይነት ይምረጡ"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"የማያ መቅረጫ"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"አፈጻጸም"</item>
- <item msgid="1627504621139124393">"የተጠቃሚ በይነገፅ"</item>
- <item msgid="8309220355268900335">"ባትሪ"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"የአንድ እጅ ሁነታ"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"የመስሚያ መሣሪያዎች"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"የመስማት ችሎታ መሣሪያ"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"የቀጥታ ስርጭት መግለጫ ጽሁፍ"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"የመሣሪያ ካሜራ እና ማይክሮፎን እገዳ ይነሳ?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"አዝራር <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"መነሻ"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"ተመለስ"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"የላይ ቀስት"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"የታች ቀስት"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"የግራ ቀስት"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"የቀኝ ቀስት"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"መሃል"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"ክፍተት"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"አስገባ"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"የታጠፈ"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"የተዘረጋ"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ባትሪ ይቀራል"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ብሮስፌዎን ከኃይል መሙያ ጋር ያገናኙ"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"የብሮስፌ ባትሪ ዝቅተኛ ነው"</string>
<string name="video_camera" msgid="7654002575156149298">"የቪድዮ ካሜራ"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"በቅርብ ጊዜ በ<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ጥቅም ላይ ውሏል"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"በ<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ጥቅም ላይ እየዋለ ነው"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"በቅርብ ጊዜ በ<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ጥቅም ላይ ውሏል"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"ሥርዓት"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ብዙ ተግባራትን በተመሳሳይ ጊዜ ማከናወን"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ግብዓት"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"የመተግበሪያ አቋራጮች"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ተደራሽነት"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"የቁልፍ ሰሌዳ አቋራጮች"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"የፍለጋ አቋራጮች"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"መሰብሰቢያ አዶ"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"መዘርጊያ አዶ"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"የቁልፍ ሰሌዳ የጀርባ ብርሃን"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"ደረጃ %1$d ከ %2$d"</string>
diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml
index 7c998d3..1502765 100644
--- a/packages/SystemUI/res/values-ar/strings.xml
+++ b/packages/SystemUI/res/values-ar/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ما هو الجانب الذي تأثّر في تجربة استخدام الجهاز؟"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"اختيار نوع المشكلة"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"تسجيل الشاشة"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"الأداء"</item>
- <item msgid="1627504621139124393">"واجهة المستخدم"</item>
- <item msgid="8309220355268900335">"البطارية"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"الأداء"</string>
+ <string name="user_interface" msgid="3712869377953950887">"واجهة المستخدم"</string>
+ <string name="thermal" msgid="6758074791325414831">"الأداء الحراري"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"وضع \"التصفح بيد واحدة\""</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"سماعات الأذن الطبية"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"سماعات الأذن الطبية"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"إقران جهاز جديد"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"انقر لإقران جهاز جديد"</string>
@@ -615,7 +617,7 @@
<string name="volume_stream_content_description_mute" msgid="4079046784917920984">"%1$s. انقر للتجاهل. قد يتم تجاهل خدمات \"سهولة الاستخدام\"."</string>
<string name="volume_stream_content_description_vibrate_a11y" msgid="2742330052979397471">"%1$s. انقر للتعيين على الاهتزاز."</string>
<string name="volume_stream_content_description_mute_a11y" msgid="5743548478357238156">"%1$s. انقر لكتم الصوت."</string>
- <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"التحكُّم في مستوى الضجيج"</string>
+ <string name="volume_panel_noise_control_title" msgid="7413949943872304474">"التحكُّم في مستوى الضوضاء"</string>
<string name="volume_panel_spatial_audio_title" msgid="3367048857932040660">"الصوت المكاني"</string>
<string name="volume_panel_spatial_audio_off" msgid="4177490084606772989">"غير مفعّل"</string>
<string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"تفعيل"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"الزر <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"سهم متّجه للأعلى"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"سهم متّجه للأسفل"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"سهم متّجه لليسار"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"سهم متّجه لليمين"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"وسط"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"مسافة"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"مطوي"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"غير مطوي"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"النسبة المئوية المتبقية من شحن البطارية: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"مستوى شحن بطارية قلم الشاشة: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"عليك توصيل قلم الشاشة بشاحن."</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"بطارية قلم الشاشة منخفضة"</string>
<string name="video_camera" msgid="7654002575156149298">"كاميرا فيديو"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"تم الاستخدام مؤخرًا في <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"قيد الاستخدام في <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"تم الاستخدام مؤخرًا في <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"النظام"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"تعدُّد المهام"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"الإدخال"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"اختصارات التطبيقات"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"تسهيل الاستخدام"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"اختصارات لوحة المفاتيح"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"اختصارات طلبات البحث"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"رمز التصغير"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"رمز التوسيع"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"الإضاءة الخلفية للوحة المفاتيح"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"مستوى الإضاءة: %1$d من %2$d"</string>
diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml
index a6ec1a0..00d673e 100644
--- a/packages/SystemUI/res/values-as/strings.xml
+++ b/packages/SystemUI/res/values-as/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"আপোনাৰ ডিভাইচৰ অভিজ্ঞতাৰ কোনটো অংশ প্ৰভাৱিত হৈছিল?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"সমস্যাৰ প্ৰকাৰ বাছনি কৰক"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"স্ক্ৰীন ৰেকৰ্ড"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"কাৰ্যদক্ষতা"</item>
- <item msgid="1627504621139124393">"ব্যৱহাৰকাৰীৰ ইণ্টাৰফে’চ"</item>
- <item msgid="8309220355268900335">"বেটাৰী"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"পাৰদৰ্শিতা"</string>
+ <string name="user_interface" msgid="3712869377953950887">"ব্যৱহাৰকাৰীৰ ইণ্টাৰফে’চ"</string>
+ <string name="thermal" msgid="6758074791325414831">"থাৰ্মেল"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"এখন হাতেৰে ব্যৱহাৰ কৰা ম’ড"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"শুনাৰ ডিভাইচ"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"শুনাৰ ডিভাইচ"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"নতুন ডিভাইচ পেয়াৰ কৰক"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"নতুন ডিভাইচ পেয়াৰ কৰিবলৈ ক্লিক কৰক"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> বুটাম"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"হ\'ম"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"উভতি যাওক"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ওপৰলৈ নিৰ্দেশ কৰা কাঁড় চিহ্ন"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"তললৈ নিৰ্দেশ কৰা কাঁড় চিহ্ন"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"বাওঁফাললৈ নিৰ্দেশ কৰা কাঁড় চিহ্ন"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"সোঁফাললৈ নিৰ্দেশ কৰা কাঁড় চিহ্ন"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"স্ক্ৰীনৰ মাজত"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"স্পেচ"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"এণ্টাৰ"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ফ’ল্ড কৰা"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"আনফ’ল্ড কৰা"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> বেটাৰী বাকী আছে"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"ষ্টাইলাছৰ বেটাৰী <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"আপোনাৰ ষ্টাইলাছ এটা চাৰ্জাৰৰ সৈতে সংযোগ কৰক"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"ষ্টাইলাছৰ বেটাৰী কম আছে"</string>
<string name="video_camera" msgid="7654002575156149298">"ভিডিঅ’ কেমেৰা"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"শেহতীয়াকৈ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)এ ব্যৱহাৰ কৰিছে"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)এ ব্যৱহাৰ কৰি আছে"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"শেহতীয়াকৈ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)এ ব্যৱহাৰ কৰিছে"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"ছিষ্টেম"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"মাল্টিটাস্কিং"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ইনপুট"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"এপ্ শ্বৰ্টকাটসমূহ"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"সাধ্য সুবিধা"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"কীব’ৰ্ডৰ শ্বৰ্টকাট"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"সন্ধানৰ শ্বৰ্টকাট"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"সংকোচন কৰাৰ চিহ্ন"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"বিস্তাৰ কৰাৰ চিহ্ন"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"কীব’ৰ্ডৰ বেকলাইট"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$dৰ %1$d স্তৰ"</string>
diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml
index da20087..b3c0058 100644
--- a/packages/SystemUI/res/values-az/strings.xml
+++ b/packages/SystemUI/res/values-az/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Cihaz istifadəsinə necə təsir etdi?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Problem növü seçin"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Ekran qeydəalma"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performans"</item>
- <item msgid="1627504621139124393">"İstifadəçi interfeysi"</item>
- <item msgid="8309220355268900335">"Batareya"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Birəlli rejim"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Eşitmə cihazları"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Eşitmə cihazları"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Yeni cihaz birləşdirin"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Yeni cihaz birləşdirmək üçün klikləyin"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Hazır ayar güncəllənmədi"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Hazır Ayar"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Avtomatik subtitrlər"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Cihaz kamerası və mikrofonu blokdan çıxarılsın?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Düymə <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Əsas səhifə"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Geri"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Yuxarı ox"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Aşağı ox"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Sol ox"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Sağ ox"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Mərkəz"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Boşluq"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Daxil olun"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"qatlanmış"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"açıq"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> enerji qalıb"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Qələmi adapterə qoşun"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Qələm enerjisi azdır"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Bu yaxınlarda <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) istifadə edib"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) istifadə edir"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Bu yaxınlarda <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) istifadə edib"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistem"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Çoxsaylı tapşırıq icrası"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Daxiletmə"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Tətbiq qısayolları"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Xüsusi imkanlar"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Klaviatura qısayolları"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Axtarış qısayolları"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"İkonanı yığcamlaşdırın"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"İkonanı genişləndirin"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Klaviatura işığı"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Səviyyə %1$d/%2$d"</string>
diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
index fafe718..22afb40 100644
--- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml
+++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Na koji deo doživljaja na uređaju je ovo uticalo?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Izaberite tip problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Snimanje ekrana"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Učinak"</item>
- <item msgid="1627504621139124393">"Korisnički interfejs"</item>
- <item msgid="8309220355268900335">"Baterija"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Performanse"</string>
+ <string name="user_interface" msgid="3712869377953950887">"Korisnički interfejs"</string>
+ <string name="thermal" msgid="6758074791325414831">"Termalna kamera"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Režim jednom rukom"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Slušni aparati"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Slušni aparati"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Upari novi uređaj"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Kliknite da biste uparili nov uređaj"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Dugme <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Taster Početna"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Taster Nazad"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Strelica nagore"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Strelica nadole"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Strelica nalevo"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Strelica nadesno"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Taster sa centralnom strelicom"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Razmak"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"zatvoreno"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"otvoreno"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Preostalo je još<xliff:g id="PERCENTAGE">%s</xliff:g> baterije"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Baterija pisaljke je na <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Povežite pisaljku sa punjačem"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Nizak nivo baterije pisaljke"</string>
<string name="video_camera" msgid="7654002575156149298">"Video kamera"</string>
@@ -1327,6 +1324,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prečice pretrage"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona za skupljanje"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona za proširivanje"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Pozadinsko osvetljenje tastature"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%1$d. nivo od %2$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"Kontrole za dom"</string>
diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml
index 1455a9c..4fe7c5a 100644
--- a/packages/SystemUI/res/values-be/strings.xml
+++ b/packages/SystemUI/res/values-be/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"З чым была звязана праблема, якая вам сустрэлася?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Выберыце тып праблемы"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Запіс экрана"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Прадукцыйнасць"</item>
- <item msgid="1627504621139124393">"Карыстальніцкі інтэрфейс"</item>
- <item msgid="8309220355268900335">"Акумулятар"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Рэжым кіравання адной рукой"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Слыхавыя апараты"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Слыхавыя апараты"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Спалучыць новую прыладу"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Націсніце, каб спалучыць новую прыладу"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Кнопка <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Назад"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Стрэлка ўверх"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Стрэлка ўніз"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Стрэлка ўлева"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Стрэлка ўправа"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Цэнтр"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Прабел"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"складзена"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"раскладзена"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Засталося зараду: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Падключыце пяро да зараднай прылады"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Нізкі ўзровень зараду пяра"</string>
<string name="video_camera" msgid="7654002575156149298">"Відэакамера"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Нядаўна выкарыстоўваўся праграмай \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Зараз выкарыстоўваецца праграмай \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Нядаўна выкарыстоўваўся праграмай \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Сістэма"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Шматзадачнасць"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Увод"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Ярлыкі праграм"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Спецыяльныя магчымасці"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Спалучэнні клавіш"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Пошук спалучэнняў клавіш"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Значок \"Згарнуць\""</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Значок \"Разгарнуць\""</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Падсветка клавіятуры"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Узровень %1$d з %2$d"</string>
diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml
index a59ca852..2cd65db 100644
--- a/packages/SystemUI/res/values-bg/strings.xml
+++ b/packages/SystemUI/res/values-bg/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"С какво имахте проблем?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Изберете тип проблем"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Запис на екрана"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Ефективност"</item>
- <item msgid="1627504621139124393">"Потребителски интерфейс"</item>
- <item msgid="8309220355268900335">"Батерия"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Режим за работа с една ръка"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Слухови апарати"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Слухови апарати"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Сдвояване на ново устройство"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Кликнете за сдвояване на ново устройство"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Бутон „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Начало"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Назад"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Стрелка за нагоре"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Стрелка за надолу"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Стрелка за наляво"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Стрелка за надясно"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Център"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Интервал"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"затворено"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"отворено"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Оставаща батерия: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Свържете писалката към зарядно устройство"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Батерията на писалката е изтощена"</string>
<string name="video_camera" msgid="7654002575156149298">"Видеокамера"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Наскоро използвано от <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Използва се от <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Наскоро използвано от <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Системни"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Изпълняване на няколко задачи едновременно"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Въвеждане"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Преки пътища към приложения"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Достъпност"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Клавишни комбинации"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Търсете клавишни комбинации"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Икона за свиване"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Икона за разгъване"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Подсветка на клавиатурата"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Ниво %1$d от %2$d"</string>
diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml
index 72e9d51..f8e350a 100644
--- a/packages/SystemUI/res/values-bn/strings.xml
+++ b/packages/SystemUI/res/values-bn/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ডিভাইস ব্যবহার করার সময় কোথায় অসুবিধা হয়েছিল?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"সমস্যার প্রকার বেছে নিন"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"স্ক্রিন রেকর্ড"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"পারফর্ম্যান্স"</item>
- <item msgid="1627504621139124393">"ইউজার ইন্টারফেস"</item>
- <item msgid="8309220355268900335">"ব্যাটারি"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"এক হাতে ব্যবহার করার মোড"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"হিয়ারিং ডিভাইস"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"হিয়ারিং ডিভাইস"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"লাইভ ক্যাপশন"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"ডিভাইসের ক্যামেরা এবং মাইক্রোফোন আনব্লক করতে চান?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> বোতাম"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"হোম"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"ফিরুন"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ঊর্ধমুখী তীরচিহ্ন"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"নিম্নমুখী তীরচিহ্ন"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"বাঁদিকের তীরচিহ্ন"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"ডানদিকের তীরচিহ্ন"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"কেন্দ্র"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"এন্টার"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ফোল্ড করা রয়েছে"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"ফোল্ড করা নেই"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ব্যাটারির চার্জ বাকি আছে"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"কোনও চার্জারের সাথে আপনার স্টাইলাস কানেক্ট করুন"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"স্টাইলাস ব্যাটারিতে চার্জ কম আছে"</string>
<string name="video_camera" msgid="7654002575156149298">"ভিডিও ক্যামেরা"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"সম্প্রতি <xliff:g id="APP_NAME">%1$s</xliff:g> অ্যাপে (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ব্যবহার করা হয়েছে"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> অ্যাপে (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ব্যবহার করা হচ্ছে"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"সম্প্রতি <xliff:g id="APP_NAME">%1$s</xliff:g> অ্যাপে (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ব্যবহার করা হয়েছে"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"সিস্টেম"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"মাল্টিটাস্কিং"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ইনপুট"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"অ্যাপ শর্টকাট"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"অ্যাক্সেসিবিলিটি"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"কীবোর্ড শর্টকাট"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"সার্চ শর্টকাট"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"আইকন আড়াল করুন"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"আইকন বড় করুন"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"কীবোর্ড ব্যাকলাইট"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d-এর মধ্যে %1$d লেভেল"</string>
diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml
index 93c8995..60c936e 100644
--- a/packages/SystemUI/res/values-bs/strings.xml
+++ b/packages/SystemUI/res/values-bs/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Koji dio uređaja je imao problem?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Odaberite vrstu problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Snimanje ekrana"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performanse"</item>
- <item msgid="1627504621139124393">"Korisnički interfejs"</item>
- <item msgid="8309220355268900335">"Baterija"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Način rada jednom rukom"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Slušni aparati"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Slušni aparati"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Uparite novi uređaj"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Kliknite da uparite novi uređaj"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Ažuriranje zadane postavke nije uspjelo"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Zadana postavka"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Automatski titlovi"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Deblokirati kameru i mikrofon uređaja?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Dugme <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Tipka za početak"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Nazad"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Strelica nagore"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Strelica nadolje"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Strelica ulijevo"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Strelica udesno"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Sredina"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Tipka za razmak"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Tipka za novi red"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"sklopljeno"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"otklopljeno"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Preostalo baterije: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Priključite pisaljku na punjač"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Baterija pisaljke je slaba"</string>
<string name="video_camera" msgid="7654002575156149298">"Video kamera"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Nedavno je koristila aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Koristi aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Nedavno je koristila aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistem"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Unos"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Prečice aplikacije"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Pristupačnost"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Prečice tastature"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prečica pretraživanja"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona sužavanja"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona proširivanja"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Pozadinsko osvjetljenje tastature"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%1$d. nivo od %2$d"</string>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index 8ad4b92..a82d6f1 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"L\'experiència amb el dispositiu s\'ha vist afectada?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Selecciona el tipus de problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Gravació de pantalla"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Rendiment"</item>
- <item msgid="1627504621139124393">"Interfície d\'usuari"</item>
- <item msgid="8309220355268900335">"Bateria"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Mode d\'una mà"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Audiòfons"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Audiòfons"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Vincula un dispositiu nou"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Fes clic per vincular un dispositiu nou"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"No s\'ha pogut actualitzar el valor predefinit"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Valors predefinits"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Subtítols instantanis"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vols desbloquejar la càmera i el micròfon del dispositiu?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Botó <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Inici"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Enrere"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Fletxa amunt"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Fletxa avall"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Fletxa esquerra"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Fletxa dreta"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centre"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Espai"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Retorn"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"plegat"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"desplegat"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Queda un <xliff:g id="PERCENTAGE">%s</xliff:g> de bateria"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connecta el llapis òptic a un carregador"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Bateria del llapis òptic baixa"</string>
<string name="video_camera" msgid="7654002575156149298">"Càmera de vídeo"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Utilitzat recentment per <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"En ús per <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Utilitzat recentment per <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistema"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasca"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Dreceres d\'aplicacions"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibilitat"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tecles de drecera"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Dreceres de cerca"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Replega la icona"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Desplega la icona"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Retroil·luminació del teclat"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nivell %1$d de %2$d"</string>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index 1474458..9b540ff 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Co v zařízení bylo ovlivněno?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Vyberte druh problém"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Záznam obrazovky"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Výkon"</item>
- <item msgid="1627504621139124393">"Uživatelské rozhraní"</item>
- <item msgid="8309220355268900335">"Baterie"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Režim jedné ruky"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Naslouchátka"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Naslouchátka"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Spárovat nové zařízení"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Kliknutím spárujete nové zařízení"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Tlačítko <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Zpět"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Šipka nahoru"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Šipka dolů"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Šipka vlevo"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Šipka doprava"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Střed"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"TAB"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Mezerník"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"složené"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"rozložené"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Zbývá <xliff:g id="PERCENTAGE">%s</xliff:g> baterie"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Připojte dotykové pero k nabíječce"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Slabá baterie dotykového pera"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Nedávno použila aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Právě používán aplikací <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Nedávno použila aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Systém"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Vstup"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Zkratky aplikací"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Přístupnost"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Klávesové zkratky"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Vyhledat zkratky"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona sbalení"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona rozbalení"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Podsvícení klávesnice"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Úroveň %1$d z %2$d"</string>
diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml
index d10d3e0..57353f7 100644
--- a/packages/SystemUI/res/values-da/strings.xml
+++ b/packages/SystemUI/res/values-da/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Hvilken del af din enhedsoplevelse blev påvirket?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Vælg problemtype"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Skærmoptagelse"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Ydeevne"</item>
- <item msgid="1627504621139124393">"Brugerflade"</item>
- <item msgid="8309220355268900335">"Batteri"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Enhåndstilstand"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Høreapparater"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Høreapparater"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Par ny enhed"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Klik for at parre en ny enhed"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Forindstillingen kunne ikke opdateres"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Forindstilling"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Livetekstning"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vil du fjerne blokeringen af enhedens kamera og mikrofon?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g>-knap"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Tilbage"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Pil op"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Pil ned"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Venstrepil"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Højrepil"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Midtertast"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Mellemrumstast"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"foldet"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"foldet ud"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> batteri tilbage"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Slut din styluspen til en oplader"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Lavt batteriniveau på styluspen"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Brugt for nylig af <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Bruges af <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Brugt for nylig af <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"System"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Appgenveje"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Hjælpefunktioner"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tastaturgenveje"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Genveje til søgning"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikon for Skjul"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikon for Udvid"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Tastaturets baggrundslys"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Niveau %1$d af %2$d"</string>
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index 20707ac..e7fa9b1 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Welche Bereiche des Geräts waren betroffen?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Art des Problems auswählen"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Bildschirmaufnahme"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Leistung"</item>
- <item msgid="1627504621139124393">"Benutzeroberfläche"</item>
- <item msgid="8309220355268900335">"Akku"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Einhandmodus"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Hörgeräte"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Hörgeräte"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Neues Gerät koppeln"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Klicken, um neues Gerät zu koppeln"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Voreinstellung konnte nicht aktualisiert werden"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Voreinstellung"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Automatische Untertitel"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Blockierung von Gerätekamera und Gerätemikrofon aufheben?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Taste <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Pos1"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Zurück"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Aufwärtspfeil"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Abwärtspfeil"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Linkspfeil"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Rechtspfeil"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Zentrieren"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tabulatortaste"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Leertaste"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Eingabetaste"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"zugeklappt"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"aufgeklappt"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Akku bei <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Schließe deinen Eingabestift an ein Ladegerät an"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Stylus-Akkustand niedrig"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Kürzlich von <xliff:g id="APP_NAME">%1$s</xliff:g> verwendet (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Verwendet von <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Kürzlich von <xliff:g id="APP_NAME">%1$s</xliff:g> verwendet (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"System"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Eingabe"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-Verknüpfungen"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Bedienungshilfen"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tastenkürzel"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Tastenkürzel suchen"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Symbol „Minimieren“"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Symbol „Maximieren“"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Tastaturbeleuchtung"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Level %1$d von %2$d"</string>
diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml
index 403ca4d..23d704d 100644
--- a/packages/SystemUI/res/values-el/strings.xml
+++ b/packages/SystemUI/res/values-el/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Ποιο κομμάτι της εμπειρίας συσκευής επηρεάστηκε;"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Επιλογή τύπου προβλήματος"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Εγγραφή οθόνης"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Απόδοση"</item>
- <item msgid="1627504621139124393">"Διεπαφή χρήστη"</item>
- <item msgid="8309220355268900335">"Μπαταρία"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Λειτουργία ενός χεριού"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Συσκευές ακοής"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Συσκευές ακοής"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Ζωντανοί υπότιτλοι"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Κατάργηση αποκλεισμού κάμερας και μικροφώνου συσκευής;"</string>
@@ -620,7 +624,7 @@
<string name="volume_panel_spatial_audio_title" msgid="3367048857932040660">"Χωρικός ήχος"</string>
<string name="volume_panel_spatial_audio_off" msgid="4177490084606772989">"Ανενεργός"</string>
<string name="volume_panel_spatial_audio_fixed" msgid="3136080137827746046">"Σταθερός"</string>
- <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Παρακ. κίνησ. κεφαλ."</string>
+ <string name="volume_panel_spatial_audio_tracking" msgid="5711115234001762974">"Παρακ. κίνησ. κεφαλής"</string>
<string name="volume_ringer_change" msgid="3574969197796055532">"Πατήστε για να αλλάξετε τη λειτουργία ειδοποίησης ήχου"</string>
<string name="volume_ringer_hint_mute" msgid="4263821214125126614">"σίγαση"</string>
<string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"κατάργηση σίγασης"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Κουμπί <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Πίσω"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Επάνω βέλος"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Κάτω βέλος"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Αριστερό βέλος"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Δεξί βέλος"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Κέντρο"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Πλήκτρο διαστήματος"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"διπλωμένη"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"ξεδιπλωμένη"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Απομένει το <xliff:g id="PERCENTAGE">%s</xliff:g> της μπαταρίας"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Συνδέστε τη γραφίδα σε έναν φορτιστή"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Χαμηλή στάθμη μπαταρίας γραφίδας"</string>
<string name="video_camera" msgid="7654002575156149298">"Βιντεοκάμερα"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Χρησιμοποιήθηκε πρόσφατα από την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Χρησιμοποιείται από την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Χρησιμοποιήθηκε πρόσφατα από την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Σύστημα"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Πολυδιεργασία"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Είσοδος"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Συντομεύσεις εφαρμογών"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Προσβασιμότητα"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Συντομεύσεις πληκτρολογίου"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Συντομεύσεις αναζήτησης"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Εικονίδιο σύμπτυξης"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Εικονίδιο ανάπτυξης"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Οπίσθιος φωτισμός πληκτρολογίου"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Επίπεδο %1$d από %2$d"</string>
diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml
index 83dffc8..d71ff1c 100644
--- a/packages/SystemUI/res/values-en-rAU/strings.xml
+++ b/packages/SystemUI/res/values-en-rAU/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"What part of your device experience was affected?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Select issue type"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Screen record"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performance"</item>
- <item msgid="1627504621139124393">"User interface"</item>
- <item msgid="8309220355268900335">"Battery"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Performance"</string>
+ <string name="user_interface" msgid="3712869377953950887">"User interface"</string>
+ <string name="thermal" msgid="6758074791325414831">"Thermal"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"One-handed mode"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Hearing devices"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Hearing devices"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Pair new device"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Click to pair new device"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Button <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Up arrow"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Down arrow"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Left arrow"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Right arrow"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centre"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"folded"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"unfolded"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> battery remaining"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Stylus battery <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connect your stylus to a charger"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Stylus battery low"</string>
<string name="video_camera" msgid="7654002575156149298">"Video camera"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Recently used by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"In use by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Recently used by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"System"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App shortcuts"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibility"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Keyboard backlight"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Level %1$d of %2$d"</string>
diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml
index b1cdcb1..44e9d25 100644
--- a/packages/SystemUI/res/values-en-rCA/strings.xml
+++ b/packages/SystemUI/res/values-en-rCA/strings.xml
@@ -361,13 +361,13 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"What part of your device experience was affected?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Select issue type"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Screen record"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performance"</item>
- <item msgid="1627504621139124393">"User Interface"</item>
- <item msgid="8309220355268900335">"Battery"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Performance"</string>
+ <string name="user_interface" msgid="3712869377953950887">"User Interface"</string>
+ <string name="thermal" msgid="6758074791325414831">"Thermal"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"One-handed mode"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Hearing devices"</string>
+ <string name="quick_settings_hearing_devices_connected" msgid="6519069502397037781">"Active"</string>
+ <string name="quick_settings_hearing_devices_disconnected" msgid="8907061223998176187">"Disconnected"</string>
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Hearing devices"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Pair new device"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Click to pair new device"</string>
@@ -727,11 +727,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Button <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Up arrow"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Down arrow"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Left arrow"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Right arrow"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Center"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1270,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"folded"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"unfolded"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> battery remaining"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Stylus battery <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connect your stylus to a charger"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Stylus battery low"</string>
<string name="video_camera" msgid="7654002575156149298">"Video camera"</string>
@@ -1327,6 +1322,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Keyboard backlight"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Level %1$d of %2$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"Home Controls"</string>
diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml
index 83dffc8..d71ff1c 100644
--- a/packages/SystemUI/res/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"What part of your device experience was affected?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Select issue type"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Screen record"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performance"</item>
- <item msgid="1627504621139124393">"User interface"</item>
- <item msgid="8309220355268900335">"Battery"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Performance"</string>
+ <string name="user_interface" msgid="3712869377953950887">"User interface"</string>
+ <string name="thermal" msgid="6758074791325414831">"Thermal"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"One-handed mode"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Hearing devices"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Hearing devices"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Pair new device"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Click to pair new device"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Button <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Up arrow"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Down arrow"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Left arrow"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Right arrow"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centre"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"folded"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"unfolded"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> battery remaining"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Stylus battery <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connect your stylus to a charger"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Stylus battery low"</string>
<string name="video_camera" msgid="7654002575156149298">"Video camera"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Recently used by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"In use by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Recently used by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"System"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App shortcuts"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibility"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Keyboard backlight"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Level %1$d of %2$d"</string>
diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml
index 83dffc8..d71ff1c 100644
--- a/packages/SystemUI/res/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"What part of your device experience was affected?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Select issue type"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Screen record"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performance"</item>
- <item msgid="1627504621139124393">"User interface"</item>
- <item msgid="8309220355268900335">"Battery"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Performance"</string>
+ <string name="user_interface" msgid="3712869377953950887">"User interface"</string>
+ <string name="thermal" msgid="6758074791325414831">"Thermal"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"One-handed mode"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Hearing devices"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Hearing devices"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Pair new device"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Click to pair new device"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Button <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Up arrow"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Down arrow"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Left arrow"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Right arrow"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centre"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"folded"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"unfolded"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> battery remaining"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Stylus battery <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connect your stylus to a charger"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Stylus battery low"</string>
<string name="video_camera" msgid="7654002575156149298">"Video camera"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Recently used by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"In use by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Recently used by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"System"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App shortcuts"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibility"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Keyboard backlight"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Level %1$d of %2$d"</string>
diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml
index bfaccd0..c2f7098 100644
--- a/packages/SystemUI/res/values-en-rXC/strings.xml
+++ b/packages/SystemUI/res/values-en-rXC/strings.xml
@@ -361,13 +361,13 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"What part of your device experience was affected?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Select issue type"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Screen record"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performance"</item>
- <item msgid="1627504621139124393">"User Interface"</item>
- <item msgid="8309220355268900335">"Battery"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Performance"</string>
+ <string name="user_interface" msgid="3712869377953950887">"User Interface"</string>
+ <string name="thermal" msgid="6758074791325414831">"Thermal"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"One-handed mode"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Hearing devices"</string>
+ <string name="quick_settings_hearing_devices_connected" msgid="6519069502397037781">"Active"</string>
+ <string name="quick_settings_hearing_devices_disconnected" msgid="8907061223998176187">"Disconnected"</string>
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Hearing devices"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Pair new device"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Click to pair new device"</string>
@@ -727,11 +727,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Button <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Up arrow"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Down arrow"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Left arrow"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Right arrow"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Center"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1270,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"folded"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"unfolded"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> battery remaining"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Stylus battery <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connect your stylus to a charger"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Stylus battery low"</string>
<string name="video_camera" msgid="7654002575156149298">"Video camera"</string>
@@ -1327,6 +1322,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Keyboard backlight"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Level %1$d of %2$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"Home Controls"</string>
diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml
index 01d2130..fd800ad 100644
--- a/packages/SystemUI/res/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"¿Qué parte de tu exp. del disp. se vio afectada?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Seleccionar tipo de problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Grabadora de pant."</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Rendimiento"</item>
- <item msgid="1627504621139124393">"Interfaz de usuario"</item>
- <item msgid="8309220355268900335">"Batería"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo una mano"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Dispositivos auditivos"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Dispositivos auditivos"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Vincular dispositivo nuevo"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Haz clic para vincular un dispositivo nuevo"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Botón <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Inicio"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Atrás"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Flecha hacia arriba"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Flecha hacia abajo"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Flecha a la izquierda"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Flecha a la derecha"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centro"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Espacio"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Intro"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"plegado"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"desplegado"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> de batería restante"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecta tu pluma stylus a un cargador"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"La pluma stylus tiene poca batería"</string>
<string name="video_camera" msgid="7654002575156149298">"Videocámara"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Uso reciente en <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"En uso por <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Uso reciente en <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistema"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Tareas múltiples"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Accesos directos a aplicaciones"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accesibilidad"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Combinaciones de teclas"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Buscar combinaciones de teclas"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícono de contraer"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícono de expandir"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Retroiluminación del teclado"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nivel %1$d de %2$d"</string>
diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml
index 7fd07f0..5bcf582 100644
--- a/packages/SystemUI/res/values-es/strings.xml
+++ b/packages/SystemUI/res/values-es/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"¿Qué parte de tu experiencia se ha visto afectada?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Selecciona el tipo de problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Grabar pantalla"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Rendimiento"</item>
- <item msgid="1627504621139124393">"Interfaz de usuario"</item>
- <item msgid="8309220355268900335">"Batería"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo Una mano"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Audífonos"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Audífonos"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Emparejar nuevo dispositivo"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Haz clic para emparejar un nuevo dispositivo"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"No se ha podido actualizar el preajuste"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Preajuste"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Subtítulos automáticos"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"¿Desbloquear la cámara y el micrófono del dispositivo?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Botón <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Inicio"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Atrás"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Flecha hacia arriba"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Flecha hacia abajo"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Flecha izquierda"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Flecha derecha"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centro"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tabulador"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Espacio"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Intro"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"plegado"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"desplegado"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Batería restante: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecta tu lápiz óptico a un cargador"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Batería del lápiz óptico baja"</string>
<string name="video_camera" msgid="7654002575156149298">"Videocámara"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Usado recientemente por <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"En uso por <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Usado recientemente por <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistema"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitarea"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Accesos directos a aplicaciones"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accesibilidad"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Combinaciones de teclas"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atajos de búsqueda"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icono de contraer"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icono de desplegar"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Retroiluminación del teclado"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nivel %1$d de %2$d"</string>
diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml
index 29f0799..e7d5e2f 100644
--- a/packages/SystemUI/res/values-et/strings.xml
+++ b/packages/SystemUI/res/values-et/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Millist seadme kasutuskogemuse osa see mõjutas?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Valige probleemi tüüp"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Ekraanisalvestus"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Toimivus"</item>
- <item msgid="1627504621139124393">"Kasutajaliides"</item>
- <item msgid="8309220355268900335">"Aku"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Ühekäerežiim"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Kuuldeseadmed"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Kuuldeseadmed"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Uue seadme sidumine"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Uue seadme sidumiseks klõpsake"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Nupp <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Avakuva"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Tagasi"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Ülesnool"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Allanool"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Vasaknool"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Paremnool"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Keskele"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Tühik"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Sisestusklahv"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"kokku volditud"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"lahti volditud"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Akutase on <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Ühendage elektronpliiats laadijaga"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Elektronpliiatsi akutase on madal"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokaamera"</string>
@@ -1327,6 +1328,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Otsingu otseteed"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ahendamisikoon"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Laiendamisikoon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Klaviatuuri taustavalgustus"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Tase %1$d/%2$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"Kodu juhtelemendid"</string>
diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml
index 5d0d778..5e4c5ac 100644
--- a/packages/SystemUI/res/values-eu/strings.xml
+++ b/packages/SystemUI/res/values-eu/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Gailuaren erabileraren zer alderdiri eragin dio?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Hautatu arazo mota"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Pantaila-grabaketa"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Errendimendua"</item>
- <item msgid="1627504621139124393">"Erabiltzaile-interfazea"</item>
- <item msgid="8309220355268900335">"Bateria"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Esku bakarreko modua"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Entzumen-gailuak"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Entzumen-gailuak"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Parekatu beste gailu bat"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Egin klik beste gailu bat parekatzeko"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Ezin izan da eguneratu aurrezarpena"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Aurrezarpena"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Istanteko azpitituluak"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Gailuaren kamera eta mikrofonoa desblokeatu nahi dituzu?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> botoia"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Hasiera"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Atzera"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Gora egiteko gezi-tekla"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Behera egiteko gezi-tekla"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Ezkerrera egiteko gezi-tekla"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Eskuinera egiteko gezi-tekla"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Erdiratu"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Zuriunea"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Sartu"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"tolestuta"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"tolestu gabe"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Bateriaren <xliff:g id="PERCENTAGE">%s</xliff:g> geratzen da"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Konektatu arkatza kargagailu batera"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Arkatzak bateria gutxi du"</string>
<string name="video_camera" msgid="7654002575156149298">"Bideokamera"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) aplikazioak erabili du duela gutxi"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak darabil (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) aplikazioak erabili du duela gutxi"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistema"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Zeregin bat baino gehiago aldi berean exekutatzea"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Sarrera"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Aplikazioetarako lasterbideak"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Erabilerraztasuna"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Lasterbideak"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Bilatu lasterbideak"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Tolesteko ikonoa"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Zabaltzeko ikonoa"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Teklatuaren hondoko argia"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%1$d/%2$d maila"</string>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index f856a7e..ad24c1b 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -361,19 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"کدام بخش تجربه استفاده از دستگاه تحتتأثیر قرار گرفت؟"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"انتخاب نوع مشکل"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"ضبط صفحهنمایش"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"عملکرد"</item>
- <item msgid="1627504621139124393">"واسط کاربر"</item>
- <item msgid="8309220355268900335">"باتری"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"حالت یکدستی"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"سمعک"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"سمعک"</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>
- <string name="live_caption_title" msgid="8916875614623730005">"زیرنویس ناشنوایان زنده"</string>
+ <string name="live_caption_title" msgid="8916875614623730005">"زیرنویس زنده"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"دوربین و میکروفون دستگاه لغو انسداد شود؟"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"دکمه <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"ابتدا"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"برگشت"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"پیکان رو بهبالا"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"پیکان روبهپایین"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"پیکان چپ"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"پیکان راست"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"مرکز"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"تاشده"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"تانشده"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> باتری باقی مانده است"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"قلم را به شارژر وصل کنید"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"باتری قلم ضعیف است"</string>
<string name="video_camera" msgid="7654002575156149298">"دوربین ویدیویی"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"اخیراً <xliff:g id="APP_NAME">%1$s</xliff:g> از آن استفاده کرده است (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> از آن استفاده میکند (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"اخیراً <xliff:g id="APP_NAME">%1$s</xliff:g> از آن استفاده کرده است (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"سیستم"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"چندوظیفگی"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ورودی"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"میانبرهای برنامه"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"دسترسپذیری"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"میانبرهای صفحهکلید"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"جستجوی میانبرها"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"نماد جمع کردن"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"نماد ازهم بازکردن"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"نور پسزمینه صفحهکلید"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"سطح %1$d از %2$d"</string>
diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml
index 459bec9..0fed3d5 100644
--- a/packages/SystemUI/res/values-fi/strings.xml
+++ b/packages/SystemUI/res/values-fi/strings.xml
@@ -201,7 +201,7 @@
<string name="fingerprint_reenroll_failure_dialog_content" msgid="4733768492747300666">"Sormenjälkiavauksen määritys epäonnistui. Siirry asetuksiin ja yritä uudelleen."</string>
<string name="face_re_enroll_notification_title" msgid="1850838867718410520">"Ota kasvojentunnistusavaus uudelleen käyttöön"</string>
<string name="face_re_enroll_notification_name" msgid="7384545252206120659">"Kasvojentunnistusavaus"</string>
- <string name="face_re_enroll_dialog_title" msgid="6392173708176069994">"Kasvojentunnistusavauksen käyttöönotto"</string>
+ <string name="face_re_enroll_dialog_title" msgid="6392173708176069994">"Kasvojen&shy;tunnistus&shy;avauksen käyttöönotto"</string>
<string name="face_re_enroll_dialog_content" msgid="7353502359464038511">"Jos haluat ottaa kasvojentunnistusavauksen uudelleen käyttöön, nykyinen kasvomalli poistetaan.\n\nJos haluat avata puhelimen lukituksen kasvoilla, sinun on otettava ominaisuus uudelleen käyttöön."</string>
<string name="face_reenroll_failure_dialog_content" msgid="7073947334397236935">"Kasvojentunnistusavauksen käyttöönotto epäonnistui. Siirry asetuksiin ja yritä uudelleen."</string>
<string name="fingerprint_dialog_touch_sensor" msgid="2817887108047658975">"Kosketa sormenjälkitunnistinta"</string>
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Mitä osaa käyttökokemuksesta ongelma koski?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Valitse ongelman tyyppi"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Näytön tallentaja"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Suorituskyky"</item>
- <item msgid="1627504621139124393">"Käyttöliittymä"</item>
- <item msgid="8309220355268900335">"Akku"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Yhden käden moodi"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Kuulolaitteet"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Kuulolaitteet"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Muodosta uusi laitepari"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Muodosta uusi laitepari klikkaamalla"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Esiasetusta ei voitu muuttaa"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Esiasetus"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Livetekstitys"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Kumotaanko laitteen kameran ja mikrofonin esto?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Painike <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Takaisin"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Ylänuoli"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Alanuoli"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Vasen nuoli"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Oikea nuoli"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Keskelle"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Välilyönti"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"taitettu"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"taittamaton"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Akkua jäljellä <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Yhdistä näyttökynä laturiin"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Näyttökynän akku vähissä"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> käytti tätä äskettäin (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Tämän käytössä: <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> käytti tätä äskettäin (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Järjestelmä"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitaskaus"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Syöte"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Sovellusten pikakuvakkeet"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Saavutettavuus"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Pikanäppäimet"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pikahaut"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Tiivistyskuvake"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Laajennuskuvake"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Näppämistön taustavalo"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Taso %1$d/%2$d"</string>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml
index 0eab07e..95c788a 100644
--- a/packages/SystemUI/res/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res/values-fr-rCA/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Quelle composante de l\'appareil a été affectée?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Sélectionner un type"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Enregistrement écran"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performance"</item>
- <item msgid="1627504621139124393">"Interface utilisateur"</item>
- <item msgid="8309220355268900335">"Pile"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Mode Une main"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Appareils auditifs"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Appareils auditifs"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Associer un nouvel appareil"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Cliquez ici pour associer un nouvel appareil"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Bouton <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Accueil"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Précédent"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Flèche vers le haut"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Flèche vers le bas"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Flèche vers la gauche"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Flèche vers la droite"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centrer"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Espace"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Entrée"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"plié"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"déplié"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Charge restante de la pile : <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connectez votre stylet à un chargeur"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Pile du stylet faible"</string>
<string name="video_camera" msgid="7654002575156149298">"Caméra"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Récemment utilisé par <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Utilisé par <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Récemment utilisé par <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Système"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitâche"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrée"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Raccourcis des applis"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibilité"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Raccourcis-clavier"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Recherchez des raccourcis"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icône Réduire"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icône Développer"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Rétroéclairage du clavier"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Niveau %1$d de %2$d"</string>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index d3983b9..b7abd0e 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Quel problème avez-vous rencontré avec votre appareil ?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Sélectionnez un type de problème"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Enregistrement de l\'écran"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performances"</item>
- <item msgid="1627504621139124393">"Interface utilisateur"</item>
- <item msgid="8309220355268900335">"Batterie"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Mode une main"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Appareils auditifs"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Appareils auditifs"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Associer un nouvel appareil"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Cliquer pour associer un nouvel appareil"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Bouton <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Accueil"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Précédent"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Flèche vers le haut"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Flèche vers le bas"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Flèche vers la gauche"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Flèche vers la droite"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centre"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Espace"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Entrée"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"plié"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"déplié"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> de batterie restante"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connectez votre stylet à un chargeur"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"La batterie du stylet est faible"</string>
<string name="video_camera" msgid="7654002575156149298">"Caméra"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Récemment utilisé par <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"En cours d\'utilisation par <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Récemment utilisé par <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Système"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitâche"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrée"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Raccourcis d\'application"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibilité"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Raccourcis clavier"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Raccourcis de recherche"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icône Réduire"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icône Développer"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Rétroéclairage du clavier"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Niveau %1$d sur %2$d"</string>
diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml
index 6c494c1..55dd05a 100644
--- a/packages/SystemUI/res/values-gl/strings.xml
+++ b/packages/SystemUI/res/values-gl/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Cal foi o problema na experiencia co dispositivo?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Selecciona o tipo de problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Gravación de pant."</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Rendemento"</item>
- <item msgid="1627504621139124393">"Interface de usuario"</item>
- <item msgid="8309220355268900335">"Batería"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo dunha soa man"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Dispositivos auditivos"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Dispositivos auditivos"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Vincular dispositivo novo"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Fai clic para vincular un novo dispositivo"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Non se puido actualizar a configuración predeterminada"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Configuración predeterminada"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Subtítulos instantáneos"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Queres desbloquear a cámara e o micrófono do dispositivo?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Botón <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Inicio"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Volver"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Frecha arriba"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Frecha abaixo"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Frecha esquerda"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Frecha dereita"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centro"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Espazo"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Intro"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"dispositivo pregado"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"dispositivo despregado"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Batería restante: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecta o lapis óptico a un cargador"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"O lapis óptico ten pouca batería"</string>
<string name="video_camera" msgid="7654002575156149298">"Videocámara"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"En uso recentemente por <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"En uso por <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"En uso recentemente por <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistema"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitarefa"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Atallos de aplicacións"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accesibilidade"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Atallos de teclado"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atallos de busca"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icona de contraer"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icona de despregar"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Retroiluminación do teclado"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nivel %1$d de %2$d"</string>
diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml
index f2516c9..425a768 100644
--- a/packages/SystemUI/res/values-gu/strings.xml
+++ b/packages/SystemUI/res/values-gu/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ડિવાઇસ સંબંધી તમારા અનુભવના કયા ભાગને અસર થઈ હતી?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"સમસ્યાનો પ્રકાર પસંદ કરો"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"સ્ક્રીન રેકોર્ડ કરો"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"પર્ફોર્મન્સ"</item>
- <item msgid="1627504621139124393">"યૂઝર ઇન્ટરફેસ"</item>
- <item msgid="8309220355268900335">"બૅટરી"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"એક-હાથે વાપરો મોડ"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"સાંભળવામાં મદદ આપતા ડિવાઇસ"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"સાંભળવામાં મદદ આપતા ડિવાઇસ"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"નવા ડિવાઇસ સાથે જોડાણ કરો"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"નવા ડિવાઇસ સાથે જોડાણ કરવા માટે ક્લિક કરો"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"બટન <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ઉપરની ઍરો કી"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"નીચેની ઍરો કી"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ડાબી ઍરો કી"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"જમણી ઍરો કી"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Center"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ફોલ્ડ કરેલું"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"અનફોલ્ડ કરેલું"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> બૅટરી બાકી છે"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"તમારા સ્ટાઇલસને ચાર્જર સાથે કનેક્ટ કરો"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"સ્ટાઇલસની બૅટરીમાં ચાર્જ ઓછો છે"</string>
<string name="video_camera" msgid="7654002575156149298">"વીડિયો કૅમેરા"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) દ્વારા તાજેતરમાં ઉપયોગ કરવામાં આવ્યો"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) દ્વારા ઉપયોગ ચાલુ છે"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) દ્વારા તાજેતરમાં ઉપયોગ કરવામાં આવ્યો"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"સિસ્ટમ"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"એકથી વધુ કાર્યો કરવા"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ઇનપુટ"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ઍપ શૉર્ટકટ"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ઍક્સેસિબિલિટી"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"કીબોર્ડ શૉર્ટકટ"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"શૉર્ટકટ શોધો"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"\'નાનું કરો\'નું આઇકન"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"\'મોટું કરો\'નું આઇકન"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"કીબોર્ડની બૅકલાઇટ"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$dમાંથી %1$d લેવલ"</string>
diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml
index 0e6e77d..8f7b87c 100644
--- a/packages/SystemUI/res/values-hi/strings.xml
+++ b/packages/SystemUI/res/values-hi/strings.xml
@@ -295,7 +295,7 @@
<string name="quick_settings_screensaver_label" msgid="1495003469366524120">"स्क्रीन सेवर"</string>
<string name="quick_settings_camera_label" msgid="5612076679385269339">"कैमरे का ऐक्सेस"</string>
<string name="quick_settings_mic_label" msgid="8392773746295266375">"माइक्रोफ़ोन का ऐक्सेस"</string>
- <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"उपलब्ध"</string>
+ <string name="quick_settings_camera_mic_available" msgid="1453719768420394314">"उपलब्ध है"</string>
<string name="quick_settings_camera_mic_blocked" msgid="4710884905006788281">"ब्लॉक किया गया है"</string>
<string name="quick_settings_media_device_label" msgid="8034019242363789941">"मीडिया डिवाइस"</string>
<string name="quick_settings_user_title" msgid="8673045967216204537">"उपयोगकर्ता"</string>
@@ -361,21 +361,26 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"आपके डिवाइस की कौनसी सुविधा पर असर पड़ा था?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"समस्या का टाइप चुनें"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"स्क्रीन रिकॉर्डर"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"परफ़ॉर्मेंस"</item>
- <item msgid="1627504621139124393">"यूज़र इंटरफ़ेस"</item>
- <item msgid="8309220355268900335">"बैटरी"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"वन-हैंडेड मोड"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"कान की मशीनें"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"कान की मशीनें"</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>
- <string name="live_caption_title" msgid="8916875614623730005">"लाइव कैप्शन की सुविधा"</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>
+ <string name="live_caption_title" msgid="8916875614623730005">"लाइव कैप्शन"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"क्या आप डिवाइस का कैमरा और माइक्रोफ़ोन अनब्लॉक करना चाहते हैं?"</string>
<string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"ऐसा करने से, सभी ऐप्लिकेशन और सेवाओं के लिए माइक्रोफ़ोन का ऐक्सेस अनब्लॉक हो जाएगा और वे इसका इस्तेमाल कर पाएंगी."</string>
<string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"ऐसा करने से, सभी ऐप्लिकेशन और सेवाओं के लिए कैमरे का ऐक्सेस अनब्लॉक हो जाएगा और वे इसका इस्तेमाल कर पाएंगी."</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"बटन <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"अप ऐरो"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"डाउन ऐरो"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"लेफ़्ट ऐरो"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"राइट ऐरो"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"मध्य तीर"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -997,7 +997,7 @@
<string name="accessibility_magnification_right_handle" msgid="9055988237319397605">"दायां हैंडल"</string>
<string name="accessibility_magnification_bottom_handle" msgid="6531646968813821258">"नीचे का हैंडल"</string>
<string name="accessibility_magnification_settings_panel_description" msgid="8174187340747846953">"ज़ूम करने की सुविधा वाली सेटिंग"</string>
- <string name="accessibility_magnifier_size" msgid="3038755600030422334">"ज़ूम करने की सुविधा का साइज़"</string>
+ <string name="accessibility_magnifier_size" msgid="3038755600030422334">"ज़ूम का साइज़"</string>
<string name="accessibility_magnification_zoom" msgid="4222088982642063979">"ज़ूम करें"</string>
<string name="accessibility_magnification_medium" msgid="6994632616884562625">"मध्यम"</string>
<string name="accessibility_magnification_small" msgid="8144502090651099970">"छोटा"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"डिवाइस फ़ोल्ड किया गया"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"डिवाइस अनफ़ोल्ड किया गया"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> बैटरी बची है"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"अपने स्टाइलस को चार्ज करें"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"स्टाइलस की बैटरी कम है"</string>
<string name="video_camera" msgid="7654002575156149298">"वीडियो कैमरा"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"हाल ही में, <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ने इस्तेमाल किया"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) पर इस्तेमाल किया जा रहा है"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"हाल ही में, <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ने इस्तेमाल किया"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"सिस्टम"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"मल्टीटास्किंग (एक साथ कई काम करना)"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"इनपुट"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ऐप शॉर्टकट"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"सुलभता"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"कीबोर्ड शॉर्टकट"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"सर्च शॉर्टकट"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"छोटा करने का आइकॉन"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"बड़ा करने का आइकॉन"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"कीबोर्ड की बैकलाइट"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d में से %1$d लेवल"</string>
diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml
index 2e6ae04..bc84c1d 100644
--- a/packages/SystemUI/res/values-hr/strings.xml
+++ b/packages/SystemUI/res/values-hr/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Na koji dio doživljaja na uređaju to utjecalo?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Odaberite vrstu problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Snimanje zaslona"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Izvedba"</item>
- <item msgid="1627504621139124393">"Korisničko sučelje"</item>
- <item msgid="8309220355268900335">"Baterija"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Način rada jednom rukom"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Slušna pomagala"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Slušna pomagala"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Uparite novi uređaj"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Kliknite da biste uparili novi uređaj"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Ažuriranje unaprijed definiranih postavki nije uspjelo"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Unaprijed definirana postavka"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Automatski titlovi"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Želite li deblokirati kameru i mikrofon uređaja?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Tipka <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Početak"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Natrag"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Strelica prema gore"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Strelica prema dolje"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Strelica lijevo"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Strelica desno"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Sredina"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Razmaknica"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Unos"</string>
@@ -933,7 +932,7 @@
<string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Način Ne uznemiravaj uključilo je automatsko pravilo ili aplikacija."</string>
<string name="running_foreground_services_title" msgid="5137313173431186685">"Izvođenje aplikacija u pozadini"</string>
<string name="running_foreground_services_msg" msgid="3009459259222695385">"Dodirnite da biste vidjeli pojedinosti o potrošnji baterije i podatkovnom prometu"</string>
- <string name="mobile_data_disable_title" msgid="5366476131671617790">"Isključiti mobilne podatke?"</string>
+ <string name="mobile_data_disable_title" msgid="5366476131671617790">"Želite li isključiti mobilne podatke?"</string>
<string name="mobile_data_disable_message" msgid="8604966027899770415">"Nećete imati pristup mobilnim podacima ili internetu putem operatera <xliff:g id="CARRIER">%s</xliff:g>. Internet će biti dostupan samo putem Wi-Fija."</string>
<string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"vaš mobilni operater"</string>
<string name="auto_data_switch_disable_title" msgid="5146527155665190652">"Vratiti se na mobilnog operatera <xliff:g id="CARRIER">%s</xliff:g>?"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"zatvoreno"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"otvoreno"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Preostalo je <xliff:g id="PERCENTAGE">%s</xliff:g> baterije"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Priključite pisaljku na punjač"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Slaba baterija pisaljke"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Nedavno koristila aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Koristi: <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Nedavno koristila aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sustav"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Obavljanje više zadataka"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Unos"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Prečaci aplikacija"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Pristupačnost"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tipkovni prečaci"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prečaci za pretraživanje"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona za sažimanje"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona za proširivanje"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Pozadinsko osvjetljenje tipkovnice"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Razina %1$d od %2$d"</string>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index d5649b7..4b36026 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Az eszközhasználati élmény mely része érintett?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Problématípus kiválasztása"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Képernyőrögzítés"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Teljesítmény"</item>
- <item msgid="1627504621139124393">"Kezelőfelület"</item>
- <item msgid="8309220355268900335">"Akkumulátor"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Egykezes mód"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Hallókészülékek"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Hallókészülékek"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Új eszköz párosítása"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Kattintson új eszköz párosításához"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> gomb"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Kezdőképernyő"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Vissza"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Felfelé nyíl"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Lefelé nyíl"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Balra nyíl"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Jobbra nyíl"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Középre"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Szóköz"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"összehajtva"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"kihajtva"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Akkumulátor töltöttségi szintje: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Tegye töltőre az érintőceruzát"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Az érintőceruza töltöttsége alacsony"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Legutóbb használta: <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Használatban a következő által: <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Legutóbb használta: <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Rendszer"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Bevitel"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Alkalmazás-parancsikonok"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Kisegítő lehetőségek"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Billentyűparancsok"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Billentyűparancsok keresése"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Összecsukás ikon"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Kibontás ikon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"A billentyűzet háttérvilágítása"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Fényerő: %2$d/%1$d"</string>
diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml
index 3860921..d8e36ad 100644
--- a/packages/SystemUI/res/values-hy/strings.xml
+++ b/packages/SystemUI/res/values-hy/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Սարքի ո՞ր մասի հետ է կապված խնդիրը։"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Ընտրեք խնդրի տեսակը"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Էկրանի տեսագրում"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Աշխատանք"</item>
- <item msgid="1627504621139124393">"Միջերես"</item>
- <item msgid="8309220355268900335">"Մարտկոց"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Մեկ ձեռքի ռեժիմ"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Լսողական սարքեր"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Լսողական սարքեր"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Նոր սարքի զուգակցում"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Սեղմեք՝ նոր սարք զուգակցելու համար"</string>
@@ -594,9 +599,9 @@
<string name="screen_pinning_negative" msgid="6882816864569211666">"Ոչ"</string>
<string name="screen_pinning_start" msgid="7483998671383371313">"Հավելվածն ամրացվեց"</string>
<string name="screen_pinning_exit" msgid="4553787518387346893">"Հավելվածն ապամրացվեց"</string>
- <string name="stream_voice_call" msgid="7468348170702375660">"Զանգ"</string>
+ <string name="stream_voice_call" msgid="7468348170702375660">"Զանգելը"</string>
<string name="stream_system" msgid="7663148785370565134">"Համակարգ"</string>
- <string name="stream_ring" msgid="7550670036738697526">"Զանգ"</string>
+ <string name="stream_ring" msgid="7550670036738697526">"Զանգ ստանալը"</string>
<string name="stream_music" msgid="2188224742361847580">"Մեդիա"</string>
<string name="stream_alarm" msgid="16058075093011694">"Զարթուցիչ"</string>
<string name="stream_notification" msgid="7930294049046243939">"Ծանուցում"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> կոճակ"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Գլխավոր էջ"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Հետ"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Վերև սլաք"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Ներքև սլաք"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Ձախ սլաք"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Աջ սլաք"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Կենտրոն"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Բացատ"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Մուտք"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ծալված"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"բացված"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Մարտկոցի լիցքը՝ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Ձեր ստիլուսը միացրեք լիցքավորիչի"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Ստիլուսի մարտկոցի լիցքի ցածր մակարդակ"</string>
<string name="video_camera" msgid="7654002575156149298">"Տեսախցիկ"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Վերջերս օգտագործվել է <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածի կողմից (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Օգտագործվում է <xliff:g id="APP_NAME">%1$s</xliff:g>ի կողմից (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Վերջերս օգտագործվել է <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածի կողմից (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Համակարգ"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Բազմախնդրություն"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ներածում"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Հավելվածի դյուրանցումներ"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Հատուկ գործառույթներ"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Ստեղնային դյուրանցումներ"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Դյուրանցումների որոնում"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ծալել պատկերակը"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ծավալել պատկերակը"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Հետին լուսավորությամբ ստեղնաշար"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%1$d՝ %2$d-ից"</string>
diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml
index b0ca07e..22d0de5 100644
--- a/packages/SystemUI/res/values-in/strings.xml
+++ b/packages/SystemUI/res/values-in/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Bagian pengalaman perangkat mana yang terpengaruh?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Pilih jenis masalah"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Perekaman layar"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performa"</item>
- <item msgid="1627504621139124393">"Antarmuka Pengguna"</item>
- <item msgid="8309220355268900335">"Baterai"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Mode satu tangan"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Alat bantu dengar"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Alat bantu dengar"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Sambungkan perangkat baru"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Klik untuk menyambungkan perangkat baru"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Tidak dapat memperbarui preset"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Preset"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Teks Otomatis"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Berhenti memblokir kamera dan mikrofon perangkat?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Tombol <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Panah atas"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Panah bawah"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Panah kiri"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Panah kanan"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Center"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ditutup"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"dibuka"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Baterai tersisa <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Hubungkan stilus ke pengisi daya"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Baterai stilus lemah"</string>
<string name="video_camera" msgid="7654002575156149298">"Kamera video"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Baru saja digunakan oleh <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Sedang digunakan oleh <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Baru saja digunakan oleh <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistem"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Pintasan aplikasi"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Aksesibilitas"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Pintasan keyboard"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pintasan penelusuran"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikon ciutkan"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikon luaskan"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Lampu latar keyboard"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Tingkat %1$d dari %2$d"</string>
diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml
index 02bc343..b631c47 100644
--- a/packages/SystemUI/res/values-is/strings.xml
+++ b/packages/SystemUI/res/values-is/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Hvað í tækjaupplifuninni varð fyrir áhrifum?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Veldu gerð vandamáls"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Skjáupptaka"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Afköst"</item>
- <item msgid="1627504621139124393">"Notandaviðmót"</item>
- <item msgid="8309220355268900335">"Rafhlaða"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Einhent stilling"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Heyrnartæki"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Heyrnartæki"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Para nýtt tæki"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Smelltu til að para nýtt tæki"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Tókst ekki að uppfæra forstillingu"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Forstilling"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Skjátextar í rauntíma"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Opna fyrir myndavél og hljóðnema tækisins?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Hnappur <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Til baka"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Ör upp"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Ör niður"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Ör til vinstri"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Ör til hægri"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Miðja"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Bilslá"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"samanbrotið"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"opið"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> hleðsla eftir á rafhlöðu"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Tengdu pennann við hleðslutæki"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Rafhlaða pennans er að tæmast"</string>
<string name="video_camera" msgid="7654002575156149298">"Kvikmyndatökuvél"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Nýlega notað af <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Í notkun í <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Nýlega notað af <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Kerfi"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Fjölvinnsla"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Inntak"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Flýtileiðir forrita"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Aðgengi"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Flýtilyklar"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Leitarflýtileiðir"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Minnka tákn"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Stækka tákn"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Baklýsing lyklaborðs"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Stig %1$d af %2$d"</string>
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index eb90d58..5494b16 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Quali problemi ha l\'esperienza del dispositivo?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Seleziona il tipo di problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Regis. dello schermo"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Prestazioni"</item>
- <item msgid="1627504621139124393">"Interfaccia utente"</item>
- <item msgid="8309220355268900335">"Batteria"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Prestazioni"</string>
+ <string name="user_interface" msgid="3712869377953950887">"Interfaccia utente"</string>
+ <string name="thermal" msgid="6758074791325414831">"Termico"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modalità a una mano"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Apparecchi acustici"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Protesi uditive"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Accoppia nuovo dispositivo"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Fai clic per accoppiare un nuovo dispositivo"</string>
@@ -580,11 +582,11 @@
<string name="csd_button_keep_listening" product="default" msgid="4093794049149286784">"Continua ad ascoltare"</string>
<string name="csd_button_lower_volume" product="default" msgid="5347210412376264579">"Abbassa il volume"</string>
<string name="screen_pinning_title" msgid="9058007390337841305">"L\'app è bloccata sullo schermo"</string>
- <string name="screen_pinning_description" msgid="8699395373875667743">"La schermata rimane visibile finché non viene sganciata. Per sganciarla, tieni premuto Indietro e Panoramica."</string>
- <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"La schermata rimane visibile finché non viene disattivato il blocco su schermo. Per disattivarlo, tocca e tieni premuto Indietro e Home."</string>
+ <string name="screen_pinning_description" msgid="8699395373875667743">"La schermata rimane visibile finché non viene sbloccata. Per sbloccarla, tieni premuto Indietro e Panoramica."</string>
+ <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"La schermata rimane visibile finché non viene sbloccata. Per sbloccarla, tocca e tieni premuto Indietro e Home."</string>
<string name="screen_pinning_description_gestural" msgid="7246323931831232068">"Rimarrà visibile finché non viene sbloccata. Scorri verso l\'alto e tieni premuto per sbloccarla."</string>
- <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"La schermata rimane visibile finché non viene sganciata. Per sganciarla, tieni premuto Panoramica."</string>
- <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"La schermata rimane visibile finché non viene disattivato il blocco su schermo. Per disattivarlo, tocca e tieni premuto Home."</string>
+ <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"La schermata rimane visibile finché non viene sbloccata. Per sbloccarla, tieni premuto Panoramica."</string>
+ <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"La schermata rimane visibile finché non viene sbloccata. Per sbloccarla, tocca e tieni premuto Home."</string>
<string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"I dati personali potrebbero essere accessibili (ad esempio i contatti e i contenuti delle email)."</string>
<string name="screen_pinning_can_open_other_apps" msgid="7529756813231421455">"L\'app bloccata sullo schermo potrebbe aprire altre app."</string>
<string name="screen_pinning_toast" msgid="8177286912533744328">"Per sbloccare questa app, tocca e tieni premuti i pulsanti Indietro e Panoramica"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Pulsante <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home page"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Indietro"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Freccia su"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Freccia giù"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Freccia sinistra"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Freccia destra"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Al centro"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Spazio"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Invio"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"Piegato"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"Non piegato"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> batteria rimanente"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Batteria dello stilo: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Connetti lo stilo a un caricabatterie"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Batteria stilo in esaurimento"</string>
<string name="video_camera" msgid="7654002575156149298">"Videocamera"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Recentemente in uso da <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"In uso da <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Recentemente in uso da <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistema"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Scorciatoie app"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibilità"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Scorciatoie da tastiera"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Scorciatoie per la ricerca"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icona Comprimi"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icona Espandi"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Retroilluminazione della tastiera"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Livello %1$d di %2$d"</string>
diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml
index 5fc6cde..2ad95fb 100644
--- a/packages/SystemUI/res/values-iw/strings.xml
+++ b/packages/SystemUI/res/values-iw/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"איזה חלק בחוויית השימוש שלך במכשיר הושפע?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"בחירה בסוג הבעיה"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"הקלטת המסך"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"ביצועים"</item>
- <item msgid="1627504621139124393">"ממשק משתמש"</item>
- <item msgid="8309220355268900335">"סוללה"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"ביצועים"</string>
+ <string name="user_interface" msgid="3712869377953950887">"ממשק משתמש"</string>
+ <string name="thermal" msgid="6758074791325414831">"תרמי"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"מצב שימוש ביד אחת"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"מכשירי שמיעה"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"מכשירי שמיעה"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"התאמה של מכשיר חדש"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"צריך ללחוץ כדי להתאים מכשיר חדש"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"לחצן <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"דף הבית"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"הקודם"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"חץ למעלה"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"חץ למטה"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"חץ שמאלה"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"חץ ימינה"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"מרכז"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"רווח"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"מצב מקופל"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"מצב לא מקופל"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"רמת הטעינה שנותרה בסוללה: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"רמת הטעינה בסוללה של הסטיילוס: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"כדאי לחבר את הסטיילוס למטען"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"הסוללה של הסטיילוס חלשה"</string>
<string name="video_camera" msgid="7654002575156149298">"מצלמת וידאו"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"נעשה שימוש לאחרונה על ידי <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"בשימוש על ידי <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"נעשה שימוש לאחרונה על ידי <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"מערכת"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ריבוי משימות"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"קלט"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"קיצורי דרך של אפליקציות"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"נגישות"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"מקשי קיצור"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"קיצורי דרך לחיפוש"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"סמל הכיווץ"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"סמל ההרחבה"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"התאורה האחורית במקלדת"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"רמה %1$d מתוך %2$d"</string>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index 81fa094..15c1f8b 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"デバイスのどの部分が影響を受けましたか？"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"問題の種類を選択する"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"スクリーン レコード"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"パフォーマンス"</item>
- <item msgid="1627504621139124393">"ユーザー インターフェース"</item>
- <item msgid="8309220355268900335">"バッテリー"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"パフォーマンス"</string>
+ <string name="user_interface" msgid="3712869377953950887">"ユーザー インターフェース"</string>
+ <string name="thermal" msgid="6758074791325414831">"温度"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"片手モード"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"補聴器"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"補聴器"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"新しいデバイスとペア設定"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"クリックすると、新しいデバイスをペア設定できます"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> ボタン"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"戻る"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"上矢印"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"下矢印"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"左矢印"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"右矢印"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"中央"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"折りたたんだ状態"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"広げた状態"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"バッテリー残量 <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"タッチペンのバッテリー残量 <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"タッチペンを充電器に接続してください"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"タッチペンのバッテリー残量が少なくなっています"</string>
<string name="video_camera" msgid="7654002575156149298">"ビデオカメラ"</string>
@@ -1327,6 +1324,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"検索ショートカット"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"閉じるアイコン"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"開くアイコン"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"キーボード バックライト"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"レベル %1$d/%2$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"ホーム コントロール"</string>
diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml
index d367f4f..4d17179 100644
--- a/packages/SystemUI/res/values-ka/strings.xml
+++ b/packages/SystemUI/res/values-ka/strings.xml
@@ -361,20 +361,21 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"თქვენი მოწყობილობის გამოცდილების რა ნაწილზე მოხდა ზეგავლენა?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"აირჩიეთ პრობლემის ტიპი"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"ეკრანის ჩანაწერი"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"ეფექტურობა"</item>
- <item msgid="1627504621139124393">"სამომხმარებლო ინტერფეისი"</item>
- <item msgid="8309220355268900335">"ბატარეა"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"ეფექტურობა"</string>
+ <string name="user_interface" msgid="3712869377953950887">"სამომხმარებლო ინტერფეისი"</string>
+ <string name="thermal" msgid="6758074791325414831">"თერმული"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"ცალი ხელის რეჟიმი"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"სმენის აპარატები"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"სმენის აპარატები"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"პირდაპირი სუბტიტრები"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"გსურთ მოწყობილობის კამერის და მიკროფონის განბლოკვა?"</string>
@@ -728,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"ღილაკი „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"უკან"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ზემოთ მიმართული ისარი"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"ქვემოთ მიმართული ისარი"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"მარცხნივ მიმართული ისარი"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"მარჯვნივ მიმართული ისარი"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"ცენტრში"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"შორისი"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"დაკეცილი"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"გაშლილი"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"დარჩენილია ბატარეის <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"სტილუსის ბატარეა <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"დააკავშირეთ თქვენი სტილუსი დამტენს"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"სტილუსის ბატარეა დაცლის პირასაა"</string>
<string name="video_camera" msgid="7654002575156149298">"ვიდეოკამერა"</string>
@@ -1328,6 +1324,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ძიების მალსახმობები"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ხატულის ჩაკეცვა"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ხატულის გაფართოება"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"კლავიატურის შენათება"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"დონე: %1$d %2$d-დან"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"სახლის კონტროლი"</string>
diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml
index fd7160f..08e9fa2 100644
--- a/packages/SystemUI/res/values-kk/strings.xml
+++ b/packages/SystemUI/res/values-kk/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Құрылғы қызметінің қандай түріне әсер етті?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Мәселе түрін таңдаңыз."</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Экранды жазу"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Өнімділік"</item>
- <item msgid="1627504621139124393">"Пайдаланушы интерфейсі"</item>
- <item msgid="8309220355268900335">"Батарея"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Бір қолмен басқару режимі"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Есту құрылғылары"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Есту құрылғылары"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Live Caption"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Құрылғы камерасы мен микрофонын блоктан шығару керек пе?"</string>
@@ -597,7 +601,7 @@
<string name="screen_pinning_exit" msgid="4553787518387346893">"Қолданба босатылды."</string>
<string name="stream_voice_call" msgid="7468348170702375660">"Қоңырау шалу"</string>
<string name="stream_system" msgid="7663148785370565134">"Жүйе"</string>
- <string name="stream_ring" msgid="7550670036738697526">"Шылдырлау"</string>
+ <string name="stream_ring" msgid="7550670036738697526">"Шылдыр"</string>
<string name="stream_music" msgid="2188224742361847580">"Мультимедиа"</string>
<string name="stream_alarm" msgid="16058075093011694">"Дабыл"</string>
<string name="stream_notification" msgid="7930294049046243939">"Хабарландыру"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> түймесі"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Артқа"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Жоғары бағыт пернесі"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Төмен бағыт пернесі"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Сол бағыт пернесі"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Оң бағыт пернесі"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Орталық"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Бос орын"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"жабық"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"ашық"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Қалған батарея заряды: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Стилусты зарядтағышқа жалғаңыз."</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Стилус батареясының заряды аз"</string>
<string name="video_camera" msgid="7654002575156149298">"Бейнекамера"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Соңғы рет <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) қолданбасы пайдаланды."</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) қолданбасы пайдаланып жатыр"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Соңғы рет <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) қолданбасы пайдаланды."</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Жүйе"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Мультитаскинг"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Кіріс"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Қолданба таңбашалары"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Арнайы мүмкіндіктер"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Перне тіркесімдері"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Іздеу жылдам пәрмендері"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Жию белгішесі"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Жаю белгішесі"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Пернетақта жарығы"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Деңгей: %1$d/%2$d"</string>
diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml
index 9adcfb5..d6538bd 100644
--- a/packages/SystemUI/res/values-km/strings.xml
+++ b/packages/SystemUI/res/values-km/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"តើផ្នែកអ្វីនៃបទពិសោធប្រើប្រាស់ឧបករណ៍របស់អ្នកបានរងការប៉ះពាល់?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"ជ្រើសរើសប្រភេទបញ្ហា"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"ការថតវីដេអូអេក្រង់"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"ប្រតិបត្តិការ"</item>
- <item msgid="1627504621139124393">"ផ្ទៃប៉ះ"</item>
- <item msgid="8309220355268900335">"ថ្ម"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"មុខងារប្រើដៃម្ខាង"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"ឧបករណ៍ជំនួយការស្ដាប់"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"ឧបករណ៍ជំនួយការស្ដាប់"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"ផ្គូផ្គងឧបករណ៍ថ្មី"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"ចុច ដើម្បីផ្គូផ្គងឧបករណ៍ថ្មី"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"ប៊ូតុង <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ព្រួញឡើងលើ"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"ព្រួញចុះក្រោម"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ព្រួញទៅឆ្វេង"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"ព្រួញទៅស្ដាំ"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Center"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"បត់"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"លា"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"ថ្មនៅសល់ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ភ្ជាប់ប៊ិករបស់អ្នកជាមួយឆ្នាំងសាក"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"ថ្មប៊ិកនៅសល់តិច"</string>
<string name="video_camera" msgid="7654002575156149298">"កាមេរ៉ាវីដេអូ"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"បានប្រើនាពេលថ្មីៗនេះដោយ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"កំពុងប្រើដោយ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"បានប្រើនាពេលថ្មីៗនេះដោយ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"ប្រព័ន្ធ"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ការដំណើរការបានច្រើន"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ធាតុចូល"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ផ្លូវកាត់កម្មវិធី"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ភាពងាយស្រួល"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"ផ្លូវកាត់ក្ដារចុច"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ផ្លូវកាត់ការស្វែងរក"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"រូបតំណាង \"បង្រួម\""</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"រូបតំណាង \"ពង្រីក\""</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"ពន្លឺក្រោយក្ដារចុច"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"កម្រិតទី %1$d នៃ %2$d"</string>
diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml
index ecc0fdf..92a8b6b 100644
--- a/packages/SystemUI/res/values-kn/strings.xml
+++ b/packages/SystemUI/res/values-kn/strings.xml
@@ -361,19 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ಸಾಧನ ಬಳಸುವಾಗ ನೀವು ಯಾವ ರೀತಿಯ ಸಮಸ್ಯೆ ಎದುರಿಸುತ್ತೀರಿ?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"ಸಮಸ್ಯೆಯ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡ್"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"ಕಾರ್ಯಕ್ಷಮತೆ"</item>
- <item msgid="1627504621139124393">"ಬಳಕೆದಾರರ ಇಂಟರ್ಫೇಸ್"</item>
- <item msgid="8309220355268900335">"ಬ್ಯಾಟರಿ"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"ಒಂದು ಕೈ ಮೋಡ್"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"ಶ್ರವಣ ಸಾಧನಗಳು"</string>
- <string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"ಹಿಯರಿಂಗ್ ಸಾಧನಗಳು"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
+ <string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"ಶ್ರವಣ ಸಾಧನಗಳು"</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>
- <string name="live_caption_title" msgid="8916875614623730005">"ಲೈವ್ ಕ್ಯಾಪ್ಶನ್"</string>
+ <string name="live_caption_title" msgid="8916875614623730005">"ಲೈವ್ ಶೀರ್ಷಿಕೆ"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"ಸಾಧನದ ಕ್ಯಾಮರಾ ಮತ್ತು ಮೈಕ್ರೋಫೋನ್ ಅನ್ನು ಅನ್ಬ್ಲಾಕ್ ಮಾಡಬೇಕೇ?"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> ಬಟನ್"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"ಹಿಂದೆ"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ಅಪ್ ಆ್ಯರೋ"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"ಡೌನ್ ಆ್ಯರೋ"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ಲೆಫ್ಟ್ ಆ್ಯರೋ"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"ರೈಟ್ ಆ್ಯರೋ"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"ಮಧ್ಯ"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"ಸ್ಪೇಸ್"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ಫೋಲ್ಡ್ ಮಾಡಿರುವುದು"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"ಅನ್ಫೋಲ್ಡ್ ಮಾಡಿರುವುದು"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ಬ್ಯಾಟರಿ ಉಳಿದಿದೆ"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ನಿಮ್ಮ ಸ್ಟೈಲಸ್ ಅನ್ನು ಚಾರ್ಜರ್ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"ಸ್ಟೈಲಸ್ ಬ್ಯಾಟರಿ ಕಡಿಮೆಯಿದೆ"</string>
<string name="video_camera" msgid="7654002575156149298">"ವೀಡಿಯೊ ಕ್ಯಾಮರಾ"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"ಇತ್ತೀಚೆಗೆ <xliff:g id="APP_NAME">%1$s</xliff:g> ಇದನ್ನು ಬಳಸಿದೆ (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> ನಿಂದ ಬಳಕೆಯಲ್ಲಿದೆ (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"ಇತ್ತೀಚೆಗೆ <xliff:g id="APP_NAME">%1$s</xliff:g> ಇದನ್ನು ಬಳಸಿದೆ (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"ಸಿಸ್ಟಂ"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ಮಲ್ಟಿಟಾಸ್ಕಿಂಗ್"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ಇನ್ಪುಟ್"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ಆ್ಯಪ್ ಶಾರ್ಟ್ಕಟ್ಗಳು"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್ಕಟ್ಗಳು"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ಹುಡುಕಾಟದ ಶಾರ್ಟ್ಕಟ್ಗಳು"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ಕುಗ್ಗಿಸುವ ಐಕಾನ್"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ವಿಸ್ತೃತಗೊಳಿಸುವ ಐಕಾನ್"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"ಕೀಬೋರ್ಡ್ ಬ್ಯಾಕ್ಲೈಟ್"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d ರಲ್ಲಿ %1$d ಮಟ್ಟ"</string>
diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml
index 889026e..b141b48 100644
--- a/packages/SystemUI/res/values-ko/strings.xml
+++ b/packages/SystemUI/res/values-ko/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"기기 경험의 어떤 부분에 영향이 있었나요?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"문제 유형 선택"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"화면 녹화"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"성능"</item>
- <item msgid="1627504621139124393">"사용자 인터페이스"</item>
- <item msgid="8309220355268900335">"배터리"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"한 손 사용 모드"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"청각 보조 기기"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"청각 보조 기기"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"새 기기와 페어링"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"새 기기와 페어링하려면 클릭하세요"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> 버튼"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"뒤로"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"위쪽 화살표"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"아래쪽 화살표"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"왼쪽 화살표"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"오른쪽 화살표"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"중앙"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"접은 상태"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"펼친 상태"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"배터리 <xliff:g id="PERCENTAGE">%s</xliff:g> 남음"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"스타일러스를 충전기에 연결하세요"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"스타일러스 배터리 부족"</string>
<string name="video_camera" msgid="7654002575156149298">"비디오 카메라"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"최근 <xliff:g id="APP_NAME">%1$s</xliff:g>에서 사용됨(<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 사용 중(<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"최근 <xliff:g id="APP_NAME">%1$s</xliff:g>에서 사용됨(<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"시스템"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"멀티태스킹"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"입력"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"앱 바로가기"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"접근성"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"단축키"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"검색 바로가기"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"접기 아이콘"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"확장 아이콘"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"키보드 백라이트"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d단계 중 %1$d단계"</string>
diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml
index 0ec1558..dc7227e 100644
--- a/packages/SystemUI/res/values-ky/strings.xml
+++ b/packages/SystemUI/res/values-ky/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Түзмөгүңүздүн кайсы бөлүгүнө кедергиси тийди?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Маселенин түрүн тандоо"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Экрандан видео жаздырып алуу"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Иштин майнаптуулугу"</item>
- <item msgid="1627504621139124393">"Колдонуучунун интерфейси"</item>
- <item msgid="8309220355268900335">"Батарея"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Бир кол режими"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Угуу аппараттары"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Угуу аппараттары"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Ыкчам коштомо жазуулар"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Түзмөктүн камерасы менен микрофону бөгөттөн чыгарылсынбы?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> баскычы"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Башкы бет"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Артка"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Өйдө жебе"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Ылдый жебе"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Солго жебе"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Оңго жебе"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Ортолотуу"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Боштук"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"бүктөлгөн"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"ачылган"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Батареянын кубаты: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Стилусту кубаттаңыз"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Стилустун батареясы отурайын деп калды"</string>
<string name="video_camera" msgid="7654002575156149298">"Видео камера"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Акыркы жолу <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) колдонмосунда иштетилди"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосунда иштеп жатат (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Акыркы жолу <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) колдонмосунда иштетилди"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Система"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Бир нече тапшырма аткаруу"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Киргизүү"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Колдонмодогу кыска жолдор"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Атайын мүмкүнчүлүктөр"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Ыкчам баскычтар"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Ыкчам баскычтарды издөө"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Жыйыштыруу сүрөтчөсү"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Жайып көрсөтүү сүрөтчөсү"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Баскычтоптун жарыгы"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d ичинен %1$d-деңгээл"</string>
diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml
index 6ba0b09..5894084 100644
--- a/packages/SystemUI/res/values-lo/strings.xml
+++ b/packages/SystemUI/res/values-lo/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ສ່ວນໃດຂອງປະສົບການອຸປະກອນຂອງທ່ານໄດ້ຮັບຜົນກະທົບ?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"ເລືອກປະເພດບັນຫາ"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"ບັນທຶກໜ້າຈໍ"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"ປະສິດທິພາບ"</item>
- <item msgid="1627504621139124393">"ສ່ວນຕິດຕໍ່ຜູ້ໃຊ້"</item>
- <item msgid="8309220355268900335">"ແບັດເຕີຣີ"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"ໂໝດມືດຽວ"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"ອຸປະກອນຊ່ວຍຟັງ"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"ອຸປະກອນຊ່ວຍຟັງ"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"ຄຳບັນຍາຍສົດ"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"ຍົກເລີກການບລັອກກ້ອງຖ່າຍຮູບ ຫຼື ໄມໂຄຣໂຟນອຸປະກອນບໍ?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"ປຸ່ມ <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"ກັບຄືນ"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ລູກສອນຂຶ້ນ"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"ລູກສອນລົງ"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ລູກສອນຊ້າຍ"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"ລູກສອນຂວາ"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"ເຄິ່ງກາງ"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ພັບແລ້ວ"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"ກາງອອກແລ້ວ"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"ແບັດເຕີຣີເຫຼືອ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ເຊື່ອມຕໍ່ປາກກາຂອງທ່ານກັບສາຍສາກ"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"ແບັດເຕີຣີປາກກາເຫຼືອໜ້ອຍ"</string>
<string name="video_camera" msgid="7654002575156149298">"ກ້ອງວິດີໂອ"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"ໃຊ້ຫຼ້າສຸດໂດຍ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"ໃຊ້ຢູ່ໂດຍ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"ໃຊ້ຫຼ້າສຸດໂດຍ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"ລະບົບ"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ການເຮັດຫຼາຍໜ້າວຽກພ້ອມກັນ"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ອິນພຸດ"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ທາງລັດແອັບ"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ການຊ່ວຍເຂົ້າເຖິງ"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"ຄີລັດ"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ທາງລັດການຊອກຫາ"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ໄອຄອນຫຍໍ້ລົງ"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ໄອຄອນຂະຫຍາຍ"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"ໄຟປຸ່ມແປ້ນພິມ"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"ລະດັບທີ %1$d ຈາກ %2$d"</string>
diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml
index 40418f0..2c9eed8 100644
--- a/packages/SystemUI/res/values-lt/strings.xml
+++ b/packages/SystemUI/res/values-lt/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Kuri įrenginio funkcija buvo paveikta?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Pasirinkite problemos tipą"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Ekrano įrašas"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Našumas"</item>
- <item msgid="1627504621139124393">"Naudotojo sąsaja"</item>
- <item msgid="8309220355268900335">"Akumuliatorius"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Vienos rankos režimas"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Klausos įrenginiai"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Klausos įrenginiai"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Susieti naują įrenginį"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Spustelėkite, kad susietumėte naują įrenginį"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Išankstinių nustatymų atnaujinti nepavyko"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Išankstiniai nustatymai"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Subtitrai realiuoju laiku"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Panaikinti įrenginio fotoaparato ir mikrofono blokavimą?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Mygtukas <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Pagrindinis"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Atgal"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Rodyklė aukštyn"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Rodyklė žemyn"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Rodyklė kairėn"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Rodyklė dešinėn"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centras"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Tarpas"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Įvesti"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"sulenkta"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"nesulenkta"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Liko akumuliatoriaus įkrovos: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Prijunkite rašiklį prie kroviklio"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Senka rašiklio akumuliatorius"</string>
<string name="video_camera" msgid="7654002575156149298">"Vaizdo kamera"</string>
@@ -1328,6 +1328,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Paieškos šaukiniai"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Sutraukimo piktograma"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Išskleidimo piktograma"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Klaviatūros foninis apšvietimas"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%1$d lygis iš %2$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"Namų sistemos valdymas"</string>
diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml
index 53c5408..6a5d068 100644
--- a/packages/SystemUI/res/values-lv/strings.xml
+++ b/packages/SystemUI/res/values-lv/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Kuras ierīces funkcijas tika ietekmētas?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Atlasiet problēmas veidu"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Ekrāna ierakstīšana"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Veiktspēja"</item>
- <item msgid="1627504621139124393">"Lietotāja saskarne"</item>
- <item msgid="8309220355268900335">"Akumulators"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Vienas rokas režīms"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Dzirdes aparāti"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Dzirdes aparāti"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Savienot pārī jaunu ierīci"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Noklikšķiniet, lai savienotu pārī jaunu ierīci"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Nevarēja atjaunināt pirmsiestatījumu"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Pirmsiestatījums"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Subtitri reāllaikā"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vai atbloķēt ierīces kameru un mikrofonu?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Poga <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Sākumvietas taustiņš"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Atpakaļ"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Augšupvērstā bultiņa"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Lejupvērstā bultiņa"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Kreisā bultiņa"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Labā bultiņa"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centrā"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Atstarpe"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Ievadīšanas taustiņš"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"aizvērta"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"atvērta"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Atlikušais uzlādes līmenis: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Pievienojiet skārienekrāna pildspalvu lādētājam"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Zems skārienekrāna pildspalvas akumulatora līmenis"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Nesen to izmantoja lietotne <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"To izmanto lietotne <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Nesen to izmantoja lietotne <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistēma"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Vairākuzdevumu režīms"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ievade"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Lietotņu saīsnes"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Pieejamība"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Īsinājumtaustiņi"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Meklēšanas saīsnes"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Sakļaušanas ikona"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Izvēršanas ikona"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Tastatūras fona apgaismojums"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Līmenis numur %1$d, kopā ir %2$d"</string>
diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml
index 8eb0537..7c41096 100644
--- a/packages/SystemUI/res/values-mk/strings.xml
+++ b/packages/SystemUI/res/values-mk/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Кој дел од доживувањето на уредот беше засегнат?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Изберете тип проблем"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Снимање екран"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Изведба"</item>
- <item msgid="1627504621139124393">"Кориснички интерфејс"</item>
- <item msgid="8309220355268900335">"Батерија"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Режим со една рака"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Слушни апарати"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Слушни апарати"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Автоматски титлови"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Да се одблокира пристапот до камерата и микрофонот на уредот?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Копче <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home-копче"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Назад"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Стрелка нагоре"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Стрелка надолу"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Стрелка налево"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Стрелка надесно"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Центар"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -989,7 +988,7 @@
<string name="magnification_close_settings_click_label" msgid="4642477260651704517">"Затворете ги поставките за зголемување"</string>
<string name="magnification_exit_edit_mode_click_label" msgid="1664818325144887117">"Излегување од „Режим на изменување“"</string>
<string name="magnification_drag_corner_to_resize" msgid="1249766311052418130">"Повлечете на аголот за да ја промените големината"</string>
- <string name="accessibility_allow_diagonal_scrolling" msgid="3258050349191496398">"Дозволете дијагонално лизгање"</string>
+ <string name="accessibility_allow_diagonal_scrolling" msgid="3258050349191496398">"Дозволи дијагонално лизгање"</string>
<string name="accessibility_resize" msgid="5733759136600611551">"Промени големина"</string>
<string name="accessibility_change_magnification_type" msgid="666000085077432421">"Променете го типот на зголемување"</string>
<string name="accessibility_magnification_end_resizing" msgid="4881690585800302628">"Заврши ја промената на големина"</string>
@@ -998,7 +997,7 @@
<string name="accessibility_magnification_right_handle" msgid="9055988237319397605">"Десна рачка"</string>
<string name="accessibility_magnification_bottom_handle" msgid="6531646968813821258">"Долна рачка"</string>
<string name="accessibility_magnification_settings_panel_description" msgid="8174187340747846953">"Поставки за зголемување"</string>
- <string name="accessibility_magnifier_size" msgid="3038755600030422334">"Големина на лупа"</string>
+ <string name="accessibility_magnifier_size" msgid="3038755600030422334">"Големина на лупата"</string>
<string name="accessibility_magnification_zoom" msgid="4222088982642063979">"Зум"</string>
<string name="accessibility_magnification_medium" msgid="6994632616884562625">"Средно"</string>
<string name="accessibility_magnification_small" msgid="8144502090651099970">"Мало"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"затворен"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"отворен"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Преостаната батерија: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Поврзете го пенкалото со полнач"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Слаба батерија на пенкало"</string>
<string name="video_camera" msgid="7654002575156149298">"Видеокамера"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Неодамна користено од <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Се користи од <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Неодамна користено од <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Систем"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Мултитаскинг"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Внесување"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Кратенки за апликации"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Пристапност"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Кратенки од тастатура"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Кратенки за пребарување"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Икона за собирање"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Икона за проширување"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Осветлување на тастатура"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Ниво %1$d од %2$d"</string>
diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml
index 291ee6a..540358c 100644
--- a/packages/SystemUI/res/values-ml/strings.xml
+++ b/packages/SystemUI/res/values-ml/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"നിങ്ങളുടെ ഉപകരണ അനുഭവത്തിന്റെ ഏത് ഭാഗമാണ് ബാധിച്ചത്?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"പ്രശ്ന തരം തിരഞ്ഞെടുക്കുക"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"സ്ക്രീൻ റെക്കോർഡ്"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"പ്രകടനം"</item>
- <item msgid="1627504621139124393">"ഉപയോക്തൃ ഇന്റര്ഫേസ്"</item>
- <item msgid="8309220355268900335">"ബാറ്ററി"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"ഒറ്റക്കൈ മോഡ്"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"കേൾവിക്കുള്ള ഉപകരണങ്ങൾ"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"കേൾവിക്കുള്ള ഉപകരണങ്ങൾ"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"തത്സമയ ക്യാപ്ഷനുകൾ"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"ഉപകരണ ക്യാമറയോ മൈക്രോഫോണോ അൺബ്ലോക്ക് ചെയ്യണോ?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"ബട്ടൺ <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"ഹോം"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"ബാക്ക്"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"മുകളിലേക്കുള്ള അമ്പടയാളം"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"താഴേക്കുള്ള അമ്പടയാളം"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ഇടത് അമ്പടയാളം"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"വലത് അമ്പടയാളം"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"മധ്യം"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"TAB"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"സ്പെയ്സ്"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"എന്റർ"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ഫോൾഡ് ചെയ്തത്"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"അൺഫോൾഡ് ചെയ്തത്"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ബാറ്ററി ചാർജ് ശേഷിക്കുന്നു"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"നിങ്ങളുടെ സ്റ്റൈലസ് ചാർജറുമായി കണക്റ്റ് ചെയ്യുക"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"സ്റ്റൈലസിന്റെ ബാറ്ററി ചാർജ് കുറവാണ്"</string>
<string name="video_camera" msgid="7654002575156149298">"വീഡിയോ ക്യാമറ"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) അടുത്തിടെ ഉപയോഗിച്ചു"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ഉപയോഗിക്കുന്നു"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) അടുത്തിടെ ഉപയോഗിച്ചു"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"സിസ്റ്റം"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"മൾട്ടിടാസ്കിംഗ്"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ഇൻപുട്ട്"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ആപ്പ് കുറുക്കുവഴികൾ"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ഉപയോഗസഹായി"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"കീബോഡ് കുറുക്കുവഴികൾ"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"തിരയൽ കുറുക്കുവഴികൾ"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ചുരുക്കൽ ഐക്കൺ"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"വികസിപ്പിക്കൽ ഐക്കൺ"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"കീബോഡ് ബാക്ക്ലൈറ്റ്"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d-ൽ %1$d-ാമത്തെ ലെവൽ"</string>
diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml
index da8db8d..47e6936 100644
--- a/packages/SystemUI/res/values-mn/strings.xml
+++ b/packages/SystemUI/res/values-mn/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Таны төхөөрөмжийн хэрэглээний аль хэсэгт нөлөөлсөн бэ?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Асуудлын төрөл сонгоно уу"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Дэлгэцийн бичлэг"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Гүйцэтгэл"</item>
- <item msgid="1627504621139124393">"Хэрэглэгчийн интерфейс"</item>
- <item msgid="8309220355268900335">"Батарей"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Нэг гарын горим"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Сонсголын төхөөрөмжүүд"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Сонсголын төхөөрөмжүүд"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Шууд тайлбар"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Төхөөрөмжийн камер болон микрофоныг блокоос гаргах уу?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> товчлуур"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Нүүр хуудас"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Буцах"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Дээш сум"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Доош сум"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Зүүн сум"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Баруун сум"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Гол хэсэг"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Зай"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Оруулах"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"эвхсэн"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"дэлгэсэн"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> батарей үлдлээ"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Мэдрэгч үзгээ цэнэглэгчтэй холбоорой"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Мэдрэгч үзэгний батарей бага байна"</string>
<string name="video_camera" msgid="7654002575156149298">"Видео камер"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Саяхан <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ашигласан"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ашиглаж байна"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Саяхан <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ашигласан"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Систем"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Олон ажил зэрэг хийх"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Оролт"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Аппын товчлол"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Хандалт"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Товчлуурын шууд холбоос"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Товчлолууд хайх"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Хураах дүрс тэмдэг"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Дэлгэх дүрс тэмдэг"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Гарын арын гэрэл"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d-с %1$d-р түвшин"</string>
diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml
index 7dd9308..39f1413 100644
--- a/packages/SystemUI/res/values-mr/strings.xml
+++ b/packages/SystemUI/res/values-mr/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"तुमच्या डिव्हाइसबाबत कोणत्या अनुभवावर परिणाम झाला?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"समस्येचा प्रकार निवडा"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"स्क्रीन रेकॉर्ड"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"परफॉर्मन्स"</item>
- <item msgid="1627504621139124393">"यूझर इंटरफेस"</item>
- <item msgid="8309220355268900335">"बॅटरी"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"परफॉर्मन्स"</string>
+ <string name="user_interface" msgid="3712869377953950887">"यूझर इंटरफेस"</string>
+ <string name="thermal" msgid="6758074791325414831">"थर्मल"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"एकहाती मोड"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"श्रवणयंत्रे"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"श्रवणयंत्रे"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"नवीन डिव्हाइस पेअर करा"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"नवीन डिव्हाइस पेअर करण्यासाठी क्लिक करा"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"बटण <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"परत"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"अप अॅरो"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"डाउन अॅरो"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"लेफ्ट अॅरो"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"राइट अॅरो"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"मध्यवर्ती"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"फोल्ड केलेले"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"फोल्ड न केलेले"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> बॅटरी शिल्लक आहे"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"स्टायलस बॅटरी <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"तुमचे स्टायलस चार्जरशी कनेक्ट करा"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"स्टायलस बॅटरी कमी आहे"</string>
<string name="video_camera" msgid="7654002575156149298">"व्हिडिओ कॅमेरा"</string>
@@ -1327,6 +1324,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"शोधण्यासाठी शॉर्टकट"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"कोलॅप्स करा आयकन"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"विस्तार करा आयकन"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"कीबोर्ड बॅकलाइट"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d पैकी %1$d पातळी"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"होम कंट्रोल"</string>
diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml
index abd9d01..8fce993 100644
--- a/packages/SystemUI/res/values-ms/strings.xml
+++ b/packages/SystemUI/res/values-ms/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Pengalaman peranti yang manakah yang terjejas?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Pilih jenis masalah"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Rakam skrin"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Prestasi"</item>
- <item msgid="1627504621139124393">"Antara Muka Pengguna"</item>
- <item msgid="8309220355268900335">"Bateri"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Mod sebelah tangan"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Peranti pendengaran"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Peranti pendengaran"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Gandingkan peranti baharu"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Klik untuk menggandingkan peranti baharu"</string>
@@ -377,8 +382,8 @@
<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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Nyahsekat kamera dan mikrofon peranti?"</string>
- <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Tindakan ini menyahsekat akses bagi semua apl dan perkhidmatan yang dibenarkan untuk menggunakan mikrofon anda."</string>
- <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Tindakan ini menyahsekat akses bagi semua apl dan perkhidmatan yang dibenarkan untuk menggunakan kamera anda."</string>
+ <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Tindakan ini menyahsekat akses bagi semua apl dan perkhidmatan yang dibenarkan untuk menggunakan mikrofon."</string>
+ <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Tindakan ini menyahsekat akses bagi semua apl dan perkhidmatan yang dibenarkan untuk menggunakan kamera."</string>
<string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Tindakan ini menyahsekat akses bagi semua apl dan perkhidmatan yang dibenarkan untuk menggunakan kamera atau mikrofon anda."</string>
<string name="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"Mikrofon disekat"</string>
<string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"Kamera disekat"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Butang <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Skrin Utama"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Kembali"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Anak panah ke atas"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Anak panah ke bawah"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Anak panah ke kiri"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Anak panah ke kanan"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Tengah"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -933,7 +933,7 @@
<string name="running_foreground_services_title" msgid="5137313173431186685">"Apl yang berjalan di latar belakang"</string>
<string name="running_foreground_services_msg" msgid="3009459259222695385">"Ketik untuk mendapatkan butiran tentang penggunaan kuasa bateri dan data"</string>
<string name="mobile_data_disable_title" msgid="5366476131671617790">"Matikan data mudah alih?"</string>
- <string name="mobile_data_disable_message" msgid="8604966027899770415">"Anda tidak akan mempunyai akses kepada data atau Internet melalui <xliff:g id="CARRIER">%s</xliff:g>. Internet hanya tersedia melaui Wi-Fi."</string>
+ <string name="mobile_data_disable_message" msgid="8604966027899770415">"Anda tidak akan dapat mengakses data atau Internet melalui <xliff:g id="CARRIER">%s</xliff:g>. Internet hanya akan tersedia melalui Wi-Fi."</string>
<string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"pembawa anda"</string>
<string name="auto_data_switch_disable_title" msgid="5146527155665190652">"Tukar kembali kepada <xliff:g id="CARRIER">%s</xliff:g>?"</string>
<string name="auto_data_switch_disable_message" msgid="5885533647399535852">"Data mudah alih tidak akan ditukar secara automatik berdasarkan ketersediaan"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"terlipat"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"tidak terlipat"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Bateri tinggal <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Sambungkan stilus anda kepada pengecas"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Bateri stilus lemah"</string>
<string name="video_camera" msgid="7654002575156149298">"Kamera video"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Digunakan baru-baru ini oleh <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Digunakan oleh <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Digunakan baru-baru ini oleh <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistem"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Berbilang tugas"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Pintasan apl"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Kebolehaksesan"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Pintasan papan kekunci"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pintasan carian"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Kuncupkan ikon"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Kembangkan ikon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Cahaya latar papan kekunci"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Tahap %1$d daripada %2$d"</string>
diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml
index a376ecf..9264261 100644
--- a/packages/SystemUI/res/values-my/strings.xml
+++ b/packages/SystemUI/res/values-my/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"စက်အသုံးပြုမှု၏ မည်သည့်အပိုင်းကို သက်ရောက်သလဲ။"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"ပြဿနာအမျိုးအစား ရွေးရန်"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"ဖန်သားပြင်ရိုက်ကူးရန်"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"စွမ်းဆောင်ရည်"</item>
- <item msgid="1627504621139124393">"သုံးသူအတွက် ကြားခံစနစ်"</item>
- <item msgid="8309220355268900335">"ဘက်ထရီ"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"လက်တစ်ဖက်သုံးမုဒ်"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"နားကြားကိရိယာ"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"နားကြားကိရိယာ"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"စက်အသစ်တွဲချိတ်ရန်"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"စက်အသစ် တွဲချိတ်ရန် နှိပ်ပါ"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"ခလုတ် <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"ပင်မ"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"နောက်သို့"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"အပေါ်ညွှန်မြား"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"အောက်ညွှန်မြား"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ဘယ်ညွှန်မြား"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"ညာညွှန်မြား"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"ဌာန"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter ခလုတ်"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ခေါက်ထားသည်"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"ဖြန့်ထားသည်"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"ဘက်ထရီ <xliff:g id="PERCENTAGE">%s</xliff:g> ကျန်သေးသည်"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"စတိုင်လပ်စ်ကို အားသွင်းကိရိယာနှင့် ချိတ်ဆက်ခြင်း"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"စတိုင်လပ်စ် ဘက်ထရီ အားနည်းနေသည်"</string>
<string name="video_camera" msgid="7654002575156149298">"ဗီဒီယိုကင်မရာ"</string>
@@ -1327,6 +1328,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ရှာဖွေစာလုံး ဖြတ်လမ်း"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"လျှော့ပြရန် သင်္ကေတ"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ပိုပြရန် သင်္ကေတ"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"ကီးဘုတ်နောက်မီး"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"အဆင့် %2$d အနက် %1$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"အိမ်ထိန်းချုပ်မှုများ"</string>
diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml
index 23dc7fd..9c2193e 100644
--- a/packages/SystemUI/res/values-nb/strings.xml
+++ b/packages/SystemUI/res/values-nb/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Hvilken del av enhetsopplevelsen din ble påvirket?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Velg problemtype"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Skjermopptak"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Ytelse"</item>
- <item msgid="1627504621139124393">"Brukergrensesnitt"</item>
- <item msgid="8309220355268900335">"Batteri"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Enhåndsmodus"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Høreapparater"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Høreapparater"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Koble til en ny enhet"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Klikk for å koble til en ny enhet"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g>-knappen"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Startskjerm"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Tilbake"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Oppoverpil"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Nedoverpil"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Venstrepil"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Høyrepil"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Midttasten"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Mellomrom"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"lagt sammen"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"åpen"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> batteri gjenstår"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Koble pekepennen til en lader"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Det er lite batteri i pekepennen"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Nylig brukt av <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"I bruk av <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Nylig brukt av <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"System"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Inndata"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-snarveier"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Tilgjengelighet"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Hurtigtaster"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Snarveier til søk"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Skjul-ikon"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Vis-ikon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Bakgrunnslys for tastatur"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nivå %1$d av %2$d"</string>
diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml
index f442427..94b197b 100644
--- a/packages/SystemUI/res/values-ne/strings.xml
+++ b/packages/SystemUI/res/values-ne/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"तपाईंको डिभाइसको कुन चाहिँ सुविधा प्रभावित भएको छ?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"समस्याको प्रकार चयन गर्नुहोस्"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"स्क्रिन रेकर्ड"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"पर्फर्मेन्स"</item>
- <item msgid="1627504621139124393">"युजर इन्टरफेस"</item>
- <item msgid="8309220355268900335">"ब्याट्री"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"एक हाते मोड"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"हियरिङ डिभाइसहरू"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"हियरिङ डिभाइसहरू"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"लाइभ क्याप्सन"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"डिभाइसको क्यामेरा र माइक्रोफोन अनब्लक गर्ने हो?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> बटन"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"पछाडि"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"अप एरो"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"डाउन एरो"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"लेफ्ट एरो"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"राइट एरो"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"केन्द्र"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"स्पेस"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"फोल्ड गरिएको"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"अनफोल्ड गरिएको"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ब्याट्री बाँकी छ"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"आफ्नो स्टाइलस चार्जरमा कनेक्ट गर्नुहोस्"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"स्टाइलसको ब्याट्री लो छ"</string>
<string name="video_camera" msgid="7654002575156149298">"भिडियो क्यामेरा"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ले हालसालै प्रयोग गरेको"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ले प्रयोग गरिरहेको छ"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ले हालसालै प्रयोग गरेको"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"सिस्टम"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"एकै पटक एकभन्दा बढी एप चलाउन मिल्ने सुविधा"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"इनपुट"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"एपका सर्टकटहरू"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"सर्वसुलभता"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"किबोर्डका सर्टकटहरू"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"खोजका सर्टकटहरू"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"\"कोल्याप्स गर्नुहोस्\" आइकन"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"\"एक्स्पान्ड गर्नुहोस्\" आइकन"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"किबोर्ड ब्याकलाइट"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d मध्ये %1$d औँ स्तर"</string>
diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml
index a68e8a2..8cdbf61 100644
--- a/packages/SystemUI/res/values-nl/strings.xml
+++ b/packages/SystemUI/res/values-nl/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Op welk onderdeel van de apparaatfunctionaliteit had dit effect?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Probleemtype selecteren"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Schermopname"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Prestaties"</item>
- <item msgid="1627504621139124393">"Gebruikersinterface"</item>
- <item msgid="8309220355268900335">"Batterij"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Prestaties"</string>
+ <string name="user_interface" msgid="3712869377953950887">"Gebruikersinterface"</string>
+ <string name="thermal" msgid="6758074791325414831">"Thermisch"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Bediening met 1 hand"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Hoortoestellen"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Hoortoestellen"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Nieuw apparaat koppelen"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Klik om nieuw apparaat te koppelen"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Knop <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Terug"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Pijl-omhoog"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Pijl-omlaag"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Pijl-links"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Pijl-rechts"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Midden"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Spatiebalk"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"dichtgevouwen"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"opengevouwen"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Nog <xliff:g id="PERCENTAGE">%s</xliff:g> batterijlading"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Stylusbatterij <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Verbind je stylus met een oplader"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Batterij van stylus bijna leeg"</string>
<string name="video_camera" msgid="7654002575156149298">"Videocamera"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Recent gebruikt door <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Gebruikt door <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Recent gebruikt door <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Systeem"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Invoer"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-snelkoppelingen"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Toegankelijkheid"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Sneltoetsen"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Snelkoppelingen voor zoekopdrachten"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icoon voor samenvouwen"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icoon voor uitvouwen"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Achtergrondverlichting van toetsenbord"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Niveau %1$d van %2$d"</string>
diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml
index 4bdd980..287d1a7 100644
--- a/packages/SystemUI/res/values-or/strings.xml
+++ b/packages/SystemUI/res/values-or/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ଆପଣଙ୍କ ଡିଭାଇସ ଅନୁଭୂତିର କେଉଁ ଅଂଶ ପ୍ରଭାବିତ ହୋଇଛି?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"ସମସ୍ୟାର ପ୍ରକାର ଚୟନ କରନ୍ତୁ"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"ସ୍କ୍ରିନ ରେକର୍ଡ"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"ପରଫରମାନ୍ସ"</item>
- <item msgid="1627504621139124393">"ୟୁଜର ଇଣ୍ଟରଫେସ"</item>
- <item msgid="8309220355268900335">"ବେଟେରୀ"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"ଏକ-ହାତ ମୋଡ"</string>
- <string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"ହିଅରିଂ ଡିଭାଇସଗୁଡ଼ିକ"</string>
- <string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"ହିଅରିଂ ଡିଭାଇସଗୁଡ଼ିକ"</string>
+ <string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"ଶ୍ରବଣ ଡିଭାଇସଗୁଡ଼ିକ"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
+ <string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"ଶ୍ରବଣ ଡିଭାଇସଗୁଡ଼ିକ"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"ଲାଇଭ କେପ୍ସନ"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"ଡିଭାଇସର କ୍ୟାମେରା ଏବଂ ମାଇକ୍ରୋଫୋନକୁ ଅନବ୍ଲକ୍ କରିବେ?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"ବଟନ୍ <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"ହୋମ"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"ଫେରନ୍ତୁ"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ଅପ ତୀର କୀ"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"ଡାଉନ ଆରୋ"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ବାମ ତୀର କୀ"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"ଡାହାଣ ତୀର କୀ"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"କେନ୍ଦ୍ର"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"ସ୍ପେସ୍"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"ଏଣ୍ଟର୍"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ଫୋଲ୍ଡେଡ"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"ଅନଫୋଲ୍ଡେଡ"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ବେଟେରୀ ଚାର୍ଜ ବାକି ଅଛି"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ଏକ ଚାର୍ଜର ସହ ଆପଣଙ୍କ ଷ୍ଟାଇଲସକୁ କନେକ୍ଟ କରନ୍ତୁ"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"ଷ୍ଟାଇଲସ ବେଟେରୀର ଚାର୍ଜ କମ ଅଛି"</string>
<string name="video_camera" msgid="7654002575156149298">"ଭିଡିଓ କେମେରା"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"ଏବେ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ଦ୍ୱାରା ବ୍ୟବହାର କରାଯାଉଛି"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଦ୍ୱାରା ବ୍ୟବହାର କରାଯାଉଛି (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"ଏବେ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ଦ୍ୱାରା ବ୍ୟବହାର କରାଯାଉଛି"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"ସିଷ୍ଟମ"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ମଲ୍ଟିଟାସ୍କିଂ"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ଇନପୁଟ"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ଆପ ସର୍ଟକଟ"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ଆକ୍ସେସିବିଲିଟୀ"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"କୀବୋର୍ଡ ସର୍ଟକଟ"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ସର୍ଚ୍ଚ ସର୍ଟକଟ"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ଆଇକନକୁ ସଙ୍କୁଚିତ କରନ୍ତୁ"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ଆଇକନକୁ ବିସ୍ତାର କରନ୍ତୁ"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"କୀବୋର୍ଡ ବେକଲାଇଟ"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$dରୁ %1$d ନମ୍ବର ଲେଭେଲ"</string>
diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml
index 2558fca..a16a8a5 100644
--- a/packages/SystemUI/res/values-pa/strings.xml
+++ b/packages/SystemUI/res/values-pa/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਕਿਹੜੀ ਸੁਵਿਧਾ ਪ੍ਰਭਾਵਿਤ ਹੋਈ ਸੀ?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"ਸਮੱਸਿਆ ਦੀ ਕਿਸਮ ਚੁਣੋ"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"ਸਕ੍ਰੀਨ ਰਿਕਾਰਡ"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"ਕਾਰਗੁਜ਼ਾਰੀ"</item>
- <item msgid="1627504621139124393">"ਯੂਜ਼ਰ ਇੰਟਰਫ਼ੇਸ"</item>
- <item msgid="8309220355268900335">"ਬੈਟਰੀ"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"ਇੱਕ ਹੱਥ ਮੋਡ"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"ਸੁਣਨ ਵਾਲੇ ਡੀਵਾਈਸ"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"ਸੁਣਨ ਵਾਲੇ ਡੀਵਾਈਸ"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"\'ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ\' \'ਤੇ ਕਲਿੱਕ ਕਰੋ"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"ਬਟਨ <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ਉੱਪਰ ਤੀਰ"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"ਹੇਠਾਂ ਤੀਰ"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ਖੱਬਾ ਤੀਰ"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"ਸੱਜਾ ਤੀਰ"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Center"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"ਫੋਲਡਯੋਗ ਡੀਵਾਈਸ"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"ਅਣਫੋਲਡਯੋਗ ਡੀਵਾਈਸ"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ਬੈਟਰੀ ਬਾਕੀ"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ਆਪਣੇ ਸਟਾਈਲਸ ਨੂੰ ਚਾਰਜਰ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"ਸਟਾਈਲਸ ਦੀ ਬੈਟਰੀ ਘੱਟ ਹੈ"</string>
<string name="video_camera" msgid="7654002575156149298">"ਵੀਡੀਓ ਕੈਮਰਾ"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"ਹਾਲ ਹੀ ਵਿੱਚ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ਵੱਲੋਂ ਵਰਤਿਆ ਗਿਆ"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ਵੱਲੋਂ ਵਰਤੋਂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"ਹਾਲ ਹੀ ਵਿੱਚ <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ਵੱਲੋਂ ਵਰਤਿਆ ਗਿਆ"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"ਸਿਸਟਮ"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ਮਲਟੀਟਾਸਕਿੰਗ"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ਇਨਪੁੱਟ"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ਐਪ ਸ਼ਾਰਟਕੱਟ"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ਪਹੁੰਚਯੋਗਤਾ"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ਖੋਜ ਸੰਬੰਧੀ ਸ਼ਾਰਟਕੱਟ"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ਪ੍ਰਤੀਕ ਨੂੰ ਸਮੇਟੋ"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ਪ੍ਰਤੀਕ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"ਕੀ-ਬੋਰਡ ਬੈਕਲਾਈਟ"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d ਵਿੱਚੋਂ %1$d ਪੱਧਰ"</string>
diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml
index 747d922..58561f1 100644
--- a/packages/SystemUI/res/values-pl/strings.xml
+++ b/packages/SystemUI/res/values-pl/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Którego aspektu korzystania z urządzenia dotyczył problem?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Wybierz typ problemu"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Nagrywanie ekranu"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Wydajność"</item>
- <item msgid="1627504621139124393">"Interfejs"</item>
- <item msgid="8309220355268900335">"Bateria"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Wydajność"</string>
+ <string name="user_interface" msgid="3712869377953950887">"Interfejs"</string>
+ <string name="thermal" msgid="6758074791325414831">"Termografia"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Tryb jednej ręki"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Urządzenia słuchowe"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Urządzenia słuchowe"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Sparuj nowe urządzenie"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Kliknij, aby sparować nowe urządzenie"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Przycisk <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Wstecz"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Strzałka w górę"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Strzałka w dół"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Strzałka w lewo"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Strzałka w prawo"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Do środka"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Spacja"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"po zamknięciu"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"po otwarciu"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Pozostało <xliff:g id="PERCENTAGE">%s</xliff:g> baterii"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Bateria rysika: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Podłącz rysik do ładowarki"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Słaba bateria w rysiku"</string>
<string name="video_camera" msgid="7654002575156149298">"Kamera"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Ostatnio używany przez aplikację <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Używany przez aplikację <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Ostatnio używany przez aplikację <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"System"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Wielozadaniowość"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Wprowadzanie"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Skróty do aplikacji"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Ułatwienia dostępu"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Skróty klawiszowe"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Skróty do wyszukiwania"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona zwijania"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona rozwijania"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Podświetlenie klawiatury"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Poziom %1$d z %2$d"</string>
diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml
index a3bfad7..8f5c519 100644
--- a/packages/SystemUI/res/values-pt-rBR/strings.xml
+++ b/packages/SystemUI/res/values-pt-rBR/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Que parte da sua experiência no dispositivo foi afetada?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Selecionar tipo de problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Gravação de tela"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Desempenho"</item>
- <item msgid="1627504621139124393">"Interface do usuário"</item>
- <item msgid="8309220355268900335">"Bateria"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo uma mão"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Aparelhos auditivos"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Aparelhos auditivos"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Parear novo dispositivo"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Clique para parear o novo dispositivo"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Botão <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Voltar"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Seta para cima"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Seta para baixo"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Seta para a esquerda"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Seta para a direita"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centralizar"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"fechado"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"aberto"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Bateria restante: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecte sua stylus a um carregador"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Bateria da stylus fraca"</string>
<string name="video_camera" msgid="7654002575156149298">"Filmadora"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Usado recentemente pelo app <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Em uso pelo app <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Usado recentemente pelo app <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistema"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitarefas"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Atalhos de apps"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Acessibilidade"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Atalhos do teclado"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atalhos de pesquisa"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícone \"Fechar\""</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícone \"Abrir\""</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Luz de fundo do teclado"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nível %1$d de %2$d"</string>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml
index d76aa8de..df73572 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Que parte da experiência do disposit. foi afetada?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Selecione o tipo de problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Gravação de ecrã"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Desempenho"</item>
- <item msgid="1627504621139124393">"Interface do utilizador"</item>
- <item msgid="8309220355268900335">"Bateria"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Desempenho"</string>
+ <string name="user_interface" msgid="3712869377953950887">"Interface do utilizador"</string>
+ <string name="thermal" msgid="6758074791325414831">"Térmico"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo para uma mão"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Dispositivos auditivos"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Dispositivos auditivos"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Sincronizar novo dispositivo"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Clique para sincronizar um novo dispositivo"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Botão <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Início"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Anterior"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Seta para cima"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Seta para baixo"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Seta para a esquerda"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Seta para a direita"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Ao centro"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Espaço"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -988,7 +985,7 @@
<string name="magnification_close_settings_click_label" msgid="4642477260651704517">"Fechar definições de ampliação"</string>
<string name="magnification_exit_edit_mode_click_label" msgid="1664818325144887117">"Sair do modo de edição"</string>
<string name="magnification_drag_corner_to_resize" msgid="1249766311052418130">"Arrastar o canto para redimensionar"</string>
- <string name="accessibility_allow_diagonal_scrolling" msgid="3258050349191496398">"Permitir deslocamento da página na diagonal"</string>
+ <string name="accessibility_allow_diagonal_scrolling" msgid="3258050349191496398">"Permitir deslocamento diagonal"</string>
<string name="accessibility_resize" msgid="5733759136600611551">"Redimensionar"</string>
<string name="accessibility_change_magnification_type" msgid="666000085077432421">"Alterar tipo de ampliação"</string>
<string name="accessibility_magnification_end_resizing" msgid="4881690585800302628">"Terminar redimensionamento"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"fechado"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"aberto"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> de bateria restante"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Bateria da caneta stylus a <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Ligue a caneta stylus a um carregador"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Bateria da caneta stylus fraca"</string>
<string name="video_camera" msgid="7654002575156149298">"Câmara de vídeo"</string>
@@ -1327,6 +1324,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atalhos de pesquisa"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícone de reduzir"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícone de expandir"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Luz do teclado"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nível %1$d de %2$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"Controlos domésticos"</string>
diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml
index a3bfad7..8f5c519 100644
--- a/packages/SystemUI/res/values-pt/strings.xml
+++ b/packages/SystemUI/res/values-pt/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Que parte da sua experiência no dispositivo foi afetada?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Selecionar tipo de problema"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Gravação de tela"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Desempenho"</item>
- <item msgid="1627504621139124393">"Interface do usuário"</item>
- <item msgid="8309220355268900335">"Bateria"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo uma mão"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Aparelhos auditivos"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Aparelhos auditivos"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Parear novo dispositivo"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Clique para parear o novo dispositivo"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Botão <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Voltar"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Seta para cima"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Seta para baixo"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Seta para a esquerda"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Seta para a direita"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centralizar"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"fechado"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"aberto"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Bateria restante: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conecte sua stylus a um carregador"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Bateria da stylus fraca"</string>
<string name="video_camera" msgid="7654002575156149298">"Filmadora"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Usado recentemente pelo app <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Em uso pelo app <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Usado recentemente pelo app <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistema"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitarefas"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Atalhos de apps"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Acessibilidade"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Atalhos do teclado"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atalhos de pesquisa"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícone \"Fechar\""</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícone \"Abrir\""</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Luz de fundo do teclado"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nível %1$d de %2$d"</string>
diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml
index c24ab85..366480e 100644
--- a/packages/SystemUI/res/values-ro/strings.xml
+++ b/packages/SystemUI/res/values-ro/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Ce parte a experienței pe dispozitiv a fost afectată?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Selectează tipul problemei"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Înregistrarea ecranului"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performanță"</item>
- <item msgid="1627504621139124393">"Interfața de utilizare"</item>
- <item msgid="8309220355268900335">"Baterie"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modul cu o mână"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Aparate auditive"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Aparate auditive"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Asociază un nou dispozitiv"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Dă clic pentru a asocia un nou dispozitiv"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Nu s-a putut actualiza presetarea"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Presetare"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Subtitrări live"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Deblochezi camera și microfonul dispozitivului?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Butonul <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"La început"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Înapoi"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Săgeată în sus"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Săgeată în jos"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Săgeată spre stânga"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Săgeată spre dreapta"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"În centru"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Spațiu"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"închis"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"deschis"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> baterie rămasă"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Conectează-ți creionul la un încărcător"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Nivelul bateriei creionului este scăzut"</string>
<string name="video_camera" msgid="7654002575156149298">"Cameră video"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Folosit recent de <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Se folosește pentru <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Folosit recent de <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistem"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Intrare"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Comenzi rapide pentru aplicații"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accesibilitate"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Comenzi rapide de la tastatură"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Comenzi directe de căutare"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Pictograma de restrângere"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Pictograma de extindere"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Iluminarea din spate a tastaturii"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nivelul %1$d din %2$d"</string>
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index 2313a93..f48e428 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -361,25 +361,29 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"С чем связана проблема, с которой вы столкнулись?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Выберите тип проблемы"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Запись экрана"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Производительность"</item>
- <item msgid="1627504621139124393">"Интерфейс"</item>
- <item msgid="8309220355268900335">"Батарея"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Режим управления одной рукой"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Слуховые аппараты"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Слуховые аппараты"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Автоматические субтитры"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Разблокировать камеру и микрофон устройства?"</string>
- <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Будет снята блокировка доступа для всех приложений и сервисов с разрешением на использование микрофона."</string>
- <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Будет снята блокировка доступа для всех приложений и сервисов с разрешением на использование камеры."</string>
+ <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"Все приложения и сервисы, у которых есть разрешение на использование микрофона, получат к нему доступ."</string>
+ <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"Все приложения и сервисы, у которых есть разрешение на использование камеры, получат к ней доступ."</string>
<string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"Будет снята блокировка доступа для всех приложений и сервисов с разрешением на использование камеры или микрофона."</string>
<string name="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"Микрофон заблокирован"</string>
<string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"Камера заблокирована"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Кнопка <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Главный экран"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Назад"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Стрелка вверх"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Стрелка вниз"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Стрелка влево"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Стрелка вправо"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Центральная стрелка"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Пробел"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Ввод"</string>
@@ -933,8 +932,8 @@
<string name="qs_dnd_prompt_auto_rule_app" msgid="1841469944118486580">"Режим \"Не беспокоить\" был включен специальным правилом или приложением."</string>
<string name="running_foreground_services_title" msgid="5137313173431186685">"Приложения, работающие в фоновом режиме"</string>
<string name="running_foreground_services_msg" msgid="3009459259222695385">"Нажмите, чтобы проверить энергопотребление и трафик"</string>
- <string name="mobile_data_disable_title" msgid="5366476131671617790">"Отключить мобильный Интернет?"</string>
- <string name="mobile_data_disable_message" msgid="8604966027899770415">"Вы не сможете передавать данные или выходить в Интернет через оператора \"<xliff:g id="CARRIER">%s</xliff:g>\". Интернет будет доступен только по сети Wi-Fi."</string>
+ <string name="mobile_data_disable_title" msgid="5366476131671617790">"Отключить мобильный интернет?"</string>
+ <string name="mobile_data_disable_message" msgid="8604966027899770415">"Вы не сможете передавать данные или выходить в интернет через оператора \"<xliff:g id="CARRIER">%s</xliff:g>\". Интернет будет доступен только по сети Wi-Fi."</string>
<string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"ваш оператор"</string>
<string name="auto_data_switch_disable_title" msgid="5146527155665190652">"Переключиться на сеть \"<xliff:g id="CARRIER">%s</xliff:g>\"?"</string>
<string name="auto_data_switch_disable_message" msgid="5885533647399535852">"Мобильный интернет не будет переключаться автоматически."</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"устройство сложено"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"устройство разложено"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Уровень заряда батареи: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Поставьте стилус на зарядку."</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Низкий заряд батареи стилуса"</string>
<string name="video_camera" msgid="7654002575156149298">"Видеокамера"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Недавно использовалось приложением \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Сейчас используется приложением \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Недавно использовалось приложением \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Система"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Многозадачность"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ввод"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Ярлыки приложений"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Специальные возможности"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Быстрые клавиши"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Найти быстрые клавиши"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Значок \"Свернуть\""</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Значок \"Развернуть\""</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Подсветка клавиатуры"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Уровень %1$d из %2$d"</string>
diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml
index 91a6843..0e621c6 100644
--- a/packages/SystemUI/res/values-si/strings.xml
+++ b/packages/SystemUI/res/values-si/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ඔබේ උපාංග අත්දැකීමේ කුමන කොටසට බලපෑවේ ද?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"ගැටලු වර්ගය තෝරන්න"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"තිර පටිගත කිරීම"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"කාර්ය සාධනය"</item>
- <item msgid="1627504621139124393">"පරිශීලක අතුරු මුහුණත"</item>
- <item msgid="8309220355268900335">"බැටරිය"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"තනි අත් ප්රකාරය"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"ශ්රවණ උපාංග"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"ශ්රවණ උපාංග"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"සජීවී සිරස්තලය"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"උපාංග කැමරාව සහ මයික්රෆෝනය අවහිර කිරීම ඉවත් කරන්නද?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> බොත්තම"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home යතුර"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"ආපසු"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ඉහළ ඊතලය"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"පහළ ඊතලය"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"වම් ඊතලය"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"දකුණු ඊතලය"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"මැද"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"ඉඩ යතුර"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter යතුර"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"නැවූ"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"නොනැවූ"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> බැටරිය ඉතිරිව ඇත"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"ඔබේ පන්හිඳ චාජරයකට සම්බන්ධ කරන්න"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"පන්හිඳ බැටරිය අඩුයි"</string>
<string name="video_camera" msgid="7654002575156149298">"වීඩියෝ කැමරාව"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> විසින් මෑතකදී භාවිත කරන ලදි (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> භාවිත කරයි (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> විසින් මෑතකදී භාවිත කරන ලදි (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"පද්ධතිය"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"බහුකාර්ය"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ආදානය"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"යෙදුම් කෙටිමං"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ප්රවේශ්යතාව"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"යතුරු පුවරු කෙටි මං"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"කෙටි මං සොයන්න"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"හැකුළුම් නිරූපකය"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"දිගහැරීම් නිරූපකය"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"යතුරු පුවරු පසු ආලෝකය"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$dන් %1$d වැනි මට්ටම"</string>
diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml
index 0df58c2..ba72fb4 100644
--- a/packages/SystemUI/res/values-sk/strings.xml
+++ b/packages/SystemUI/res/values-sk/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Čo v zariadení bolo ovplyvnené?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Vyberte typ problému"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Rekordér obrazovky"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Výkon"</item>
- <item msgid="1627504621139124393">"Používateľské rozhranie"</item>
- <item msgid="8309220355268900335">"Batéria"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Režim jednej ruky"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Načúvacie zariadenia"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Načúvacie zariadenia"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Spárovať nové zariadenie"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Kliknutím spárujete nové zariadenie"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Predvoľbu sa nepodarilo aktualizovať"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Predvoľba"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Živý prepis"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Chcete odblokovať fotoaparát a mikrofón zariadenia?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Tlačidlo <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Domov"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Späť"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Šípka nahor"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Šípka nadol"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Šípka doľava"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Šípka doprava"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Do stredu"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Medzerník"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"zložené"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"rozložené"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Zostáva <xliff:g id="PERCENTAGE">%s</xliff:g> batérie"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Pripojte dotykové pero k nabíjačke"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Stav batérie dotykového pera je nízky"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Nedávno využila aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Využíva <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Nedávno využila aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Systém"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Vstup"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Odkazy do aplikácií"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Dostupnosť"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Klávesové skratky"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Vyhľadávacie odkazy"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona zbalenia"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona rozbalenia"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Podsvietenie klávesnice"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%1$d. úroveň z %2$d"</string>
diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml
index 9bbe70e..c6c1439 100644
--- a/packages/SystemUI/res/values-sl/strings.xml
+++ b/packages/SystemUI/res/values-sl/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Na kateri del izkušnje z napravo je to vplivalo?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Izberite vrsto težave"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Snemanje zaslona"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Učinkovitost delovanja"</item>
- <item msgid="1627504621139124393">"Uporabniški vmesnik"</item>
- <item msgid="8309220355268900335">"Baterija"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Enoročni način"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Slušni pripomočki"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Slušni pripomočki"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Seznanitev nove naprave"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Kliknite za seznanitev nove naprave"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Gumb <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Začetek"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Nazaj"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Puščica gor"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Puščica dol"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Puščica levo"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Puščica desno"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Sredina"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Preslednica"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Vnesi"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"zaprto"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"razprto"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Preostanek energije baterije: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Povežite pisalo s polnilnikom."</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Skoraj prazna baterija pisala"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1327,6 +1328,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Bližnjice za iskanje"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona za strnitev"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona za razširitev"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Osvetlitev tipkovnice"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Stopnja %1$d od %2$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"Kontrolniki za dom"</string>
diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml
index 4aebab4..dc9407f 100644
--- a/packages/SystemUI/res/values-sq/strings.xml
+++ b/packages/SystemUI/res/values-sq/strings.xml
@@ -361,21 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Cila pjesë e përvojës me pajisjen është prekur?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Zgjidh llojin e problemit"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Regjistrim i ekranit"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performanca"</item>
- <item msgid="1627504621139124393">"Ndërfaqja e përdoruesit"</item>
- <item msgid="8309220355268900335">"Bateria"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modaliteti i përdorimit me një dorë"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Pajisje ndihmëse për dëgjimin"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Pajisjet e dëgjimit"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Çifto pajisje të re"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Kliko për të çiftuar një pajisje të re"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Paravendosja nuk mund të përditësohej"</string>
- <!-- no translation found for hearing_devices_preset_label (7878267405046232358) -->
- <skip />
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="hearing_devices_preset_label" msgid="7878267405046232358">"Paravendosja"</string>
+ <string name="live_caption_title" msgid="8916875614623730005">"Titra në çast"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Të zhbllokohen kamera dhe mikrofoni i pajisjes?"</string>
@@ -596,9 +599,9 @@
<string name="screen_pinning_negative" msgid="6882816864569211666">"Jo, faleminderit!"</string>
<string name="screen_pinning_start" msgid="7483998671383371313">"Aplikacioni u gozhdua"</string>
<string name="screen_pinning_exit" msgid="4553787518387346893">"Aplikacioni u zhgozhdua"</string>
- <string name="stream_voice_call" msgid="7468348170702375660">"Telefono"</string>
+ <string name="stream_voice_call" msgid="7468348170702375660">"Telefonata"</string>
<string name="stream_system" msgid="7663148785370565134">"Sistemi"</string>
- <string name="stream_ring" msgid="7550670036738697526">"Bjeri ziles"</string>
+ <string name="stream_ring" msgid="7550670036738697526">"Zilja"</string>
<string name="stream_music" msgid="2188224742361847580">"Media"</string>
<string name="stream_alarm" msgid="16058075093011694">"Alarmi"</string>
<string name="stream_notification" msgid="7930294049046243939">"Njoftimi"</string>
@@ -729,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Butoni <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Kreu"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Prapa"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Shigjeta lart"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Shigjeta poshtë"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Shigjeta majtas"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Shigjeta djathtas"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Qendror"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Hapësirë"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1277,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"palosur"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"shpalosur"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Përqindja e mbetur e baterisë: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Lidhe stilolapsin me një karikues"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Bateria e stilolapsit në nivel të ulët"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1320,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Përdorur së fundi nga <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Në përdorim nga <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Përdorur së fundi nga <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistemi"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Kryerja e shumë detyrave"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Hyrja"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Shkurtoret e aplikacionit"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Qasshmëria"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Shkurtoret e tastierës"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Kërko për shkurtoret"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona e palosjes"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona e zgjerimit"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Drita e sfondit e tastierës"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Niveli: %1$d nga %2$d"</string>
diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml
index 0f0d78d..1228eef 100644
--- a/packages/SystemUI/res/values-sr/strings.xml
+++ b/packages/SystemUI/res/values-sr/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"На који део доживљаја на уређају је ово утицало?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Изаберите тип проблема"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Снимање екрана"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Учинак"</item>
- <item msgid="1627504621139124393">"Кориснички интерфејс"</item>
- <item msgid="8309220355268900335">"Батерија"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Перформансе"</string>
+ <string name="user_interface" msgid="3712869377953950887">"Кориснички интерфејс"</string>
+ <string name="thermal" msgid="6758074791325414831">"Термална камера"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Режим једном руком"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Слушни апарати"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Слушни апарати"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Упари нови уређај"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Кликните да бисте упарили нов уређај"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Дугме <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Тастер Почетна"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Тастер Назад"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Стрелица нагоре"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Стрелица надоле"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Стрелица налево"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Стрелица надесно"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Тастер са централном стрелицом"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Размак"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"затворено"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"отворено"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Преостало је још<xliff:g id="PERCENTAGE">%s</xliff:g> батерије"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Батерија писаљке је на <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Повежите писаљку са пуњачем"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Низак ниво батерије писаљке"</string>
<string name="video_camera" msgid="7654002575156149298">"Видео камера"</string>
@@ -1327,6 +1324,8 @@
<string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Пречице претраге"</string>
<string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Икона за скупљање"</string>
<string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Икона за проширивање"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
+ <skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Позадинско осветљење тастатуре"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%1$d. ниво од %2$d"</string>
<string name="home_controls_dream_label" msgid="6567105701292324257">"Контроле за дом"</string>
diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml
index 2b88829..cf2b93c 100644
--- a/packages/SystemUI/res/values-sv/strings.xml
+++ b/packages/SystemUI/res/values-sv/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Vilken enhetsupplevelse påverkades?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Välj problemtyp"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Skärminspelning"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Prestanda"</item>
- <item msgid="1627504621139124393">"Användargränssnitt"</item>
- <item msgid="8309220355268900335">"Batteri"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Prestanda"</string>
+ <string name="user_interface" msgid="3712869377953950887">"Användargränssnitt"</string>
+ <string name="thermal" msgid="6758074791325414831">"Termisk"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Enhandsläge"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Hörhjälpmedel"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Hörhjälpmedel"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Parkoppla en ny enhet"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Klicka för att parkoppla en ny enhet"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Knappen <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Start"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Tillbaka"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Uppåtpil"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Nedåtpil"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Vänsterpil"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Högerpil"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Centrera"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Blanksteg"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Retur"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"hopvikt"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"uppvikt"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> av batteriet återstår"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"E-pennans batteri: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Anslut e-pennan till en laddare"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"E-pennans batterinivå är låg"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Användes nyligen av <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Används av <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Användes nyligen av <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"System"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multikörning"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ingång"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Genvägar till appar"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Tillgänglighet"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Kortkommandon"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Sökgenvägar"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikonen Komprimera"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikonen Utöka"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Bakgrundsbelysning för tangentbord"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Nivå %1$d av %2$d"</string>
diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml
index 5260a5a..1ee1d0c 100644
--- a/packages/SystemUI/res/values-sw/strings.xml
+++ b/packages/SystemUI/res/values-sw/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Ni sehemu gani ya matumizi ya kifaa iliathiriwa?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Chagua aina ya tatizo"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Rekodi ya skrini"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Utendaji"</item>
- <item msgid="1627504621139124393">"Kiolesura cha Mtumiaji"</item>
- <item msgid="8309220355268900335">"Betri"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Hali ya kutumia kwa mkono mmoja"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Vifaa vya kusikilizia"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Vifaa vya kusikilizia"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Unganisha kifaa kipya"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Bofya ili uunganishe kifaa kipya"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Kitufe cha <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Mwanzo"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Nyuma"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Kishale cha juu"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Kishale cha chini"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Kishale cha kushoto"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Kishale cha kulia"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Katikati"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"kimekunjwa"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"kimefunguliwa"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Chaji ya betri imesalia <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Unganisha stylus yako kwenye chaja"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Chaji ya betri ya Stylus imepungua"</string>
<string name="video_camera" msgid="7654002575156149298">"Kamera ya video"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Ilitumiwa hivi majuzi na <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Inatumiwa na <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Ilitumiwa hivi majuzi na <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Mfumo"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Majukumu mengi"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Kifaa cha kuingiza data"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Njia za mikato za programu"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Ufikivu"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Mikato ya kibodi"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Njia mkato za kutafutia"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Kunja aikoni"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Panua aikoni"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Mwanga chini ya kibodi"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Kiwango cha %1$d kati ya %2$d"</string>
diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml
index 67a31af..6e95c3b 100644
--- a/packages/SystemUI/res/values-ta/strings.xml
+++ b/packages/SystemUI/res/values-ta/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"சாதன அனுபவத்தின் எந்தப் பகுதி பாதிக்கப்பட்டது?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"சிக்கல் வகையைத் தேர்வுசெய்க"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"ஸ்கிரீன் ரெக்கார்டு"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"செயல்திறன்"</item>
- <item msgid="1627504621139124393">"பயனர் இடைமுகம்"</item>
- <item msgid="8309220355268900335">"பேட்டரி"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"ஒற்றைக் கைப் பயன்முறை"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"செவித்துணைக் கருவிகள்"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"செவித்துணைக் கருவிகள்"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"உடனடி வசன உரை"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"சாதனத்தின் கேமராவுக்கும் மைக்ரோஃபோனுக்குமான தடுப்பை நீக்கவா?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> பட்டன்"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"ஹோம்"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"பேக்"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"மேல்நோக்கிய அம்புக்குறி"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"கீழ்நோக்கிய அம்புக்குறி"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"இடது அம்புக்குறி"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"வலது அம்புக்குறி"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"நடு"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"ஸ்பேஸ்"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"என்டர்"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"மடக்கப்பட்டது"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"விரிக்கப்பட்டது"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> பேட்டரி மீதமுள்ளது"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"உங்கள் ஸ்டைலஸைச் சார்ஜருடன் இணையுங்கள்"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"ஸ்டைலஸின் பேட்டரி குறைவாக உள்ளது"</string>
<string name="video_camera" msgid="7654002575156149298">"வீடியோ கேமரா"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ஆப்ஸால் சமீபத்தில் பயன்படுத்தப்பட்டது"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ஆப்ஸால் பயன்படுத்தப்படுகிறது"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ஆப்ஸால் சமீபத்தில் பயன்படுத்தப்பட்டது"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"சிஸ்டம்"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"பல வேலைகளைச் செய்தல்"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"உள்ளீடு"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ஆப்ஸ் ஷார்ட்கட்கள்"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"அணுகல்தன்மை"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"கீபோர்டு ஷார்ட்கட்கள்"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"தேடல் ஷார்ட்கட்கள்"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"சுருக்குவதற்கான ஐகான்"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"விரிவாக்குவதற்கான ஐகான்"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"கீபோர்டு பேக்லைட்"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"நிலை, %2$d இல் %1$d"</string>
diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml
index 6e10896..64d6f9e 100644
--- a/packages/SystemUI/res/values-te/strings.xml
+++ b/packages/SystemUI/res/values-te/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"మీ పరికర అనుభవంలో ఏ భాగం ప్రభావితమైంది?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"సమస్య రకాన్ని ఎంచుకోండి"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"స్క్రీన్ రికార్డ్"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"పనితీరు"</item>
- <item msgid="1627504621139124393">"యూజర్ ఇంటర్ఫేస్"</item>
- <item msgid="8309220355268900335">"బ్యాటరీ"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"వన్-హ్యాండెడ్ మోడ్"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"వినికిడి పరికరాలు"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"వినికిడి పరికరాలు"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"లైవ్ క్యాప్షన్"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"పరికరంలోని కెమెరా, మైక్రోఫోన్లను అన్బ్లాక్ చేయమంటారా?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"బటన్ <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"వెనుకకు"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"పై వైపు బాణం"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"కింది వైపు బాణం"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ఎడమ వైపు బాణం"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"కుడి వైపు బాణం"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"మధ్య"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -989,7 +988,7 @@
<string name="magnification_close_settings_click_label" msgid="4642477260651704517">"మాగ్నిఫికేషన్ సెట్టింగ్లను మూసివేయండి"</string>
<string name="magnification_exit_edit_mode_click_label" msgid="1664818325144887117">"సవరణ మోడ్ నుండి ఎగ్జిట్ అవ్వండి"</string>
<string name="magnification_drag_corner_to_resize" msgid="1249766311052418130">"సైజ్ మార్చడానికి మూలను లాగండి"</string>
- <string name="accessibility_allow_diagonal_scrolling" msgid="3258050349191496398">"డయాగనల్ స్క్రోలింగ్ను అనుమతించండి"</string>
+ <string name="accessibility_allow_diagonal_scrolling" msgid="3258050349191496398">"డయాగోనల్ స్క్రోలింగ్ను అనుమతించండి"</string>
<string name="accessibility_resize" msgid="5733759136600611551">"సైజ్ మార్చండి"</string>
<string name="accessibility_change_magnification_type" msgid="666000085077432421">"మ్యాగ్నిఫికేషన్ రకాన్ని మార్చండి"</string>
<string name="accessibility_magnification_end_resizing" msgid="4881690585800302628">"సైజ్ను మార్చడం ముగించండి"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"మడిచే సదుపాయం గల పరికరం"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"మడిచే సదుపాయం లేని పరికరం"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> బ్యాటరీ మిగిలి ఉంది"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"మీ స్టైలస్ను ఛార్జర్కి కనెక్ట్ చేయండి"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"తక్కువ స్టైలస్ బ్యాటరీ"</string>
<string name="video_camera" msgid="7654002575156149298">"వీడియో కెమెరా"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ద్వారా ఇటీవల వినియోగించబడింది"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ద్వారా వినియోగంలో ఉంది"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ద్వారా ఇటీవల ఉపయోగించబడింది"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"సిస్టమ్"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"మల్టీ-టాస్కింగ్"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ఇన్పుట్"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"యాప్ షార్ట్కట్లు"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"యాక్సెసిబిలిటీ"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"కీబోర్డ్ షార్ట్కట్లు"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"సెర్చ్ షార్ట్కట్లు"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"కుదించండి చిహ్నం"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"విస్తరించండి చిహ్నం"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"కీబోర్డ్ బ్యాక్లైట్"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$dలో %1$dవ స్థాయి"</string>
diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml
index 1f0f45a1..8a76629 100644
--- a/packages/SystemUI/res/values-th/strings.xml
+++ b/packages/SystemUI/res/values-th/strings.xml
@@ -361,20 +361,21 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"ประสบการณ์การใช้งานอุปกรณ์ส่วนใดที่ได้รับผลกระทบ"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"เลือกประเภทปัญหา"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"บันทึกหน้าจอ"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"ประสิทธิภาพ"</item>
- <item msgid="1627504621139124393">"อินเทอร์เฟซผู้ใช้"</item>
- <item msgid="8309220355268900335">"แบตเตอรี่"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"ประสิทธิภาพ"</string>
+ <string name="user_interface" msgid="3712869377953950887">"อินเทอร์เฟซผู้ใช้"</string>
+ <string name="thermal" msgid="6758074791325414831">"ความร้อน"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"โหมดมือเดียว"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"เครื่องช่วยฟัง"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"เครื่องช่วยฟัง"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"คำบรรยายสด"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"เลิกบล็อกกล้องและไมโครโฟนของอุปกรณ์ใช่ไหม"</string>
@@ -728,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"ปุ่ม <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"กลับ"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"ลูกศรขึ้น"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"ลูกศรลง"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"ลูกศรซ้าย"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"ลูกศรขวา"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"กึ่งกลาง"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"วรรค"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"พับ"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"กางออก"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"เหลือแบตเตอรี่ <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"แบตเตอรี่สไตลัส <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"เชื่อมต่อสไตลัสกับที่ชาร์จ"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"แบตเตอรี่สไตลัสเหลือน้อย"</string>
<string name="video_camera" msgid="7654002575156149298">"กล้องวิดีโอ"</string>
@@ -1319,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"ใช้ล่าสุดโดย <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"ใช้อยู่โดย <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"ใช้ล่าสุดโดย <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"ระบบ"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"การทํางานหลายอย่างพร้อมกัน"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"อินพุต"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"แป้นพิมพ์ลัดของแอป"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"การช่วยเหลือพิเศษ"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"แป้นพิมพ์ลัด"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ค้นหาแป้นพิมพ์ลัด"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ไอคอนยุบ"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ไอคอนขยาย"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"ไฟแบ็กไลต์ของแป้นพิมพ์"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"ระดับที่ %1$d จาก %2$d"</string>
diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml
index d3517d4..e74139f 100644
--- a/packages/SystemUI/res/values-tl/strings.xml
+++ b/packages/SystemUI/res/values-tl/strings.xml
@@ -361,20 +361,21 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Ano\'ng naapektuhang parte ng experience sa device?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Piliin ang uri ng isyu"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Pag-record ng screen"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performance"</item>
- <item msgid="1627504621139124393">"User Interface"</item>
- <item msgid="8309220355268900335">"Baterya"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Performance"</string>
+ <string name="user_interface" msgid="3712869377953950887">"User Interface"</string>
+ <string name="thermal" msgid="6758074791325414831">"Thermal"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"One-hand mode"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Mga hearing device"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Mga hearing device"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Magpares ng bagong device"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"I-click para magpares ng bagong device"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Hindi ma-update ang preset"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Preset"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Instant Caption"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"I-unblock ang camera at mikropono ng device?"</string>
@@ -728,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Button na <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Pataas na arrow"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Pababang arrow"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Pakaliwang arrow"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Pakanang arrow"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Center"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"naka-fold"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"hindi naka-fold"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> baterya na lang ang natitira"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Baterya ng stylus <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Ikonekta sa charger ang iyong stylus"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Paubos na ang baterya ng stylus"</string>
<string name="video_camera" msgid="7654002575156149298">"Video camera"</string>
@@ -1319,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Kamakailang ginamit ng <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Ginagamit ng <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Kamakailang ginamit ng <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"System"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Pag-multitask"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Mga shortcut ng app"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Accessibility"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Mga keyboard shortcut"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Mga shortcut ng paghahanap"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"I-collapse ang icon"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"I-expand ang icon"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Backlight ng keyboard"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Level %1$d sa %2$d"</string>
diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml
index b54fd95..a66fbed 100644
--- a/packages/SystemUI/res/values-tr/strings.xml
+++ b/packages/SystemUI/res/values-tr/strings.xml
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Cihaz deneyiminiz ne şekilde etkilendi?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Sorun türünü seçin"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Ekran kaydedicisi"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Performans"</item>
- <item msgid="1627504621139124393">"Kullanıcı Arayüzü"</item>
- <item msgid="8309220355268900335">"Pil"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Tek el modu"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"İşitme cihazları"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"İşitme cihazları"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Yeni cihaz eşle"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Yeni cihaz eşlemek için tıklayın"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> düğmesi"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Geri"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Yukarı ok"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Aşağı ok"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Sol ok"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Sağ ok"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Orta"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Boşluk"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"katlanmış"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"katlanmamış"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> pil kaldı"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Ekran kaleminizi bir şarj cihazına bağlayın"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Ekran kaleminin pil seviyesi düşük"</string>
<string name="video_camera" msgid="7654002575156149298">"Video kamera"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"En son <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) tarafından kullanıldı"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) tarafından kullanılıyor"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"En son <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) tarafından kullanıldı"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Sistem"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Çoklu görev becerisi"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Giriş"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Uygulama kısayolları"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Erişilebilirlik"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Klavye kısayolları"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Arama kısayolları"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Daralt simgesi"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Genişlet simgesi"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Klavye aydınlatması"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Seviye %1$d / %2$d"</string>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index 4768dcb..5262d74 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"На який аспект роботи пристрою вплинула проблема?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Виберіть тип проблеми"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Запис відео з екрана"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Продуктивність"</item>
- <item msgid="1627504621139124393">"Інтерфейс користувача"</item>
- <item msgid="8309220355268900335">"Акумулятор"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Режим керування однією рукою"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Слухові апарати"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Слухові апарати"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Живі субтитри"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Надати доступ до камери й мікрофона?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Кнопка <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Назад"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Стрілка вгору"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Стрілка вниз"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Стрілка вліво"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Стрілка вправо"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Центр"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Пробіл"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"складений"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"розкладений"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Заряд акумулятора: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Підключіть стилус до зарядного пристрою"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Низький заряд акумулятора стилуса"</string>
<string name="video_camera" msgid="7654002575156149298">"Відеокамера"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Нещодавно використано (<xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Використовується додатком <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Нещодавно використано (<xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Система"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Багатозадачність"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Введення"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Комбінації клавіш для додатків"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Доступність"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Комбінації клавіш"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Комбінації клавіш для пошуку"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Значок згортання"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Значок розгортання"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Підсвічування клавіатури"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Рівень %1$d з %2$d"</string>
diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml
index 9410327..0d3f1fe 100644
--- a/packages/SystemUI/res/values-ur/strings.xml
+++ b/packages/SystemUI/res/values-ur/strings.xml
@@ -361,20 +361,21 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"آپ کے آلے کے تجربے کا کون سا حصہ متاثر ہوا؟"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"مسئلہ کی قسم منتخب کریں"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"اسکرین ریکارڈ"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"کارکردگی"</item>
- <item msgid="1627504621139124393">"یوزر انٹرفیس"</item>
- <item msgid="8309220355268900335">"بیٹری"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"کارکردگی"</string>
+ <string name="user_interface" msgid="3712869377953950887">"یوزر انٹرفیس"</string>
+ <string name="thermal" msgid="6758074791325414831">"تھرمل"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"ایک ہاتھ کی وضع"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"سماعت کے آلات"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"سماعت کے آلات"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"لائیو کیپشن"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"آلے کا کیمرا اور مائیکروفون غیر مسدود کریں؟"</string>
@@ -732,11 +733,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"بٹن <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"پیچھے"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"اوپر تیر کا نشان"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"نیچے تیر کا نشان"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"بایاں تیر"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"دایاں تیر"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"سینٹر"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Space"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1280,7 +1276,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"فولڈ کردہ"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"اَن فولڈ کردہ"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> بیٹری باقی ہے"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"<xliff:g id="PERCENTAGE">%s</xliff:g> اسٹائلس بیٹری"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"اپنے اسٹائلس کو چارجر منسلک کریں"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"اسٹائلس بیٹری کم ہے"</string>
<string name="video_camera" msgid="7654002575156149298">"ویڈیو کیمرا"</string>
@@ -1323,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) کے ذریعے حال ہی میں استعمال کیا گیا"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) کے زیر استعمال"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) کے ذریعے حال ہی میں استعمال کیا گیا"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"سسٹم"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ملٹی ٹاسکنگ"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ان پٹ"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ایپ شارٹ کٹس"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"ایکسیسبیلٹی"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"کی بورڈ شارٹ کٹس"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"تلاش کے شارٹ کٹس"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"آئیکن سکیڑیں"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"آئیکن پھیلائیں"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"کی بورڈ بیک لائٹ"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"%2$d میں سے %1$d کا لیول"</string>
diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml
index 8ad7e14..3f3983d 100644
--- a/packages/SystemUI/res/values-uz/strings.xml
+++ b/packages/SystemUI/res/values-uz/strings.xml
@@ -361,13 +361,15 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Qurilma ishlashining qaysi qismiga taʼsir qildi?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Muammo turini tanlang"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Ekran yozuvi"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Unumdorlik"</item>
- <item msgid="1627504621139124393">"Foydalanuvchi interfeysi"</item>
- <item msgid="8309220355268900335">"Batareya"</item>
- </string-array>
+ <string name="performance" msgid="6552785217174378320">"Unumdorlik"</string>
+ <string name="user_interface" msgid="3712869377953950887">"Foydalanuvchi interfeysi"</string>
+ <string name="thermal" msgid="6758074791325414831">"Termal"</string>
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Ixcham rejim"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Eshitish qurilmalari"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Eshitish qurilmalari"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Yangi qurilmani ulash"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Yangi qurilmani ulash uchun bosing"</string>
@@ -727,11 +729,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> tugmasi"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Bosh ekran"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Orqaga"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Tepaga strelka"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Pastga strelka"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Chapga strelka"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Oʻngga strelka"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Markaziy ko‘rsatkichli chiziq"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Probel"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1272,7 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"buklangan"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"buklanmagan"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Batareya quvvati: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <string name="stylus_battery_low_percentage" msgid="2564243323894629626">"Stilus batareyasi: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Stilusni quvvat manbaiga ulang"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Stilus batareyasi kam"</string>
<string name="video_camera" msgid="7654002575156149298">"Videokamera"</string>
@@ -1318,23 +1315,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Yaqinda <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) ishlatgan"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ishlatmoqda"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Yaqinda <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) ishlatgan"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Tizim"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multi-vazifalilik"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Kiritish"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Ilova yorliqlari"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Qulayliklar"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tezkor tugmalar"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Tezkor tugmalar qidiruvi"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Yigʻish belgisi"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Yoyish belgisi"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Klaviatura orqa yoritkichi"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Daraja: %1$d / %2$d"</string>
diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml
index 1efa983..dc4fa12 100644
--- a/packages/SystemUI/res/values-vi/strings.xml
+++ b/packages/SystemUI/res/values-vi/strings.xml
@@ -247,7 +247,7 @@
<string name="accessibility_quick_settings_dnd" msgid="2415967452264206047">"Không làm phiền."</string>
<string name="accessibility_quick_settings_bluetooth" msgid="8250942386687551283">"Bluetooth."</string>
<string name="accessibility_quick_settings_bluetooth_on" msgid="3819082137684078013">"Bluetooth bật."</string>
- <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Báo thức được đặt cho <xliff:g id="TIME">%s</xliff:g>."</string>
+ <string name="accessibility_quick_settings_alarm" msgid="558094529584082090">"Chuông báo được đặt cho <xliff:g id="TIME">%s</xliff:g>."</string>
<string name="accessibility_quick_settings_more_time" msgid="7646479831704665284">"Nhiều thời gian hơn."</string>
<string name="accessibility_quick_settings_less_time" msgid="9110364286464977870">"Ít thời gian hơn."</string>
<string name="accessibility_casting_turned_off" msgid="1387906158563374962">"Đã ngừng truyền màn hình."</string>
@@ -361,13 +361,18 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Bạn gặp loại vấn đề gì khi dùng thiết bị?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Chọn loại vấn đề"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Ghi màn hình"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Hiệu suất"</item>
- <item msgid="1627504621139124393">"Giao diện người dùng"</item>
- <item msgid="8309220355268900335">"Pin"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Chế độ một tay"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Thiết bị trợ thính"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Thiết bị trợ thính"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Ghép nối thiết bị mới"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Nhấp để ghép nối thiết bị mới"</string>
@@ -594,11 +599,11 @@
<string name="screen_pinning_negative" msgid="6882816864569211666">"Không, cảm ơn"</string>
<string name="screen_pinning_start" msgid="7483998671383371313">"Đã ghim ứng dụng"</string>
<string name="screen_pinning_exit" msgid="4553787518387346893">"Đã bỏ ghim ứng dụng"</string>
- <string name="stream_voice_call" msgid="7468348170702375660">"Gọi"</string>
+ <string name="stream_voice_call" msgid="7468348170702375660">"Cuộc gọi"</string>
<string name="stream_system" msgid="7663148785370565134">"Hệ thống"</string>
<string name="stream_ring" msgid="7550670036738697526">"Chuông"</string>
<string name="stream_music" msgid="2188224742361847580">"Nội dung nghe nhìn"</string>
- <string name="stream_alarm" msgid="16058075093011694">"Báo thức"</string>
+ <string name="stream_alarm" msgid="16058075093011694">"Chuông báo"</string>
<string name="stream_notification" msgid="7930294049046243939">"Thông báo"</string>
<string name="stream_bluetooth_sco" msgid="6234562365528664331">"Bluetooth"</string>
<string name="stream_dtmf" msgid="7322536356554673067">"Tần số đa chuông kép"</string>
@@ -642,7 +647,7 @@
<string name="enable_demo_mode" msgid="3180345364745966431">"Bật chế độ trình diễn"</string>
<string name="show_demo_mode" msgid="3677956462273059726">"Hiển thị chế độ trình diễn"</string>
<string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string>
- <string name="status_bar_alarm" msgid="87160847643623352">"Báo thức"</string>
+ <string name="status_bar_alarm" msgid="87160847643623352">"Chuông báo"</string>
<string name="wallet_title" msgid="5369767670735827105">"Ví"</string>
<string name="wallet_empty_state_label" msgid="7776761245237530394">"Thiết lập để mua hàng nhanh hơn và an toàn hơn bằng điện thoại"</string>
<string name="wallet_app_button_label" msgid="7123784239111190992">"Hiện tất cả"</string>
@@ -655,7 +660,7 @@
<string name="qr_code_scanner_updating_secondary_label" msgid="8344598017007876352">"Đang cập nhật"</string>
<string name="status_bar_work" msgid="5238641949837091056">"Hồ sơ công việc"</string>
<string name="status_bar_airplane" msgid="4848702508684541009">"Chế độ trên máy bay"</string>
- <string name="zen_alarm_warning" msgid="7844303238486849503">"Bạn sẽ không nghe thấy báo thức tiếp theo lúc <xliff:g id="WHEN">%1$s</xliff:g> của mình"</string>
+ <string name="zen_alarm_warning" msgid="7844303238486849503">"Bạn sẽ không nghe thấy chuông báo tiếp theo lúc <xliff:g id="WHEN">%1$s</xliff:g> của mình"</string>
<string name="alarm_template" msgid="2234991538018805736">"lúc <xliff:g id="WHEN">%1$s</xliff:g>"</string>
<string name="alarm_template_far" msgid="3561752195856839456">"vào <xliff:g id="WHEN">%1$s</xliff:g>"</string>
<string name="accessibility_status_bar_hotspot" msgid="2888479317489131669">"Điểm phát sóng"</string>
@@ -727,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Nút <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Quay lại"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Mũi tên lên"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Mũi tên xuống"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Mũi tên trái"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Mũi tên phải"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Giữa"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Dấu cách"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -1275,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"gập"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"mở"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"Còn <xliff:g id="PERCENTAGE">%s</xliff:g> pin"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Hãy kết nối bút cảm ứng với bộ sạc"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Bút cảm ứng bị yếu pin"</string>
<string name="video_camera" msgid="7654002575156149298">"Máy quay video"</string>
@@ -1318,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) đã dùng gần đây"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) đang dùng"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) đã dùng gần đây"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Hệ thống"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Đa nhiệm"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Phương thức nhập"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Lối tắt ứng dụng"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Hỗ trợ tiếp cận"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Phím tắt"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Lối tắt tìm kiếm"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Biểu tượng Thu gọn"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Biểu tượng Mở rộng"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Đèn nền bàn phím"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Độ sáng %1$d/%2$d"</string>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index 0860f31..9b69f9e 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -361,25 +361,29 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"设备体验的哪个方面受到影响？"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"选择问题类型"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"屏幕录制"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"性能"</item>
- <item msgid="1627504621139124393">"界面"</item>
- <item msgid="8309220355268900335">"电池"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"单手模式"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"助听装置"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"助听装置"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"实时字幕"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"要解锁设备摄像头和麦克风吗？"</string>
- <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"这将会为所有获准使用您麦克风的应用和服务启用这项权限。"</string>
- <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"这将会为所有获准使用您摄像头的应用和服务启用这项权限。"</string>
+ <string name="sensor_privacy_start_use_mic_dialog_content" msgid="1624701280680913717">"解锁后，所有具有麦克风使用权的应用和服务都可使用您的麦克风。"</string>
+ <string name="sensor_privacy_start_use_camera_dialog_content" msgid="4704948062372435963">"解锁后，所有具有摄像头使用权的应用和服务都可使用您的摄像头。"</string>
<string name="sensor_privacy_start_use_mic_camera_dialog_content" msgid="3577642558418404919">"这将会为所有获准使用您的摄像头或麦克风的应用和服务启用这项权限。"</string>
<string name="sensor_privacy_start_use_mic_blocked_dialog_title" msgid="2640140287496469689">"麦克风已被屏蔽"</string>
<string name="sensor_privacy_start_use_camera_blocked_dialog_title" msgid="7398084286822440384">"摄像头已被屏蔽"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g>按钮"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"返回"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"向上键"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"向下键"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"向左键"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"向右键"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"中心"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"空格"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter"</string>
@@ -934,7 +933,7 @@
<string name="running_foreground_services_title" msgid="5137313173431186685">"在后台运行的应用"</string>
<string name="running_foreground_services_msg" msgid="3009459259222695385">"点按即可详细了解电量和流量消耗情况"</string>
<string name="mobile_data_disable_title" msgid="5366476131671617790">"要关闭移动数据网络吗？"</string>
- <string name="mobile_data_disable_message" msgid="8604966027899770415">"您将无法通过<xliff:g id="CARRIER">%s</xliff:g>使用移动数据或互联网，只能通过 WLAN 连接到互联网。"</string>
+ <string name="mobile_data_disable_message" msgid="8604966027899770415">"关闭后，您将无法通过<xliff:g id="CARRIER">%s</xliff:g>使用移动数据或互联网，只能通过 WLAN 连接到互联网。"</string>
<string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"您的运营商"</string>
<string name="auto_data_switch_disable_title" msgid="5146527155665190652">"是否要切换回 <xliff:g id="CARRIER">%s</xliff:g>？"</string>
<string name="auto_data_switch_disable_message" msgid="5885533647399535852">"移动流量不会根据网络可用情况自动切换"</string>
@@ -1208,7 +1207,7 @@
<string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"添加功能块"</string>
<string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"不添加功能块"</string>
<string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"选择用户"</string>
- <string name="fgs_manager_footer_label" msgid="8276763570622288231">"{count,plural, =1{# 个应用处于活动状态}other{# 个应用处于活动状态}}"</string>
+ <string name="fgs_manager_footer_label" msgid="8276763570622288231">"{count,plural, =1{# 个应用处于运行状态}other{# 个应用处于运行状态}}"</string>
<string name="fgs_dot_content_description" msgid="2865071539464777240">"新信息"</string>
<string name="fgs_manager_dialog_title" msgid="5879184257257718677">"已开启的应用"</string>
<string name="fgs_manager_dialog_message" msgid="2670045017200730076">"这些应用即使在闲置时仍处于活跃运行状态。应用的功能会因此提升，但可能会影响电池续航时间。"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"折叠状态"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"展开状态"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s/%2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"电池还剩 <xliff:g id="PERCENTAGE">%s</xliff:g> 的电量"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"请将触控笔连接充电器"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"触控笔电池电量低"</string>
<string name="video_camera" msgid="7654002575156149298">"摄像机"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”最近使用过（<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>）"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”正在使用（<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>）"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”最近使用过（<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>）"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"系统"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"多任务处理"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"输入"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"应用快捷键"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"无障碍功能"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"键盘快捷键"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"搜索快捷键"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"收起图标"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"展开图标"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"键盘背光"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"第 %1$d 级，共 %2$d 级"</string>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml
index 39c1b2b..5c164ab 100644
--- a/packages/SystemUI/res/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"哪些裝置使用體驗受影響？"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"選取問題類型"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"螢幕錄影"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"效能"</item>
- <item msgid="1627504621139124393">"使用者介面"</item>
- <item msgid="8309220355268900335">"電池"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"單手模式"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"助聽器"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"助聽器"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"即時字幕"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"要解除封鎖裝置相機和麥克風嗎？"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> 鍵"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"返回"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"向上箭咀"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"向下箭咀"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"向左箭咀"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"向右箭咀"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"箭咀中央"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"空格"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"輸入 (Enter)"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"已摺疊"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"已打開"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"剩餘電量：<xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"將觸控筆連接充電器"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"觸控筆電量不足"</string>
<string name="video_camera" msgid="7654002575156149298">"攝影機"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」最近使用過此權限 (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"<xliff:g id="APP_NAME">%1$s</xliff:g> 正在使用 (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」最近使用過此權限 (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"系統"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"多工處理"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"輸入"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"應用程式捷徑"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"無障礙功能"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"鍵盤快速鍵"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"搜尋快速鍵"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"收合圖示"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"展開圖示"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"鍵盤背光"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"第 %1$d 級，共 %2$d 級"</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml
index f1a6f81..0d50ad5 100644
--- a/packages/SystemUI/res/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"哪些裝置使用體驗受到影響？"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"選取問題類型"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"螢幕錄影"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"效能"</item>
- <item msgid="1627504621139124393">"使用者介面"</item>
- <item msgid="8309220355268900335">"電池"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"單手模式"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"助聽器"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"助聽器"</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>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"即時字幕"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"要將裝置的相機和麥克風解除封鎖嗎？"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"<xliff:g id="NAME">%1$s</xliff:g> 按鈕"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Home 鍵"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"返回"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"向上箭頭"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"向下箭頭"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"向左箭頭"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"向右箭頭"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"中央鍵"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"空格鍵"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Enter 鍵"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"已摺疊"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"已展開"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"剩餘電量：<xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"將觸控筆接上充電器"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"觸控筆電力不足"</string>
<string name="video_camera" msgid="7654002575156149298">"攝影機"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」最近用過這項權限 (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"正由「<xliff:g id="APP_NAME">%1$s</xliff:g>」使用 (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」最近用過這項權限 (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"系統"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"多工處理"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"輸入"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"應用程式捷徑"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"無障礙"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"鍵盤快速鍵"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"搜尋快速鍵"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"收合圖示"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"展開圖示"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"鍵盤背光"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"第 %1$d 級，共 %2$d 級"</string>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index 840d8a6..2e03bd5 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -361,20 +361,24 @@
<string name="qs_record_issue_dropdown_header" msgid="5995983175678658329">"Kuthinteke yiphi ingxenye yokusebenzisa idivayisi?"</string>
<string name="qs_record_issue_dropdown_prompt" msgid="2526949919167046219">"Khetha uhlobo lwenkinga"</string>
<string name="qs_record_issue_dropdown_screenrecord" msgid="6396141928484257626">"Irekhodi lesikrini"</string>
- <string-array name="qs_record_issue_types">
- <item msgid="2947988124014085798">"Ukusebenza"</item>
- <item msgid="1627504621139124393">"Okusetshenziswa Kubonwa"</item>
- <item msgid="8309220355268900335">"Ibhethri"</item>
- </string-array>
+ <!-- no translation found for performance (6552785217174378320) -->
+ <skip />
+ <!-- no translation found for user_interface (3712869377953950887) -->
+ <skip />
+ <!-- no translation found for thermal (6758074791325414831) -->
+ <skip />
<string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Imodi yesandla esisodwa"</string>
<string name="quick_settings_hearing_devices_label" msgid="7277170419679404129">"Izinsizakuzwa"</string>
+ <!-- no translation found for quick_settings_hearing_devices_connected (6519069502397037781) -->
+ <skip />
+ <!-- no translation found for quick_settings_hearing_devices_disconnected (8907061223998176187) -->
+ <skip />
<string name="quick_settings_hearing_devices_dialog_title" msgid="9004774017688484981">"Izinsizakuzwa"</string>
<string name="quick_settings_pair_hearing_devices" msgid="5987105102207447322">"Bhangqa idivayisi entsha"</string>
<string name="accessibility_hearing_device_pair_new_device" msgid="8440082580186130090">"Chofoza ukuze ubhangqe idivayisi entsha"</string>
<string name="hearing_devices_presets_error" msgid="350363093458408536">"Ayikwazanga ukubuyekeza ukusetha ngaphambilini"</string>
<string name="hearing_devices_preset_label" msgid="7878267405046232358">"Ukusetha ngaphambilini"</string>
- <!-- no translation found for live_caption_title (8916875614623730005) -->
- <skip />
+ <string name="live_caption_title" msgid="8916875614623730005">"Amagama-ncazo abukhoma"</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>
<string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"Vulela ikhamera yedivayisi nemakrofoni?"</string>
@@ -728,11 +732,6 @@
<string name="keyboard_key_button_template" msgid="8005673627272051429">"Inkinobho <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="keyboard_key_home" msgid="3734400625170020657">"Ekhaya"</string>
<string name="keyboard_key_back" msgid="4185420465469481999">"Emuva"</string>
- <string name="keyboard_key_dpad_up" msgid="7199805608386368673">"Umcibisholo waphezulu"</string>
- <string name="keyboard_key_dpad_down" msgid="3354221123220737397">"Umcibisholo waphansi"</string>
- <string name="keyboard_key_dpad_left" msgid="144176368026538621">"Umcibisholo wangokwesokunxele"</string>
- <string name="keyboard_key_dpad_right" msgid="8485763312139820037">"Umcibisholo wangokwesokudla"</string>
- <string name="keyboard_key_dpad_center" msgid="4079412840715672825">"Maphakathi"</string>
<string name="keyboard_key_tab" msgid="4592772350906496730">"Tab"</string>
<string name="keyboard_key_space" msgid="6980847564173394012">"Isikhala"</string>
<string name="keyboard_key_enter" msgid="8633362970109751646">"Faka"</string>
@@ -1276,7 +1275,8 @@
<string name="quick_settings_rotation_posture_folded" msgid="2430280856312528289">"kugoqiwe"</string>
<string name="quick_settings_rotation_posture_unfolded" msgid="6372316273574167114">"kuvuliwe"</string>
<string name="rotation_tile_with_posture_secondary_label_template" msgid="7648496484163318886">"%1$s / %2$s"</string>
- <string name="stylus_battery_low_percentage" msgid="1620068112350141558">"<xliff:g id="PERCENTAGE">%s</xliff:g> ibhethri elisele"</string>
+ <!-- no translation found for stylus_battery_low_percentage (2564243323894629626) -->
+ <skip />
<string name="stylus_battery_low_subtitle" msgid="3583843128908823273">"Xhuma i-stylus yakho kushaja"</string>
<string name="stylus_battery_low" msgid="7134370101603167096">"Ibhethri le-stylus liphansi"</string>
<string name="video_camera" msgid="7654002575156149298">"Ikhamera yevidiyo"</string>
@@ -1319,23 +1319,16 @@
<string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Kusetshenziswe kamuva yi-<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
<string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Isetshenziswa yi-<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
<string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Kusetshenziswe kamuva yi-<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
- <!-- no translation found for shortcut_helper_category_system (462110876978937359) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_multitasking (7413381961404090136) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_input (8674018654124839566) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_app_shortcuts (8010249408308587117) -->
- <skip />
- <!-- no translation found for shortcut_helper_category_a11y (6314444792641773464) -->
- <skip />
- <!-- no translation found for shortcut_helper_title (8567500639300970049) -->
- <skip />
- <!-- no translation found for shortcut_helper_search_placeholder (5488547526269871819) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_collapse_icon (8028015738431664954) -->
- <skip />
- <!-- no translation found for shortcut_helper_content_description_expand_icon (1084435697860417390) -->
+ <string name="shortcut_helper_category_system" msgid="462110876978937359">"Isistimu"</string>
+ <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Ukwenza imisebenzi eminingi"</string>
+ <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Okokufaka"</string>
+ <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Izinqamuleli Zohlelo lokusebenza"</string>
+ <string name="shortcut_helper_category_a11y" msgid="6314444792641773464">"Ukufinyeleleka"</string>
+ <string name="shortcut_helper_title" msgid="8567500639300970049">"Izinqamuleli zekhibhodi"</string>
+ <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Sesha izinqamuleli"</string>
+ <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Goqa isithonjana"</string>
+ <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Nweba isithonjana"</string>
+ <!-- no translation found for shortcut_helper_key_combinations_or_separator (7082902112102125540) -->
<skip />
<string name="keyboard_backlight_dialog_title" msgid="8273102932345564724">"Ilambu lekhibhodi"</string>
<string name="keyboard_backlight_value" msgid="7336398765584393538">"Ileveli %1$d ka-%2$d"</string>
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index fb88364..f8762f0 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -37,6 +37,9 @@
<item>400</item>
</integer-array>
+ <!-- Whether to use deadzone with nav bar -->
+ <bool name="config_useDeadZone">true</bool>
+
<!-- decay duration (from size_max -> size), in ms -->
<integer name="navigation_bar_deadzone_hold">333</integer>
<integer name="navigation_bar_deadzone_decay">333</integer>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index effaaf2..c2ca4da 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -3529,6 +3529,14 @@
use. The helper shows shortcuts in categories, which can be collapsed or expanded.
[CHAR LIMIT=NONE] -->
<string name="shortcut_helper_content_description_expand_icon">Expand icon</string>
+ <!-- Word that separates different possible key combinations of a shortcut. For example the
+ "Go to home screen" shortcut could be triggered using "home button" OR "ctrl + h".
+ This is that "or" separator.
+ The keyboard shortcut helper is a component that shows the user which keyboard shortcuts
+ they can use.
+ [CHAR LIMIT=NONE]
+ -->
+ <string name="shortcut_helper_key_combinations_or_separator">or</string>
<!-- Content description for keyboard backlight brightness dialog [CHAR LIMIT=NONE] -->
<string name="keyboard_backlight_dialog_title">Keyboard backlight</string>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 1e0adec..73b7586 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -338,8 +338,11 @@
<item name="android:textSize">16sp</item>
</style>
- <style name="AuthCredentialPanelStyle">
+ <style name="AuthNonCredentialPanelStyle">
<item name="android:background">?androidprv:attr/materialColorSurfaceBright</item>
+ </style>
+
+ <style name="AuthCredentialPanelStyle" parent="AuthNonCredentialPanelStyle">
<item name="android:clickable">true</item>
<item name="android:clipToOutline">true</item>
<item name="android:importantForAccessibility">no</item>
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java
index c33b7ce..c225cbc 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java
@@ -87,10 +87,15 @@
mTmpDestinationRect.inset(insets);
// Scale to the bounds no smaller than the destination and offset such that the top/left
// of the scaled inset source rect aligns with the top/left of the destination bounds
- final float scale;
+ final float scale, left, top;
if (sourceRectHint.isEmpty() || sourceRectHint.width() == sourceBounds.width()) {
scale = Math.max((float) destinationBounds.width() / sourceBounds.width(),
(float) destinationBounds.height() / sourceBounds.height());
+ // Work around the rounding error by fix the position at very beginning.
+ left = scale == 1
+ ? 0 : destinationBounds.left - (insets.left + sourceBounds.left) * scale;
+ top = scale == 1
+ ? 0 : destinationBounds.top - (insets.top + sourceBounds.top) * scale;
} else {
// scale by sourceRectHint if it's not edge-to-edge
final float endScale = sourceRectHint.width() <= sourceRectHint.height()
@@ -100,9 +105,9 @@
? (float) destinationBounds.width() / sourceBounds.width()
: (float) destinationBounds.height() / sourceBounds.height();
scale = Math.min((1 - progress) * startScale + progress * endScale, 1.0f);
+ left = destinationBounds.left - (insets.left + sourceBounds.left) * scale;
+ top = destinationBounds.top - (insets.top + sourceBounds.top) * scale;
}
- final float left = destinationBounds.left - (insets.left + sourceBounds.left) * scale;
- final float top = destinationBounds.top - (insets.top + sourceBounds.top) * scale;
mTmpTransform.setScale(scale, scale);
final float cornerRadius = getScaledCornerRadius(mTmpDestinationRect, destinationBounds);
tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
index b4377ea..c0c8b75 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
@@ -122,6 +122,8 @@
public static final long SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY = 1L << 31;
// Physical keyboard shortcuts helper is showing
public static final long SYSUI_STATE_SHORTCUT_HELPER_SHOWING = 1L << 32;
+ // Touchpad gestures are disabled
+ public static final long SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED = 1L << 33;
// Mask for SystemUiStateFlags to isolate SYSUI_STATE_AWAKE and
// SYSUI_STATE_WAKEFULNESS_TRANSITION, to match WAKEFULNESS_* constants
@@ -170,6 +172,7 @@
SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE,
SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY,
SYSUI_STATE_SHORTCUT_HELPER_SHOWING,
+ SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED,
})
public @interface SystemUiStateFlags {}
@@ -271,6 +274,9 @@
if ((flags & SYSUI_STATE_SHORTCUT_HELPER_SHOWING) != 0) {
str.add("shortcut_helper_showing");
}
+ if ((flags & SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED) != 0) {
+ str.add("touchpad_gestures_disabled");
+ }
return str.toString();
}
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesChecker.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesChecker.java
new file mode 100644
index 0000000..2d1cd03
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesChecker.java
@@ -0,0 +1,108 @@
+/*
+ * 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.accessibility.hearingaid;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
+import com.android.settingslib.bluetooth.BluetoothUtils;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.systemui.dagger.SysUISingleton;
+
+import javax.inject.Inject;
+
+/**
+ * HearingDevicesChecker provides utility methods to determine the presence and status of
+ * connected hearing aid devices.
+ *
+ * <p>It also filters out devices that are exclusively managed by other applications to avoid
+ * interfering with their operation.
+ */
+@SysUISingleton
+public class HearingDevicesChecker {
+
+ private final Context mContext;
+ private final LocalBluetoothManager mLocalBluetoothManager;
+
+ @Inject
+ public HearingDevicesChecker(
+ Context context,
+ @Nullable LocalBluetoothManager localBluetoothManager) {
+ mContext = context;
+ mLocalBluetoothManager = localBluetoothManager;
+ }
+
+ /**
+ * Checks if any hearing device is already paired.
+ *
+ * <p>It includes {@link BluetoothDevice.BOND_BONDING} and {@link BluetoothDevice.BOND_BONDED}).
+ *
+ * <p>A bonded device means it has been paired, but may not connected now.
+ *
+ * @return {@code true} if any bonded hearing device is found, {@code false} otherwise.
+ */
+ @WorkerThread
+ public boolean isAnyPairedHearingDevice() {
+ if (mLocalBluetoothManager == null) {
+ return false;
+ }
+ if (!mLocalBluetoothManager.getBluetoothAdapter().isEnabled()) {
+ return false;
+ }
+
+ return mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy().stream()
+ .anyMatch(device -> device.isHearingAidDevice()
+ && device.getBondState() != BluetoothDevice.BOND_NONE
+ && !isExclusivelyManagedBluetoothDevice(device));
+ }
+
+ /**
+ * Checks if there are any active hearing device.
+ *
+ * <p>An active device means it is currently connected and streaming media.
+ *
+ * @return {@code true} if any active hearing device is found, {@code false} otherwise.
+ */
+ @WorkerThread
+ public boolean isAnyActiveHearingDevice() {
+ if (mLocalBluetoothManager == null) {
+ return false;
+ }
+ if (!mLocalBluetoothManager.getBluetoothAdapter().isEnabled()) {
+ return false;
+ }
+
+ return mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy().stream()
+ .anyMatch(device -> BluetoothUtils.isActiveMediaDevice(device)
+ && BluetoothUtils.isAvailableHearingDevice(device)
+ && !isExclusivelyManagedBluetoothDevice(device));
+ }
+
+ private boolean isExclusivelyManagedBluetoothDevice(
+ @NonNull CachedBluetoothDevice cachedDevice) {
+ if (com.android.settingslib.flags.Flags.enableHideExclusivelyManagedBluetoothDevice()) {
+ return BluetoothUtils.isExclusivelyManagedBluetoothDevice(mContext,
+ cachedDevice.getDevice());
+ }
+ return false;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java
index 14e5f34..bc4cb45 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java
@@ -16,19 +16,24 @@
package com.android.systemui.accessibility.hearingaid;
-import android.bluetooth.BluetoothDevice;
import android.util.Log;
-import androidx.annotation.Nullable;
+import androidx.concurrent.futures.CallbackToFutureAdapter;
import com.android.internal.jank.InteractionJankMonitor;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.systemui.animation.DialogCuj;
import com.android.systemui.animation.DialogTransitionAnimator;
import com.android.systemui.animation.Expandable;
import com.android.systemui.dagger.SysUISingleton;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.statusbar.phone.SystemUIDialog;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+
import javax.inject.Inject;
/**
@@ -43,16 +48,22 @@
private SystemUIDialog mDialog;
private final DialogTransitionAnimator mDialogTransitionAnimator;
private final HearingDevicesDialogDelegate.Factory mDialogFactory;
- private final LocalBluetoothManager mLocalBluetoothManager;
+ private final HearingDevicesChecker mDevicesChecker;
+ private final Executor mBackgroundExecutor;
+ private final Executor mMainExecutor;
@Inject
public HearingDevicesDialogManager(
DialogTransitionAnimator dialogTransitionAnimator,
HearingDevicesDialogDelegate.Factory dialogFactory,
- @Nullable LocalBluetoothManager localBluetoothManager) {
+ HearingDevicesChecker devicesChecker,
+ @Background Executor backgroundExecutor,
+ @Main Executor mainExecutor) {
mDialogTransitionAnimator = dialogTransitionAnimator;
mDialogFactory = dialogFactory;
- mLocalBluetoothManager = localBluetoothManager;
+ mDevicesChecker = devicesChecker;
+ mBackgroundExecutor = backgroundExecutor;
+ mMainExecutor = mainExecutor;
}
/**
@@ -68,36 +79,41 @@
destroyDialog();
}
- mDialog = mDialogFactory.create(!isAnyBondedHearingDevice()).createDialog();
+ final ListenableFuture<Boolean> pairedHearingDeviceCheckTask =
+ CallbackToFutureAdapter.getFuture(completer -> {
+ mBackgroundExecutor.execute(
+ () -> {
+ completer.set(mDevicesChecker.isAnyPairedHearingDevice());
+ });
+ // This value is used only for debug purposes: it will be used in toString()
+ // of returned future or error cases.
+ return "isAnyPairedHearingDevice check";
+ });
+ pairedHearingDeviceCheckTask.addListener(() -> {
+ try {
+ mDialog = mDialogFactory.create(!pairedHearingDeviceCheckTask.get()).createDialog();
- if (expandable != null) {
- DialogTransitionAnimator.Controller controller = expandable.dialogTransitionController(
- new DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
- INTERACTION_JANK_TAG));
- if (controller != null) {
- mDialogTransitionAnimator.show(mDialog,
- controller, /* animateBackgroundBoundsChange= */ true);
- return;
+ if (expandable != null) {
+ DialogTransitionAnimator.Controller controller =
+ expandable.dialogTransitionController(
+ new DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
+ INTERACTION_JANK_TAG));
+ if (controller != null) {
+ mDialogTransitionAnimator.show(mDialog,
+ controller, /* animateBackgroundBoundsChange= */ true);
+ return;
+ }
+ }
+ mDialog.show();
+
+ } catch (InterruptedException | ExecutionException e) {
+ Log.e(TAG, "Exception occurs while running pairedHearingDeviceCheckTask", e);
}
- }
- mDialog.show();
+ }, mMainExecutor);
}
private void destroyDialog() {
mDialog.dismiss();
mDialog = null;
}
-
- private boolean isAnyBondedHearingDevice() {
- if (mLocalBluetoothManager == null) {
- return false;
- }
- if (!mLocalBluetoothManager.getBluetoothAdapter().isEnabled()) {
- return false;
- }
-
- return mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy().stream()
- .anyMatch(device -> device.isHearingAidDevice()
- && device.getBondState() != BluetoothDevice.BOND_NONE);
- }
}
diff --git a/packages/SystemUI/src/com/android/systemui/ambient/touch/ShadeTouchHandler.java b/packages/SystemUI/src/com/android/systemui/ambient/touch/ShadeTouchHandler.java
index 9ef9938..fcd7ef5 100644
--- a/packages/SystemUI/src/com/android/systemui/ambient/touch/ShadeTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/ambient/touch/ShadeTouchHandler.java
@@ -18,11 +18,15 @@
import static com.android.systemui.ambient.touch.dagger.ShadeModule.NOTIFICATION_SHADE_GESTURE_INITIATION_HEIGHT;
+import android.app.DreamManager;
import android.graphics.Rect;
import android.graphics.Region;
import android.view.GestureDetector;
import android.view.MotionEvent;
+import androidx.annotation.NonNull;
+
+import com.android.systemui.Flags;
import com.android.systemui.shade.ShadeViewController;
import com.android.systemui.statusbar.phone.CentralSurfaces;
@@ -38,28 +42,39 @@
public class ShadeTouchHandler implements TouchHandler {
private final Optional<CentralSurfaces> mSurfaces;
private final ShadeViewController mShadeViewController;
+ private final DreamManager mDreamManager;
private final int mInitiationHeight;
+ /**
+ * Tracks whether or not we are capturing a given touch. Will be null before and after a touch.
+ */
+ private Boolean mCapture;
+
@Inject
ShadeTouchHandler(Optional<CentralSurfaces> centralSurfaces,
ShadeViewController shadeViewController,
+ DreamManager dreamManager,
@Named(NOTIFICATION_SHADE_GESTURE_INITIATION_HEIGHT) int initiationHeight) {
mSurfaces = centralSurfaces;
mShadeViewController = shadeViewController;
+ mDreamManager = dreamManager;
mInitiationHeight = initiationHeight;
}
@Override
public void onSessionStart(TouchSession session) {
- if (mSurfaces.map(CentralSurfaces::isBouncerShowing).orElse(false)) {
+ if (mSurfaces.isEmpty()) {
session.pop();
return;
}
- session.registerInputListener(ev -> {
- mShadeViewController.handleExternalTouch((MotionEvent) ev);
+ session.registerCallback(() -> mCapture = null);
+ session.registerInputListener(ev -> {
if (ev instanceof MotionEvent) {
+ if (mCapture != null && mCapture) {
+ sendTouchEvent((MotionEvent) ev);
+ }
if (((MotionEvent) ev).getAction() == MotionEvent.ACTION_UP) {
session.pop();
}
@@ -68,19 +83,41 @@
session.registerGestureListener(new GestureDetector.SimpleOnGestureListener() {
@Override
- public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
+ public boolean onScroll(MotionEvent e1, @NonNull MotionEvent e2, float distanceX,
float distanceY) {
- return true;
+ if (mCapture == null) {
+ // Only capture swipes that are going downwards.
+ mCapture = Math.abs(distanceY) > Math.abs(distanceX) && distanceY < 0;
+ if (mCapture) {
+ // Send the initial touches over, as the input listener has already
+ // processed these touches.
+ sendTouchEvent(e1);
+ sendTouchEvent(e2);
+ }
+ }
+ return mCapture;
}
@Override
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+ public boolean onFling(MotionEvent e1, @NonNull MotionEvent e2, float velocityX,
float velocityY) {
- return true;
+ return mCapture;
}
});
}
+ private void sendTouchEvent(MotionEvent event) {
+ if (Flags.communalHub() && !mDreamManager.isDreaming()) {
+ // Send touches to central surfaces only when on the glanceable hub while not dreaming.
+ // While sending touches where while dreaming will open the shade, the shade
+ // while closing if opened then closed in the same gesture.
+ mSurfaces.get().handleExternalShadeWindowTouch(event);
+ } else {
+ // Send touches to the shade view when dreaming.
+ mShadeViewController.handleExternalTouch(event);
+ }
+ }
+
@Override
public void getTouchInitiationRegion(Rect bounds, Region region, Rect exclusionRect) {
final Rect outBounds = new Rect(bounds);
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
index 177aad9..430ff07 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
@@ -515,7 +515,9 @@
} else {
throw new IllegalStateException("Unknown credential type: " + credentialType);
}
- mCredentialView = factory.inflate(layoutResourceId, null, false);
+ // TODO(b/288175645): Once AuthContainerView is removed, set 0dp in credential view xml
+ // files with the corresponding left/right or top/bottom constraints being set to "parent".
+ mCredentialView = factory.inflate(layoutResourceId, mLayout, false);
// The background is used for detecting taps / cancelling authentication. Since the
// credential view is full-screen and should not be canceled from background taps,
diff --git a/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java b/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java
index e284bc7..92108e9 100644
--- a/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java
+++ b/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java
@@ -36,7 +36,6 @@
import com.android.internal.logging.UiEventLogger;
import com.android.settingslib.Utils;
import com.android.systemui.CoreStartable;
-import com.android.systemui.Flags;
import com.android.systemui.animation.ActivityTransitionAnimator;
import com.android.systemui.complication.dagger.DreamHomeControlsComplicationComponent;
import com.android.systemui.controls.ControlsServiceInfo;
@@ -137,9 +136,7 @@
private void updateHomeControlsComplication() {
mControlsComponent.getControlsListingController().ifPresent(c -> {
- final boolean replacedWithOpenHub =
- Flags.glanceableHubShortcutButton() && mReplacedByOpenHub;
- if (isHomeControlsAvailable(c.getCurrentServices()) && !replacedWithOpenHub) {
+ if (isHomeControlsAvailable(c.getCurrentServices())) {
mDreamOverlayStateController.addComplication(mComplication);
} else {
mDreamOverlayStateController.removeComplication(mComplication);
diff --git a/packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java b/packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java
index a679bfb..05df2bb 100644
--- a/packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java
+++ b/packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java
@@ -28,7 +28,6 @@
import com.android.settingslib.Utils;
import com.android.systemui.CoreStartable;
-import com.android.systemui.Flags;
import com.android.systemui.communal.domain.interactor.CommunalInteractor;
import com.android.systemui.communal.shared.model.CommunalScenes;
import com.android.systemui.complication.dagger.OpenHubComplicationComponent;
@@ -111,11 +110,11 @@
private void updateOpenHubComplication() {
// TODO(b/339667383): don't show the complication if glanceable hub is disabled
- if (Flags.glanceableHubShortcutButton()) {
- mDreamOverlayStateController.addComplication(mComplication);
- } else {
- mDreamOverlayStateController.removeComplication(mComplication);
- }
+// if (Flags.glanceableHubShortcutButton()) {
+// mDreamOverlayStateController.addComplication(mComplication);
+// } else {
+// mDreamOverlayStateController.removeComplication(mComplication);
+// }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java
index c2e1e33..2fbb75e 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java
@@ -29,6 +29,7 @@
import com.android.systemui.sensorprivacy.SensorUseStartedActivity;
import com.android.systemui.settings.brightness.BrightnessDialog;
import com.android.systemui.telephony.ui.activity.SwitchToManagedProfileForCallActivity;
+import com.android.systemui.touchpad.tutorial.ui.view.TouchpadTutorialActivity;
import com.android.systemui.tuner.TunerActivity;
import com.android.systemui.usb.UsbAccessoryUriActivity;
import com.android.systemui.usb.UsbConfirmActivity;
@@ -156,4 +157,10 @@
@ClassKey(SwitchToManagedProfileForCallActivity.class)
public abstract Activity bindSwitchToManagedProfileForCallActivity(
SwitchToManagedProfileForCallActivity activity);
+
+ /** Inject into TouchpadTutorialActivity. */
+ @Binds
+ @IntoMap
+ @ClassKey(TouchpadTutorialActivity.class)
+ public abstract Activity bindTouchpadTutorialActivity(TouchpadTutorialActivity activity);
}
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index 9311187..4a9f741 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -40,6 +40,7 @@
import com.android.internal.logging.InstanceId;
import com.android.internal.logging.UiEvent;
import com.android.internal.logging.UiEventLogger;
+import com.android.systemui.Flags;
import com.android.systemui.biometrics.AuthController;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dock.DockManager;
@@ -564,6 +565,12 @@
return;
}
+ // When already in pulsing, we can show the new Notification without requesting a new pulse.
+ if (Flags.notificationPulsingFix()
+ && dozeState == State.DOZE_PULSING && reason == DozeLog.PULSE_REASON_NOTIFICATION) {
+ return;
+ }
+
if (!mAllowPulseTriggers || mDozeHost.isPulsePending()
|| !canPulse(dozeState, performedProxCheck)) {
if (!mAllowPulseTriggers) {
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
index 95012a2..1a06418 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
@@ -18,6 +18,7 @@
import static com.android.systemui.doze.DozeMachine.State.DOZE;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSED;
+import static com.android.systemui.Flags.dozeuiSchedulingAlarmsBackgroundExecution;
import android.app.AlarmManager;
import android.content.Context;
@@ -70,6 +71,7 @@
@Inject
public DozeUi(Context context, AlarmManager alarmManager,
WakeLock wakeLock, DozeHost host, @Main Handler handler,
+ @Background Handler bgHandler,
DozeParameters params,
@Background DelayableExecutor bgExecutor,
DozeLog dozeLog) {
@@ -80,7 +82,13 @@
mBgExecutor = bgExecutor;
mCanAnimateTransition = !params.getDisplayNeedsBlanking();
mDozeParameters = params;
- mTimeTicker = new AlarmTimeout(alarmManager, this::onTimeTick, "doze_time_tick", handler);
+ if (dozeuiSchedulingAlarmsBackgroundExecution()) {
+ mTimeTicker = new AlarmTimeout(alarmManager, this::onTimeTick, "doze_time_tick",
+ bgHandler);
+ } else {
+ mTimeTicker = new AlarmTimeout(alarmManager, this::onTimeTick, "doze_time_tick",
+ handler);
+ }
mDozeLog = dozeLog;
}
diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt
index 52ccc21..271e79b 100644
--- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt
@@ -16,13 +16,16 @@
package com.android.systemui.keyboard.shortcut.ui.composable
-import androidx.annotation.StringRes
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.FlowRowScope
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
@@ -32,21 +35,19 @@
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.OpenInNew
-import androidx.compose.material.icons.filled.Accessibility
-import androidx.compose.material.icons.filled.Apps
import androidx.compose.material.icons.filled.ExpandMore
-import androidx.compose.material.icons.filled.Keyboard
import androidx.compose.material.icons.filled.Search
-import androidx.compose.material.icons.filled.Tv
-import androidx.compose.material.icons.filled.VerticalSplit
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationDrawerItemColors
@@ -56,6 +57,7 @@
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@@ -69,10 +71,13 @@
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.role
import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.util.fastForEach
@@ -81,8 +86,13 @@
import com.android.systemui.res.R
@Composable
-fun ShortcutHelper(modifier: Modifier = Modifier, onKeyboardSettingsClicked: () -> Unit) {
- if (shouldUseSinglePane()) {
+fun ShortcutHelper(
+ onKeyboardSettingsClicked: () -> Unit,
+ modifier: Modifier = Modifier,
+ categories: List<ShortcutHelperCategory> = ShortcutHelperTemporaryData.categories,
+ useSinglePane: @Composable () -> Boolean = { shouldUseSinglePane() },
+) {
+ if (useSinglePane()) {
ShortcutHelperSinglePane(modifier, categories, onKeyboardSettingsClicked)
} else {
ShortcutHelperTwoPane(modifier, categories, onKeyboardSettingsClicked)
@@ -91,7 +101,8 @@
@Composable
private fun shouldUseSinglePane() =
- LocalWindowSizeClass.current.widthSizeClass == WindowWidthSizeClass.Compact
+ LocalWindowSizeClass.current.widthSizeClass == WindowWidthSizeClass.Compact ||
+ LocalWindowSizeClass.current.heightSizeClass == WindowHeightSizeClass.Compact
@Composable
private fun ShortcutHelperSinglePane(
@@ -209,11 +220,31 @@
@Composable
private fun ShortcutCategoryDetailsSinglePane(category: ShortcutHelperCategory) {
- Box(modifier = Modifier.fillMaxWidth().heightIn(min = 300.dp)) {
- Text(
- modifier = Modifier.align(Alignment.Center),
- text = stringResource(category.labelResId),
- )
+ Column(Modifier.padding(horizontal = 16.dp)) {
+ category.subCategories.fastForEach { subCategory ->
+ ShortcutSubCategorySinglePane(subCategory)
+ }
+ }
+}
+
+@Composable
+private fun ShortcutSubCategorySinglePane(subCategory: SubCategory) {
+ // This @Composable is expected to be in a Column.
+ SubCategoryTitle(subCategory.label)
+ subCategory.shortcuts.fastForEachIndexed { index, shortcut ->
+ if (index > 0) {
+ HorizontalDivider()
+ }
+ ShortcutSinglePane(shortcut)
+ }
+}
+
+@Composable
+private fun ShortcutSinglePane(shortcut: Shortcut) {
+ Column(Modifier.padding(vertical = 24.dp)) {
+ ShortcutDescriptionText(shortcut = shortcut)
+ Spacer(modifier = Modifier.height(12.dp))
+ ShortcutKeyCombinations(shortcut = shortcut)
}
}
@@ -223,6 +254,7 @@
categories: List<ShortcutHelperCategory>,
onKeyboardSettingsClicked: () -> Unit,
) {
+ var selectedCategory by remember { mutableStateOf(categories.first()) }
Column(modifier = modifier.fillMaxSize().padding(start = 24.dp, end = 24.dp, top = 26.dp)) {
TitleBar()
Spacer(modifier = Modifier.height(12.dp))
@@ -230,39 +262,189 @@
StartSidePanel(
modifier = Modifier.fillMaxWidth(fraction = 0.32f),
categories = categories,
+ selectedCategory = selectedCategory,
+ onCategoryClicked = { selectedCategory = it },
onKeyboardSettingsClicked = onKeyboardSettingsClicked,
)
Spacer(modifier = Modifier.width(24.dp))
- EndSidePanel(Modifier.fillMaxSize())
+ EndSidePanel(Modifier.fillMaxSize(), selectedCategory)
}
}
}
@Composable
+private fun EndSidePanel(modifier: Modifier, category: ShortcutHelperCategory) {
+ LazyColumn(modifier.nestedScroll(rememberNestedScrollInteropConnection())) {
+ items(items = category.subCategories, key = { item -> item.label }) {
+ SubCategoryContainerDualPane(it)
+ Spacer(modifier = Modifier.height(8.dp))
+ }
+ }
+}
+
+@Composable
+private fun SubCategoryContainerDualPane(subCategory: SubCategory) {
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ shape = RoundedCornerShape(28.dp),
+ color = MaterialTheme.colorScheme.surfaceBright
+ ) {
+ Column(Modifier.padding(horizontal = 32.dp, vertical = 24.dp)) {
+ SubCategoryTitle(subCategory.label)
+ Spacer(Modifier.height(24.dp))
+ subCategory.shortcuts.fastForEachIndexed { index, shortcut ->
+ if (index > 0) {
+ HorizontalDivider()
+ }
+ ShortcutViewDualPane(shortcut)
+ }
+ }
+ }
+}
+
+@Composable
+private fun SubCategoryTitle(title: String) {
+ Text(
+ title,
+ style = MaterialTheme.typography.titleSmall,
+ color = MaterialTheme.colorScheme.primary,
+ )
+}
+
+@Composable
+private fun ShortcutViewDualPane(shortcut: Shortcut) {
+ Row(Modifier.padding(vertical = 16.dp)) {
+ ShortcutDescriptionText(
+ modifier = Modifier.weight(0.25f).align(Alignment.CenterVertically),
+ shortcut = shortcut,
+ )
+ ShortcutKeyCombinations(
+ modifier = Modifier.weight(0.75f),
+ shortcut = shortcut,
+ )
+ }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun ShortcutKeyCombinations(
+ modifier: Modifier = Modifier,
+ shortcut: Shortcut,
+) {
+ FlowRow(modifier = modifier, verticalArrangement = Arrangement.spacedBy(8.dp)) {
+ shortcut.commands.forEachIndexed { index, command ->
+ if (index > 0) {
+ ShortcutOrSeparator(spacing = 16.dp)
+ }
+ ShortcutCommand(command)
+ }
+ }
+}
+
+@Composable
+private fun ShortcutCommand(command: ShortcutCommand) {
+ // This @Composable is expected to be in a Row or FlowRow.
+ command.keys.forEachIndexed { keyIndex, key ->
+ if (keyIndex > 0) {
+ Spacer(Modifier.width(4.dp))
+ }
+ ShortcutKeyContainer {
+ if (key is ShortcutKey.Text) {
+ ShortcutTextKey(key)
+ } else if (key is ShortcutKey.Icon) {
+ ShortcutIconKey(key)
+ }
+ }
+ }
+}
+
+@Composable
+private fun ShortcutKeyContainer(shortcutKeyContent: @Composable BoxScope.() -> Unit) {
+ Box(
+ modifier =
+ Modifier.height(36.dp)
+ .background(
+ color = MaterialTheme.colorScheme.surfaceContainer,
+ shape = RoundedCornerShape(12.dp)
+ ),
+ ) {
+ shortcutKeyContent()
+ }
+}
+
+@Composable
+private fun BoxScope.ShortcutTextKey(key: ShortcutKey.Text) {
+ Text(
+ text = key.value,
+ modifier = Modifier.align(Alignment.Center).padding(horizontal = 12.dp),
+ style = MaterialTheme.typography.titleSmall,
+ )
+}
+
+@Composable
+private fun BoxScope.ShortcutIconKey(key: ShortcutKey.Icon) {
+ Icon(
+ imageVector = key.value,
+ contentDescription = null,
+ modifier = Modifier.align(Alignment.Center).padding(6.dp)
+ )
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun FlowRowScope.ShortcutOrSeparator(spacing: Dp) {
+ Spacer(Modifier.width(spacing))
+ Text(
+ text = stringResource(R.string.shortcut_helper_key_combinations_or_separator),
+ modifier = Modifier.align(Alignment.CenterVertically),
+ style = MaterialTheme.typography.titleSmall,
+ )
+ Spacer(Modifier.width(spacing))
+}
+
+@Composable
+private fun ShortcutDescriptionText(
+ shortcut: Shortcut,
+ modifier: Modifier = Modifier,
+) {
+ Text(
+ modifier = modifier,
+ text = shortcut.label,
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurface,
+ )
+}
+
+@Composable
private fun StartSidePanel(
modifier: Modifier,
categories: List<ShortcutHelperCategory>,
onKeyboardSettingsClicked: () -> Unit,
+ selectedCategory: ShortcutHelperCategory,
+ onCategoryClicked: (ShortcutHelperCategory) -> Unit,
) {
Column(modifier) {
ShortcutsSearchBar()
Spacer(modifier = Modifier.heightIn(16.dp))
- CategoriesPanelTwoPane(categories)
+ CategoriesPanelTwoPane(categories, selectedCategory, onCategoryClicked)
Spacer(modifier = Modifier.weight(1f))
KeyboardSettings(onKeyboardSettingsClicked)
}
}
@Composable
-private fun CategoriesPanelTwoPane(categories: List<ShortcutHelperCategory>) {
- var selected by remember { mutableStateOf(categories.first()) }
+private fun CategoriesPanelTwoPane(
+ categories: List<ShortcutHelperCategory>,
+ selectedCategory: ShortcutHelperCategory,
+ onCategoryClicked: (ShortcutHelperCategory) -> Unit
+) {
Column {
categories.fastForEach {
CategoryItemTwoPane(
label = stringResource(it.labelResId),
icon = it.icon,
- selected = selected == it,
- onClick = { selected = it }
+ selected = selectedCategory == it,
+ onClick = { onCategoryClicked(it) }
)
}
}
@@ -305,15 +487,6 @@
}
@Composable
-fun EndSidePanel(modifier: Modifier) {
- Surface(
- modifier = modifier,
- shape = RoundedCornerShape(28.dp),
- color = MaterialTheme.colorScheme.surfaceBright
- ) {}
-}
-
-@Composable
@OptIn(ExperimentalMaterial3Api::class)
private fun TitleBar() {
CenterAlignedTopAppBar(
@@ -333,6 +506,7 @@
private fun ShortcutsSearchBar() {
var query by remember { mutableStateOf("") }
SearchBar(
+ modifier = Modifier.fillMaxWidth(),
colors = SearchBarDefaults.colors(containerColor = MaterialTheme.colorScheme.surfaceBright),
query = query,
active = false,
@@ -372,25 +546,6 @@
}
}
-/** Temporary data class just to populate the UI. */
-private data class ShortcutHelperCategory(
- @StringRes val labelResId: Int,
- val icon: ImageVector,
-)
-
-// Temporarily populating the categories directly in the UI.
-private val categories =
- listOf(
- ShortcutHelperCategory(R.string.shortcut_helper_category_system, Icons.Default.Tv),
- ShortcutHelperCategory(
- R.string.shortcut_helper_category_multitasking,
- Icons.Default.VerticalSplit
- ),
- ShortcutHelperCategory(R.string.shortcut_helper_category_input, Icons.Default.Keyboard),
- ShortcutHelperCategory(R.string.shortcut_helper_category_app_shortcuts, Icons.Default.Apps),
- ShortcutHelperCategory(R.string.shortcut_helper_category_a11y, Icons.Default.Accessibility),
- )
-
object ShortcutHelper {
object Shapes {
diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelperTemporaryData.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelperTemporaryData.kt
new file mode 100644
index 0000000..fa2388f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelperTemporaryData.kt
@@ -0,0 +1,251 @@
+/*
+ * 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.keyboard.shortcut.ui.composable
+
+import androidx.annotation.StringRes
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Accessibility
+import androidx.compose.material.icons.filled.Apps
+import androidx.compose.material.icons.filled.ArrowBackIosNew
+import androidx.compose.material.icons.filled.Keyboard
+import androidx.compose.material.icons.filled.KeyboardCommandKey
+import androidx.compose.material.icons.filled.RadioButtonUnchecked
+import androidx.compose.material.icons.filled.Tv
+import androidx.compose.material.icons.filled.VerticalSplit
+import androidx.compose.ui.graphics.vector.ImageVector
+import com.android.systemui.res.R
+
+/** Temporary data classes and data below just to populate the UI. */
+data class ShortcutHelperCategory(
+ @StringRes val labelResId: Int,
+ val icon: ImageVector,
+ val subCategories: List<SubCategory>,
+)
+
+data class SubCategory(
+ val label: String,
+ val shortcuts: List<Shortcut>,
+)
+
+data class Shortcut(val label: String, val commands: List<ShortcutCommand>)
+
+data class ShortcutCommand(val keys: List<ShortcutKey>)
+
+sealed interface ShortcutKey {
+ data class Text(val value: String) : ShortcutKey
+
+ data class Icon(val value: ImageVector) : ShortcutKey
+}
+
+// DSL Builder Functions
+private fun shortcutHelperCategory(
+ labelResId: Int,
+ icon: ImageVector,
+ block: ShortcutHelperCategoryBuilder.() -> Unit
+): ShortcutHelperCategory = ShortcutHelperCategoryBuilder(labelResId, icon).apply(block).build()
+
+private fun ShortcutHelperCategoryBuilder.subCategory(
+ label: String,
+ block: SubCategoryBuilder.() -> Unit
+) {
+ subCategories.add(SubCategoryBuilder(label).apply(block).build())
+}
+
+private fun SubCategoryBuilder.shortcut(label: String, block: ShortcutBuilder.() -> Unit) {
+ shortcuts.add(ShortcutBuilder(label).apply(block).build())
+}
+
+private fun ShortcutBuilder.command(block: ShortcutCommandBuilder.() -> Unit) {
+ commands.add(ShortcutCommandBuilder().apply(block).build())
+}
+
+private fun ShortcutCommandBuilder.key(value: String) {
+ keys.add(ShortcutKey.Text(value))
+}
+
+private fun ShortcutCommandBuilder.key(value: ImageVector) {
+ keys.add(ShortcutKey.Icon(value))
+}
+
+private class ShortcutHelperCategoryBuilder(
+ private val labelResId: Int,
+ private val icon: ImageVector
+) {
+ val subCategories = mutableListOf<SubCategory>()
+
+ fun build() = ShortcutHelperCategory(labelResId, icon, subCategories)
+}
+
+private class SubCategoryBuilder(private val label: String) {
+ val shortcuts = mutableListOf<Shortcut>()
+
+ fun build() = SubCategory(label, shortcuts)
+}
+
+private class ShortcutBuilder(private val label: String) {
+ val commands = mutableListOf<ShortcutCommand>()
+
+ fun build() = Shortcut(label, commands)
+}
+
+private class ShortcutCommandBuilder {
+ val keys = mutableListOf<ShortcutKey>()
+
+ fun build() = ShortcutCommand(keys)
+}
+
+object ShortcutHelperTemporaryData {
+
+ // Some shortcuts and their strings below are made up just to populate the UI for now.
+ // For this reason they are not in translatable resources yet.
+ val categories =
+ listOf(
+ shortcutHelperCategory(R.string.shortcut_helper_category_system, Icons.Default.Tv) {
+ subCategory("System controls") {
+ shortcut("Go to home screen") {
+ command { key(Icons.Default.RadioButtonUnchecked) }
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("H")
+ }
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("Return")
+ }
+ }
+ shortcut("View recent apps") {
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("Tab")
+ }
+ }
+ shortcut("All apps search") {
+ command { key(Icons.Default.KeyboardCommandKey) }
+ }
+ }
+ subCategory("System apps") {
+ shortcut("Go back") {
+ command { key(Icons.Default.ArrowBackIosNew) }
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("Left arrow")
+ }
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("ESC")
+ }
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("Backspace")
+ }
+ }
+ shortcut("View notifications") {
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("N")
+ }
+ }
+ shortcut("Take a screenshot") {
+ command { key(Icons.Default.KeyboardCommandKey) }
+ command { key("CTRL") }
+ command { key("S") }
+ }
+ shortcut("Open Settings") {
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("I")
+ }
+ }
+ }
+ },
+ shortcutHelperCategory(
+ R.string.shortcut_helper_category_multitasking,
+ Icons.Default.VerticalSplit
+ ) {
+ subCategory("Multitasking & windows") {
+ shortcut("Take a screenshot") {
+ command { key(Icons.Default.KeyboardCommandKey) }
+ command { key("CTRL") }
+ command { key("S") }
+ }
+ }
+ },
+ shortcutHelperCategory(
+ R.string.shortcut_helper_category_input,
+ Icons.Default.Keyboard
+ ) {
+ subCategory("Input") {
+ shortcut("Open Settings") {
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("I")
+ }
+ }
+ shortcut("View notifications") {
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("N")
+ }
+ }
+ }
+ },
+ shortcutHelperCategory(
+ R.string.shortcut_helper_category_app_shortcuts,
+ Icons.Default.Apps
+ ) {
+ subCategory("App shortcuts") {
+ shortcut("Open Settings") {
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("I")
+ }
+ }
+ shortcut("Go back") {
+ command { key(Icons.Default.ArrowBackIosNew) }
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("Left arrow")
+ }
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("ESC")
+ }
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("Backspace")
+ }
+ }
+ }
+ },
+ shortcutHelperCategory(
+ R.string.shortcut_helper_category_a11y,
+ Icons.Default.Accessibility
+ ) {
+ subCategory("Accessibility shortcuts") {
+ shortcut("View recent apps") {
+ command {
+ key(Icons.Default.KeyboardCommandKey)
+ key("Tab")
+ }
+ }
+ shortcut("All apps search") {
+ command { key(Icons.Default.KeyboardCommandKey) }
+ }
+ }
+ }
+ )
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt
index 6b11dc5..191056c 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardSmartspaceViewBinder.kt
@@ -121,10 +121,7 @@
) {
val dateView =
constraintLayout.requireViewById<View>(sharedR.id.date_smartspace_view)
- val weatherView =
- constraintLayout.requireViewById<View>(sharedR.id.weather_smartspace_view)
addView(dateView)
- addView(weatherView)
}
}
}
@@ -141,9 +138,6 @@
) {
val dateView =
constraintLayout.requireViewById<View>(sharedR.id.date_smartspace_view)
- val weatherView =
- constraintLayout.requireViewById<View>(sharedR.id.weather_smartspace_view)
- removeView(weatherView)
removeView(dateView)
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt
index 0435531..8a751f0 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt
@@ -18,6 +18,7 @@
import android.content.Context
import android.view.View
+import android.view.ViewGroup
import android.view.ViewTreeObserver.OnGlobalLayoutListener
import androidx.constraintlayout.widget.Barrier
import androidx.constraintlayout.widget.ConstraintLayout
@@ -51,7 +52,7 @@
) : KeyguardSection() {
private var smartspaceView: View? = null
private var weatherView: View? = null
- private var dateView: View? = null
+ private var dateWeatherView: ViewGroup? = null
private var smartspaceVisibilityListener: OnGlobalLayoutListener? = null
private var pastVisibility: Int = -1
@@ -69,12 +70,15 @@
if (!keyguardSmartspaceViewModel.isSmartspaceEnabled) return
smartspaceView = smartspaceController.buildAndConnectView(constraintLayout)
weatherView = smartspaceController.buildAndConnectWeatherView(constraintLayout)
- dateView = smartspaceController.buildAndConnectDateView(constraintLayout)
+ dateWeatherView =
+ smartspaceController.buildAndConnectDateView(constraintLayout) as ViewGroup
pastVisibility = smartspaceView?.visibility ?: View.GONE
constraintLayout.addView(smartspaceView)
if (keyguardSmartspaceViewModel.isDateWeatherDecoupled) {
- constraintLayout.addView(weatherView)
- constraintLayout.addView(dateView)
+ constraintLayout.addView(dateWeatherView)
+ // Place weather right after the date, before the extras (alarm and dnd)
+ val index = if (dateWeatherView?.childCount == 0) 0 else 1
+ dateWeatherView?.addView(weatherView, index)
}
keyguardUnlockAnimationController.lockscreenSmartspace = smartspaceView
smartspaceVisibilityListener = OnGlobalLayoutListener {
@@ -116,26 +120,6 @@
ConstraintSet.START,
horizontalPaddingStart
)
- constrainWidth(sharedR.id.weather_smartspace_view, ConstraintSet.WRAP_CONTENT)
- connect(
- sharedR.id.weather_smartspace_view,
- ConstraintSet.TOP,
- sharedR.id.date_smartspace_view,
- ConstraintSet.TOP
- )
- connect(
- sharedR.id.weather_smartspace_view,
- ConstraintSet.BOTTOM,
- sharedR.id.date_smartspace_view,
- ConstraintSet.BOTTOM
- )
- connect(
- sharedR.id.weather_smartspace_view,
- ConstraintSet.START,
- sharedR.id.date_smartspace_view,
- ConstraintSet.END,
- 4
- )
// migrate addSmartspaceView from KeyguardClockSwitchController
constrainHeight(sharedR.id.bc_smartspace_view, ConstraintSet.WRAP_CONTENT)
@@ -186,7 +170,6 @@
*intArrayOf(
sharedR.id.bc_smartspace_view,
sharedR.id.date_smartspace_view,
- sharedR.id.weather_smartspace_view,
)
)
}
@@ -196,7 +179,7 @@
override fun removeViews(constraintLayout: ConstraintLayout) {
if (!MigrateClocksToBlueprint.isEnabled) return
if (!keyguardSmartspaceViewModel.isSmartspaceEnabled) return
- listOf(smartspaceView, dateView, weatherView).forEach {
+ listOf(smartspaceView, dateWeatherView).forEach {
it?.let {
if (it.parent == constraintLayout) {
constraintLayout.removeView(it)
@@ -220,7 +203,7 @@
setVisibility(sharedR.id.weather_smartspace_view, weatherVisibility)
setAlpha(
sharedR.id.weather_smartspace_view,
- if (weatherVisibility == ConstraintSet.VISIBLE) 1f else 0f
+ if (weatherVisibility == View.VISIBLE) 1f else 0f
)
val dateVisibility =
if (keyguardClockViewModel.hasCustomWeatherDataDisplay.value) ConstraintSet.GONE
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 a70bf91..8f15561 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
@@ -106,6 +106,7 @@
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onStart
import kotlinx.coroutines.launch
@@ -694,6 +695,7 @@
.onStart { emit(Unit) }
.map { getMediaLockScreenSetting() }
.distinctUntilChanged()
+ .flowOn(backgroundDispatcher)
.collectLatest {
allowMediaPlayerOnLockScreen = it
updateHostVisibility()
@@ -882,8 +884,7 @@
val previousVisibleIndex =
MediaPlayerData.playerKeys().indexOfFirst { key -> it == key }
mediaCarouselScrollHandler.scrollToPlayer(previousVisibleIndex, mediaIndex)
- }
- ?: mediaCarouselScrollHandler.scrollToPlayer(destIndex = mediaIndex)
+ } ?: mediaCarouselScrollHandler.scrollToPlayer(destIndex = mediaIndex)
}
} else if (isRtl && mediaContent.childCount > 0) {
// In RTL, Scroll to the first player as it is the rightmost player in media carousel.
diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskListProvider.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskListProvider.kt
index 596c18f..03adf1b 100644
--- a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskListProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskListProvider.kt
@@ -53,8 +53,13 @@
withContext(coroutineDispatcher) {
val groupedTasks: List<GroupedRecentTaskInfo> = recents?.getTasks() ?: emptyList()
// Note: the returned task list is from the most-recent to least-recent order.
- // The last foreground task is at index 1, because at index 0 will be our app selector.
- val foregroundGroup = groupedTasks.elementAtOrNull(1)
+ // When opening the app selector in full screen, index 0 will be just the app selector
+ // activity and a null second task, so the foreground task will be index 1, but when
+ // opening the app selector in split screen mode, the foreground task will be the second
+ // task in index 0.
+ val foregroundGroup =
+ if (groupedTasks.first().splitBounds != null) groupedTasks.first()
+ else groupedTasks.elementAtOrNull(1)
val foregroundTaskId1 = foregroundGroup?.taskInfo1?.taskId
val foregroundTaskId2 = foregroundGroup?.taskInfo2?.taskId
val foregroundTaskIds = listOfNotNull(foregroundTaskId1, foregroundTaskId2)
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java b/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java
index 3268306..8177fde 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java
@@ -61,6 +61,7 @@
}
};
+ private final boolean mUseDeadZone;
private final NavigationBarController mNavBarController;
private final NavigationBarView mNavigationBarView;
@@ -86,9 +87,12 @@
@Inject
public DeadZone(NavigationBarView view) {
+ mUseDeadZone = view.getResources().getBoolean(R.bool.config_useDeadZone);
+
mNavigationBarView = view;
mNavBarController = Dependency.get(NavigationBarController.class);
mDisplayId = view.getContext().getDisplayId();
+
onConfigurationChanged(HORIZONTAL);
}
@@ -108,12 +112,20 @@
}
public void setFlashOnTouchCapture(boolean dbg) {
+ if (!mUseDeadZone) {
+ return;
+ }
+
mShouldFlash = dbg;
mFlashFrac = 0f;
mNavigationBarView.postInvalidate();
}
public void onConfigurationChanged(int rotation) {
+ if (!mUseDeadZone) {
+ return;
+ }
+
mDisplayRotation = rotation;
final Resources res = mNavigationBarView.getResources();
@@ -134,6 +146,10 @@
// I made you a touch event...
public boolean onTouchEvent(MotionEvent event) {
+ if (!mUseDeadZone) {
+ return false;
+ }
+
if (DEBUG) {
Slog.v(TAG, this + " onTouch: " + MotionEvent.actionToString(event.getAction()));
}
@@ -187,17 +203,17 @@
if (mShouldFlash) mNavigationBarView.postInvalidate();
}
- public void setFlash(float f) {
+ private void setFlash(float f) {
mFlashFrac = f;
mNavigationBarView.postInvalidate();
}
- public float getFlash() {
+ private float getFlash() {
return mFlashFrac;
}
public void onDraw(Canvas can) {
- if (!mShouldFlash || mFlashFrac <= 0f) {
+ if (!mUseDeadZone || !mShouldFlash || mFlashFrac <= 0f) {
return;
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index 9c8c17b..f3cc35ba 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -113,6 +113,9 @@
private boolean mSceneContainerEnabled;
+ @Nullable
+ private View mMediaViewPlaceHolderForScene;
+
public QSPanel(Context context, AttributeSet attrs) {
super(context, attrs);
mUsingMediaPlayer = useQsMediaPlayer(context);
@@ -125,7 +128,6 @@
setOrientation(VERTICAL);
mMovableContentStartIndex = getChildCount();
-
}
void initialize(QSLogger qsLogger, boolean usingMediaPlayer) {
@@ -133,7 +135,7 @@
mUsingMediaPlayer = usingMediaPlayer;
mTileLayout = getOrCreateTileLayout();
- if (mUsingMediaPlayer) {
+ if (mUsingMediaPlayer || SceneContainerFlag.isEnabled()) {
mHorizontalLinearLayout = new RemeasuringLinearLayout(mContext);
mHorizontalLinearLayout.setOrientation(LinearLayout.HORIZONTAL);
mHorizontalLinearLayout.setVisibility(
@@ -151,6 +153,13 @@
lp.setMarginEnd(marginSize);
lp.gravity = Gravity.CENTER_VERTICAL;
mHorizontalLinearLayout.addView(mHorizontalContentContainer, lp);
+ if (SceneContainerFlag.isEnabled()) {
+ int mediaHeight = mContext.getResources()
+ .getDimensionPixelSize(R.dimen.qs_media_session_height_expanded);
+ lp = new LayoutParams(0, mediaHeight, 1);
+ mMediaViewPlaceHolderForScene = new View(mContext);
+ mHorizontalLinearLayout.addView(mMediaViewPlaceHolderForScene, lp);
+ }
lp = new LayoutParams(LayoutParams.MATCH_PARENT, 0, 1);
addView(mHorizontalLinearLayout, lp);
@@ -383,6 +392,13 @@
if (mTileLayout != null) {
mTileLayout.updateResources();
}
+
+ if (mMediaViewPlaceHolderForScene != null) {
+ ViewGroup.LayoutParams lp = mMediaViewPlaceHolderForScene.getLayoutParams();
+ lp.height = mContext.getResources()
+ .getDimensionPixelSize(R.dimen.qs_media_session_height_expanded);
+ mMediaViewPlaceHolderForScene.setLayoutParams(lp);
+ }
}
protected void updatePadding() {
@@ -417,7 +433,8 @@
}
private void updateHorizontalLinearLayoutMargins() {
- if (mUsingMediaPlayer && mHorizontalLinearLayout != null && !displayMediaMarginsOnMedia()) {
+ if ((mUsingMediaPlayer || SceneContainerFlag.isEnabled()) && mHorizontalLinearLayout != null
+ && !displayMediaMarginsOnMedia()) {
LayoutParams lp = (LayoutParams) mHorizontalLinearLayout.getLayoutParams();
lp.bottomMargin = Math.max(mMediaTotalBottomMargin - getPaddingBottom(), 0);
mHorizontalLinearLayout.setLayoutParams(lp);
@@ -632,6 +649,7 @@
// using media, the parent should always be this.
ViewGroup newParent =
horizontal && mUsingMediaPlayer ? mHorizontalContentContainer : this;
+ if (SceneContainerFlag.isEnabled()) return;
switchAllContentToParent(newParent, mTileLayout);
reAttachMediaHost(mediaHostView, horizontal);
if (needsDynamicRowsAndColumns()) {
@@ -647,6 +665,19 @@
void setColumnRowLayout(boolean withMedia) {
mTileLayout.setMinRows(withMedia ? 2 : 1);
mTileLayout.setMaxColumns(withMedia ? 2 : 4);
+ placeTileLayoutForScene(withMedia);
+ }
+
+ protected void placeTileLayoutForScene(boolean withMedia) {
+ // The tile layout should be reparented if horizontal and we are using media. If not
+ // using media, the parent should always be this.
+ ViewGroup newParent = withMedia ? mHorizontalContentContainer : this;
+ if (mTileLayout != null && ((View) mTileLayout).getParent() != newParent) {
+ switchAllContentToParent(newParent, mTileLayout);
+ }
+ if (mHorizontalLinearLayout != null) {
+ mHorizontalLinearLayout.setVisibility(withMedia ? View.VISIBLE : View.GONE);
+ }
}
private void updateMargins(ViewGroup mediaHostView) {
@@ -699,6 +730,12 @@
mCanCollapse = canCollapse;
}
+ @Nullable
+ @VisibleForTesting
+ View getMediaPlaceholder() {
+ return mMediaViewPlaceHolderForScene;
+ }
+
public interface QSTileLayout {
/** */
default void saveInstanceState(Bundle outState) {}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java
index 3b5cc61..13cedc2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java
@@ -456,7 +456,7 @@
boolean switchTileLayout(boolean force) {
/* Whether or not the panel currently contains a media player. */
boolean horizontal = shouldUseHorizontalLayout();
- if (horizontal != mUsingHorizontalLayout || force) {
+ if ((!SceneContainerFlag.isEnabled() && horizontal != mUsingHorizontalLayout) || force) {
mQSLogger.logSwitchTileLayout(horizontal, mUsingHorizontalLayout, force,
mView.getDumpableTag());
mUsingHorizontalLayout = horizontal;
@@ -470,7 +470,7 @@
return false;
}
- void setLayoutForMediaInScene() {
+ private void setLayoutForMediaInScene() {
boolean withMedia = shouldUseHorizontalInScene();
mView.setColumnRowLayout(withMedia);
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
index d457e88..fb47b40 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
@@ -332,7 +332,7 @@
if (info.applicationInfo.isSystemApp()) {
final StatusBarIcon statusIcon = icon != null
? new StatusBarIcon(userHandle, packageName, icon, 0, 0,
- contentDescription)
+ contentDescription, StatusBarIcon.Type.SystemIcon)
: null;
final String slot = getStatusBarIconSlotName(componentName);
mMainHandler.post(new Runnable() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PartitionedGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PartitionedGridLayout.kt
index d600767..e1b21ef 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PartitionedGridLayout.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PartitionedGridLayout.kt
@@ -284,7 +284,7 @@
Box(
Modifier.fillMaxWidth()
.background(
- color = MaterialTheme.colorScheme.surfaceVariant,
+ color = MaterialTheme.colorScheme.background,
alpha = { 1f },
shape = RoundedCornerShape(dimensionResource(R.dimen.qs_corner_radius))
)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt
index f776bf0..e4fbb4b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/Tile.kt
@@ -17,6 +17,8 @@
package com.android.systemui.qs.panels.ui.compose
import android.graphics.drawable.Animatable
+import android.service.quicksettings.Tile.STATE_ACTIVE
+import android.service.quicksettings.Tile.STATE_INACTIVE
import android.text.TextUtils
import androidx.appcompat.content.res.AppCompatResources
import androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi
@@ -49,6 +51,7 @@
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Remove
import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
@@ -75,14 +78,11 @@
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.compose.animation.Expandable
-import com.android.compose.theme.colorAttr
import com.android.systemui.common.shared.model.Icon
import com.android.systemui.common.ui.compose.Icon
import com.android.systemui.common.ui.compose.load
-import com.android.systemui.qs.panels.ui.viewmodel.ActiveTileColorAttributes
import com.android.systemui.qs.panels.ui.viewmodel.AvailableEditActions
import com.android.systemui.qs.panels.ui.viewmodel.EditTileViewModel
-import com.android.systemui.qs.panels.ui.viewmodel.TileColorAttributes
import com.android.systemui.qs.panels.ui.viewmodel.TileUiState
import com.android.systemui.qs.panels.ui.viewmodel.TileViewModel
import com.android.systemui.qs.panels.ui.viewmodel.toUiState
@@ -108,10 +108,12 @@
tile.state
.mapLatest { it.toUiState() }
.collectAsStateWithLifecycle(tile.currentState.toUiState())
+ val colors = TileDefaults.getColorForState(state.state)
+
val context = LocalContext.current
Expandable(
- color = colorAttr(state.colors.background),
+ color = colors.background,
shape = RoundedCornerShape(dimensionResource(R.dimen.qs_corner_radius)),
) {
Row(
@@ -121,7 +123,7 @@
onClick = { tile.onClick(it) },
onLongClick = { tile.onLongClick(it) }
)
- .tileModifier(state.colors),
+ .tileModifier(colors),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = tileHorizontalArrangement(iconOnly),
) {
@@ -139,7 +141,7 @@
label = state.label.toString(),
secondaryLabel = state.secondaryLabel.toString(),
icon = icon,
- colors = state.colors,
+ colors = colors,
iconOnly = iconOnly,
showLabels = showLabels,
)
@@ -292,7 +294,7 @@
modifier: Modifier = Modifier,
) {
val label = tileViewModel.label.load() ?: tileViewModel.tileSpec.spec
- val colors = ActiveTileColorAttributes
+ val colors = TileDefaults.inactiveTileColors()
Row(
modifier = modifier.tileModifier(colors).semantics { this.contentDescription = label },
@@ -361,10 +363,10 @@
}
@Composable
-private fun Modifier.tileModifier(colors: TileColorAttributes): Modifier {
+private fun Modifier.tileModifier(colors: TileColors): Modifier {
return fillMaxWidth()
.clip(RoundedCornerShape(dimensionResource(R.dimen.qs_corner_radius)))
- .background(colorAttr(colors.background))
+ .background(colors.background)
.padding(horizontal = dimensionResource(id = R.dimen.qs_label_container_margin))
}
@@ -387,7 +389,7 @@
label: String,
secondaryLabel: String?,
icon: Icon,
- colors: TileColorAttributes,
+ colors: TileColors,
iconOnly: Boolean,
showLabels: Boolean = false,
animateIconToEnd: Boolean = false,
@@ -397,13 +399,13 @@
verticalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxHeight()
) {
- TileIcon(icon, colorAttr(colors.icon), animateIconToEnd)
+ TileIcon(icon, colors.icon, animateIconToEnd)
if (iconOnly && showLabels) {
Text(
label,
maxLines = 2,
- color = colorAttr(colors.label),
+ color = colors.label,
overflow = TextOverflow.Ellipsis,
textAlign = TextAlign.Center,
)
@@ -414,13 +416,13 @@
Column(verticalArrangement = Arrangement.Center, modifier = Modifier.fillMaxHeight()) {
Text(
label,
- color = colorAttr(colors.label),
+ color = colors.label,
modifier = Modifier.basicMarquee(),
)
if (!TextUtils.isEmpty(secondaryLabel)) {
Text(
secondaryLabel ?: "",
- color = colorAttr(colors.secondaryLabel),
+ color = colors.secondaryLabel,
modifier = Modifier.basicMarquee(),
)
}
@@ -431,12 +433,55 @@
@Composable
fun tileHeight(iconWithLabel: Boolean = false): Dp {
return if (iconWithLabel) {
- TileDimensions.IconTileWithLabelHeight
+ TileDefaults.IconTileWithLabelHeight
} else {
dimensionResource(id = R.dimen.qs_tile_height)
}
}
-private object TileDimensions {
+private data class TileColors(
+ val background: Color,
+ val label: Color,
+ val secondaryLabel: Color,
+ val icon: Color,
+)
+
+private object TileDefaults {
val IconTileWithLabelHeight = 100.dp
+
+ @Composable
+ fun activeTileColors(): TileColors =
+ TileColors(
+ background = MaterialTheme.colorScheme.primary,
+ label = MaterialTheme.colorScheme.onPrimary,
+ secondaryLabel = MaterialTheme.colorScheme.onPrimary,
+ icon = MaterialTheme.colorScheme.onPrimary,
+ )
+
+ @Composable
+ fun inactiveTileColors(): TileColors =
+ TileColors(
+ background = MaterialTheme.colorScheme.surfaceVariant,
+ label = MaterialTheme.colorScheme.onSurfaceVariant,
+ secondaryLabel = MaterialTheme.colorScheme.onSurfaceVariant,
+ icon = MaterialTheme.colorScheme.onSurfaceVariant,
+ )
+
+ @Composable
+ fun unavailableTileColors(): TileColors =
+ TileColors(
+ background = MaterialTheme.colorScheme.surface,
+ label = MaterialTheme.colorScheme.onSurface,
+ secondaryLabel = MaterialTheme.colorScheme.onSurface,
+ icon = MaterialTheme.colorScheme.onSurface,
+ )
+
+ @Composable
+ fun getColorForState(state: Int): TileColors {
+ return when (state) {
+ STATE_ACTIVE -> activeTileColors()
+ STATE_INACTIVE -> inactiveTileColors()
+ else -> unavailableTileColors()
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileColorAttributes.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileColorAttributes.kt
deleted file mode 100644
index 1290bf3..0000000
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileColorAttributes.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.panels.ui.viewmodel
-
-import android.service.quicksettings.Tile
-import androidx.annotation.AttrRes
-import com.android.systemui.plugins.qs.QSTile
-import com.android.systemui.res.R
-
-data class TileColorAttributes(
- @AttrRes val background: Int = 0,
- @AttrRes val label: Int = 0,
- @AttrRes val secondaryLabel: Int = 0,
- @AttrRes val icon: Int = 0,
-)
-
-val ActiveTileColorAttributes =
- TileColorAttributes(
- background = R.attr.shadeActive,
- label = R.attr.onShadeActive,
- secondaryLabel = R.attr.onShadeActiveVariant,
- icon = R.attr.onShadeActive,
- )
-
-val InactiveTileColorAttributes =
- TileColorAttributes(
- background = R.attr.shadeInactive,
- label = R.attr.onShadeInactive,
- secondaryLabel = R.attr.onShadeInactiveVariant,
- icon = R.attr.onShadeInactiveVariant,
- )
-
-val UnavailableTileColorAttributes =
- TileColorAttributes(
- background = R.attr.shadeDisabled,
- label = R.attr.outline,
- secondaryLabel = R.attr.outline,
- icon = R.attr.outline,
- )
-
-fun QSTile.State.colors(): TileColorAttributes =
- when (state) {
- Tile.STATE_UNAVAILABLE -> UnavailableTileColorAttributes
- Tile.STATE_ACTIVE -> ActiveTileColorAttributes
- Tile.STATE_INACTIVE -> InactiveTileColorAttributes
- else -> TileColorAttributes()
- }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileUiState.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileUiState.kt
index 58d07c3..578a292 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileUiState.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileUiState.kt
@@ -22,7 +22,7 @@
data class TileUiState(
val label: CharSequence,
val secondaryLabel: CharSequence,
- val colors: TileColorAttributes,
+ val state: Int,
val icon: Supplier<QSTile.Icon>,
)
@@ -30,7 +30,7 @@
return TileUiState(
label ?: "",
secondaryLabel ?: "",
- colors(),
+ state,
icon?.let { Supplier { icon } } ?: iconSupplier,
)
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java
index 183c1a4..b96e83d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java
@@ -19,34 +19,53 @@
import android.content.Intent;
import android.os.Handler;
import android.os.Looper;
+import android.os.UserManager;
import android.provider.Settings;
+import android.service.quicksettings.Tile;
import androidx.annotation.Nullable;
import com.android.internal.logging.MetricsLogger;
import com.android.systemui.Flags;
+import com.android.systemui.accessibility.hearingaid.HearingDevicesChecker;
import com.android.systemui.accessibility.hearingaid.HearingDevicesDialogManager;
import com.android.systemui.animation.Expandable;
import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.plugins.FalsingManager;
-import com.android.systemui.plugins.qs.QSTile.State;
+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.tileimpl.QSTileImpl;
import com.android.systemui.res.R;
+import com.android.systemui.statusbar.policy.BluetoothController;
import javax.inject.Inject;
/** Quick settings tile: Hearing Devices **/
-public class HearingDevicesTile extends QSTileImpl<State> {
-
+public class HearingDevicesTile extends QSTileImpl<BooleanState> {
+ //TODO(b/338520598): Transform the current implementation into new QS architecture
+ // and use Kotlin except Tile class.
public static final String TILE_SPEC = "hearing_devices";
private final HearingDevicesDialogManager mDialogManager;
+ private final HearingDevicesChecker mDevicesChecker;
+ private final BluetoothController mBluetoothController;
+
+ private final BluetoothController.Callback mCallback = new BluetoothController.Callback() {
+ @Override
+ public void onBluetoothStateChange(boolean enabled) {
+ refreshState();
+ }
+
+ @Override
+ public void onBluetoothDevicesChanged() {
+ refreshState();
+ }
+ };
@Inject
public HearingDevicesTile(
@@ -59,16 +78,20 @@
StatusBarStateController statusBarStateController,
ActivityStarter activityStarter,
QSLogger qsLogger,
- HearingDevicesDialogManager hearingDevicesDialogManager
- ) {
+ HearingDevicesDialogManager hearingDevicesDialogManager,
+ HearingDevicesChecker hearingDevicesChecker,
+ BluetoothController bluetoothController) {
super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
statusBarStateController, activityStarter, qsLogger);
mDialogManager = hearingDevicesDialogManager;
+ mDevicesChecker = hearingDevicesChecker;
+ mBluetoothController = bluetoothController;
+ mBluetoothController.observe(getLifecycle(), mCallback);
}
@Override
- public State newTileState() {
- return new State();
+ public BooleanState newTileState() {
+ return new BooleanState();
}
@Override
@@ -77,9 +100,28 @@
}
@Override
- protected void handleUpdateState(State state, Object arg) {
+ protected void handleUpdateState(BooleanState state, Object arg) {
+ checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_BLUETOOTH);
+
state.label = mContext.getString(R.string.quick_settings_hearing_devices_label);
state.icon = ResourceIcon.get(R.drawable.qs_hearing_devices_icon);
+ state.forceExpandIcon = true;
+
+ boolean isBonded = mDevicesChecker.isAnyPairedHearingDevice();
+ boolean isActive = mDevicesChecker.isAnyActiveHearingDevice();
+
+ if (isActive) {
+ state.state = Tile.STATE_ACTIVE;
+ state.secondaryLabel = mContext.getString(
+ R.string.quick_settings_hearing_devices_connected);
+ } else if (isBonded) {
+ state.state = Tile.STATE_INACTIVE;
+ state.secondaryLabel = mContext.getString(
+ R.string.quick_settings_hearing_devices_disconnected);
+ } else {
+ state.state = Tile.STATE_INACTIVE;
+ state.secondaryLabel = "";
+ }
}
@Nullable
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt
index e680102..70f3b84 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt
@@ -52,7 +52,6 @@
import com.android.systemui.settings.UserContextProvider
import com.android.systemui.statusbar.phone.KeyguardDismissUtil
import com.android.systemui.statusbar.policy.KeyguardStateController
-import com.android.traceur.TraceUtils.PresetTraceType
import java.util.concurrent.Executor
import javax.inject.Inject
@@ -131,15 +130,11 @@
}
}
- private fun startIssueRecordingService(screenRecord: Boolean, traceType: PresetTraceType) =
+ private fun startIssueRecordingService() =
PendingIntent.getForegroundService(
userContextProvider.userContext,
RecordingService.REQUEST_CODE,
- IssueRecordingService.getStartIntent(
- userContextProvider.userContext,
- screenRecord,
- traceType
- ),
+ IssueRecordingService.getStartIntent(userContextProvider.userContext),
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
.send(BroadcastOptions.makeBasic().apply { isInteractive = true }.toBundle())
@@ -157,7 +152,7 @@
val dialog: AlertDialog =
delegateFactory
.create {
- startIssueRecordingService(it.screenRecord, it.traceType)
+ startIssueRecordingService()
dialogTransitionAnimator.disableAllCurrentDialogsExitAnimations()
panelInteractor.collapsePanels()
}
@@ -169,8 +164,7 @@
if (expandable != null && !keyguardStateController.isShowing) {
expandable
.dialogTransitionController(DialogCuj(CUJ_SHADE_DIALOG_OPEN, TILE_SPEC))
- ?.let { dialogTransitionAnimator.show(dialog, it) }
- ?: dialog.show()
+ ?.let { dialogTransitionAnimator.show(dialog, it) } ?: dialog.show()
} else {
dialog.show()
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/ui/adapter/QSSceneAdapter.kt b/packages/SystemUI/src/com/android/systemui/qs/ui/adapter/QSSceneAdapter.kt
index c7326b08..bb36fd5 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/ui/adapter/QSSceneAdapter.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/ui/adapter/QSSceneAdapter.kt
@@ -33,6 +33,7 @@
import com.android.systemui.qs.QSContainerImpl
import com.android.systemui.qs.QSImpl
import com.android.systemui.qs.dagger.QSSceneComponent
+import com.android.systemui.qs.tiles.viewmodel.StubQSTileViewModel.state
import com.android.systemui.res.R
import com.android.systemui.settings.brightness.MirrorController
import com.android.systemui.shade.domain.interactor.ShadeInteractor
@@ -267,6 +268,7 @@
override val qqsHeight: Int
get() = qsImpl.value?.qqsHeight ?: 0
+
override val qsHeight: Int
get() = qsImpl.value?.qsHeight ?: 0
@@ -375,8 +377,10 @@
qs.view.setPadding(0, 0, 0, 0)
qs.setContainerController(this@QSSceneAdapterImpl)
qs.applyState(state.value)
+ applyLatestExpansionAndSquishiness()
}
}
+
override fun setState(state: QSSceneAdapter.State) {
this.state.value = state
}
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt
index 5ede64a..4a4c73b 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt
+++ b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt
@@ -35,8 +35,6 @@
import com.android.systemui.screenrecord.RecordingServiceStrings
import com.android.systemui.settings.UserContextProvider
import com.android.systemui.statusbar.phone.KeyguardDismissUtil
-import com.android.traceur.MessageConstants.INTENT_EXTRA_TRACE_TYPE
-import com.android.traceur.TraceUtils.PresetTraceType
import java.util.concurrent.Executor
import javax.inject.Inject
@@ -76,15 +74,10 @@
when (intent?.action) {
ACTION_START -> {
bgExecutor.execute {
- traceurMessageSender.startTracing(
- intent.getSerializableExtra(
- INTENT_EXTRA_TRACE_TYPE,
- PresetTraceType::class.java
- )
- )
+ traceurMessageSender.startTracing(issueRecordingState.traceType)
}
issueRecordingState.isRecording = true
- if (!intent.getBooleanExtra(EXTRA_SCREEN_RECORD, false)) {
+ if (!issueRecordingState.recordScreen) {
// If we don't want to record the screen, the ACTION_SHOW_START_NOTIF action
// will circumvent the RecordingService's screen recording start code.
return super.onStartCommand(Intent(ACTION_SHOW_START_NOTIF), flags, startId)
@@ -107,7 +100,7 @@
)
val screenRecording = intent.getParcelableExtra(EXTRA_PATH, Uri::class.java)
- if (issueRecordingState.takeBugReport) {
+ if (issueRecordingState.takeBugreport) {
iActivityManager.requestBugReportWithExtraAttachment(screenRecording)
} else {
traceurMessageSender.shareTraces(applicationContext, screenRecording)
@@ -130,7 +123,6 @@
companion object {
private const val TAG = "IssueRecordingService"
private const val CHANNEL_ID = "issue_record"
- private const val EXTRA_SCREEN_RECORD = "extra_screenRecord"
/**
* Get an intent to stop the issue recording service.
@@ -148,35 +140,36 @@
*
* @param context Context from the requesting activity
*/
- fun getStartIntent(
- context: Context,
- screenRecord: Boolean,
- traceType: PresetTraceType,
- ): Intent =
- Intent(context, IssueRecordingService::class.java)
- .setAction(ACTION_START)
- .putExtra(EXTRA_SCREEN_RECORD, screenRecord)
- .putExtra(INTENT_EXTRA_TRACE_TYPE, traceType)
+ fun getStartIntent(context: Context): Intent =
+ Intent(context, IssueRecordingService::class.java).setAction(ACTION_START)
}
}
private class IrsStrings(private val res: Resources) : RecordingServiceStrings(res) {
override val title
get() = res.getString(R.string.issuerecord_title)
+
override val notificationChannelDescription
get() = res.getString(R.string.issuerecord_channel_description)
+
override val startErrorResId
get() = R.string.issuerecord_start_error
+
override val startError
get() = res.getString(R.string.issuerecord_start_error)
+
override val saveErrorResId
get() = R.string.issuerecord_save_error
+
override val saveError
get() = res.getString(R.string.issuerecord_save_error)
+
override val ongoingRecording
get() = res.getString(R.string.issuerecord_ongoing_screen_only)
+
override val backgroundProcessingLabel
get() = res.getString(R.string.issuerecord_background_processing_label)
+
override val saveTitle
get() = res.getString(R.string.issuerecord_save_title)
}
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingState.kt b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingState.kt
index 12ed06d..4ea3345 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingState.kt
+++ b/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingState.kt
@@ -16,23 +16,62 @@
package com.android.systemui.recordissue
+import android.content.Context
import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.qs.tiles.RecordIssueTile
+import com.android.systemui.res.R
+import com.android.systemui.settings.UserFileManager
+import com.android.systemui.settings.UserTracker
+import com.android.traceur.TraceUtils.PresetTraceType
import java.util.concurrent.CopyOnWriteArrayList
import javax.inject.Inject
@SysUISingleton
-class IssueRecordingState @Inject constructor() {
+class IssueRecordingState
+@Inject
+constructor(
+ userTracker: UserTracker,
+ userFileManager: UserFileManager,
+) {
+
+ private val prefs =
+ userFileManager.getSharedPreferences(
+ RecordIssueTile.TILE_SPEC,
+ Context.MODE_PRIVATE,
+ userTracker.userId
+ )
+
+ var takeBugreport
+ get() = prefs.getBoolean(KEY_TAKE_BUG_REPORT, false)
+ set(value) = prefs.edit().putBoolean(KEY_TAKE_BUG_REPORT, value).apply()
+
+ var recordScreen
+ get() = prefs.getBoolean(KEY_RECORD_SCREEN, false)
+ set(value) = prefs.edit().putBoolean(KEY_RECORD_SCREEN, value).apply()
+
+ var hasUserApprovedScreenRecording
+ get() = prefs.getBoolean(HAS_APPROVED_SCREEN_RECORDING, false)
+ private set(value) = prefs.edit().putBoolean(HAS_APPROVED_SCREEN_RECORDING, value).apply()
+
+ var issueTypeRes
+ get() = prefs.getInt(KEY_ISSUE_TYPE_RES, ISSUE_TYPE_NOT_SET)
+ set(value) = prefs.edit().putInt(KEY_ISSUE_TYPE_RES, value).apply()
+
+ val traceType: PresetTraceType
+ get() = ALL_ISSUE_TYPES[issueTypeRes] ?: PresetTraceType.UNSET
private val listeners = CopyOnWriteArrayList<Runnable>()
- var takeBugReport: Boolean = false
-
var isRecording = false
set(value) {
field = value
listeners.forEach(Runnable::run)
}
+ fun markUserApprovalForScreenRecording() {
+ hasUserApprovedScreenRecording = true
+ }
+
fun addListener(listener: Runnable) {
listeners.add(listener)
}
@@ -40,4 +79,20 @@
fun removeListener(listener: Runnable) {
listeners.remove(listener)
}
+
+ companion object {
+ private const val KEY_TAKE_BUG_REPORT = "key_takeBugReport"
+ private const val HAS_APPROVED_SCREEN_RECORDING = "HasApprovedScreenRecord"
+ private const val KEY_RECORD_SCREEN = "key_recordScreen"
+ const val KEY_ISSUE_TYPE_RES = "key_issueTypeRes"
+ const val ISSUE_TYPE_NOT_SET = -1
+
+ val ALL_ISSUE_TYPES: Map<Int, PresetTraceType> =
+ hashMapOf(
+ Pair(R.string.performance, PresetTraceType.PERFORMANCE),
+ Pair(R.string.user_interface, PresetTraceType.UI),
+ Pair(R.string.battery, PresetTraceType.BATTERY),
+ Pair(R.string.thermal, PresetTraceType.THERMAL)
+ )
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt
index 84a063a..bbf4e51 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt
+++ b/packages/SystemUI/src/com/android/systemui/recordissue/RecordIssueDialogDelegate.kt
@@ -17,7 +17,7 @@
package com.android.systemui.recordissue
import android.annotation.SuppressLint
-import android.app.AlertDialog
+import android.app.AlertDialog.BUTTON_POSITIVE
import android.content.Context
import android.content.Intent
import android.content.res.ColorStateList
@@ -41,18 +41,16 @@
import com.android.systemui.mediaprojection.SessionCreationSource
import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDevicePolicyResolver
import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDisabledDialogDelegate
-import com.android.systemui.qs.tiles.RecordIssueTile
+import com.android.systemui.recordissue.IssueRecordingState.Companion.ALL_ISSUE_TYPES
+import com.android.systemui.recordissue.IssueRecordingState.Companion.ISSUE_TYPE_NOT_SET
+import com.android.systemui.recordissue.IssueRecordingState.Companion.KEY_ISSUE_TYPE_RES
import com.android.systemui.res.R
-import com.android.systemui.settings.UserFileManager
import com.android.systemui.settings.UserTracker
import com.android.systemui.statusbar.phone.SystemUIDialog
-import com.android.traceur.MessageConstants.INTENT_EXTRA_TRACE_TYPE
-import com.android.traceur.TraceUtils.PresetTraceType
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import java.util.concurrent.Executor
-import java.util.function.Consumer
class RecordIssueDialogDelegate
@AssistedInject
@@ -64,31 +62,20 @@
@Main private val mainExecutor: Executor,
private val devicePolicyResolver: dagger.Lazy<ScreenCaptureDevicePolicyResolver>,
private val mediaProjectionMetricsLogger: MediaProjectionMetricsLogger,
- private val userFileManager: UserFileManager,
private val screenCaptureDisabledDialogDelegate: ScreenCaptureDisabledDialogDelegate,
- private val issueRecordingState: IssueRecordingState,
+ private val state: IssueRecordingState,
private val traceurMessageSender: TraceurMessageSender,
- @Assisted private val onStarted: Consumer<IssueRecordingConfig>,
+ @Assisted private val onStarted: Runnable,
) : SystemUIDialog.Delegate {
- private val issueTypeOptions: Map<Int, PresetTraceType> =
- hashMapOf(
- Pair(R.string.performance, PresetTraceType.PERFORMANCE),
- Pair(R.string.user_interface, PresetTraceType.UI),
- Pair(R.string.battery, PresetTraceType.BATTERY),
- Pair(R.string.thermal, PresetTraceType.THERMAL)
- )
- private var selectedIssueType: PresetTraceType? = null
-
/** To inject dependencies and allow for easier testing */
@AssistedFactory
interface Factory {
/** Create a dialog object */
- fun create(onStarted: Consumer<IssueRecordingConfig>): RecordIssueDialogDelegate
+ fun create(onStarted: Runnable): RecordIssueDialogDelegate
}
@SuppressLint("UseSwitchCompatOrMaterialCode") private lateinit var screenRecordSwitch: Switch
- @SuppressLint("UseSwitchCompatOrMaterialCode") private lateinit var bugReportSwitch: Switch
private lateinit var issueTypeButton: Button
@MainThread
@@ -97,21 +84,8 @@
setView(LayoutInflater.from(context).inflate(R.layout.record_issue_dialog, null))
setTitle(context.getString(R.string.qs_record_issue_label))
setIcon(R.drawable.qs_record_issue_icon_off)
- setNegativeButton(R.string.cancel) { _, _ -> dismiss() }
- setPositiveButton(
- R.string.qs_record_issue_start,
- { _, _ ->
- issueRecordingState.takeBugReport = bugReportSwitch.isChecked
- onStarted.accept(
- IssueRecordingConfig(
- screenRecordSwitch.isChecked,
- selectedIssueType ?: PresetTraceType.UNSET
- )
- )
- dismiss()
- },
- false
- )
+ setNegativeButton(R.string.cancel) { _, _ -> }
+ setPositiveButton(R.string.qs_record_issue_start) { _, _ -> onStarted.run() }
}
bgExecutor.execute { traceurMessageSender.bindToTraceur(dialog.context) }
}
@@ -121,22 +95,39 @@
@MainThread
override fun onCreate(dialog: SystemUIDialog, savedInstanceState: Bundle?) {
dialog.apply {
- window?.addPrivateFlags(WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS)
- window?.setGravity(Gravity.CENTER)
+ window?.apply {
+ addPrivateFlags(WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS)
+ setGravity(Gravity.CENTER)
+ }
- screenRecordSwitch = requireViewById(R.id.screenrecord_switch)
- screenRecordSwitch.setOnCheckedChangeListener { _, isEnabled ->
- if (isEnabled) {
- bgExecutor.execute { onScreenRecordSwitchClicked() }
+ screenRecordSwitch =
+ requireViewById<Switch>(R.id.screenrecord_switch).apply {
+ isChecked = state.recordScreen
+ setOnCheckedChangeListener { _, isChecked ->
+ state.recordScreen = isChecked
+ if (isChecked) {
+ bgExecutor.execute { onScreenRecordSwitchClicked() }
+ }
+ }
}
+
+ requireViewById<Switch>(R.id.bugreport_switch).apply {
+ isChecked = state.takeBugreport
+ setOnCheckedChangeListener { _, isChecked -> state.takeBugreport = isChecked }
}
- bugReportSwitch = requireViewById(R.id.bugreport_switch)
- val startButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE)
- issueTypeButton = requireViewById(R.id.issue_type_button)
- issueTypeButton.setOnClickListener {
- onIssueTypeClicked(context) { startButton.isEnabled = true }
- }
- startButton.isEnabled = false
+
+ issueTypeButton =
+ requireViewById<Button>(R.id.issue_type_button).apply {
+ val startButton = dialog.getButton(BUTTON_POSITIVE)
+ if (state.issueTypeRes != ISSUE_TYPE_NOT_SET) {
+ setText(state.issueTypeRes)
+ } else {
+ startButton.isEnabled = false
+ }
+ setOnClickListener {
+ onIssueTypeClicked(context) { startButton.isEnabled = true }
+ }
+ }
}
}
@@ -160,19 +151,14 @@
SessionCreationSource.SYSTEM_UI_SCREEN_RECORDER
)
- if (flags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING)) {
- val prefs =
- userFileManager.getSharedPreferences(
- RecordIssueTile.TILE_SPEC,
- Context.MODE_PRIVATE,
- userTracker.userId
- )
- if (!prefs.getBoolean(HAS_APPROVED_SCREEN_RECORDING, false)) {
- mainExecutor.execute {
- ScreenCapturePermissionDialogDelegate(factory, prefs).createDialog().apply {
- setOnCancelListener { screenRecordSwitch.isChecked = false }
- show()
- }
+ if (
+ flags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING) &&
+ !state.hasUserApprovedScreenRecording
+ ) {
+ mainExecutor.execute {
+ ScreenCapturePermissionDialogDelegate(factory, state).createDialog().apply {
+ setOnCancelListener { screenRecordSwitch.isChecked = false }
+ show()
}
}
}
@@ -182,23 +168,21 @@
private fun onIssueTypeClicked(context: Context, onIssueTypeSelected: Runnable) {
val popupMenu = PopupMenu(context, issueTypeButton)
- issueTypeOptions.keys.forEach {
+ ALL_ISSUE_TYPES.keys.forEach {
popupMenu.menu.add(it).apply {
setIcon(R.drawable.arrow_pointing_down)
- if (issueTypeOptions[it] != selectedIssueType) {
+ if (it != state.issueTypeRes) {
iconTintList = ColorStateList.valueOf(Color.TRANSPARENT)
}
- intent = Intent().putExtra(INTENT_EXTRA_TRACE_TYPE, issueTypeOptions[it])
+ intent = Intent().putExtra(KEY_ISSUE_TYPE_RES, it)
}
}
popupMenu.apply {
setOnMenuItemClickListener {
issueTypeButton.text = it.title
- selectedIssueType =
- it.intent?.getSerializableExtra(
- INTENT_EXTRA_TRACE_TYPE,
- PresetTraceType::class.java
- )
+ state.issueTypeRes =
+ it.intent?.getIntExtra(KEY_ISSUE_TYPE_RES, ISSUE_TYPE_NOT_SET)
+ ?: ISSUE_TYPE_NOT_SET
onIssueTypeSelected.run()
true
}
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/ScreenCapturePermissionDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/recordissue/ScreenCapturePermissionDialogDelegate.kt
index de6d3f6..b029d07 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/ScreenCapturePermissionDialogDelegate.kt
+++ b/packages/SystemUI/src/com/android/systemui/recordissue/ScreenCapturePermissionDialogDelegate.kt
@@ -16,18 +16,15 @@
package com.android.systemui.recordissue
-import android.content.SharedPreferences
import android.os.Bundle
import android.view.Gravity
import android.view.WindowManager
import com.android.systemui.res.R
import com.android.systemui.statusbar.phone.SystemUIDialog
-const val HAS_APPROVED_SCREEN_RECORDING = "HasApprovedScreenRecord"
-
class ScreenCapturePermissionDialogDelegate(
private val dialogFactory: SystemUIDialog.Factory,
- private val sharedPreferences: SharedPreferences,
+ private val state: IssueRecordingState,
) : SystemUIDialog.Delegate {
override fun beforeCreate(dialog: SystemUIDialog, savedInstanceState: Bundle?) {
@@ -37,7 +34,7 @@
setMessage(R.string.screenrecord_permission_dialog_warning_entire_screen)
setNegativeButton(R.string.slice_permission_deny) { _, _ -> cancel() }
setPositiveButton(R.string.slice_permission_allow) { _, _ ->
- sharedPreferences.edit().putBoolean(HAS_APPROVED_SCREEN_RECORDING, true).apply()
+ state.markUserApprovalForScreenRecording()
dismiss()
}
window?.addPrivateFlags(WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS)
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/TraceurMessageSender.kt b/packages/SystemUI/src/com/android/systemui/recordissue/TraceurMessageSender.kt
index 189336c..51744aa 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/TraceurMessageSender.kt
+++ b/packages/SystemUI/src/com/android/systemui/recordissue/TraceurMessageSender.kt
@@ -93,7 +93,7 @@
}
@WorkerThread
- fun startTracing(traceType: PresetTraceType?) {
+ fun startTracing(traceType: PresetTraceType) {
val data =
Bundle().apply { putSerializable(MessageConstants.INTENT_EXTRA_TRACE_TYPE, traceType) }
notifyTraceur(MessageConstants.START_WHAT, data)
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/policy/PolicyRequestProcessor.kt b/packages/SystemUI/src/com/android/systemui/screenshot/policy/PolicyRequestProcessor.kt
index 80aa0ef..4f27b9e 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/policy/PolicyRequestProcessor.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/policy/PolicyRequestProcessor.kt
@@ -79,7 +79,10 @@
}
/** Produce a new [ScreenshotData] using [CaptureParameters] */
- suspend fun modify(original: ScreenshotData, updates: CaptureParameters): ScreenshotData {
+ private suspend fun modify(
+ original: ScreenshotData,
+ updates: CaptureParameters,
+ ): ScreenshotData {
// Update and apply bitmap capture depending on the parameters.
val updated =
when (val type = updates.type) {
@@ -117,7 +120,7 @@
return replaceWithScreenshot(
original = original,
componentName = topMainRootTask?.topActivity ?: defaultComponent,
- owner = topMainRootTask?.userId?.let { UserHandle.of(it) } ?: defaultOwner,
+ owner = defaultOwner,
displayId = original.displayId
)
}
diff --git a/packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt b/packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt
index bf0843b..2def6c7 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt
@@ -157,9 +157,15 @@
private var anyBouncerShowing = false
/**
- * True if the shade is fully expanded, meaning the hub should not receive any touch input.
+ * True if the shade is fully expanded and the user is not interacting with it anymore, meaning
+ * the hub should not receive any touch input.
*
- * Tracks [ShadeInteractor.isAnyFullyExpanded].
+ * We need to not pause the touch handling lifecycle as soon as the shade opens because if the
+ * user swipes down, then back up without lifting their finger, the lifecycle will be paused
+ * then resumed, and resuming force-stops all active touch sessions. This means the shade will
+ * not receive the end of the gesture and will be stuck open.
+ *
+ * Based on [ShadeInteractor.isAnyFullyExpanded] and [ShadeInteractor.isUserInteracting].
*/
private var shadeShowing = false
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
index 6efa633..c01b7b6 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
@@ -138,6 +138,11 @@
private final PanelExpansionInteractor mPanelExpansionInteractor;
private final ShadeExpansionStateManager mShadeExpansionStateManager;
+ /**
+ * If {@code true}, an external touch sent in {@link #handleExternalTouch(MotionEvent)} has been
+ * intercepted and all future touch events for the gesture should be processed by this view.
+ */
+ private boolean mExternalTouchIntercepted = false;
private boolean mIsTrackingBarGesture = false;
private boolean mIsOcclusionTransitionRunning = false;
private DisableSubpixelTextTransitionListener mDisableSubpixelTextTransitionListener;
@@ -255,11 +260,28 @@
}
/**
- * Handle a touch event while dreaming by forwarding the event to the content view.
+ * Handle a touch event while dreaming or on the hub by forwarding the event to the content
+ * view.
+ * <p>
+ * Since important logic for handling touches lives in the dispatch/intercept phases, we
+ * simulate going through all of these stages before sending onTouchEvent if intercepted.
+ *
* @param event The event to forward.
*/
- public void handleDreamTouch(MotionEvent event) {
- mView.dispatchTouchEvent(event);
+ public void handleExternalTouch(MotionEvent event) {
+ if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+ mExternalTouchIntercepted = false;
+ }
+
+ if (!mView.dispatchTouchEvent(event)) {
+ return;
+ }
+ if (!mExternalTouchIntercepted) {
+ mExternalTouchIntercepted = mView.onInterceptTouchEvent(event);
+ }
+ if (mExternalTouchIntercepted) {
+ mView.onTouchEvent(event);
+ }
}
/** Inflates the {@link R.layout#status_bar_expanded} layout and sets it up. */
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
index c742f641..5c4a63c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
@@ -455,7 +455,7 @@
if (mReceivedAppShortcutGroups == null || mReceivedImeShortcutGroups == null) {
return;
}
- List<KeyboardShortcutGroup> shortcutGroups = mReceivedAppShortcutGroups;
+ List<KeyboardShortcutGroup> shortcutGroups = new ArrayList<>(mReceivedAppShortcutGroups);
shortcutGroups.addAll(mReceivedImeShortcutGroups);
mReceivedAppShortcutGroups = null;
mReceivedImeShortcutGroups = null;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 47939ae..337ffa4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -20,6 +20,7 @@
import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;
import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_MANAGEMENT_DISCLOSURE;
import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE;
+import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_START;
import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_TOO_DARK;
import static android.hardware.biometrics.BiometricFaceConstants.FACE_ERROR_TIMEOUT;
import static android.hardware.biometrics.BiometricSourceType.FACE;
@@ -1296,6 +1297,12 @@
@Override
public void onBiometricAcquired(BiometricSourceType biometricSourceType, int acquireInfo) {
if (biometricSourceType == FACE) {
+ if (acquireInfo == FACE_ACQUIRED_START) {
+ // Let's hide any previous messages when authentication starts, otherwise
+ // multiple auth attempts would overlap.
+ hideBiometricMessage();
+ mBiometricErrorMessageToShowOnScreenOn = null;
+ }
mFaceAcquiredMessageDeferral.processFrame(acquireInfo);
}
}
@@ -1485,13 +1492,6 @@
@Override
public void onBiometricRunningStateChanged(boolean running,
BiometricSourceType biometricSourceType) {
- if (running && biometricSourceType == FACE) {
- // Let's hide any previous messages when authentication starts, otherwise
- // multiple auth attempts would overlap.
- hideBiometricMessage();
- mBiometricErrorMessageToShowOnScreenOn = null;
- }
-
if (!running && biometricSourceType == FACE) {
showTrustAgentErrorMessage(mTrustAgentErrorMessage);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
index 6d34a0f..04a413a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
@@ -303,7 +303,12 @@
// TODO(b/169655907): get the semi-filtered notifications for current user
Collection<NotificationEntry> allNotifications = mNotifPipeline.getAllNotifs();
if (notificationMediaManagerBackgroundExecution()) {
- mBackgroundExecutor.execute(() -> findPlayingMediaNotification(allNotifications));
+ // Create new sbn list to be accessed in background thread.
+ List<StatusBarNotification> statusBarNotifications = new ArrayList<>();
+ for (NotificationEntry entry: allNotifications) {
+ statusBarNotifications.add(entry.getSbn());
+ }
+ mBackgroundExecutor.execute(() -> findPlayingMediaNotification(statusBarNotifications));
} else {
findPlayingMediaNotification(allNotifications);
}
@@ -341,6 +346,51 @@
}
}
+ StatusBarNotification statusBarNotification = null;
+ if (mediaNotification != null) {
+ statusBarNotification = mediaNotification.getSbn();
+ }
+ setUpControllerAndKey(controller, statusBarNotification);
+ }
+
+ /**
+ * Find a notification and media controller associated with the playing media session, and
+ * update this manager's internal state.
+ * This method must be called in background.
+ * TODO(b/273443374) check this method
+ */
+ void findPlayingMediaNotification(@NonNull List<StatusBarNotification> allNotifications) {
+ // Promote the media notification with a controller in 'playing' state, if any.
+ StatusBarNotification statusBarNotification = null;
+ MediaController controller = null;
+ for (StatusBarNotification sbn : allNotifications) {
+ Notification notif = sbn.getNotification();
+ if (notif.isMediaNotification()) {
+ final MediaSession.Token token =
+ sbn.getNotification().extras.getParcelable(
+ Notification.EXTRA_MEDIA_SESSION, MediaSession.Token.class);
+ if (token != null) {
+ MediaController aController = new MediaController(mContext, token);
+ if (PlaybackState.STATE_PLAYING
+ == getMediaControllerPlaybackState(aController)) {
+ if (DEBUG_MEDIA) {
+ Log.v(TAG, "DEBUG_MEDIA: found mediastyle controller matching "
+ + sbn.getKey());
+ }
+ statusBarNotification = sbn;
+ controller = aController;
+ break;
+ }
+ }
+ }
+ }
+
+ setUpControllerAndKey(controller, statusBarNotification);
+ }
+
+ private void setUpControllerAndKey(
+ MediaController controller,
+ StatusBarNotification mediaNotification) {
if (controller != null && !sameSessions(mMediaController, controller)) {
// We have a new media session
clearCurrentMediaNotificationSession();
@@ -354,8 +404,8 @@
}
if (mediaNotification != null
- && !mediaNotification.getSbn().getKey().equals(mMediaNotificationKey)) {
- mMediaNotificationKey = mediaNotification.getSbn().getKey();
+ && !mediaNotification.getKey().equals(mMediaNotificationKey)) {
+ mMediaNotificationKey = mediaNotification.getKey();
if (DEBUG_MEDIA) {
Log.v(TAG, "DEBUG_MEDIA: Found new media notification: key="
+ mMediaNotificationKey);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index f8193a4..d0702fc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -27,6 +27,7 @@
import android.app.Notification;
import android.content.Context;
import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
import android.content.res.ColorStateList;
import android.content.res.Configuration;
import android.content.res.Resources;
@@ -35,6 +36,7 @@
import android.graphics.ColorMatrixColorFilter;
import android.graphics.Paint;
import android.graphics.Rect;
+import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.os.Trace;
@@ -94,6 +96,8 @@
public static final int STATE_DOT = 1;
public static final int STATE_HIDDEN = 2;
+ public static final float APP_ICON_SCALE = .75f;
+
@Retention(RetentionPolicy.SOURCE)
@IntDef({STATE_ICON, STATE_DOT, STATE_HIDDEN})
public @interface VisibleState { }
@@ -499,7 +503,12 @@
userId = UserHandle.USER_SYSTEM;
}
- Drawable icon = statusBarIcon.icon.loadDrawableAsUser(context, userId);
+ // Try to load the monochrome app icon if applicable
+ Drawable icon = maybeGetMonochromeAppIcon(context, statusBarIcon);
+ // Otherwise, just use the icon normally
+ if (icon == null) {
+ icon = statusBarIcon.icon.loadDrawableAsUser(context, userId);
+ }
TypedValue typedValue = new TypedValue();
sysuiContext.getResources().getValue(R.dimen.status_bar_icon_scale_factor,
@@ -526,6 +535,26 @@
return new ScalingDrawableWrapper(icon, scaleFactor);
}
+ @Nullable
+ private Drawable maybeGetMonochromeAppIcon(Context context,
+ StatusBarIcon statusBarIcon) {
+ if (android.app.Flags.notificationsUseMonochromeAppIcon()
+ && statusBarIcon.type == StatusBarIcon.Type.MaybeMonochromeAppIcon) {
+ // Check if we have a monochrome app icon
+ PackageManager pm = context.getPackageManager();
+ Drawable appIcon = context.getApplicationInfo().loadIcon(pm);
+ if (appIcon instanceof AdaptiveIconDrawable) {
+ Drawable monochrome = ((AdaptiveIconDrawable) appIcon).getMonochrome();
+ if (monochrome != null) {
+ setCropToPadding(true);
+ setScaleType(ScaleType.CENTER);
+ return new ScalingDrawableWrapper(monochrome, APP_ICON_SCALE);
+ }
+ }
+ }
+ return null;
+ }
+
public StatusBarIcon getStatusBarIcon() {
return mIcon;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt
index 2f293e0..f62b24a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt
@@ -18,33 +18,29 @@
import android.content.Context
import android.provider.DeviceConfig
-
import com.android.internal.annotations.VisibleForTesting
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.NOTIFICATIONS_USE_PEOPLE_FILTERING
import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.statusbar.notification.shared.NotificationMinimalismPrototype
import com.android.systemui.statusbar.notification.shared.PriorityPeopleSection
import com.android.systemui.statusbar.notification.stack.BUCKET_ALERTING
import com.android.systemui.statusbar.notification.stack.BUCKET_FOREGROUND_SERVICE
import com.android.systemui.statusbar.notification.stack.BUCKET_HEADS_UP
import com.android.systemui.statusbar.notification.stack.BUCKET_MEDIA_CONTROLS
import com.android.systemui.statusbar.notification.stack.BUCKET_PEOPLE
-import com.android.systemui.statusbar.notification.stack.BUCKET_PRIORITY_PEOPLE
import com.android.systemui.statusbar.notification.stack.BUCKET_SILENT
+import com.android.systemui.statusbar.notification.stack.PriorityBucket
import com.android.systemui.util.DeviceConfigProxy
import com.android.systemui.util.Utils
-
import javax.inject.Inject
private var sUsePeopleFiltering: Boolean? = null
-/**
- * Feature controller for the NOTIFICATIONS_USE_PEOPLE_FILTERING config.
- */
+/** Feature controller for the NOTIFICATIONS_USE_PEOPLE_FILTERING config. */
@SysUISingleton
-class NotificationSectionsFeatureManager @Inject constructor(
- val proxy: DeviceConfigProxy,
- val context: Context
-) {
+class NotificationSectionsFeatureManager
+@Inject
+constructor(val proxy: DeviceConfigProxy, val context: Context) {
fun isFilteringEnabled(): Boolean {
return usePeopleFiltering(proxy)
@@ -55,30 +51,37 @@
}
fun getNotificationBuckets(): IntArray {
- if (PriorityPeopleSection.isEnabled) {
+ if (PriorityPeopleSection.isEnabled || NotificationMinimalismPrototype.V2.isEnabled) {
// We don't need this list to be adaptive, it can be the superset of all features.
- return intArrayOf(
- BUCKET_MEDIA_CONTROLS,
- BUCKET_HEADS_UP,
- BUCKET_FOREGROUND_SERVICE,
- BUCKET_PRIORITY_PEOPLE,
- BUCKET_PEOPLE,
- BUCKET_ALERTING,
- BUCKET_SILENT,
- )
+ return PriorityBucket.getAllInOrder()
}
return when {
isFilteringEnabled() && isMediaControlsEnabled() ->
- intArrayOf(BUCKET_HEADS_UP, BUCKET_FOREGROUND_SERVICE, BUCKET_MEDIA_CONTROLS,
- BUCKET_PEOPLE, BUCKET_ALERTING, BUCKET_SILENT)
+ intArrayOf(
+ BUCKET_HEADS_UP,
+ BUCKET_FOREGROUND_SERVICE,
+ BUCKET_MEDIA_CONTROLS,
+ BUCKET_PEOPLE,
+ BUCKET_ALERTING,
+ BUCKET_SILENT
+ )
!isFilteringEnabled() && isMediaControlsEnabled() ->
- intArrayOf(BUCKET_HEADS_UP, BUCKET_FOREGROUND_SERVICE, BUCKET_MEDIA_CONTROLS,
- BUCKET_ALERTING, BUCKET_SILENT)
+ intArrayOf(
+ BUCKET_HEADS_UP,
+ BUCKET_FOREGROUND_SERVICE,
+ BUCKET_MEDIA_CONTROLS,
+ BUCKET_ALERTING,
+ BUCKET_SILENT
+ )
isFilteringEnabled() && !isMediaControlsEnabled() ->
- intArrayOf(BUCKET_HEADS_UP, BUCKET_FOREGROUND_SERVICE, BUCKET_PEOPLE,
- BUCKET_ALERTING, BUCKET_SILENT)
- else ->
- intArrayOf(BUCKET_ALERTING, BUCKET_SILENT)
+ intArrayOf(
+ BUCKET_HEADS_UP,
+ BUCKET_FOREGROUND_SERVICE,
+ BUCKET_PEOPLE,
+ BUCKET_ALERTING,
+ BUCKET_SILENT
+ )
+ else -> intArrayOf(BUCKET_ALERTING, BUCKET_SILENT)
}
}
@@ -94,8 +97,12 @@
private fun usePeopleFiltering(proxy: DeviceConfigProxy): Boolean {
if (sUsePeopleFiltering == null) {
- sUsePeopleFiltering = proxy.getBoolean(
- DeviceConfig.NAMESPACE_SYSTEMUI, NOTIFICATIONS_USE_PEOPLE_FILTERING, true)
+ sUsePeopleFiltering =
+ proxy.getBoolean(
+ DeviceConfig.NAMESPACE_SYSTEMUI,
+ NOTIFICATIONS_USE_PEOPLE_FILTERING,
+ true
+ )
}
return sUsePeopleFiltering!!
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 b397906..1adfef0 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
@@ -68,6 +68,9 @@
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRowController;
import com.android.systemui.statusbar.notification.row.NotificationGuts;
+import com.android.systemui.statusbar.notification.row.shared.HeadsUpStatusBarModel;
+import com.android.systemui.statusbar.notification.row.shared.NotificationContentModel;
+import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor;
import com.android.systemui.statusbar.notification.stack.PriorityBucket;
import com.android.systemui.util.ListenerSet;
@@ -951,6 +954,7 @@
* heads up.
*/
public void setHeadsUpStatusBarText(CharSequence headsUpStatusBarText) {
+ NotificationRowContentBinderRefactor.assertInLegacyMode();
this.mHeadsUpStatusBarText.setValue(headsUpStatusBarText);
}
@@ -964,6 +968,7 @@
* heads up, and its content is sensitive right now.
*/
public void setHeadsUpStatusBarTextPublic(CharSequence headsUpStatusBarTextPublic) {
+ NotificationRowContentBinderRefactor.assertInLegacyMode();
this.mHeadsUpStatusBarTextPublic.setValue(headsUpStatusBarTextPublic);
}
@@ -1036,6 +1041,14 @@
== Notification.VISIBILITY_PRIVATE;
}
+ /** Set the content generated by the notification inflater. */
+ public void setContentModel(NotificationContentModel contentModel) {
+ if (NotificationRowContentBinderRefactor.isUnexpectedlyInLegacyMode()) return;
+ HeadsUpStatusBarModel headsUpStatusBarModel = contentModel.getHeadsUpStatusBarModel();
+ this.mHeadsUpStatusBarText.setValue(headsUpStatusBarModel.getPrivateText());
+ this.mHeadsUpStatusBarTextPublic.setValue(headsUpStatusBarModel.getPublicText());
+ }
+
/** Information about a suggestion that is being edited. */
public static class EditedSuggestionInfo {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ColorizedFgsCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ColorizedFgsCoordinator.java
index 63997f8..47a0429 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ColorizedFgsCoordinator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ColorizedFgsCoordinator.java
@@ -60,22 +60,27 @@
public boolean isInSection(ListEntry entry) {
NotificationEntry notificationEntry = entry.getRepresentativeEntry();
if (notificationEntry != null) {
- return isColorizedForegroundService(notificationEntry) || isCall(notificationEntry);
+ return isRichOngoing(notificationEntry);
}
return false;
}
-
- private boolean isColorizedForegroundService(NotificationEntry entry) {
- Notification notification = entry.getSbn().getNotification();
- return notification.isForegroundService()
- && notification.isColorized()
- && entry.getImportance() > IMPORTANCE_MIN;
- }
-
- private boolean isCall(NotificationEntry entry) {
- Notification notification = entry.getSbn().getNotification();
- return entry.getImportance() > IMPORTANCE_MIN
- && notification.isStyle(Notification.CallStyle.class);
- }
};
+
+ /** Determines if the given notification is a colorized or call notification */
+ public static boolean isRichOngoing(NotificationEntry entry) {
+ return isColorizedForegroundService(entry) || isCall(entry);
+ }
+
+ private static boolean isColorizedForegroundService(NotificationEntry entry) {
+ Notification notification = entry.getSbn().getNotification();
+ return notification.isForegroundService()
+ && notification.isColorized()
+ && entry.getImportance() > IMPORTANCE_MIN;
+ }
+
+ private static boolean isCall(NotificationEntry entry) {
+ Notification notification = entry.getSbn().getNotification();
+ return entry.getImportance() > IMPORTANCE_MIN
+ && notification.isStyle(Notification.CallStyle.class);
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt
index 071192b..5a1146d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt
@@ -18,6 +18,7 @@
package com.android.systemui.statusbar.notification.collection.coordinator
+import android.app.NotificationManager
import android.os.UserHandle
import android.provider.Settings
import androidx.annotation.VisibleForTesting
@@ -44,7 +45,8 @@
import com.android.systemui.statusbar.notification.domain.interactor.SeenNotificationsInteractor
import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProvider
import com.android.systemui.statusbar.notification.shared.NotificationMinimalismPrototype
-import com.android.systemui.statusbar.notification.stack.BUCKET_FOREGROUND_SERVICE
+import com.android.systemui.statusbar.notification.stack.BUCKET_TOP_ONGOING
+import com.android.systemui.statusbar.notification.stack.BUCKET_TOP_UNSEEN
import com.android.systemui.statusbar.policy.HeadsUpManager
import com.android.systemui.statusbar.policy.headsUpEvents
import com.android.systemui.util.asIndenting
@@ -113,7 +115,7 @@
private fun attachUnseenFilter(pipeline: NotifPipeline) {
if (NotificationMinimalismPrototype.V2.isEnabled) {
pipeline.addPromoter(unseenNotifPromoter)
- pipeline.addOnBeforeTransformGroupsListener(::pickOutTopUnseenNotif)
+ pipeline.addOnBeforeTransformGroupsListener(::pickOutTopUnseenNotifs)
}
pipeline.addFinalizeFilter(unseenNotifFilter)
pipeline.addCollectionListener(collectionListener)
@@ -347,15 +349,16 @@
}
}
- private fun pickOutTopUnseenNotif(list: List<ListEntry>) {
+ private fun pickOutTopUnseenNotifs(list: List<ListEntry>) {
if (NotificationMinimalismPrototype.V2.isUnexpectedlyInLegacyMode()) return
// Only ever elevate a top unseen notification on keyguard, not even locked shade
if (statusBarStateController.state != StatusBarState.KEYGUARD) {
+ seenNotificationsInteractor.setTopOngoingNotification(null)
seenNotificationsInteractor.setTopUnseenNotification(null)
return
}
// On keyguard pick the top-ranked unseen or ongoing notification to elevate
- seenNotificationsInteractor.setTopUnseenNotification(
+ val nonSummaryEntries: Sequence<NotificationEntry> =
list
.asSequence()
.flatMap {
@@ -365,7 +368,15 @@
else -> error("unhandled type of $it")
}
}
- .filter { shouldIgnoreUnseenCheck(it) || it in unseenNotifications }
+ .filter { it.importance >= NotificationManager.IMPORTANCE_DEFAULT }
+ seenNotificationsInteractor.setTopOngoingNotification(
+ nonSummaryEntries
+ .filter { ColorizedFgsCoordinator.isRichOngoing(it) }
+ .minByOrNull { it.ranking.rank }
+ )
+ seenNotificationsInteractor.setTopUnseenNotification(
+ nonSummaryEntries
+ .filter { !ColorizedFgsCoordinator.isRichOngoing(it) && it in unseenNotifications }
.minByOrNull { it.ranking.rank }
)
}
@@ -375,29 +386,39 @@
object : NotifPromoter("$TAG-unseen") {
override fun shouldPromoteToTopLevel(child: NotificationEntry): Boolean =
if (NotificationMinimalismPrototype.V2.isUnexpectedlyInLegacyMode()) false
+ else if (!NotificationMinimalismPrototype.V2.ungroupTopUnseen) false
else
- seenNotificationsInteractor.isTopUnseenNotification(child) &&
- NotificationMinimalismPrototype.V2.ungroupTopUnseen
+ seenNotificationsInteractor.isTopOngoingNotification(child) ||
+ seenNotificationsInteractor.isTopUnseenNotification(child)
}
- val unseenNotifSectioner =
- object : NotifSectioner("Unseen", BUCKET_FOREGROUND_SERVICE) {
+ val topOngoingSectioner =
+ object : NotifSectioner("TopOngoing", BUCKET_TOP_ONGOING) {
override fun isInSection(entry: ListEntry): Boolean {
if (NotificationMinimalismPrototype.V2.isUnexpectedlyInLegacyMode()) return false
- if (
- seenNotificationsInteractor.isTopUnseenNotification(entry.representativeEntry)
- ) {
- return true
- }
- if (entry !is GroupEntry) {
- return false
- }
- return entry.children.any {
- seenNotificationsInteractor.isTopUnseenNotification(it)
+ return entry.anyEntry { notificationEntry ->
+ seenNotificationsInteractor.isTopOngoingNotification(notificationEntry)
}
}
}
+ val topUnseenSectioner =
+ object : NotifSectioner("TopUnseen", BUCKET_TOP_UNSEEN) {
+ override fun isInSection(entry: ListEntry): Boolean {
+ if (NotificationMinimalismPrototype.V2.isUnexpectedlyInLegacyMode()) return false
+ return entry.anyEntry { notificationEntry ->
+ seenNotificationsInteractor.isTopUnseenNotification(notificationEntry)
+ }
+ }
+ }
+
+ private fun ListEntry.anyEntry(predicate: (NotificationEntry?) -> Boolean) =
+ when {
+ predicate(representativeEntry) -> true
+ this !is GroupEntry -> false
+ else -> children.any(predicate)
+ }
+
@VisibleForTesting
internal val unseenNotifFilter =
object : NotifFilter("$TAG-unseen") {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt
index 4506385..e413522 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt
@@ -116,11 +116,14 @@
}
// Manually add Ordered Sections
- mOrderedSections.add(headsUpCoordinator.sectioner) // HeadsUp
- mOrderedSections.add(colorizedFgsCoordinator.sectioner) // ForegroundService
if (NotificationMinimalismPrototype.V2.isEnabled) {
- mOrderedSections.add(keyguardCoordinator.unseenNotifSectioner) // Unseen (FGS)
+ mOrderedSections.add(keyguardCoordinator.topOngoingSectioner) // Top Ongoing
}
+ mOrderedSections.add(headsUpCoordinator.sectioner) // HeadsUp
+ if (NotificationMinimalismPrototype.V2.isEnabled) {
+ mOrderedSections.add(keyguardCoordinator.topUnseenSectioner) // Top Unseen
+ }
+ mOrderedSections.add(colorizedFgsCoordinator.sectioner) // ForegroundService
if (PriorityPeopleSection.isEnabled) {
mOrderedSections.add(conversationCoordinator.priorityPeopleSectioner) // Priority People
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/data/repository/ActiveNotificationListRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/data/repository/ActiveNotificationListRepository.kt
index e2c9e02..45d1034 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/data/repository/ActiveNotificationListRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/data/repository/ActiveNotificationListRepository.kt
@@ -42,6 +42,9 @@
/** Stats about the list of notifications attached to the shade */
val notifStats = MutableStateFlow(NotifStats.empty)
+ /** The key of the top ongoing notification */
+ val topOngoingNotificationKey = MutableStateFlow<String?>(null)
+
/** The key of the top unseen notification */
val topUnseenNotificationKey = MutableStateFlow<String?>(null)
}
@@ -75,6 +78,7 @@
/** Unique key identifying an [ActiveNotificationEntryModel] in the store. */
sealed class Key {
data class Individual(val key: String) : Key()
+
data class Group(val key: String) : Key()
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/SeenNotificationsInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/SeenNotificationsInteractor.kt
index 42828d9..85c66bd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/SeenNotificationsInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/SeenNotificationsInteractor.kt
@@ -39,6 +39,18 @@
notificationListRepository.hasFilteredOutSeenNotifications.value = value
}
+ /** Set the entry that is identified as the top ongoing notification. */
+ fun setTopOngoingNotification(entry: NotificationEntry?) {
+ if (NotificationMinimalismPrototype.V2.isUnexpectedlyInLegacyMode()) return
+ notificationListRepository.topOngoingNotificationKey.value = entry?.key
+ }
+
+ /** Determine if the given notification is the top ongoing notification. */
+ fun isTopOngoingNotification(entry: NotificationEntry?): Boolean =
+ if (NotificationMinimalismPrototype.V2.isUnexpectedlyInLegacyMode()) false
+ else
+ entry != null && notificationListRepository.topOngoingNotificationKey.value == entry.key
+
/** Set the entry that is identified as the top unseen notification. */
fun setTopUnseenNotification(entry: NotificationEntry?) {
if (NotificationMinimalismPrototype.V2.isUnexpectedlyInLegacyMode()) return
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt
index 3df9374..331d3cc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt
@@ -20,8 +20,6 @@
import android.app.Notification.MessagingStyle
import android.app.Person
import android.content.pm.LauncherApps
-import android.graphics.drawable.AdaptiveIconDrawable
-import android.graphics.drawable.Drawable
import android.graphics.drawable.Icon
import android.os.Build
import android.os.Bundle
@@ -226,28 +224,22 @@
}
val n = entry.sbn.notification
- var usingMonochromeAppIcon = false
- val icon: Icon?
- if (showPeopleAvatar) {
- icon = createPeopleAvatar(entry)
- } else if (android.app.Flags.notificationsUseMonochromeAppIcon()) {
- if (n.shouldUseAppIcon()) {
- icon =
- getMonochromeAppIcon(entry)?.also { usingMonochromeAppIcon = true }
- ?: n.smallIcon
+ val (icon: Icon?, type: StatusBarIcon.Type) =
+ if (showPeopleAvatar) {
+ createPeopleAvatar(entry) to StatusBarIcon.Type.PeopleAvatar
+ } else if (
+ android.app.Flags.notificationsUseMonochromeAppIcon() && n.shouldUseAppIcon()
+ ) {
+ n.smallIcon to StatusBarIcon.Type.MaybeMonochromeAppIcon
} else {
- icon = n.smallIcon
+ n.smallIcon to StatusBarIcon.Type.NotifSmallIcon
}
- } else {
- icon = n.smallIcon
- }
-
if (icon == null) {
throw InflationException("No icon in notification from ${entry.sbn.packageName}")
}
- val sbi = icon.toStatusBarIcon(entry)
- cacheIconDescriptor(entry, sbi, showPeopleAvatar, usingMonochromeAppIcon)
+ val sbi = icon.toStatusBarIcon(entry, type)
+ cacheIconDescriptor(entry, sbi)
return sbi
}
@@ -269,29 +261,24 @@
}
}
- private fun cacheIconDescriptor(
- entry: NotificationEntry,
- descriptor: StatusBarIcon,
- showPeopleAvatar: Boolean,
- usingMonochromeAppIcon: Boolean
- ) {
- if (android.app.Flags.notificationsUseAppIcon() ||
- android.app.Flags.notificationsUseMonochromeAppIcon()
+ private fun cacheIconDescriptor(entry: NotificationEntry, descriptor: StatusBarIcon) {
+ if (
+ android.app.Flags.notificationsUseAppIcon() ||
+ android.app.Flags.notificationsUseMonochromeAppIcon()
) {
// If either of the new icon flags is enabled, we cache the icon all the time.
- if (showPeopleAvatar) {
- entry.icons.peopleAvatarDescriptor = descriptor
- } else if (usingMonochromeAppIcon) {
+ when (descriptor.type) {
+ StatusBarIcon.Type.PeopleAvatar -> entry.icons.peopleAvatarDescriptor = descriptor
// When notificationsUseMonochromeAppIcon is enabled, we use the appIconDescriptor.
- entry.icons.appIconDescriptor = descriptor
- } else {
+ StatusBarIcon.Type.MaybeMonochromeAppIcon ->
+ entry.icons.appIconDescriptor = descriptor
// When notificationsUseAppIcon is enabled, the app icon overrides the small icon.
// But either way, it's a good idea to cache the descriptor.
- entry.icons.smallIconDescriptor = descriptor
+ else -> entry.icons.smallIconDescriptor = descriptor
}
} else if (isImportantConversation(entry)) {
// Old approach: cache only if important conversation.
- if (showPeopleAvatar) {
+ if (descriptor.type == StatusBarIcon.Type.PeopleAvatar) {
entry.icons.peopleAvatarDescriptor = descriptor
} else {
entry.icons.smallIconDescriptor = descriptor
@@ -312,7 +299,10 @@
}
}
- private fun Icon.toStatusBarIcon(entry: NotificationEntry): StatusBarIcon {
+ private fun Icon.toStatusBarIcon(
+ entry: NotificationEntry,
+ type: StatusBarIcon.Type
+ ): StatusBarIcon {
val n = entry.sbn.notification
return StatusBarIcon(
entry.sbn.user,
@@ -320,33 +310,11 @@
/* icon = */ this,
n.iconLevel,
n.number,
- iconBuilder.getIconContentDescription(n)
+ iconBuilder.getIconContentDescription(n),
+ type
)
}
- // TODO(b/335211019): Should we merge this with the method in GroupHelper?
- private fun getMonochromeAppIcon(entry: NotificationEntry): Icon? {
- // TODO(b/335211019): This should be done in the background.
- var monochromeIcon: Icon? = null
- try {
- val appIcon: Drawable = iconBuilder.getAppIcon(entry.sbn.notification)
- if (appIcon is AdaptiveIconDrawable) {
- if (appIcon.monochrome != null) {
- monochromeIcon =
- Icon.createWithResourceAdaptiveDrawable(
- /* resPackage = */ entry.sbn.packageName,
- /* resId = */ appIcon.sourceDrawableResId,
- /* useMonochrome = */ true,
- /* inset = */ -3.0f * AdaptiveIconDrawable.getExtraInsetFraction()
- )
- }
- }
- } catch (e: Exception) {
- Log.e(TAG, "Failed to getAppIcon() in getMonochromeAppIcon()", e)
- }
- return monochromeIcon
- }
-
private suspend fun getLauncherShortcutIconForPeopleAvatar(entry: NotificationEntry) =
withContext(bgCoroutineContext) {
var icon: Icon? = null
@@ -365,7 +333,8 @@
// Once we have the icon, updating it should happen on the main thread.
if (icon != null) {
withContext(mainCoroutineContext) {
- val iconDescriptor = icon.toStatusBarIcon(entry)
+ val iconDescriptor =
+ icon.toStatusBarIcon(entry, StatusBarIcon.Type.PeopleAvatar)
// Cache the value
entry.icons.peopleAvatarDescriptor = iconDescriptor
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 6ba26d9..af5117e 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
@@ -56,6 +56,7 @@
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation;
import com.android.systemui.statusbar.notification.row.shared.AsyncHybridViewInflation;
+import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor;
import com.android.systemui.statusbar.notification.row.ui.viewbinder.SingleLineConversationViewBinder;
import com.android.systemui.statusbar.notification.row.ui.viewbinder.SingleLineViewBinder;
import com.android.systemui.statusbar.notification.row.ui.viewmodel.SingleLineViewModel;
@@ -105,6 +106,7 @@
NotifLayoutInflaterFactory.Provider notifLayoutInflaterFactoryProvider,
HeadsUpStyleProvider headsUpStyleProvider,
NotificationRowContentBinderLogger logger) {
+ NotificationRowContentBinderRefactor.assertInLegacyMode();
mRemoteViewCache = remoteViewCache;
mRemoteInputManager = remoteInputManager;
mConversationProcessor = conversationProcessor;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinder.java
index c1302a0..fe0ee52 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinder.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinder.java
@@ -147,11 +147,6 @@
* Use increased height when binding heads up views.
*/
public boolean usesIncreasedHeadsUpHeight;
-
- /**
- * Is group summary notification
- */
- public boolean mIsGroupSummary;
}
/**
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
new file mode 100644
index 0000000..e704140
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt
@@ -0,0 +1,1569 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.systemui.statusbar.notification.row
+
+import android.annotation.SuppressLint
+import android.app.Notification
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.content.res.Resources
+import android.os.AsyncTask
+import android.os.Build
+import android.os.CancellationSignal
+import android.os.Trace
+import android.os.UserHandle
+import android.service.notification.StatusBarNotification
+import android.util.Log
+import android.view.NotificationHeaderView
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RemoteViews
+import android.widget.RemoteViews.InteractionHandler
+import android.widget.RemoteViews.OnViewAppliedListener
+import com.android.app.tracing.TraceUtils
+import com.android.internal.annotations.VisibleForTesting
+import com.android.internal.widget.ImageMessageConsumer
+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.NotificationRemoteInputManager
+import com.android.systemui.statusbar.notification.ConversationNotificationProcessor
+import com.android.systemui.statusbar.notification.InflationException
+import com.android.systemui.statusbar.notification.collection.NotificationEntry
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.BindParams
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_EXPANDED
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_HEADS_UP
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_PUBLIC
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_SINGLE_LINE
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_GROUP_SUMMARY_HEADER
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationCallback
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag
+import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation
+import com.android.systemui.statusbar.notification.row.shared.AsyncHybridViewInflation
+import com.android.systemui.statusbar.notification.row.shared.HeadsUpStatusBarModel
+import com.android.systemui.statusbar.notification.row.shared.NewRemoteViews
+import com.android.systemui.statusbar.notification.row.shared.NotificationContentModel
+import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor
+import com.android.systemui.statusbar.notification.row.ui.viewbinder.SingleLineConversationViewBinder
+import com.android.systemui.statusbar.notification.row.ui.viewbinder.SingleLineViewBinder
+import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewWrapper
+import com.android.systemui.statusbar.notification.stack.NotificationChildrenContainer
+import com.android.systemui.statusbar.policy.InflatedSmartReplyState
+import com.android.systemui.statusbar.policy.InflatedSmartReplyViewHolder
+import com.android.systemui.statusbar.policy.SmartReplyStateInflater
+import com.android.systemui.util.Assert
+import java.util.concurrent.Executor
+import java.util.function.Consumer
+import javax.inject.Inject
+
+/**
+ * [NotificationRowContentBinderImpl] binds content to a [ExpandableNotificationRow] by
+ * asynchronously building the content's [RemoteViews] and applying it to the row.
+ */
+@SysUISingleton
+@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+class NotificationRowContentBinderImpl
+@Inject
+constructor(
+ private val remoteViewCache: NotifRemoteViewCache,
+ private val remoteInputManager: NotificationRemoteInputManager,
+ private val conversationProcessor: ConversationNotificationProcessor,
+ @NotifInflation private val inflationExecutor: Executor,
+ private val smartReplyStateInflater: SmartReplyStateInflater,
+ private val notifLayoutInflaterFactoryProvider: NotifLayoutInflaterFactory.Provider,
+ private val headsUpStyleProvider: HeadsUpStyleProvider,
+ private val logger: NotificationRowContentBinderLogger
+) : NotificationRowContentBinder {
+
+ init {
+ /* check if */ NotificationRowContentBinderRefactor.isUnexpectedlyInLegacyMode()
+ }
+
+ private var inflateSynchronously = false
+
+ override fun bindContent(
+ entry: NotificationEntry,
+ row: ExpandableNotificationRow,
+ @InflationFlag contentToBind: Int,
+ bindParams: BindParams,
+ forceInflate: Boolean,
+ callback: InflationCallback?
+ ) {
+ if (row.isRemoved) {
+ // We don't want to reinflate anything for removed notifications. Otherwise views might
+ // be readded to the stack, leading to leaks. This may happen with low-priority groups
+ // where the removal of already removed children can lead to a reinflation.
+ logger.logNotBindingRowWasRemoved(entry)
+ return
+ }
+ logger.logBinding(entry, contentToBind)
+ val sbn: StatusBarNotification = entry.sbn
+
+ // To check if the notification has inline image and preload inline image if necessary.
+ row.imageResolver.preloadImages(sbn.notification)
+ if (forceInflate) {
+ remoteViewCache.clearCache(entry)
+ }
+
+ // Cancel any pending frees on any view we're trying to bind since we should be bound after.
+ cancelContentViewFrees(row, contentToBind)
+ val task =
+ AsyncInflationTask(
+ inflationExecutor,
+ inflateSynchronously,
+ /* reInflateFlags = */ contentToBind,
+ remoteViewCache,
+ entry,
+ conversationProcessor,
+ row,
+ bindParams.isMinimized,
+ bindParams.usesIncreasedHeight,
+ bindParams.usesIncreasedHeadsUpHeight,
+ callback,
+ remoteInputManager.remoteViewsOnClickHandler,
+ /* isMediaFlagEnabled = */ smartReplyStateInflater,
+ notifLayoutInflaterFactoryProvider,
+ headsUpStyleProvider,
+ logger
+ )
+ if (inflateSynchronously) {
+ task.onPostExecute(task.doInBackground())
+ } else {
+ task.executeOnExecutor(inflationExecutor)
+ }
+ }
+
+ @VisibleForTesting
+ fun inflateNotificationViews(
+ entry: NotificationEntry,
+ row: ExpandableNotificationRow,
+ bindParams: BindParams,
+ inflateSynchronously: Boolean,
+ @InflationFlag reInflateFlags: Int,
+ builder: Notification.Builder,
+ packageContext: Context,
+ smartRepliesInflater: SmartReplyStateInflater
+ ): InflationProgress {
+ val systemUIContext = row.context
+ val result =
+ beginInflationAsync(
+ reInflateFlags = reInflateFlags,
+ entry = entry,
+ builder = builder,
+ isMinimized = bindParams.isMinimized,
+ usesIncreasedHeight = bindParams.usesIncreasedHeight,
+ usesIncreasedHeadsUpHeight = bindParams.usesIncreasedHeadsUpHeight,
+ systemUIContext = systemUIContext,
+ packageContext = packageContext,
+ row = row,
+ notifLayoutInflaterFactoryProvider = notifLayoutInflaterFactoryProvider,
+ headsUpStyleProvider = headsUpStyleProvider,
+ conversationProcessor = conversationProcessor,
+ logger = logger,
+ )
+ inflateSmartReplyViews(
+ result,
+ reInflateFlags,
+ entry,
+ systemUIContext,
+ packageContext,
+ row.existingSmartReplyState,
+ smartRepliesInflater,
+ logger,
+ )
+ if (AsyncHybridViewInflation.isEnabled) {
+ result.inflatedSingleLineView =
+ result.contentModel.singleLineViewModel?.let { viewModel ->
+ SingleLineViewInflater.inflateSingleLineViewHolder(
+ viewModel.isConversation(),
+ reInflateFlags,
+ entry,
+ systemUIContext,
+ logger,
+ )
+ }
+ }
+ apply(
+ inflationExecutor,
+ inflateSynchronously,
+ bindParams.isMinimized,
+ result,
+ reInflateFlags,
+ remoteViewCache,
+ entry,
+ row,
+ remoteInputManager.remoteViewsOnClickHandler,
+ /* callback= */ null,
+ logger
+ )
+ return result
+ }
+
+ override fun cancelBind(entry: NotificationEntry, row: ExpandableNotificationRow): Boolean {
+ val abortedTask: Boolean = entry.abortTask()
+ if (abortedTask) {
+ logger.logCancelBindAbortedTask(entry)
+ }
+ return abortedTask
+ }
+
+ @SuppressLint("WrongConstant")
+ override fun unbindContent(
+ entry: NotificationEntry,
+ row: ExpandableNotificationRow,
+ @InflationFlag contentToUnbind: Int
+ ) {
+ logger.logUnbinding(entry, contentToUnbind)
+ var curFlag = 1
+ var contentLeftToUnbind = contentToUnbind
+ while (contentLeftToUnbind != 0) {
+ if (contentLeftToUnbind and curFlag != 0) {
+ freeNotificationView(entry, row, curFlag)
+ }
+ contentLeftToUnbind = contentLeftToUnbind and curFlag.inv()
+ curFlag = curFlag shl 1
+ }
+ }
+
+ /**
+ * Frees the content view associated with the inflation flag as soon as the view is not showing.
+ *
+ * @param inflateFlag the flag corresponding to the content view which should be freed
+ */
+ private fun freeNotificationView(
+ entry: NotificationEntry,
+ row: ExpandableNotificationRow,
+ @InflationFlag inflateFlag: Int
+ ) {
+ when (inflateFlag) {
+ FLAG_CONTENT_VIEW_CONTRACTED ->
+ row.privateLayout.performWhenContentInactive(
+ NotificationContentView.VISIBLE_TYPE_CONTRACTED
+ ) {
+ row.privateLayout.setContractedChild(null)
+ remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_CONTRACTED)
+ }
+ FLAG_CONTENT_VIEW_EXPANDED ->
+ row.privateLayout.performWhenContentInactive(
+ NotificationContentView.VISIBLE_TYPE_EXPANDED
+ ) {
+ row.privateLayout.setExpandedChild(null)
+ remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_EXPANDED)
+ }
+ FLAG_CONTENT_VIEW_HEADS_UP ->
+ row.privateLayout.performWhenContentInactive(
+ NotificationContentView.VISIBLE_TYPE_HEADSUP
+ ) {
+ row.privateLayout.setHeadsUpChild(null)
+ remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_HEADS_UP)
+ row.privateLayout.setHeadsUpInflatedSmartReplies(null)
+ }
+ FLAG_CONTENT_VIEW_PUBLIC ->
+ row.publicLayout.performWhenContentInactive(
+ NotificationContentView.VISIBLE_TYPE_CONTRACTED
+ ) {
+ row.publicLayout.setContractedChild(null)
+ remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_PUBLIC)
+ }
+ FLAG_CONTENT_VIEW_SINGLE_LINE -> {
+ if (AsyncHybridViewInflation.isEnabled) {
+ row.privateLayout.performWhenContentInactive(
+ NotificationContentView.VISIBLE_TYPE_SINGLELINE
+ ) {
+ row.privateLayout.setSingleLineView(null)
+ }
+ }
+ }
+ else -> {}
+ }
+ }
+
+ /**
+ * Cancel any pending content view frees from [.freeNotificationView] for the provided content
+ * views.
+ *
+ * @param row top level notification row containing the content views
+ * @param contentViews content views to cancel pending frees on
+ */
+ private fun cancelContentViewFrees(
+ row: ExpandableNotificationRow,
+ @InflationFlag contentViews: Int
+ ) {
+ if (contentViews and FLAG_CONTENT_VIEW_CONTRACTED != 0) {
+ row.privateLayout.removeContentInactiveRunnable(
+ NotificationContentView.VISIBLE_TYPE_CONTRACTED
+ )
+ }
+ if (contentViews and FLAG_CONTENT_VIEW_EXPANDED != 0) {
+ row.privateLayout.removeContentInactiveRunnable(
+ NotificationContentView.VISIBLE_TYPE_EXPANDED
+ )
+ }
+ if (contentViews and FLAG_CONTENT_VIEW_HEADS_UP != 0) {
+ row.privateLayout.removeContentInactiveRunnable(
+ NotificationContentView.VISIBLE_TYPE_HEADSUP
+ )
+ }
+ if (contentViews and FLAG_CONTENT_VIEW_PUBLIC != 0) {
+ row.publicLayout.removeContentInactiveRunnable(
+ NotificationContentView.VISIBLE_TYPE_CONTRACTED
+ )
+ }
+ if (
+ AsyncHybridViewInflation.isEnabled &&
+ contentViews and FLAG_CONTENT_VIEW_SINGLE_LINE != 0
+ ) {
+ row.privateLayout.removeContentInactiveRunnable(
+ NotificationContentView.VISIBLE_TYPE_SINGLELINE
+ )
+ }
+ }
+
+ /**
+ * Sets whether to perform inflation on the same thread as the caller. This method should only
+ * be used in tests, not in production.
+ */
+ @VisibleForTesting
+ override fun setInflateSynchronously(inflateSynchronously: Boolean) {
+ this.inflateSynchronously = inflateSynchronously
+ }
+
+ class AsyncInflationTask(
+ private val inflationExecutor: Executor,
+ private val inflateSynchronously: Boolean,
+ @get:InflationFlag @get:VisibleForTesting @InflationFlag val reInflateFlags: Int,
+ private val remoteViewCache: NotifRemoteViewCache,
+ private val entry: NotificationEntry,
+ private val conversationProcessor: ConversationNotificationProcessor,
+ private val row: ExpandableNotificationRow,
+ private val isMinimized: Boolean,
+ private val usesIncreasedHeight: Boolean,
+ private val usesIncreasedHeadsUpHeight: Boolean,
+ private val callback: InflationCallback?,
+ private val remoteViewClickHandler: InteractionHandler?,
+ private val smartRepliesInflater: SmartReplyStateInflater,
+ private val notifLayoutInflaterFactoryProvider: NotifLayoutInflaterFactory.Provider,
+ private val headsUpStyleProvider: HeadsUpStyleProvider,
+ private val logger: NotificationRowContentBinderLogger
+ ) : AsyncTask<Void, Void, Result<InflationProgress>>(), InflationCallback, InflationTask {
+ private val context: Context
+ get() = row.context
+
+ private var cancellationSignal: CancellationSignal? = null
+
+ init {
+ entry.setInflationTask(this)
+ }
+
+ private fun updateApplicationInfo(sbn: StatusBarNotification) {
+ val packageName: String = sbn.packageName
+ val userId: Int = UserHandle.getUserId(sbn.uid)
+ val appInfo: ApplicationInfo
+ try {
+ // This method has an internal cache, so we don't need to add our own caching here.
+ appInfo =
+ context.packageManager.getApplicationInfoAsUser(
+ packageName,
+ PackageManager.MATCH_UNINSTALLED_PACKAGES,
+ userId
+ )
+ } catch (e: PackageManager.NameNotFoundException) {
+ return
+ }
+ Notification.addFieldsFromContext(appInfo, sbn.notification)
+ }
+
+ override fun onPreExecute() {
+ Trace.beginAsyncSection(ASYNC_TASK_TRACE_METHOD, System.identityHashCode(this))
+ }
+
+ public override fun doInBackground(vararg params: Void): Result<InflationProgress> {
+ return TraceUtils.trace(
+ "NotificationContentInflater.AsyncInflationTask#doInBackground"
+ ) {
+ try {
+ return@trace Result.success(doInBackgroundInternal())
+ } catch (e: Exception) {
+ logger.logAsyncTaskException(entry, "inflating", e)
+ return@trace Result.failure(e)
+ }
+ }
+ }
+
+ private fun doInBackgroundInternal(): InflationProgress {
+ val sbn: StatusBarNotification = entry.sbn
+ // Ensure the ApplicationInfo is updated before a builder is recovered.
+ updateApplicationInfo(sbn)
+ val recoveredBuilder = Notification.Builder.recoverBuilder(context, sbn.notification)
+ var packageContext: Context = sbn.getPackageContext(context)
+ if (recoveredBuilder.usesTemplate()) {
+ // For all of our templates, we want it to be RTL
+ packageContext = RtlEnabledContext(packageContext)
+ }
+ val inflationProgress =
+ beginInflationAsync(
+ reInflateFlags = reInflateFlags,
+ entry = entry,
+ builder = recoveredBuilder,
+ isMinimized = isMinimized,
+ usesIncreasedHeight = usesIncreasedHeight,
+ usesIncreasedHeadsUpHeight = usesIncreasedHeadsUpHeight,
+ systemUIContext = context,
+ packageContext = packageContext,
+ row = row,
+ notifLayoutInflaterFactoryProvider = notifLayoutInflaterFactoryProvider,
+ headsUpStyleProvider = headsUpStyleProvider,
+ conversationProcessor = conversationProcessor,
+ logger = logger
+ )
+ logger.logAsyncTaskProgress(
+ entry,
+ "getting existing smart reply state (on wrong thread!)"
+ )
+ val previousSmartReplyState: InflatedSmartReplyState? = row.existingSmartReplyState
+ logger.logAsyncTaskProgress(entry, "inflating smart reply views")
+ inflateSmartReplyViews(
+ /* result = */ inflationProgress,
+ reInflateFlags,
+ entry,
+ context,
+ packageContext,
+ previousSmartReplyState,
+ smartRepliesInflater,
+ logger,
+ )
+ if (AsyncHybridViewInflation.isEnabled) {
+ logger.logAsyncTaskProgress(entry, "inflating single line view")
+ inflationProgress.inflatedSingleLineView =
+ inflationProgress.contentModel.singleLineViewModel?.let {
+ SingleLineViewInflater.inflateSingleLineViewHolder(
+ it.isConversation(),
+ reInflateFlags,
+ entry,
+ context,
+ logger
+ )
+ }
+ }
+ logger.logAsyncTaskProgress(entry, "getting row image resolver (on wrong thread!)")
+ val imageResolver = row.imageResolver
+ // wait for image resolver to finish preloading
+ logger.logAsyncTaskProgress(entry, "waiting for preloaded images")
+ imageResolver.waitForPreloadedImages(IMG_PRELOAD_TIMEOUT_MS)
+ return inflationProgress
+ }
+
+ public override fun onPostExecute(result: Result<InflationProgress>) {
+ Trace.endAsyncSection(ASYNC_TASK_TRACE_METHOD, System.identityHashCode(this))
+ result
+ .onSuccess { progress ->
+ // Logged in detail in apply.
+ cancellationSignal =
+ apply(
+ inflationExecutor,
+ inflateSynchronously,
+ isMinimized,
+ progress,
+ reInflateFlags,
+ remoteViewCache,
+ entry,
+ row,
+ remoteViewClickHandler,
+ this /* callback */,
+ logger
+ )
+ }
+ .onFailure { error -> handleError(error as Exception) }
+ }
+
+ override fun onCancelled(result: Result<InflationProgress>) {
+ Trace.endAsyncSection(ASYNC_TASK_TRACE_METHOD, System.identityHashCode(this))
+ }
+
+ private fun handleError(e: Exception) {
+ entry.onInflationTaskFinished()
+ val sbn: StatusBarNotification = entry.sbn
+ val ident: String = (sbn.packageName + "/0x" + Integer.toHexString(sbn.id))
+ Log.e(TAG, "couldn't inflate view for notification $ident", e)
+ callback?.handleInflationException(
+ row.entry,
+ InflationException("Couldn't inflate contentViews$e")
+ )
+
+ // Cancel any image loading tasks, not useful any more
+ row.imageResolver.cancelRunningTasks()
+ }
+
+ override fun abort() {
+ logger.logAsyncTaskProgress(entry, "cancelling inflate")
+ cancel(/* mayInterruptIfRunning= */ true)
+ if (cancellationSignal != null) {
+ logger.logAsyncTaskProgress(entry, "cancelling apply")
+ cancellationSignal!!.cancel()
+ }
+ logger.logAsyncTaskProgress(entry, "aborted")
+ }
+
+ override fun handleInflationException(entry: NotificationEntry, e: Exception) {
+ handleError(e)
+ }
+
+ override fun onAsyncInflationFinished(entry: NotificationEntry) {
+ this.entry.onInflationTaskFinished()
+ row.onNotificationUpdated()
+ callback?.onAsyncInflationFinished(this.entry)
+
+ // Notify the resolver that the inflation task has finished,
+ // try to purge unnecessary cached entries.
+ row.imageResolver.purgeCache()
+
+ // Cancel any image loading tasks that have not completed at this point
+ row.imageResolver.cancelRunningTasks()
+ }
+
+ class RtlEnabledContext(packageContext: Context) : ContextWrapper(packageContext) {
+ override fun getApplicationInfo(): ApplicationInfo {
+ val applicationInfo = ApplicationInfo(super.getApplicationInfo())
+ applicationInfo.flags = applicationInfo.flags or ApplicationInfo.FLAG_SUPPORTS_RTL
+ return applicationInfo
+ }
+ }
+
+ companion object {
+ private const val IMG_PRELOAD_TIMEOUT_MS = 1000L
+ }
+ }
+
+ @VisibleForTesting
+ class InflationProgress(
+ @VisibleForTesting val packageContext: Context,
+ val remoteViews: NewRemoteViews,
+ val contentModel: NotificationContentModel,
+ ) {
+
+ var inflatedContentView: View? = null
+ var inflatedHeadsUpView: View? = null
+ var inflatedExpandedView: View? = null
+ var inflatedPublicView: View? = null
+ var inflatedGroupHeaderView: NotificationHeaderView? = null
+ var inflatedMinimizedGroupHeaderView: NotificationHeaderView? = null
+ var inflatedSmartReplyState: InflatedSmartReplyState? = null
+ var expandedInflatedSmartReplies: InflatedSmartReplyViewHolder? = null
+ var headsUpInflatedSmartReplies: InflatedSmartReplyViewHolder? = null
+
+ // Inflated SingleLineView that lacks the UI State
+ var inflatedSingleLineView: HybridNotificationView? = null
+ }
+
+ @VisibleForTesting
+ abstract class ApplyCallback {
+ abstract fun setResultView(v: View)
+
+ abstract val remoteView: RemoteViews
+ }
+
+ companion object {
+ const val TAG = "NotifContentInflater"
+
+ private fun inflateSmartReplyViews(
+ result: InflationProgress,
+ @InflationFlag reInflateFlags: Int,
+ entry: NotificationEntry,
+ context: Context,
+ packageContext: Context,
+ previousSmartReplyState: InflatedSmartReplyState?,
+ inflater: SmartReplyStateInflater,
+ logger: NotificationRowContentBinderLogger
+ ) {
+ val inflateContracted =
+ (reInflateFlags and FLAG_CONTENT_VIEW_CONTRACTED != 0 &&
+ result.remoteViews.contracted != null)
+ val inflateExpanded =
+ (reInflateFlags and FLAG_CONTENT_VIEW_EXPANDED != 0 &&
+ result.remoteViews.expanded != null)
+ val inflateHeadsUp =
+ (reInflateFlags and FLAG_CONTENT_VIEW_HEADS_UP != 0 &&
+ result.remoteViews.headsUp != null)
+ if (inflateContracted || inflateExpanded || inflateHeadsUp) {
+ logger.logAsyncTaskProgress(entry, "inflating contracted smart reply state")
+ result.inflatedSmartReplyState = inflater.inflateSmartReplyState(entry)
+ }
+ if (inflateExpanded) {
+ logger.logAsyncTaskProgress(entry, "inflating expanded smart reply state")
+ result.expandedInflatedSmartReplies =
+ inflater.inflateSmartReplyViewHolder(
+ context,
+ packageContext,
+ entry,
+ previousSmartReplyState,
+ result.inflatedSmartReplyState!!
+ )
+ }
+ if (inflateHeadsUp) {
+ logger.logAsyncTaskProgress(entry, "inflating heads up smart reply state")
+ result.headsUpInflatedSmartReplies =
+ inflater.inflateSmartReplyViewHolder(
+ context,
+ packageContext,
+ entry,
+ previousSmartReplyState,
+ result.inflatedSmartReplyState!!
+ )
+ }
+ }
+
+ private fun beginInflationAsync(
+ @InflationFlag reInflateFlags: Int,
+ entry: NotificationEntry,
+ builder: Notification.Builder,
+ isMinimized: Boolean,
+ usesIncreasedHeight: Boolean,
+ usesIncreasedHeadsUpHeight: Boolean,
+ systemUIContext: Context,
+ packageContext: Context,
+ row: ExpandableNotificationRow,
+ notifLayoutInflaterFactoryProvider: NotifLayoutInflaterFactory.Provider,
+ headsUpStyleProvider: HeadsUpStyleProvider,
+ conversationProcessor: ConversationNotificationProcessor,
+ logger: NotificationRowContentBinderLogger
+ ): InflationProgress {
+ // process conversations and extract the messaging style
+ val messagingStyle =
+ if (entry.ranking.isConversation) {
+ conversationProcessor.processNotification(entry, builder, logger)
+ } else null
+
+ val remoteViews =
+ createRemoteViews(
+ reInflateFlags = reInflateFlags,
+ builder = builder,
+ isMinimized = isMinimized,
+ usesIncreasedHeight = usesIncreasedHeight,
+ usesIncreasedHeadsUpHeight = usesIncreasedHeadsUpHeight,
+ row = row,
+ notifLayoutInflaterFactoryProvider = notifLayoutInflaterFactoryProvider,
+ headsUpStyleProvider = headsUpStyleProvider,
+ logger = logger,
+ )
+
+ val singleLineViewModel =
+ if (
+ AsyncHybridViewInflation.isEnabled &&
+ reInflateFlags and FLAG_CONTENT_VIEW_SINGLE_LINE != 0
+ ) {
+ logger.logAsyncTaskProgress(entry, "inflating single line view model")
+ SingleLineViewInflater.inflateSingleLineViewModel(
+ notification = entry.sbn.notification,
+ messagingStyle = messagingStyle,
+ builder = builder,
+ systemUiContext = systemUIContext,
+ )
+ } else null
+
+ val headsUpStatusBarModel =
+ HeadsUpStatusBarModel(
+ privateText = builder.getHeadsUpStatusBarText(/* publicMode= */ false),
+ publicText = builder.getHeadsUpStatusBarText(/* publicMode= */ true),
+ )
+
+ val contentModel =
+ NotificationContentModel(
+ headsUpStatusBarModel = headsUpStatusBarModel,
+ singleLineViewModel = singleLineViewModel,
+ )
+
+ return InflationProgress(
+ packageContext = packageContext,
+ remoteViews = remoteViews,
+ contentModel = contentModel,
+ )
+ }
+
+ private fun createRemoteViews(
+ @InflationFlag reInflateFlags: Int,
+ builder: Notification.Builder,
+ isMinimized: Boolean,
+ usesIncreasedHeight: Boolean,
+ usesIncreasedHeadsUpHeight: Boolean,
+ row: ExpandableNotificationRow,
+ notifLayoutInflaterFactoryProvider: NotifLayoutInflaterFactory.Provider,
+ headsUpStyleProvider: HeadsUpStyleProvider,
+ logger: NotificationRowContentBinderLogger
+ ): NewRemoteViews {
+ return TraceUtils.trace("NotificationContentInflater.createRemoteViews") {
+ val entryForLogging: NotificationEntry = row.entry
+ val contracted =
+ if (reInflateFlags and FLAG_CONTENT_VIEW_CONTRACTED != 0) {
+ logger.logAsyncTaskProgress(
+ entryForLogging,
+ "creating contracted remote view"
+ )
+ createContentView(builder, isMinimized, usesIncreasedHeight)
+ } else null
+ val expanded =
+ if (reInflateFlags and FLAG_CONTENT_VIEW_EXPANDED != 0) {
+ logger.logAsyncTaskProgress(
+ entryForLogging,
+ "creating expanded remote view"
+ )
+ createExpandedView(builder, isMinimized)
+ } else null
+ val headsUp =
+ if (reInflateFlags and FLAG_CONTENT_VIEW_HEADS_UP != 0) {
+ logger.logAsyncTaskProgress(
+ entryForLogging,
+ "creating heads up remote view"
+ )
+ val isHeadsUpCompact = headsUpStyleProvider.shouldApplyCompactStyle()
+ if (isHeadsUpCompact) {
+ builder.createCompactHeadsUpContentView()
+ } else {
+ builder.createHeadsUpContentView(usesIncreasedHeadsUpHeight)
+ }
+ } else null
+ val public =
+ if (reInflateFlags and FLAG_CONTENT_VIEW_PUBLIC != 0) {
+ logger.logAsyncTaskProgress(entryForLogging, "creating public remote view")
+ builder.makePublicContentView(isMinimized)
+ } else null
+ val normalGroupHeader =
+ if (
+ AsyncGroupHeaderViewInflation.isEnabled &&
+ reInflateFlags and FLAG_GROUP_SUMMARY_HEADER != 0
+ ) {
+ logger.logAsyncTaskProgress(
+ entryForLogging,
+ "creating group summary remote view"
+ )
+ builder.makeNotificationGroupHeader()
+ } else null
+ val minimizedGroupHeader =
+ if (
+ AsyncGroupHeaderViewInflation.isEnabled &&
+ reInflateFlags and FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER != 0
+ ) {
+ logger.logAsyncTaskProgress(
+ entryForLogging,
+ "creating low-priority group summary remote view"
+ )
+ builder.makeLowPriorityContentView(true /* useRegularSubtext */)
+ } else null
+ NewRemoteViews(
+ contracted = contracted,
+ headsUp = headsUp,
+ expanded = expanded,
+ public = public,
+ normalGroupHeader = normalGroupHeader,
+ minimizedGroupHeader = minimizedGroupHeader
+ )
+ .withLayoutInflaterFactory(row, notifLayoutInflaterFactoryProvider)
+ }
+ }
+
+ private fun NewRemoteViews.withLayoutInflaterFactory(
+ row: ExpandableNotificationRow,
+ provider: NotifLayoutInflaterFactory.Provider
+ ): NewRemoteViews {
+ contracted?.let {
+ it.layoutInflaterFactory = provider.provide(row, FLAG_CONTENT_VIEW_CONTRACTED)
+ }
+ expanded?.let {
+ it.layoutInflaterFactory = provider.provide(row, FLAG_CONTENT_VIEW_EXPANDED)
+ }
+ headsUp?.let {
+ it.layoutInflaterFactory = provider.provide(row, FLAG_CONTENT_VIEW_HEADS_UP)
+ }
+ public?.let {
+ it.layoutInflaterFactory = provider.provide(row, FLAG_CONTENT_VIEW_PUBLIC)
+ }
+ return this
+ }
+
+ private fun apply(
+ inflationExecutor: Executor,
+ inflateSynchronously: Boolean,
+ isMinimized: Boolean,
+ result: InflationProgress,
+ @InflationFlag reInflateFlags: Int,
+ remoteViewCache: NotifRemoteViewCache,
+ entry: NotificationEntry,
+ row: ExpandableNotificationRow,
+ remoteViewClickHandler: InteractionHandler?,
+ callback: InflationCallback?,
+ logger: NotificationRowContentBinderLogger
+ ): CancellationSignal {
+ Trace.beginAsyncSection(APPLY_TRACE_METHOD, System.identityHashCode(row))
+ val privateLayout = row.privateLayout
+ val publicLayout = row.publicLayout
+ val runningInflations = HashMap<Int, CancellationSignal>()
+ var flag = FLAG_CONTENT_VIEW_CONTRACTED
+ if (reInflateFlags and flag != 0) {
+ val isNewView =
+ !canReapplyRemoteView(
+ newView = result.remoteViews.contracted,
+ oldView = remoteViewCache.getCachedView(entry, FLAG_CONTENT_VIEW_CONTRACTED)
+ )
+ val applyCallback: ApplyCallback =
+ object : ApplyCallback() {
+ override fun setResultView(v: View) {
+ logger.logAsyncTaskProgress(entry, "contracted view applied")
+ result.inflatedContentView = v
+ }
+
+ override val remoteView: RemoteViews
+ get() = result.remoteViews.contracted!!
+ }
+ logger.logAsyncTaskProgress(entry, "applying contracted view")
+ applyRemoteView(
+ inflationExecutor = inflationExecutor,
+ inflateSynchronously = inflateSynchronously,
+ isMinimized = isMinimized,
+ result = result,
+ reInflateFlags = reInflateFlags,
+ inflationId = flag,
+ remoteViewCache = remoteViewCache,
+ entry = entry,
+ row = row,
+ isNewView = isNewView,
+ remoteViewClickHandler = remoteViewClickHandler,
+ callback = callback,
+ parentLayout = privateLayout,
+ existingView = privateLayout.contractedChild,
+ existingWrapper =
+ privateLayout.getVisibleWrapper(
+ NotificationContentView.VISIBLE_TYPE_CONTRACTED
+ ),
+ runningInflations = runningInflations,
+ applyCallback = applyCallback,
+ logger = logger
+ )
+ }
+ flag = FLAG_CONTENT_VIEW_EXPANDED
+ if (reInflateFlags and flag != 0) {
+ if (result.remoteViews.expanded != null) {
+ val isNewView =
+ !canReapplyRemoteView(
+ newView = result.remoteViews.expanded,
+ oldView =
+ remoteViewCache.getCachedView(entry, FLAG_CONTENT_VIEW_EXPANDED)
+ )
+ val applyCallback: ApplyCallback =
+ object : ApplyCallback() {
+ override fun setResultView(v: View) {
+ logger.logAsyncTaskProgress(entry, "expanded view applied")
+ result.inflatedExpandedView = v
+ }
+
+ override val remoteView: RemoteViews
+ get() = result.remoteViews.expanded
+ }
+ logger.logAsyncTaskProgress(entry, "applying expanded view")
+ applyRemoteView(
+ inflationExecutor = inflationExecutor,
+ inflateSynchronously = inflateSynchronously,
+ isMinimized = isMinimized,
+ result = result,
+ reInflateFlags = reInflateFlags,
+ inflationId = flag,
+ remoteViewCache = remoteViewCache,
+ entry = entry,
+ row = row,
+ isNewView = isNewView,
+ remoteViewClickHandler = remoteViewClickHandler,
+ callback = callback,
+ parentLayout = privateLayout,
+ existingView = privateLayout.expandedChild,
+ existingWrapper =
+ privateLayout.getVisibleWrapper(
+ NotificationContentView.VISIBLE_TYPE_EXPANDED
+ ),
+ runningInflations = runningInflations,
+ applyCallback = applyCallback,
+ logger = logger
+ )
+ }
+ }
+ flag = FLAG_CONTENT_VIEW_HEADS_UP
+ if (reInflateFlags and flag != 0) {
+ if (result.remoteViews.headsUp != null) {
+ val isNewView =
+ !canReapplyRemoteView(
+ newView = result.remoteViews.headsUp,
+ oldView =
+ remoteViewCache.getCachedView(entry, FLAG_CONTENT_VIEW_HEADS_UP)
+ )
+ val applyCallback: ApplyCallback =
+ object : ApplyCallback() {
+ override fun setResultView(v: View) {
+ logger.logAsyncTaskProgress(entry, "heads up view applied")
+ result.inflatedHeadsUpView = v
+ }
+
+ override val remoteView: RemoteViews
+ get() = result.remoteViews.headsUp
+ }
+ logger.logAsyncTaskProgress(entry, "applying heads up view")
+ applyRemoteView(
+ inflationExecutor = inflationExecutor,
+ inflateSynchronously = inflateSynchronously,
+ isMinimized = isMinimized,
+ result = result,
+ reInflateFlags = reInflateFlags,
+ inflationId = flag,
+ remoteViewCache = remoteViewCache,
+ entry = entry,
+ row = row,
+ isNewView = isNewView,
+ remoteViewClickHandler = remoteViewClickHandler,
+ callback = callback,
+ parentLayout = privateLayout,
+ existingView = privateLayout.headsUpChild,
+ existingWrapper =
+ privateLayout.getVisibleWrapper(
+ NotificationContentView.VISIBLE_TYPE_HEADSUP
+ ),
+ runningInflations = runningInflations,
+ applyCallback = applyCallback,
+ logger = logger
+ )
+ }
+ }
+ flag = FLAG_CONTENT_VIEW_PUBLIC
+ if (reInflateFlags and flag != 0) {
+ val isNewView =
+ !canReapplyRemoteView(
+ newView = result.remoteViews.public,
+ oldView = remoteViewCache.getCachedView(entry, FLAG_CONTENT_VIEW_PUBLIC)
+ )
+ val applyCallback: ApplyCallback =
+ object : ApplyCallback() {
+ override fun setResultView(v: View) {
+ logger.logAsyncTaskProgress(entry, "public view applied")
+ result.inflatedPublicView = v
+ }
+
+ override val remoteView: RemoteViews
+ get() = result.remoteViews.public!!
+ }
+ logger.logAsyncTaskProgress(entry, "applying public view")
+ applyRemoteView(
+ inflationExecutor = inflationExecutor,
+ inflateSynchronously = inflateSynchronously,
+ isMinimized = isMinimized,
+ result = result,
+ reInflateFlags = reInflateFlags,
+ inflationId = flag,
+ remoteViewCache = remoteViewCache,
+ entry = entry,
+ row = row,
+ isNewView = isNewView,
+ remoteViewClickHandler = remoteViewClickHandler,
+ callback = callback,
+ parentLayout = publicLayout,
+ existingView = publicLayout.contractedChild,
+ existingWrapper =
+ publicLayout.getVisibleWrapper(
+ NotificationContentView.VISIBLE_TYPE_CONTRACTED
+ ),
+ runningInflations = runningInflations,
+ applyCallback = applyCallback,
+ logger = logger
+ )
+ }
+ if (AsyncGroupHeaderViewInflation.isEnabled) {
+ val childrenContainer: NotificationChildrenContainer =
+ row.getChildrenContainerNonNull()
+ if (reInflateFlags and FLAG_GROUP_SUMMARY_HEADER != 0) {
+ val isNewView =
+ !canReapplyRemoteView(
+ newView = result.remoteViews.normalGroupHeader,
+ oldView =
+ remoteViewCache.getCachedView(entry, FLAG_GROUP_SUMMARY_HEADER)
+ )
+ val applyCallback: ApplyCallback =
+ object : ApplyCallback() {
+ override fun setResultView(v: View) {
+ logger.logAsyncTaskProgress(entry, "group header view applied")
+ result.inflatedGroupHeaderView = v as NotificationHeaderView?
+ }
+
+ override val remoteView: RemoteViews
+ get() = result.remoteViews.normalGroupHeader!!
+ }
+ logger.logAsyncTaskProgress(entry, "applying group header view")
+ applyRemoteView(
+ inflationExecutor = inflationExecutor,
+ inflateSynchronously = inflateSynchronously,
+ isMinimized = isMinimized,
+ result = result,
+ reInflateFlags = reInflateFlags,
+ inflationId = FLAG_GROUP_SUMMARY_HEADER,
+ remoteViewCache = remoteViewCache,
+ entry = entry,
+ row = row,
+ isNewView = isNewView,
+ remoteViewClickHandler = remoteViewClickHandler,
+ callback = callback,
+ parentLayout = childrenContainer,
+ existingView = childrenContainer.groupHeader,
+ existingWrapper = childrenContainer.notificationHeaderWrapper,
+ runningInflations = runningInflations,
+ applyCallback = applyCallback,
+ logger = logger
+ )
+ }
+ if (reInflateFlags and FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER != 0) {
+ val isNewView =
+ !canReapplyRemoteView(
+ newView = result.remoteViews.minimizedGroupHeader,
+ oldView =
+ remoteViewCache.getCachedView(
+ entry,
+ FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER
+ )
+ )
+ val applyCallback: ApplyCallback =
+ object : ApplyCallback() {
+ override fun setResultView(v: View) {
+ logger.logAsyncTaskProgress(
+ entry,
+ "low-priority group header view applied"
+ )
+ result.inflatedMinimizedGroupHeaderView =
+ v as NotificationHeaderView?
+ }
+
+ override val remoteView: RemoteViews
+ get() = result.remoteViews.minimizedGroupHeader!!
+ }
+ logger.logAsyncTaskProgress(entry, "applying low priority group header view")
+ applyRemoteView(
+ inflationExecutor = inflationExecutor,
+ inflateSynchronously = inflateSynchronously,
+ isMinimized = isMinimized,
+ result = result,
+ reInflateFlags = reInflateFlags,
+ inflationId = FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER,
+ remoteViewCache = remoteViewCache,
+ entry = entry,
+ row = row,
+ isNewView = isNewView,
+ remoteViewClickHandler = remoteViewClickHandler,
+ callback = callback,
+ parentLayout = childrenContainer,
+ existingView = childrenContainer.minimizedNotificationHeader,
+ existingWrapper = childrenContainer.minimizedGroupHeaderWrapper,
+ runningInflations = runningInflations,
+ applyCallback = applyCallback,
+ logger = logger
+ )
+ }
+ }
+
+ // Let's try to finish, maybe nobody is even inflating anything
+ finishIfDone(
+ result,
+ isMinimized,
+ reInflateFlags,
+ remoteViewCache,
+ runningInflations,
+ callback,
+ entry,
+ row,
+ logger
+ )
+ val cancellationSignal = CancellationSignal()
+ cancellationSignal.setOnCancelListener {
+ logger.logAsyncTaskProgress(entry, "apply cancelled")
+ Trace.endAsyncSection(APPLY_TRACE_METHOD, System.identityHashCode(row))
+ runningInflations.values.forEach(
+ Consumer { obj: CancellationSignal -> obj.cancel() }
+ )
+ }
+ return cancellationSignal
+ }
+
+ @VisibleForTesting
+ fun applyRemoteView(
+ inflationExecutor: Executor?,
+ inflateSynchronously: Boolean,
+ isMinimized: Boolean,
+ result: InflationProgress,
+ @InflationFlag reInflateFlags: Int,
+ @InflationFlag inflationId: Int,
+ remoteViewCache: NotifRemoteViewCache,
+ entry: NotificationEntry,
+ row: ExpandableNotificationRow,
+ isNewView: Boolean,
+ remoteViewClickHandler: InteractionHandler?,
+ callback: InflationCallback?,
+ parentLayout: ViewGroup?,
+ existingView: View?,
+ existingWrapper: NotificationViewWrapper?,
+ runningInflations: HashMap<Int, CancellationSignal>,
+ applyCallback: ApplyCallback,
+ logger: NotificationRowContentBinderLogger
+ ) {
+ val newContentView: RemoteViews = applyCallback.remoteView
+ if (inflateSynchronously) {
+ try {
+ if (isNewView) {
+ val v: View =
+ newContentView.apply(
+ result.packageContext,
+ parentLayout,
+ remoteViewClickHandler
+ )
+ validateView(v, entry, row.resources)
+ applyCallback.setResultView(v)
+ } else {
+ requireNotNull(existingView)
+ requireNotNull(existingWrapper)
+ newContentView.reapply(
+ result.packageContext,
+ existingView,
+ remoteViewClickHandler
+ )
+ validateView(existingView, entry, row.resources)
+ existingWrapper.onReinflated()
+ }
+ } catch (e: Exception) {
+ handleInflationError(
+ runningInflations,
+ e,
+ row.entry,
+ callback,
+ logger,
+ "applying view synchronously"
+ )
+ // Add a running inflation to make sure we don't trigger callbacks.
+ // Safe to do because only happens in tests.
+ runningInflations[inflationId] = CancellationSignal()
+ }
+ return
+ }
+ val listener: OnViewAppliedListener =
+ object : OnViewAppliedListener {
+ override fun onViewInflated(v: View) {
+ if (v is ImageMessageConsumer) {
+ (v as ImageMessageConsumer).setImageResolver(row.imageResolver)
+ }
+ }
+
+ override fun onViewApplied(v: View) {
+ val invalidReason = isValidView(v, entry, row.resources)
+ if (invalidReason != null) {
+ handleInflationError(
+ runningInflations,
+ InflationException(invalidReason),
+ row.entry,
+ callback,
+ logger,
+ "applied invalid view"
+ )
+ runningInflations.remove(inflationId)
+ return
+ }
+ if (isNewView) {
+ applyCallback.setResultView(v)
+ } else {
+ existingWrapper?.onReinflated()
+ }
+ runningInflations.remove(inflationId)
+ finishIfDone(
+ result,
+ isMinimized,
+ reInflateFlags,
+ remoteViewCache,
+ runningInflations,
+ callback,
+ entry,
+ row,
+ logger
+ )
+ }
+
+ override fun onError(e: Exception) {
+ // Uh oh the async inflation failed. Due to some bugs (see b/38190555), this
+ // could
+ // actually also be a system issue, so let's try on the UI thread again to
+ // be safe.
+ try {
+ val newView =
+ if (isNewView) {
+ newContentView.apply(
+ result.packageContext,
+ parentLayout,
+ remoteViewClickHandler
+ )
+ } else {
+ newContentView.reapply(
+ result.packageContext,
+ existingView,
+ remoteViewClickHandler
+ )
+ existingView!!
+ }
+ Log.wtf(
+ TAG,
+ "Async Inflation failed but normal inflation finished normally.",
+ e
+ )
+ onViewApplied(newView)
+ } catch (anotherException: Exception) {
+ runningInflations.remove(inflationId)
+ handleInflationError(
+ runningInflations,
+ e,
+ row.entry,
+ callback,
+ logger,
+ "applying view"
+ )
+ }
+ }
+ }
+ val cancellationSignal: CancellationSignal =
+ if (isNewView) {
+ newContentView.applyAsync(
+ result.packageContext,
+ parentLayout,
+ inflationExecutor,
+ listener,
+ remoteViewClickHandler
+ )
+ } else {
+ newContentView.reapplyAsync(
+ result.packageContext,
+ existingView,
+ inflationExecutor,
+ listener,
+ remoteViewClickHandler
+ )
+ }
+ runningInflations[inflationId] = cancellationSignal
+ }
+
+ /**
+ * Checks if the given View is a valid notification View.
+ *
+ * @return null == valid, non-null == invalid, String represents reason for rejection.
+ */
+ @VisibleForTesting
+ fun isValidView(view: View, entry: NotificationEntry, resources: Resources): String? {
+ return if (!satisfiesMinHeightRequirement(view, entry, resources)) {
+ "inflated notification does not meet minimum height requirement"
+ } else null
+ }
+
+ private fun satisfiesMinHeightRequirement(
+ view: View,
+ entry: NotificationEntry,
+ resources: Resources
+ ): Boolean {
+ return if (!requiresHeightCheck(entry)) {
+ true
+ } else
+ TraceUtils.trace("NotificationContentInflater#satisfiesMinHeightRequirement") {
+ val heightSpec =
+ View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
+ val referenceWidth =
+ resources.getDimensionPixelSize(
+ R.dimen.notification_validation_reference_width
+ )
+ val widthSpec =
+ View.MeasureSpec.makeMeasureSpec(referenceWidth, View.MeasureSpec.EXACTLY)
+ view.measure(widthSpec, heightSpec)
+ val minHeight =
+ resources.getDimensionPixelSize(
+ R.dimen.notification_validation_minimum_allowed_height
+ )
+ view.measuredHeight >= minHeight
+ }
+ }
+
+ /**
+ * Notifications with undecorated custom views need to satisfy a minimum height to avoid
+ * visual issues.
+ */
+ private fun requiresHeightCheck(entry: NotificationEntry): Boolean {
+ // Undecorated custom views are disallowed from S onwards
+ if (entry.targetSdk >= Build.VERSION_CODES.S) {
+ return false
+ }
+ // No need to check if the app isn't using any custom views
+ val notification: Notification = entry.sbn.notification
+ @Suppress("DEPRECATION")
+ return !(notification.contentView == null &&
+ notification.bigContentView == null &&
+ notification.headsUpContentView == null)
+ }
+
+ @Throws(InflationException::class)
+ private fun validateView(view: View, entry: NotificationEntry, resources: Resources) {
+ val invalidReason = isValidView(view, entry, resources)
+ if (invalidReason != null) {
+ throw InflationException(invalidReason)
+ }
+ }
+
+ private fun handleInflationError(
+ runningInflations: HashMap<Int, CancellationSignal>,
+ e: Exception,
+ notification: NotificationEntry,
+ callback: InflationCallback?,
+ logger: NotificationRowContentBinderLogger,
+ logContext: String
+ ) {
+ Assert.isMainThread()
+ logger.logAsyncTaskException(notification, logContext, e)
+ runningInflations.values.forEach(Consumer { obj: CancellationSignal -> obj.cancel() })
+ callback?.handleInflationException(notification, e)
+ }
+
+ /**
+ * Finish the inflation of the views
+ *
+ * @return true if the inflation was finished
+ */
+ private fun finishIfDone(
+ result: InflationProgress,
+ isMinimized: Boolean,
+ @InflationFlag reInflateFlags: Int,
+ remoteViewCache: NotifRemoteViewCache,
+ runningInflations: HashMap<Int, CancellationSignal>,
+ endListener: InflationCallback?,
+ entry: NotificationEntry,
+ row: ExpandableNotificationRow,
+ logger: NotificationRowContentBinderLogger
+ ): Boolean {
+ Assert.isMainThread()
+ if (runningInflations.isNotEmpty()) {
+ return false
+ }
+ val privateLayout = row.privateLayout
+ val publicLayout = row.publicLayout
+ logger.logAsyncTaskProgress(entry, "finishing")
+ if (reInflateFlags and FLAG_CONTENT_VIEW_CONTRACTED != 0) {
+ if (result.inflatedContentView != null) {
+ // New view case
+ privateLayout.setContractedChild(result.inflatedContentView)
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_CONTENT_VIEW_CONTRACTED,
+ result.remoteViews.contracted
+ )
+ } else if (remoteViewCache.hasCachedView(entry, FLAG_CONTENT_VIEW_CONTRACTED)) {
+ // Reinflation case. Only update if it's still cached (i.e. view has not been
+ // freed while inflating).
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_CONTENT_VIEW_CONTRACTED,
+ result.remoteViews.contracted
+ )
+ }
+ }
+ if (reInflateFlags and FLAG_CONTENT_VIEW_EXPANDED != 0) {
+ if (result.inflatedExpandedView != null) {
+ privateLayout.setExpandedChild(result.inflatedExpandedView)
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_CONTENT_VIEW_EXPANDED,
+ result.remoteViews.expanded
+ )
+ } else if (result.remoteViews.expanded == null) {
+ privateLayout.setExpandedChild(null)
+ remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_EXPANDED)
+ } else if (remoteViewCache.hasCachedView(entry, FLAG_CONTENT_VIEW_EXPANDED)) {
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_CONTENT_VIEW_EXPANDED,
+ result.remoteViews.expanded
+ )
+ }
+ if (result.remoteViews.expanded != null) {
+ privateLayout.setExpandedInflatedSmartReplies(
+ result.expandedInflatedSmartReplies
+ )
+ } else {
+ privateLayout.setExpandedInflatedSmartReplies(null)
+ }
+ row.setExpandable(result.remoteViews.expanded != null)
+ }
+ if (reInflateFlags and FLAG_CONTENT_VIEW_HEADS_UP != 0) {
+ if (result.inflatedHeadsUpView != null) {
+ privateLayout.setHeadsUpChild(result.inflatedHeadsUpView)
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_CONTENT_VIEW_HEADS_UP,
+ result.remoteViews.headsUp
+ )
+ } else if (result.remoteViews.headsUp == null) {
+ privateLayout.setHeadsUpChild(null)
+ remoteViewCache.removeCachedView(entry, FLAG_CONTENT_VIEW_HEADS_UP)
+ } else if (remoteViewCache.hasCachedView(entry, FLAG_CONTENT_VIEW_HEADS_UP)) {
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_CONTENT_VIEW_HEADS_UP,
+ result.remoteViews.headsUp
+ )
+ }
+ if (result.remoteViews.headsUp != null) {
+ privateLayout.setHeadsUpInflatedSmartReplies(result.headsUpInflatedSmartReplies)
+ } else {
+ privateLayout.setHeadsUpInflatedSmartReplies(null)
+ }
+ }
+ if (
+ AsyncHybridViewInflation.isEnabled &&
+ reInflateFlags and FLAG_CONTENT_VIEW_SINGLE_LINE != 0
+ ) {
+ val singleLineView = result.inflatedSingleLineView
+ val viewModel = result.contentModel.singleLineViewModel
+ if (singleLineView != null && viewModel != null) {
+ if (viewModel.isConversation()) {
+ SingleLineConversationViewBinder.bind(viewModel, singleLineView)
+ } else {
+ SingleLineViewBinder.bind(viewModel, singleLineView)
+ }
+ privateLayout.setSingleLineView(result.inflatedSingleLineView)
+ }
+ }
+ result.inflatedSmartReplyState?.let { privateLayout.setInflatedSmartReplyState(it) }
+ if (reInflateFlags and FLAG_CONTENT_VIEW_PUBLIC != 0) {
+ if (result.inflatedPublicView != null) {
+ publicLayout.setContractedChild(result.inflatedPublicView)
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_CONTENT_VIEW_PUBLIC,
+ result.remoteViews.public
+ )
+ } else if (remoteViewCache.hasCachedView(entry, FLAG_CONTENT_VIEW_PUBLIC)) {
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_CONTENT_VIEW_PUBLIC,
+ result.remoteViews.public
+ )
+ }
+ }
+ if (AsyncGroupHeaderViewInflation.isEnabled) {
+ if (reInflateFlags and FLAG_GROUP_SUMMARY_HEADER != 0) {
+ if (result.inflatedGroupHeaderView != null) {
+ // We need to set if the row is minimized before setting the group header to
+ // make sure the setting of header view works correctly
+ row.setIsMinimized(isMinimized)
+ row.setGroupHeader(/* headerView= */ result.inflatedGroupHeaderView)
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_GROUP_SUMMARY_HEADER,
+ result.remoteViews.normalGroupHeader
+ )
+ } else if (remoteViewCache.hasCachedView(entry, FLAG_GROUP_SUMMARY_HEADER)) {
+ // Re-inflation case. Only update if it's still cached (i.e. view has not
+ // been freed while inflating).
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_GROUP_SUMMARY_HEADER,
+ result.remoteViews.normalGroupHeader
+ )
+ }
+ }
+ if (reInflateFlags and FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER != 0) {
+ if (result.inflatedMinimizedGroupHeaderView != null) {
+ // We need to set if the row is minimized before setting the group header to
+ // make sure the setting of header view works correctly
+ row.setIsMinimized(isMinimized)
+ row.setMinimizedGroupHeader(
+ /* headerView= */ result.inflatedMinimizedGroupHeaderView
+ )
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER,
+ result.remoteViews.minimizedGroupHeader
+ )
+ } else if (
+ remoteViewCache.hasCachedView(entry, FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER)
+ ) {
+ // Re-inflation case. Only update if it's still cached (i.e. view has not
+ // been freed while inflating).
+ remoteViewCache.putCachedView(
+ entry,
+ FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER,
+ result.remoteViews.normalGroupHeader
+ )
+ }
+ }
+ }
+ entry.setContentModel(result.contentModel)
+ Trace.endAsyncSection(APPLY_TRACE_METHOD, System.identityHashCode(row))
+ endListener?.onAsyncInflationFinished(entry)
+ return true
+ }
+
+ private fun createExpandedView(
+ builder: Notification.Builder,
+ isMinimized: Boolean
+ ): RemoteViews? {
+ @Suppress("DEPRECATION")
+ val bigContentView: RemoteViews? = builder.createBigContentView()
+ if (bigContentView != null) {
+ return bigContentView
+ }
+ if (isMinimized) {
+ @Suppress("DEPRECATION") val contentView: RemoteViews = builder.createContentView()
+ Notification.Builder.makeHeaderExpanded(contentView)
+ return contentView
+ }
+ return null
+ }
+
+ private fun createContentView(
+ builder: Notification.Builder,
+ isMinimized: Boolean,
+ useLarge: Boolean
+ ): RemoteViews {
+ return if (isMinimized) {
+ builder.makeLowPriorityContentView(false /* useRegularSubtext */)
+ } else builder.createContentView(useLarge)
+ }
+
+ /**
+ * @param newView The new view that will be applied
+ * @param oldView The old view that was applied to the existing view before
+ * @return `true` if the RemoteViews are the same and the view can be reused to reapply.
+ */
+ @VisibleForTesting
+ fun canReapplyRemoteView(newView: RemoteViews?, oldView: RemoteViews?): Boolean {
+ return newView == null && oldView == null ||
+ newView != null &&
+ oldView != null &&
+ oldView.getPackage() != null &&
+ newView.getPackage() != null &&
+ newView.getPackage() == oldView.getPackage() &&
+ newView.layoutId == oldView.layoutId &&
+ !oldView.hasFlags(RemoteViews.FLAG_REAPPLY_DISALLOWED)
+ }
+
+ private const val ASYNC_TASK_TRACE_METHOD =
+ "NotificationRowContentBinderImpl.AsyncInflationTask"
+ private const val APPLY_TRACE_METHOD = "NotificationRowContentBinderImpl#apply"
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowModule.java
index 17c2026..84f2f66 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowModule.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowModule.java
@@ -17,9 +17,13 @@
package com.android.systemui.statusbar.notification.row;
import com.android.systemui.dagger.SysUISingleton;
+import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor;
import dagger.Binds;
import dagger.Module;
+import dagger.Provides;
+
+import javax.inject.Provider;
/**
* Dagger Module containing notification row and view inflation implementations.
@@ -30,10 +34,18 @@
/**
* Provides notification row content binder instance.
*/
- @Binds
+ @Provides
@SysUISingleton
- public abstract NotificationRowContentBinder provideNotificationRowContentBinder(
- NotificationContentInflater contentBinderImpl);
+ public static NotificationRowContentBinder provideNotificationRowContentBinder(
+ Provider<NotificationContentInflater> legacyImpl,
+ Provider<NotificationRowContentBinderImpl> refactoredImpl
+ ) {
+ if (NotificationRowContentBinderRefactor.isEnabled()) {
+ return refactoredImpl.get();
+ } else {
+ return legacyImpl.get();
+ }
+ }
/**
* Provides notification remote view cache instance.
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/shared/HeadsUpStatusBarModel.kt
similarity index 76%
rename from packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
rename to packages/SystemUI/src/com/android/systemui/statusbar/notification/row/shared/HeadsUpStatusBarModel.kt
index 23dbc26..e43ce76 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/shared/HeadsUpStatusBarModel.kt
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-package com.android.systemui.recordissue
+package com.android.systemui.statusbar.notification.row.shared
-import com.android.traceur.TraceUtils.PresetTraceType
-
-data class IssueRecordingConfig(val screenRecord: Boolean, val traceType: PresetTraceType)
+class HeadsUpStatusBarModel(
+ val privateText: CharSequence,
+ val publicText: CharSequence,
+)
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/shared/NewRemoteViews.kt
similarity index 61%
copy from packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
copy to packages/SystemUI/src/com/android/systemui/statusbar/notification/row/shared/NewRemoteViews.kt
index 23dbc26..63bba86 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/shared/NewRemoteViews.kt
@@ -14,8 +14,15 @@
* limitations under the License.
*/
-package com.android.systemui.recordissue
+package com.android.systemui.statusbar.notification.row.shared
-import com.android.traceur.TraceUtils.PresetTraceType
+import android.widget.RemoteViews
-data class IssueRecordingConfig(val screenRecord: Boolean, val traceType: PresetTraceType)
+class NewRemoteViews(
+ val contracted: RemoteViews? = null,
+ val headsUp: RemoteViews? = null,
+ val expanded: RemoteViews? = null,
+ val public: RemoteViews? = null,
+ val normalGroupHeader: RemoteViews? = null,
+ val minimizedGroupHeader: RemoteViews? = null,
+)
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/shared/NotificationContentModel.kt
similarity index 66%
copy from packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
copy to packages/SystemUI/src/com/android/systemui/statusbar/notification/row/shared/NotificationContentModel.kt
index 23dbc26..b2421bc 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/shared/NotificationContentModel.kt
@@ -14,8 +14,11 @@
* limitations under the License.
*/
-package com.android.systemui.recordissue
+package com.android.systemui.statusbar.notification.row.shared
-import com.android.traceur.TraceUtils.PresetTraceType
+import com.android.systemui.statusbar.notification.row.ui.viewmodel.SingleLineViewModel
-data class IssueRecordingConfig(val screenRecord: Boolean, val traceType: PresetTraceType)
+data class NotificationContentModel(
+ val headsUpStatusBarModel: HeadsUpStatusBarModel,
+ val singleLineViewModel: SingleLineViewModel? = null,
+)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationPriorityBucket.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationPriorityBucket.kt
index fc28a99..fabb696 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationPriorityBucket.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationPriorityBucket.kt
@@ -13,7 +13,9 @@
[
BUCKET_UNKNOWN,
BUCKET_MEDIA_CONTROLS,
+ BUCKET_TOP_ONGOING,
BUCKET_HEADS_UP,
+ BUCKET_TOP_UNSEEN,
BUCKET_FOREGROUND_SERVICE,
BUCKET_PRIORITY_PEOPLE,
BUCKET_PEOPLE,
@@ -21,11 +23,28 @@
BUCKET_SILENT
]
)
-annotation class PriorityBucket
+annotation class PriorityBucket {
+ companion object {
+ fun getAllInOrder(): IntArray =
+ intArrayOf(
+ BUCKET_MEDIA_CONTROLS,
+ BUCKET_TOP_ONGOING,
+ BUCKET_HEADS_UP,
+ BUCKET_TOP_UNSEEN,
+ BUCKET_FOREGROUND_SERVICE,
+ BUCKET_PRIORITY_PEOPLE,
+ BUCKET_PEOPLE,
+ BUCKET_ALERTING,
+ BUCKET_SILENT,
+ )
+ }
+}
const val BUCKET_UNKNOWN = 0
const val BUCKET_MEDIA_CONTROLS = 1
+const val BUCKET_TOP_ONGOING = 8
const val BUCKET_HEADS_UP = 2
+const val BUCKET_TOP_UNSEEN = 9
const val BUCKET_FOREGROUND_SERVICE = 3
const val BUCKET_PRIORITY_PEOPLE = 7
const val BUCKET_PEOPLE = 4
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculator.kt
index 4b0b1e0..391bc43 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculator.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculator.kt
@@ -73,7 +73,8 @@
private var maxNotificationsExcludesMedia = false
/** Whether we allow keyguard to show less important notifications above the shelf. */
- private var limitLockScreenToImportant = false
+ private val limitLockScreenToOneImportant
+ get() = NotificationMinimalismPrototype.V2.isEnabled
/** Minimum space between two notifications, see [calculateGapAndDividerHeight]. */
private var dividerHeight by notNull<Float>()
@@ -89,7 +90,7 @@
}
private fun allowedByPolicy(stackHeight: StackHeight): Boolean =
- if (limitLockScreenToImportant && stackHeight.includesLessImportantNotification) {
+ if (stackHeight.shouldForceIntoShelf) {
log { "\tallowedByPolicy = false" }
false
} else {
@@ -333,8 +334,8 @@
// changes during the lockscreen <=> full shade transition.
val shelfHeightWithSpaceBefore: Float,
- /** Whether this stack height includes less at least one important notification. */
- val includesLessImportantNotification: Boolean
+ /** Whether the stack should actually be forced into the shelf before this height. */
+ val shouldForceIntoShelf: Boolean
)
private fun computeHeightPerNotificationLimit(
@@ -347,7 +348,7 @@
var previous: ExpandableView? = null
val onLockscreen = onLockscreen()
- var includesLessImportantNotification = false
+ val counter = if (limitLockScreenToOneImportant) BucketTypeCounter() else null
// Only shelf. This should never happen, since we allow 1 view minimum (EmptyViewState).
yield(
@@ -355,7 +356,7 @@
notifsHeight = 0f,
notifsHeightSavingSpace = 0f,
shelfHeightWithSpaceBefore = shelfHeight,
- includesLessImportantNotification = includesLessImportantNotification,
+ shouldForceIntoShelf = false,
)
)
@@ -381,17 +382,9 @@
spaceBeforeShelf + shelfHeight
}
- if (limitLockScreenToImportant && !includesLessImportantNotification) {
- val bucket = (currentNotification as? ExpandableNotificationRow)?.entry?.bucket
- includesLessImportantNotification =
- when (bucket) {
- null,
- BUCKET_MEDIA_CONTROLS,
- BUCKET_HEADS_UP,
- BUCKET_FOREGROUND_SERVICE,
- BUCKET_PRIORITY_PEOPLE -> false
- else -> true
- }
+ if (counter != null) {
+ val entry = (currentNotification as? ExpandableNotificationRow)?.entry
+ counter.incrementForBucket(entry?.bucket)
}
log {
@@ -404,7 +397,7 @@
notifsHeight = notifications,
notifsHeightSavingSpace = notifsWithCollapsedHun,
shelfHeightWithSpaceBefore = shelfWithSpaceBefore,
- includesLessImportantNotification = includesLessImportantNotification,
+ shouldForceIntoShelf = counter?.shouldForceIntoShelf() ?: false
)
)
}
@@ -415,8 +408,6 @@
infiniteIfNegative(
if (NotificationMinimalismPrototype.V1.isEnabled) {
NotificationMinimalismPrototype.V1.maxNotifs
- } else if (NotificationMinimalismPrototype.V2.isEnabled) {
- 1
} else {
resources.getInteger(R.integer.keyguard_max_notification_count)
}
@@ -424,7 +415,6 @@
maxNotificationsExcludesMedia =
NotificationMinimalismPrototype.V1.isEnabled ||
NotificationMinimalismPrototype.V2.isEnabled
- limitLockScreenToImportant = NotificationMinimalismPrototype.V2.isEnabled
dividerHeight =
max(1f, resources.getDimensionPixelSize(R.dimen.notification_divider_height).toFloat())
@@ -552,4 +542,24 @@
/** Returns the last index where [predicate] returns true, or -1 if it was always false. */
private fun <T> Sequence<T>.lastIndexWhile(predicate: (T) -> Boolean): Int =
takeWhile(predicate).count() - 1
+
+ /** Counts the number of notifications for each type of bucket */
+ data class BucketTypeCounter(
+ var ongoing: Int = 0,
+ var important: Int = 0,
+ var other: Int = 0,
+ ) {
+ fun incrementForBucket(@PriorityBucket bucket: Int?) {
+ when (bucket) {
+ BUCKET_MEDIA_CONTROLS,
+ null -> Unit // not counted as notifications at all
+ BUCKET_TOP_ONGOING -> ongoing++
+ BUCKET_HEADS_UP -> important++
+ BUCKET_TOP_UNSEEN -> important++
+ else -> other++
+ }
+ }
+
+ fun shouldForceIntoShelf(): Boolean = ongoing > 1 || important > 1 || other > 0
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
index 05a4391..7434891 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
@@ -288,11 +288,12 @@
void awakenDreams();
/**
- * Handle a touch event while dreaming when the touch was initiated within a prescribed
- * swipeable area. This method is provided for cases where swiping in certain areas of a dream
- * should be handled by CentralSurfaces instead (e.g. swiping communal hub open).
+ * Handle a touch event while dreaming or on the glanceable hub when the touch was initiated
+ * within a prescribed swipeable area. This method is provided for cases where swiping in
+ * certain areas should be handled by CentralSurfaces instead (e.g. swiping hub open, opening
+ * the notification shade over dream or hub).
*/
- void handleDreamTouch(MotionEvent event);
+ void handleExternalShadeWindowTouch(MotionEvent event);
boolean isBouncerShowing();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesEmptyImpl.kt
index a7b5484..906baa2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesEmptyImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesEmptyImpl.kt
@@ -80,7 +80,7 @@
override fun updateScrimController() {}
override fun shouldIgnoreTouch() = false
override fun isDeviceInteractive() = false
- override fun handleDreamTouch(event: MotionEvent?) {}
+ override fun handleExternalShadeWindowTouch(event: MotionEvent?) {}
override fun handleCommunalHubTouch(event: MotionEvent?) {}
override fun awakenDreams() {}
override fun isBouncerShowing() = false
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
index 7567f36..42680ab 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -2954,8 +2954,8 @@
};
@Override
- public void handleDreamTouch(MotionEvent event) {
- getNotificationShadeWindowViewController().handleDreamTouch(event);
+ public void handleExternalShadeWindowTouch(MotionEvent event) {
+ getNotificationShadeWindowViewController().handleExternalTouch(event);
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java
index cff46ab..0ba4aab 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java
@@ -223,7 +223,8 @@
}
return;
}
- StatusBarIcon icon = new StatusBarIcon(iconPkg, UserHandle.SYSTEM, iconId, 0, 0, "Demo");
+ StatusBarIcon icon = new StatusBarIcon(iconPkg, UserHandle.SYSTEM, iconId, 0, 0, "Demo",
+ StatusBarIcon.Type.SystemIcon);
icon.visible = true;
StatusBarIconView v = new StatusBarIconView(getContext(), slot, null, false);
v.setTag(slot);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt
index 08a890d..d699b38 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt
@@ -155,6 +155,7 @@
0,
0,
contentDescription,
+ StatusBarIcon.Type.SystemIcon,
)
holder.tag = state.subId
return holder
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImpl.java
index fabf858d..85213cb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImpl.java
@@ -227,8 +227,8 @@
StatusBarIconHolder holder = mStatusBarIconList.getIconHolder(slot, 0);
if (holder == null) {
StatusBarIcon icon = new StatusBarIcon(UserHandle.SYSTEM, mContext.getPackageName(),
- Icon.createWithResource(
- mContext, resourceId), 0, 0, contentDescription);
+ Icon.createWithResource(mContext, resourceId), 0, 0,
+ contentDescription, StatusBarIcon.Type.SystemIcon);
holder = StatusBarIconHolder.fromIcon(icon);
setIcon(slot, holder);
} else {
@@ -295,7 +295,7 @@
} else {
holder.setIcon(new StatusBarIcon(UserHandle.SYSTEM, mContext.getPackageName(),
Icon.createWithResource(mContext, state.callStrengthResId), 0, 0,
- state.callStrengthDescription));
+ state.callStrengthDescription, StatusBarIcon.Type.SystemIcon));
}
setIcon(slot, holder);
}
@@ -320,7 +320,7 @@
} else {
holder.setIcon(new StatusBarIcon(UserHandle.SYSTEM, mContext.getPackageName(),
Icon.createWithResource(mContext, state.noCallingResId), 0, 0,
- state.noCallingDescription));
+ state.noCallingDescription, StatusBarIcon.Type.SystemIcon));
}
setIcon(slot, holder);
}
diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/GestureViewModelFactory.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/GestureViewModelFactory.kt
new file mode 100644
index 0000000..504bd5f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/GestureViewModelFactory.kt
@@ -0,0 +1,39 @@
+/*
+ * 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.touchpad.tutorial.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+
+sealed class GestureTutorialViewModel : ViewModel()
+
+class BackGestureTutorialViewModel : GestureTutorialViewModel()
+
+class HomeGestureTutorialViewModel : GestureTutorialViewModel()
+
+class GestureViewModelFactory : ViewModelProvider.Factory {
+
+ @Suppress("UNCHECKED_CAST")
+ override fun <T : ViewModel> create(modelClass: Class<T>): T {
+ return when (modelClass) {
+ BackGestureTutorialViewModel::class.java -> BackGestureTutorialViewModel()
+ HomeGestureTutorialViewModel::class.java -> HomeGestureTutorialViewModel()
+ else -> error("Unknown ViewModel class: ${modelClass.name}")
+ }
+ as T
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/TouchpadTutorialViewModel.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/TouchpadTutorialViewModel.kt
new file mode 100644
index 0000000..7669524
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/TouchpadTutorialViewModel.kt
@@ -0,0 +1,43 @@
+/*
+ * 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.touchpad.tutorial.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import javax.inject.Inject
+
+class TouchpadTutorialViewModel : ViewModel() {
+
+ private val _screen = MutableStateFlow(Screen.TUTORIAL_SELECTION)
+ val screen: StateFlow<Screen> = _screen
+
+ class Factory @Inject constructor() : ViewModelProvider.Factory {
+
+ @Suppress("UNCHECKED_CAST")
+ override fun <T : ViewModel> create(modelClass: Class<T>): T {
+ return TouchpadTutorialViewModel() as T
+ }
+ }
+}
+
+enum class Screen {
+ TUTORIAL_SELECTION,
+ BACK_GESTURE,
+ HOME_GESTURE,
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/TutorialSelectionViewModel.kt
similarity index 60%
copy from packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
copy to packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/TutorialSelectionViewModel.kt
index 23dbc26..1a8272d8 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
+++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/TutorialSelectionViewModel.kt
@@ -14,8 +14,17 @@
* limitations under the License.
*/
-package com.android.systemui.recordissue
+package com.android.systemui.touchpad.tutorial.ui
-import com.android.traceur.TraceUtils.PresetTraceType
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
-data class IssueRecordingConfig(val screenRecord: Boolean, val traceType: PresetTraceType)
+class TutorialSelectionViewModel : ViewModel()
+
+class TutorialSelectionViewModelFactory : ViewModelProvider.Factory {
+
+ @Suppress("UNCHECKED_CAST")
+ override fun <T : ViewModel> create(modelClass: Class<T>): T {
+ return TutorialSelectionViewModel() as T
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/view/TouchpadTutorialActivity.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/view/TouchpadTutorialActivity.kt
new file mode 100644
index 0000000..09dd909
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/view/TouchpadTutorialActivity.kt
@@ -0,0 +1,76 @@
+/*
+ * 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.touchpad.tutorial.ui.view
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.Lifecycle.State.STARTED
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.android.compose.theme.PlatformTheme
+import com.android.systemui.touchpad.tutorial.ui.BackGestureTutorialViewModel
+import com.android.systemui.touchpad.tutorial.ui.GestureViewModelFactory
+import com.android.systemui.touchpad.tutorial.ui.HomeGestureTutorialViewModel
+import com.android.systemui.touchpad.tutorial.ui.Screen.BACK_GESTURE
+import com.android.systemui.touchpad.tutorial.ui.Screen.HOME_GESTURE
+import com.android.systemui.touchpad.tutorial.ui.Screen.TUTORIAL_SELECTION
+import com.android.systemui.touchpad.tutorial.ui.TouchpadTutorialViewModel
+import com.android.systemui.touchpad.tutorial.ui.TutorialSelectionViewModel
+import com.android.systemui.touchpad.tutorial.ui.TutorialSelectionViewModelFactory
+import javax.inject.Inject
+
+class TouchpadTutorialActivity
+@Inject
+constructor(
+ private val viewModelFactory: TouchpadTutorialViewModel.Factory,
+) : ComponentActivity() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContent { PlatformTheme { TouchpadTutorialScreen(viewModelFactory) } }
+ }
+}
+
+@Composable
+fun TouchpadTutorialScreen(viewModelFactory: ViewModelProvider.Factory) {
+ val vm = viewModel<TouchpadTutorialViewModel>(factory = viewModelFactory)
+ val activeScreen by vm.screen.collectAsStateWithLifecycle(STARTED)
+ when (activeScreen) {
+ TUTORIAL_SELECTION -> TutorialSelectionScreen()
+ BACK_GESTURE -> BackGestureTutorialScreen()
+ HOME_GESTURE -> HomeGestureTutorialScreen()
+ }
+}
+
+@Composable
+fun TutorialSelectionScreen() {
+ val vm = viewModel<TutorialSelectionViewModel>(factory = TutorialSelectionViewModelFactory())
+}
+
+@Composable
+fun BackGestureTutorialScreen() {
+ val vm = viewModel<BackGestureTutorialViewModel>(factory = GestureViewModelFactory())
+}
+
+@Composable
+fun HomeGestureTutorialScreen() {
+ val vm = viewModel<HomeGestureTutorialViewModel>(factory = GestureViewModelFactory())
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/settings/GlobalSettingsImpl.java b/packages/SystemUI/src/com/android/systemui/util/settings/GlobalSettingsImpl.java
index 4438763..42389f0 100644
--- a/packages/SystemUI/src/com/android/systemui/util/settings/GlobalSettingsImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/util/settings/GlobalSettingsImpl.java
@@ -23,23 +23,16 @@
import android.net.Uri;
import android.provider.Settings;
-import com.android.systemui.dagger.qualifiers.Background;
-
-import kotlinx.coroutines.CoroutineDispatcher;
-
import javax.inject.Inject;
// use UserHandle.USER_SYSTEM everywhere
@SuppressLint("StaticSettingsProvider")
class GlobalSettingsImpl implements GlobalSettings {
private final ContentResolver mContentResolver;
- private final CoroutineDispatcher mBgDispatcher;
@Inject
- GlobalSettingsImpl(ContentResolver contentResolver,
- @Background CoroutineDispatcher bgDispatcher) {
+ GlobalSettingsImpl(ContentResolver contentResolver) {
mContentResolver = contentResolver;
- mBgDispatcher = bgDispatcher;
}
@Override
@@ -53,11 +46,6 @@
}
@Override
- public CoroutineDispatcher getBackgroundDispatcher() {
- return mBgDispatcher;
- }
-
- @Override
public String getString(String name) {
return Settings.Global.getString(mContentResolver, name);
}
diff --git a/packages/SystemUI/src/com/android/systemui/util/settings/SecureSettingsImpl.java b/packages/SystemUI/src/com/android/systemui/util/settings/SecureSettingsImpl.java
index 38ad5d0..6532ce8 100644
--- a/packages/SystemUI/src/com/android/systemui/util/settings/SecureSettingsImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/util/settings/SecureSettingsImpl.java
@@ -22,24 +22,18 @@
import androidx.annotation.NonNull;
-import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.settings.UserTracker;
-import kotlinx.coroutines.CoroutineDispatcher;
-
import javax.inject.Inject;
class SecureSettingsImpl implements SecureSettings {
private final ContentResolver mContentResolver;
private final UserTracker mUserTracker;
- private final CoroutineDispatcher mBgDispatcher;
@Inject
- SecureSettingsImpl(ContentResolver contentResolver, UserTracker userTracker,
- @Background CoroutineDispatcher bgDispatcher) {
+ SecureSettingsImpl(ContentResolver contentResolver, UserTracker userTracker) {
mContentResolver = contentResolver;
mUserTracker = userTracker;
- mBgDispatcher = bgDispatcher;
}
@Override
@@ -58,11 +52,6 @@
}
@Override
- public CoroutineDispatcher getBackgroundDispatcher() {
- return mBgDispatcher;
- }
-
- @Override
public String getStringForUser(String name, int userHandle) {
return Settings.Secure.getStringForUser(mContentResolver, name,
getRealUserHandle(userHandle));
diff --git a/packages/SystemUI/src/com/android/systemui/util/settings/SettingsProxy.kt b/packages/SystemUI/src/com/android/systemui/util/settings/SettingsProxy.kt
index 55171ad..d92127c 100644
--- a/packages/SystemUI/src/com/android/systemui/util/settings/SettingsProxy.kt
+++ b/packages/SystemUI/src/com/android/systemui/util/settings/SettingsProxy.kt
@@ -19,10 +19,7 @@
import android.database.ContentObserver
import android.net.Uri
import android.provider.Settings.SettingNotFoundException
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import com.android.app.tracing.TraceUtils.trace
/**
* Used to interact with mainly with Settings.Global, but can also be used for Settings.System and
@@ -43,12 +40,6 @@
fun getContentResolver(): ContentResolver
/**
- * Returns the background [CoroutineDispatcher] that the async APIs will use for a specific
- * implementation.
- */
- fun getBackgroundDispatcher(): CoroutineDispatcher
-
- /**
* Construct the content URI for a particular name/value pair, useful for monitoring changes
* with a ContentObserver.
*
@@ -66,28 +57,6 @@
registerContentObserverSync(getUriFor(name), settingsObserver)
}
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * suspend API corresponding to [registerContentObserver] to ensure that [ContentObserver]
- * registration happens on a worker thread. Caller may wrap the API in an async block if they
- * wish to synchronize execution.
- */
- suspend fun registerContentObserver(name: String, settingsObserver: ContentObserver) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverSync(getUriFor(name), settingsObserver)
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * API corresponding to [registerContentObserver] for Java usage.
- */
- fun registerContentObserverAsync(name: String, settingsObserver: ContentObserver) =
- CoroutineScope(getBackgroundDispatcher()).launch {
- registerContentObserverSync(getUriFor(name), settingsObserver)
- }
-
/** Convenience wrapper around [ContentResolver.registerContentObserver].' */
fun registerContentObserverSync(uri: Uri, settingsObserver: ContentObserver) =
registerContentObserverSync(uri, false, settingsObserver)
@@ -95,28 +64,6 @@
/**
* Convenience wrapper around [ContentResolver.registerContentObserver].'
*
- * suspend API corresponding to [registerContentObserver] to ensure that [ContentObserver]
- * registration happens on a worker thread. Caller may wrap the API in an async block if they
- * wish to synchronize execution.
- */
- suspend fun registerContentObserver(uri: Uri, settingsObserver: ContentObserver) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverSync(uri, settingsObserver)
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * API corresponding to [registerContentObserver] for Java usage.
- */
- fun registerContentObserverAsync(uri: Uri, settingsObserver: ContentObserver) =
- CoroutineScope(getBackgroundDispatcher()).launch {
- registerContentObserverSync(uri, settingsObserver)
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
* Implicitly calls [getUriFor] on the passed in name.
*/
fun registerContentObserverSync(
@@ -125,100 +72,24 @@
settingsObserver: ContentObserver
) = registerContentObserverSync(getUriFor(name), notifyForDescendants, settingsObserver)
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * suspend API corresponding to [registerContentObserver] to ensure that [ContentObserver]
- * registration happens on a worker thread. Caller may wrap the API in an async block if they
- * wish to synchronize execution.
- */
- suspend fun registerContentObserver(
- name: String,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver
- ) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverSync(getUriFor(name), notifyForDescendants, settingsObserver)
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * API corresponding to [registerContentObserver] for Java usage.
- */
- fun registerContentObserverAsync(
- name: String,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver
- ) =
- CoroutineScope(getBackgroundDispatcher()).launch {
- registerContentObserverSync(getUriFor(name), notifyForDescendants, settingsObserver)
- }
-
/** Convenience wrapper around [ContentResolver.registerContentObserver].' */
fun registerContentObserverSync(
uri: Uri,
notifyForDescendants: Boolean,
settingsObserver: ContentObserver
) {
- getContentResolver().registerContentObserver(uri, notifyForDescendants, settingsObserver)
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * suspend API corresponding to [registerContentObserver] to ensure that [ContentObserver]
- * registration happens on a worker thread. Caller may wrap the API in an async block if they
- * wish to synchronize execution.
- */
- suspend fun registerContentObserver(
- uri: Uri,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver
- ) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverSync(uri, notifyForDescendants, settingsObserver)
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * API corresponding to [registerContentObserver] for Java usage.
- */
- fun registerContentObserverAsync(
- uri: Uri,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver
- ) =
- CoroutineScope(getBackgroundDispatcher()).launch {
+ trace({ "SP#registerObserver#[$uri]" }) {
getContentResolver()
.registerContentObserver(uri, notifyForDescendants, settingsObserver)
}
+ }
/** See [ContentResolver.unregisterContentObserver]. */
- fun unregisterContentObserverSync(settingsObserver: ContentObserver) =
- getContentResolver().unregisterContentObserver(settingsObserver)
-
- /**
- * Convenience wrapper around [ContentResolver.unregisterContentObserver].'
- *
- * API corresponding to [unregisterContentObserver] for Java usage to ensure that
- * [ContentObserver] un-registration happens on a worker thread. Caller may wrap the API in an
- * async block if they wish to synchronize execution.
- */
- suspend fun unregisterContentObserver(settingsObserver: ContentObserver) =
- withContext(getBackgroundDispatcher()) { unregisterContentObserverSync(settingsObserver) }
-
- /**
- * Convenience wrapper around [ContentResolver.unregisterContentObserver].'
- *
- * API corresponding to [unregisterContentObserver] for Java usage to ensure that
- * [ContentObserver] registration happens on a worker thread.
- */
- fun unregisterContentObserverAsync(settingsObserver: ContentObserver) =
- CoroutineScope(getBackgroundDispatcher()).launch {
- unregisterContentObserver(settingsObserver)
+ fun unregisterContentObserverSync(settingsObserver: ContentObserver) {
+ trace({ "SP#unregisterObserver" }) {
+ getContentResolver().unregisterContentObserver(settingsObserver)
}
+ }
/**
* Look up a name in the database.
diff --git a/packages/SystemUI/src/com/android/systemui/util/settings/SystemSettingsImpl.java b/packages/SystemUI/src/com/android/systemui/util/settings/SystemSettingsImpl.java
index 68cc753..658b299 100644
--- a/packages/SystemUI/src/com/android/systemui/util/settings/SystemSettingsImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/util/settings/SystemSettingsImpl.java
@@ -22,24 +22,18 @@
import androidx.annotation.NonNull;
-import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.settings.UserTracker;
-import kotlinx.coroutines.CoroutineDispatcher;
-
import javax.inject.Inject;
class SystemSettingsImpl implements SystemSettings {
private final ContentResolver mContentResolver;
private final UserTracker mUserTracker;
- private final CoroutineDispatcher mBgCoroutineDispatcher;
@Inject
- SystemSettingsImpl(ContentResolver contentResolver, UserTracker userTracker,
- @Background CoroutineDispatcher bgDispatcher) {
+ SystemSettingsImpl(ContentResolver contentResolver, UserTracker userTracker) {
mContentResolver = contentResolver;
mUserTracker = userTracker;
- mBgCoroutineDispatcher = bgDispatcher;
}
@Override
@@ -58,11 +52,6 @@
}
@Override
- public CoroutineDispatcher getBackgroundDispatcher() {
- return mBgCoroutineDispatcher;
- }
-
- @Override
public String getStringForUser(String name, int userHandle) {
return Settings.System.getStringForUser(mContentResolver, name,
getRealUserHandle(userHandle));
diff --git a/packages/SystemUI/src/com/android/systemui/util/settings/UserSettingsProxy.kt b/packages/SystemUI/src/com/android/systemui/util/settings/UserSettingsProxy.kt
index 9133fbb..ed65f1a 100644
--- a/packages/SystemUI/src/com/android/systemui/util/settings/UserSettingsProxy.kt
+++ b/packages/SystemUI/src/com/android/systemui/util/settings/UserSettingsProxy.kt
@@ -16,7 +16,6 @@
package com.android.systemui.util.settings
import android.annotation.UserIdInt
-import android.content.ContentResolver
import android.database.ContentObserver
import android.net.Uri
import android.os.UserHandle
@@ -27,9 +26,6 @@
import com.android.systemui.util.settings.SettingsProxy.Companion.parseFloatOrThrow
import com.android.systemui.util.settings.SettingsProxy.Companion.parseLongOrThrow
import com.android.systemui.util.settings.SettingsProxy.Companion.parseLongOrUseDefault
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
/**
* Used to interact with per-user Settings.Secure and Settings.System settings (but not
@@ -70,16 +66,6 @@
registerContentObserverForUserSync(uri, settingsObserver, userId)
}
- override suspend fun registerContentObserver(uri: Uri, settingsObserver: ContentObserver) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverForUserSync(uri, settingsObserver, userId)
- }
-
- override fun registerContentObserverAsync(uri: Uri, settingsObserver: ContentObserver) =
- CoroutineScope(getBackgroundDispatcher()).launch {
- registerContentObserverForUserSync(uri, settingsObserver, userId)
- }
-
/** Convenience wrapper around [ContentResolver.registerContentObserver].' */
override fun registerContentObserverSync(
uri: Uri,
@@ -89,29 +75,6 @@
registerContentObserverForUserSync(uri, notifyForDescendants, settingsObserver, userId)
}
- override suspend fun registerContentObserver(
- uri: Uri,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver
- ) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverForUserSync(uri, notifyForDescendants, settingsObserver, userId)
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * API corresponding to [registerContentObserverForUser] for Java usage.
- */
- override fun registerContentObserverAsync(
- uri: Uri,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver
- ) =
- CoroutineScope(getBackgroundDispatcher()).launch {
- registerContentObserverForUserSync(uri, notifyForDescendants, settingsObserver, userId)
- }
-
/**
* Convenience wrapper around [ContentResolver.registerContentObserver]
*
@@ -125,36 +88,6 @@
registerContentObserverForUserSync(getUriFor(name), settingsObserver, userHandle)
}
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * suspend API corresponding to [registerContentObserverForUser] to ensure that
- * [ContentObserver] registration happens on a worker thread. Caller may wrap the API in an
- * async block if they wish to synchronize execution.
- */
- suspend fun registerContentObserverForUser(
- name: String,
- settingsObserver: ContentObserver,
- userHandle: Int
- ) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverForUserSync(name, settingsObserver, userHandle)
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * API corresponding to [registerContentObserverForUser] for Java usage.
- */
- fun registerContentObserverForUserAsync(
- name: String,
- settingsObserver: ContentObserver,
- userHandle: Int
- ) =
- CoroutineScope(getBackgroundDispatcher()).launch {
- registerContentObserverForUserSync(getUriFor(name), settingsObserver, userHandle)
- }
-
/** Convenience wrapper around [ContentResolver.registerContentObserver] */
fun registerContentObserverForUserSync(
uri: Uri,
@@ -165,36 +98,6 @@
}
/**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * suspend API corresponding to [registerContentObserverForUser] to ensure that
- * [ContentObserver] registration happens on a worker thread. Caller may wrap the API in an
- * async block if they wish to synchronize execution.
- */
- suspend fun registerContentObserverForUser(
- uri: Uri,
- settingsObserver: ContentObserver,
- userHandle: Int
- ) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverForUserSync(uri, settingsObserver, userHandle)
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * API corresponding to [registerContentObserverForUser] for Java usage.
- */
- fun registerContentObserverForUserAsync(
- uri: Uri,
- settingsObserver: ContentObserver,
- userHandle: Int
- ) =
- CoroutineScope(getBackgroundDispatcher()).launch {
- registerContentObserverForUserSync(uri, settingsObserver, userHandle)
- }
-
- /**
* Convenience wrapper around [ContentResolver.registerContentObserver]
*
* Implicitly calls [getUriFor] on the passed in name.
@@ -213,49 +116,6 @@
)
}
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * suspend API corresponding to [registerContentObserverForUser] to ensure that
- * [ContentObserver] registration happens on a worker thread. Caller may wrap the API in an
- * async block if they wish to synchronize execution.
- */
- suspend fun registerContentObserverForUser(
- name: String,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver,
- userHandle: Int
- ) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverForUserSync(
- name,
- notifyForDescendants,
- settingsObserver,
- userHandle
- )
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * API corresponding to [registerContentObserverForUser] for Java usage.
- */
- fun registerContentObserverForUserAsync(
- name: String,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver,
- userHandle: Int
- ) {
- CoroutineScope(getBackgroundDispatcher()).launch {
- registerContentObserverForUserSync(
- getUriFor(name),
- notifyForDescendants,
- settingsObserver,
- userHandle
- )
- }
- }
-
/** Convenience wrapper around [ContentResolver.registerContentObserver] */
fun registerContentObserverForUserSync(
uri: Uri,
@@ -276,48 +136,6 @@
}
/**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * suspend API corresponding to [registerContentObserverForUser] to ensure that
- * [ContentObserver] registration happens on a worker thread. Caller may wrap the API in an
- * async block if they wish to synchronize execution.
- */
- suspend fun registerContentObserverForUser(
- uri: Uri,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver,
- userHandle: Int
- ) =
- withContext(getBackgroundDispatcher()) {
- registerContentObserverForUserSync(
- uri,
- notifyForDescendants,
- settingsObserver,
- getRealUserHandle(userHandle)
- )
- }
-
- /**
- * Convenience wrapper around [ContentResolver.registerContentObserver].'
- *
- * API corresponding to [registerContentObserverForUser] for Java usage.
- */
- fun registerContentObserverForUserAsync(
- uri: Uri,
- notifyForDescendants: Boolean,
- settingsObserver: ContentObserver,
- userHandle: Int
- ) =
- CoroutineScope(getBackgroundDispatcher()).launch {
- registerContentObserverForUserSync(
- uri,
- notifyForDescendants,
- settingsObserver,
- userHandle
- )
- }
-
- /**
* Look up a name in the database.
*
* @param name to look up in the table
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index ce5545c..e613216 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -136,6 +136,7 @@
import com.android.systemui.util.RoundedCornerProgressDrawable;
import com.android.systemui.util.settings.SecureSettings;
import com.android.systemui.volume.domain.interactor.VolumePanelNavigationInteractor;
+import com.android.systemui.volume.ui.binder.VolumeDialogMenuIconBinder;
import com.android.systemui.volume.ui.navigation.VolumeNavigator;
import dagger.Lazy;
@@ -311,6 +312,7 @@
private int mDialogTimeoutMillis;
private final VibratorHelper mVibratorHelper;
private final com.android.systemui.util.time.SystemClock mSystemClock;
+ private final VolumeDialogMenuIconBinder mVolumeDialogMenuIconBinder;
public VolumeDialogImpl(
Context context,
@@ -329,6 +331,7 @@
DumpManager dumpManager,
Lazy<SecureSettings> secureSettings,
VibratorHelper vibratorHelper,
+ VolumeDialogMenuIconBinder volumeDialogMenuIconBinder,
com.android.systemui.util.time.SystemClock systemClock) {
mContext =
new ContextThemeWrapper(context, R.style.volume_dialog_theme);
@@ -361,6 +364,7 @@
mVolumePanelNavigationInteractor = volumePanelNavigationInteractor;
mVolumeNavigator = volumeNavigator;
mSecureSettings = secureSettings;
+ mVolumeDialogMenuIconBinder = volumeDialogMenuIconBinder;
mDialogTimeoutMillis = DIALOG_TIMEOUT_MILLIS;
dumpManager.registerDumpable("VolumeDialogImpl", this);
@@ -436,6 +440,7 @@
if (mDevicePostureController != null) {
mDevicePostureController.removeCallback(mDevicePostureControllerCallback);
}
+ mVolumeDialogMenuIconBinder.destroy();
}
@Override
@@ -671,6 +676,7 @@
mSettingsView = mDialog.findViewById(R.id.settings_container);
mSettingsIcon = mDialog.findViewById(R.id.settings);
+ mVolumeDialogMenuIconBinder.bind(mSettingsIcon);
if (mRows.isEmpty()) {
if (!AudioSystem.isSingleVolume(mContext)) {
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogModule.kt b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogModule.kt
new file mode 100644
index 0000000..54dc3db
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogModule.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.volume
+
+import com.android.systemui.volume.panel.shared.flag.VolumePanelFlag
+import com.android.systemui.volume.ui.viewmodel.AnimatedVolumeMenuIconViewModel
+import com.android.systemui.volume.ui.viewmodel.StaticVolumeMenuIconViewModel
+import com.android.systemui.volume.ui.viewmodel.VolumeMenuIconViewModel
+import dagger.Lazy
+import dagger.Module
+import dagger.Provides
+
+@Module
+interface VolumeDialogModule {
+
+ companion object {
+
+ @Provides
+ fun provideVolumeMenuIconViewModel(
+ volumePanelFlag: VolumePanelFlag,
+ static: Lazy<StaticVolumeMenuIconViewModel>,
+ animated: Lazy<AnimatedVolumeMenuIconViewModel>,
+ ): VolumeMenuIconViewModel {
+ return if (volumePanelFlag.canUseNewVolumePanel()) {
+ animated
+ } else {
+ static
+ }
+ .get()
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java b/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java
index dc1e8cf..fd68bfb 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java
@@ -38,11 +38,13 @@
import com.android.systemui.volume.VolumeComponent;
import com.android.systemui.volume.VolumeDialogComponent;
import com.android.systemui.volume.VolumeDialogImpl;
+import com.android.systemui.volume.VolumeDialogModule;
import com.android.systemui.volume.VolumePanelDialogReceiver;
import com.android.systemui.volume.VolumeUI;
import com.android.systemui.volume.domain.interactor.VolumePanelNavigationInteractor;
import com.android.systemui.volume.panel.dagger.VolumePanelComponent;
import com.android.systemui.volume.panel.dagger.factory.VolumePanelComponentFactory;
+import com.android.systemui.volume.ui.binder.VolumeDialogMenuIconBinder;
import com.android.systemui.volume.ui.navigation.VolumeNavigator;
import dagger.Binds;
@@ -61,6 +63,7 @@
CaptioningModule.class,
MediaDevicesModule.class,
SpatializerModule.class,
+ VolumeDialogModule.class,
},
subcomponents = {
VolumePanelComponent.class
@@ -112,6 +115,7 @@
DumpManager dumpManager,
Lazy<SecureSettings> secureSettings,
VibratorHelper vibratorHelper,
+ VolumeDialogMenuIconBinder volumeDialogMenuIconBinder,
SystemClock systemClock) {
VolumeDialogImpl impl = new VolumeDialogImpl(
context,
@@ -130,6 +134,7 @@
dumpManager,
secureSettings,
vibratorHelper,
+ volumeDialogMenuIconBinder,
systemClock);
impl.setStreamImportant(AudioManager.STREAM_SYSTEM, false);
impl.setAutomute(true);
diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractor.kt
index 6e1ebc8..12e624ca 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaDeviceSessionInteractor.kt
@@ -19,10 +19,10 @@
import android.media.session.MediaController
import android.media.session.PlaybackState
import com.android.settingslib.volume.data.repository.MediaControllerRepository
+import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Background
import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaControllerChangeModel
import com.android.systemui.volume.panel.component.mediaoutput.shared.model.MediaDeviceSession
-import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope
import javax.inject.Inject
import kotlin.coroutines.CoroutineContext
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -38,7 +38,7 @@
/** Allows to observe and change [MediaDeviceSession] state. */
@OptIn(ExperimentalCoroutinesApi::class)
-@VolumePanelScope
+@SysUISingleton
class MediaDeviceSessionInteractor
@Inject
constructor(
diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractor.kt
index 31a8977..8282210 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractor.kt
@@ -23,11 +23,12 @@
import com.android.settingslib.media.MediaDevice
import com.android.settingslib.volume.data.repository.LocalMediaRepository
import com.android.settingslib.volume.data.repository.MediaControllerRepository
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
import com.android.systemui.dagger.qualifiers.Background
import com.android.systemui.volume.panel.component.mediaoutput.data.repository.LocalMediaRepositoryFactory
import com.android.systemui.volume.panel.component.mediaoutput.domain.model.MediaDeviceSessions
import com.android.systemui.volume.panel.component.mediaoutput.shared.model.MediaDeviceSession
-import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope
import com.android.systemui.volume.panel.shared.model.Result
import com.android.systemui.volume.panel.shared.model.filterData
import com.android.systemui.volume.panel.shared.model.wrapInResult
@@ -52,13 +53,13 @@
/** Provides observable models about the current media session state. */
@OptIn(ExperimentalCoroutinesApi::class)
-@VolumePanelScope
+@SysUISingleton
class MediaOutputInteractor
@Inject
constructor(
private val localMediaRepositoryFactory: LocalMediaRepositoryFactory,
private val packageManager: PackageManager,
- @VolumePanelScope private val coroutineScope: CoroutineScope,
+ @Application private val coroutineScope: CoroutineScope,
@Background private val backgroundCoroutineContext: CoroutineContext,
mediaControllerRepository: MediaControllerRepository,
private val mediaControllerInteractor: MediaControllerInteractor,
@@ -74,7 +75,7 @@
.onStart { emit(activeSessions) }
}
.map { getMediaControllers(it) }
- .stateIn(coroutineScope, SharingStarted.Eagerly, MediaControllers(null, null))
+ .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), MediaControllers(null, null))
/** [MediaDeviceSessions] that contains currently active sessions. */
val activeMediaDeviceSessions: Flow<MediaDeviceSessions> =
@@ -85,7 +86,11 @@
remote = it.remote?.mediaDeviceSession()
)
}
- .stateIn(coroutineScope, SharingStarted.Eagerly, MediaDeviceSessions(null, null))
+ .stateIn(
+ coroutineScope,
+ SharingStarted.WhileSubscribed(),
+ MediaDeviceSessions(null, null)
+ )
/** Returns the default [MediaDeviceSession] from [activeMediaDeviceSessions] */
val defaultActiveMediaSession: StateFlow<Result<MediaDeviceSession?>> =
@@ -100,7 +105,7 @@
}
.wrapInResult()
.flowOn(backgroundCoroutineContext)
- .stateIn(coroutineScope, SharingStarted.Eagerly, Result.Loading())
+ .stateIn(coroutineScope, SharingStarted.WhileSubscribed(), Result.Loading())
private val localMediaRepository: Flow<LocalMediaRepository> =
defaultActiveMediaSession
diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt
index 850162e..c18573e 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt
@@ -32,9 +32,13 @@
import dagger.assisted.AssistedInject
import kotlin.math.roundToInt
import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
@@ -49,6 +53,7 @@
private val uiEventLogger: UiEventLogger,
) : SliderViewModel {
+ private val volumeChanges = MutableStateFlow<Int?>(null)
private val streamsAffectedByRing =
setOf(
AudioManager.STREAM_RING,
@@ -104,12 +109,17 @@
}
.stateIn(coroutineScope, SharingStarted.Eagerly, SliderState.Empty)
+ init {
+ volumeChanges
+ .filterNotNull()
+ .onEach { audioVolumeInteractor.setVolume(audioStream, it) }
+ .launchIn(coroutineScope)
+ }
+
override fun onValueChanged(state: SliderState, newValue: Float) {
val audioViewModel = state as? State
audioViewModel ?: return
- coroutineScope.launch {
- audioVolumeInteractor.setVolume(audioStream, newValue.roundToInt())
- }
+ volumeChanges.tryEmit(newValue.roundToInt())
}
override fun onValueChangeFinished() {
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ui/binder/VolumeDialogMenuIconBinder.kt b/packages/SystemUI/src/com/android/systemui/volume/ui/binder/VolumeDialogMenuIconBinder.kt
new file mode 100644
index 0000000..a352e28
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/volume/ui/binder/VolumeDialogMenuIconBinder.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.volume.ui.binder
+
+import android.animation.ValueAnimator
+import android.graphics.drawable.Animatable2
+import android.widget.ImageView
+import androidx.core.animation.doOnEnd
+import com.android.systemui.common.shared.model.Icon
+import com.android.systemui.common.ui.binder.IconViewBinder
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.statusbar.CrossFadeHelper
+import com.android.systemui.volume.ui.viewmodel.VolumeMenuIconViewModel
+import javax.inject.Inject
+import kotlin.coroutines.resume
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+
+/** Binds volume dialog menu button icon. */
+class VolumeDialogMenuIconBinder
+@Inject
+constructor(
+ @Application private val coroutineScope: CoroutineScope,
+ private val viewModel: VolumeMenuIconViewModel,
+) {
+
+ private var job: Job? = null
+
+ fun bind(iconImageView: ImageView?) {
+ job?.cancel()
+ job =
+ iconImageView?.let { imageView ->
+ coroutineScope.launch {
+ viewModel.icon.collectLatest { icon ->
+ animate { CrossFadeHelper.fadeOut(imageView, it) }
+ IconViewBinder.bind(icon, imageView)
+ if (icon is Icon.Loaded && icon.drawable is Animatable2) {
+ icon.drawable.start()
+ }
+ animate { CrossFadeHelper.fadeIn(imageView, it) }
+ }
+ }
+ }
+ }
+
+ private suspend fun animate(update: (value: Float) -> Unit) =
+ suspendCancellableCoroutine { continuation ->
+ val anim = ValueAnimator.ofFloat(0f, 1f)
+ anim.start()
+ anim.addUpdateListener { update(it.animatedValue as Float) }
+ anim.doOnEnd { continuation.resume(Unit) }
+ continuation.invokeOnCancellation {
+ anim.removeAllListeners()
+ anim.cancel()
+ }
+ }
+
+ fun destroy() {
+ job?.cancel()
+ job = null
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ui/viewmodel/VolumeMenuIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/ui/viewmodel/VolumeMenuIconViewModel.kt
new file mode 100644
index 0000000..0bd3adb
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/volume/ui/viewmodel/VolumeMenuIconViewModel.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.volume.ui.viewmodel
+
+import android.annotation.SuppressLint
+import android.content.Context
+import com.android.systemui.common.shared.model.Icon
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.res.R
+import com.android.systemui.util.drawable.LoopedAnimatable2DrawableWrapper
+import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaDeviceSessionInteractor
+import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaOutputInteractor
+import com.android.systemui.volume.panel.shared.model.filterData
+import javax.inject.Inject
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.mapLatest
+
+/** View Model that provides an icon for the menu button of the volume dialog. */
+interface VolumeMenuIconViewModel {
+
+ val icon: Flow<Icon>
+}
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@SuppressLint("UseCompatLoadingForDrawables")
+class AnimatedVolumeMenuIconViewModel
+@Inject
+constructor(
+ @Application private val context: Context,
+ private val mediaOutputInteractor: MediaOutputInteractor,
+ private val mediaDeviceSessionInteractor: MediaDeviceSessionInteractor,
+) : VolumeMenuIconViewModel {
+
+ override val icon: Flow<Icon>
+ get() =
+ mediaOutputInteractor.defaultActiveMediaSession
+ .filterData()
+ .flatMapLatest { session ->
+ if (session == null) {
+ flowOf(null)
+ } else {
+ mediaDeviceSessionInteractor.playbackState(session)
+ }
+ }
+ .distinctUntilChangedBy { it?.isActive }
+ .mapLatest { playbackState ->
+ if (playbackState?.isActive == true) {
+ Icon.Loaded(
+ LoopedAnimatable2DrawableWrapper.fromDrawable(
+ context.getDrawable(R.drawable.audio_bars_playing)!!
+ ),
+ null,
+ )
+ } else {
+ Icon.Resource(R.drawable.horizontal_ellipsis, null)
+ }
+ }
+}
+
+class StaticVolumeMenuIconViewModel @Inject constructor() : VolumeMenuIconViewModel {
+
+ override val icon: Flow<Icon> = flowOf(Icon.Resource(R.drawable.horizontal_ellipsis, null))
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesCheckerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesCheckerTest.java
new file mode 100644
index 0000000..51f6cdb
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesCheckerTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.accessibility.hearingaid;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.systemui.SysuiTestCase;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidTestingRunner.class)
+@TestableLooper.RunWithLooper(setAsMainLooper = true)
+@SmallTest
+public class HearingDevicesCheckerTest extends SysuiTestCase {
+ @Rule
+ public MockitoRule mockito = MockitoJUnit.rule();
+
+ private final List<CachedBluetoothDevice> mCachedDevices = new ArrayList<>();
+ @Mock
+ private LocalBluetoothManager mLocalBluetoothManager;
+ @Mock
+ private LocalBluetoothAdapter mLocalBluetoothAdapter;
+ @Mock
+ private CachedBluetoothDeviceManager mCachedBluetoothDeviceManager;
+ @Mock
+ private CachedBluetoothDevice mCachedDevice;
+ @Mock
+ private BluetoothDevice mDevice;
+ private HearingDevicesChecker mDevicesChecker;
+
+ @Before
+ public void setUp() {
+ when(mLocalBluetoothManager.getBluetoothAdapter()).thenReturn(mLocalBluetoothAdapter);
+ when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(
+ mCachedBluetoothDeviceManager);
+ when(mCachedBluetoothDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices);
+ when(mCachedDevice.getDevice()).thenReturn(mDevice);
+ when(mDevice.getMetadata(BluetoothDevice.METADATA_EXCLUSIVE_MANAGER)).thenReturn(
+ null);
+
+ mDevicesChecker = new HearingDevicesChecker(mContext, mLocalBluetoothManager);
+ }
+
+ @Test
+ public void isAnyPairedHearingDevice_bluetoothDisable_returnFalse() {
+ when(mLocalBluetoothAdapter.isEnabled()).thenReturn(false);
+
+ assertThat(mDevicesChecker.isAnyPairedHearingDevice()).isFalse();
+ }
+
+ @Test
+ public void isAnyActiveHearingDevice_bluetoothDisable_returnFalse() {
+ when(mLocalBluetoothAdapter.isEnabled()).thenReturn(false);
+
+ assertThat(mDevicesChecker.isAnyActiveHearingDevice()).isFalse();
+ }
+
+ @Test
+ public void isAnyPairedHearingDevice_hearingAidBonded_returnTrue() {
+ when(mLocalBluetoothAdapter.isEnabled()).thenReturn(true);
+ when(mCachedDevice.isHearingAidDevice()).thenReturn(true);
+ when(mCachedDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+ mCachedDevices.add(mCachedDevice);
+
+ assertThat(mDevicesChecker.isAnyPairedHearingDevice()).isTrue();
+ }
+
+ @Test
+ public void isAnyActiveHearingDevice_hearingAidActiveAndConnected_returnTrue() {
+ when(mLocalBluetoothAdapter.isEnabled()).thenReturn(true);
+ when(mCachedDevice.isActiveDevice(BluetoothProfile.HEARING_AID)).thenReturn(true);
+ when(mCachedDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+ when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+ when(mDevice.isConnected()).thenReturn(true);
+ when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
+ mCachedDevices.add(mCachedDevice);
+
+ assertThat(mDevicesChecker.isAnyActiveHearingDevice()).isTrue();
+ }
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java
index e9c742d..cb9c26c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java
@@ -21,20 +21,17 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.bluetooth.BluetoothDevice;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
import androidx.test.filters.SmallTest;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.animation.DialogTransitionAnimator;
import com.android.systemui.animation.Expandable;
import com.android.systemui.statusbar.phone.SystemUIDialog;
+import com.android.systemui.util.concurrency.FakeExecutor;
+import com.android.systemui.util.time.FakeSystemClock;
import org.junit.Before;
import org.junit.Rule;
@@ -44,9 +41,6 @@
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
-import java.util.ArrayList;
-import java.util.List;
-
/** Tests for {@link HearingDevicesDialogManager}. */
@RunWith(AndroidTestingRunner.class)
@TestableLooper.RunWithLooper(setAsMainLooper = true)
@@ -56,7 +50,8 @@
@Rule
public MockitoRule mockito = MockitoJUnit.rule();
- private final List<CachedBluetoothDevice> mCachedDevices = new ArrayList<>();
+ private final FakeExecutor mMainExecutor = new FakeExecutor(new FakeSystemClock());
+ private final FakeExecutor mBackgroundExecutor = new FakeExecutor(new FakeSystemClock());
@Mock
private Expandable mExpandable;
@Mock
@@ -68,13 +63,7 @@
@Mock
private SystemUIDialog mDialog;
@Mock
- private LocalBluetoothManager mLocalBluetoothManager;
- @Mock
- private LocalBluetoothAdapter mLocalBluetoothAdapter;
- @Mock
- private CachedBluetoothDeviceManager mCachedBluetoothDeviceManager;
- @Mock
- private CachedBluetoothDevice mCachedDevice;
+ private HearingDevicesChecker mDevicesChecker;
private HearingDevicesDialogManager mManager;
@@ -82,36 +71,35 @@
public void setUp() {
when(mDialogFactory.create(anyBoolean())).thenReturn(mDialogDelegate);
when(mDialogDelegate.createDialog()).thenReturn(mDialog);
- when(mLocalBluetoothManager.getBluetoothAdapter()).thenReturn(mLocalBluetoothAdapter);
- when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(
- mCachedBluetoothDeviceManager);
- when(mCachedBluetoothDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices);
mManager = new HearingDevicesDialogManager(
mDialogTransitionAnimator,
mDialogFactory,
- mLocalBluetoothManager
+ mDevicesChecker,
+ mBackgroundExecutor,
+ mMainExecutor
);
}
@Test
- public void showDialog_bluetoothDisable_showPairNewDeviceTrue() {
- when(mLocalBluetoothAdapter.isEnabled()).thenReturn(false);
+ public void showDialog_existHearingDevice_showPairNewDeviceFalse() {
+ when(mDevicesChecker.isAnyPairedHearingDevice()).thenReturn(true);
mManager.showDialog(mExpandable);
+ mBackgroundExecutor.runAllReady();
+ mMainExecutor.runAllReady();
- verify(mDialogFactory).create(eq(true));
+ verify(mDialogFactory).create(eq(/* showPairNewDevice= */ false));
}
@Test
- public void showDialog_containsHearingAid_showPairNewDeviceFalse() {
- when(mLocalBluetoothAdapter.isEnabled()).thenReturn(true);
- when(mCachedDevice.isHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
- mCachedDevices.add(mCachedDevice);
+ public void showDialog_noHearingDevice_showPairNewDeviceTrue() {
+ when(mDevicesChecker.isAnyPairedHearingDevice()).thenReturn(false);
mManager.showDialog(mExpandable);
+ mBackgroundExecutor.runAllReady();
+ mMainExecutor.runAllReady();
- verify(mDialogFactory).create(eq(false));
+ verify(mDialogFactory).create(eq(/* showPairNewDevice= */ true));
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
index 3a6b075..40b8fc7 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
@@ -21,12 +21,14 @@
import static com.android.systemui.doze.DozeMachine.State.UNINITIALIZED;
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.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -35,6 +37,7 @@
import android.app.StatusBarManager;
import android.hardware.Sensor;
import android.hardware.display.AmbientDisplayConfiguration;
+import android.platform.test.annotations.EnableFlags;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper.RunWithLooper;
import android.view.Display;
@@ -43,6 +46,7 @@
import com.android.internal.logging.InstanceId;
import com.android.internal.logging.UiEventLogger;
+import com.android.systemui.Flags;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.biometrics.AuthController;
import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -71,6 +75,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -85,6 +90,7 @@
private DozeHost mHost;
@Mock
private BroadcastDispatcher mBroadcastDispatcher;
+ private final AmbientDisplayConfiguration mConfig = DozeConfigurationUtil.createMockConfig();
@Mock
private DockManager mDockManager;
@Mock
@@ -105,6 +111,8 @@
private SelectedUserInteractor mSelectedUserInteractor;
@Mock
private SessionTracker mSessionTracker;
+ @Captor
+ private ArgumentCaptor<DozeHost.Callback> mHostCallbackCaptor;
private DozeTriggers mTriggers;
private FakeSensorManager mSensors;
@@ -116,7 +124,7 @@
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
setupDozeTriggers(
- DozeConfigurationUtil.createMockConfig(),
+ mConfig,
DozeConfigurationUtil.createMockParameters());
}
@@ -174,10 +182,69 @@
}
@Test
+ public void testOnNotification_startsPulseRequest() {
+ // GIVEN device is dozing
+ Runnable pulseSuppressListener = mock(Runnable.class);
+ when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
+ doAnswer(invocation -> null).when(mHost).addCallback(mHostCallbackCaptor.capture());
+ mTriggers.transitionTo(UNINITIALIZED, DozeMachine.State.INITIALIZED);
+ mTriggers.transitionTo(DozeMachine.State.INITIALIZED, DozeMachine.State.DOZE);
+ clearInvocations(mMachine);
+
+ // WHEN receive an alerting notification
+ mHostCallbackCaptor.getValue().onNotificationAlerted(pulseSuppressListener);
+
+ // THEN entering to pulse
+ verify(mHost).setPulsePending(true);
+ // AND suppress listeners are NOT notified
+ verify(pulseSuppressListener, never()).run();
+ }
+
+ @Test
+ public void testOnNotification_cannotPulse_notificationSuppressed() {
+ // GIVEN device is dozing
+ Runnable pulseSuppressListener = mock(Runnable.class);
+ when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
+ doAnswer(invocation -> null).when(mHost).addCallback(mHostCallbackCaptor.capture());
+ mTriggers.transitionTo(UNINITIALIZED, DozeMachine.State.INITIALIZED);
+ mTriggers.transitionTo(DozeMachine.State.INITIALIZED, DozeMachine.State.DOZE);
+ clearInvocations(mMachine);
+ // AND pulsing is disabled
+ when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
+
+ // WHEN receive an alerting notification
+ mHostCallbackCaptor.getValue().onNotificationAlerted(pulseSuppressListener);
+
+ // THEN NOT starting pulse
+ verify(mHost, never()).setPulsePending(anyBoolean());
+ // AND the notification is suppressed
+ verify(pulseSuppressListener).run();
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_NOTIFICATION_PULSING_FIX)
+ public void testOnNotification_alreadyPulsing_notificationNotSuppressed() {
+ // GIVEN device is pulsing
+ Runnable pulseSuppressListener = mock(Runnable.class);
+ when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE_PULSING);
+ doAnswer(invocation -> null).when(mHost).addCallback(mHostCallbackCaptor.capture());
+ mTriggers.transitionTo(UNINITIALIZED, DozeMachine.State.INITIALIZED);
+ mTriggers.transitionTo(DozeMachine.State.INITIALIZED, DozeMachine.State.DOZE_PULSING);
+ clearInvocations(mMachine);
+
+ // WHEN receive an alerting notification
+ mHostCallbackCaptor.getValue().onNotificationAlerted(pulseSuppressListener);
+
+ // THEN entering to pulse
+ verify(mHost, never()).setPulsePending(anyBoolean());
+ // AND suppress listeners are NOT notified
+ verify(pulseSuppressListener, never()).run();
+ }
+
+ @Test
public void testOnNotification_noPulseIfPulseIsNotPendingAnymore() {
when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
- ArgumentCaptor<DozeHost.Callback> captor = ArgumentCaptor.forClass(DozeHost.Callback.class);
- doAnswer(invocation -> null).when(mHost).addCallback(captor.capture());
+ doAnswer(invocation -> null).when(mHost).addCallback(mHostCallbackCaptor.capture());
mTriggers.transitionTo(UNINITIALIZED, DozeMachine.State.INITIALIZED);
mTriggers.transitionTo(DozeMachine.State.INITIALIZED, DozeMachine.State.DOZE);
@@ -189,7 +256,7 @@
// WHEN prox check returns FAR
mProximitySensor.setLastEvent(new ThresholdSensorEvent(false, 2));
- captor.getValue().onNotificationAlerted(null /* pulseSuppressedListener */);
+ mHostCallbackCaptor.getValue().onNotificationAlerted(null /* pulseSuppressedListener */);
mProximitySensor.alertListeners();
// THEN don't request pulse because the pending pulse was abandoned early
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeUiTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeUiTest.java
index e7caf00..69e74d8 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeUiTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeUiTest.java
@@ -85,7 +85,7 @@
mHandler = mHandlerThread.getThreadHandler();
mFakeExecutor = new FakeExecutor(new FakeSystemClock());
mDozeUi = new DozeUi(mContext, mAlarmManager, mWakeLock, mHost, mHandler,
- mDozeParameters, mFakeExecutor, mDozeLog);
+ mHandler, mDozeParameters, mFakeExecutor, mDozeLog);
mDozeUi.setDozeMachine(mMachine);
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSectionTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSectionTest.kt
index 7d4f034..201ee88 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSectionTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSectionTest.kt
@@ -18,6 +18,7 @@
package com.android.systemui.keyguard.ui.view.layout.sections
import android.view.View
+import android.widget.LinearLayout
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.constraintlayout.widget.ConstraintSet
import androidx.constraintlayout.widget.ConstraintSet.GONE
@@ -58,7 +59,7 @@
private val smartspaceView = View(mContext).also { it.id = sharedR.id.bc_smartspace_view }
private val weatherView = View(mContext).also { it.id = sharedR.id.weather_smartspace_view }
- private val dateView = View(mContext).also { it.id = sharedR.id.date_smartspace_view }
+ private val dateView = LinearLayout(mContext).also { it.id = sharedR.id.date_smartspace_view }
private lateinit var constraintLayout: ConstraintLayout
private lateinit var constraintSet: ConstraintSet
@@ -109,7 +110,7 @@
whenever(keyguardSmartspaceViewModel.isDateWeatherDecoupled).thenReturn(true)
underTest.addViews(constraintLayout)
assert(smartspaceView.parent == constraintLayout)
- assert(weatherView.parent == constraintLayout)
+ assertThat(weatherView.parent).isEqualTo(dateView)
assert(dateView.parent == constraintLayout)
}
@@ -127,7 +128,7 @@
whenever(keyguardSmartspaceViewModel.isDateWeatherDecoupled).thenReturn(true)
underTest.addViews(constraintLayout)
underTest.applyConstraints(constraintSet)
- assertWeatherSmartspaceConstrains(constraintSet)
+ assertThat(weatherView.parent).isEqualTo(dateView)
val smartspaceConstraints = constraintSet.getConstraint(smartspaceView.id)
assertThat(smartspaceConstraints.layout.topToBottom).isEqualTo(dateView.id)
@@ -141,7 +142,6 @@
hasCustomWeatherDataDisplay.value = true
underTest.addViews(constraintLayout)
underTest.applyConstraints(constraintSet)
- assertWeatherSmartspaceConstrains(constraintSet)
val dateConstraints = constraintSet.getConstraint(dateView.id)
assertThat(dateConstraints.layout.bottomToTop).isEqualTo(smartspaceView.id)
@@ -168,12 +168,4 @@
assertThat(constraintSet.getVisibility(weatherView.id)).isEqualTo(GONE)
assertThat(constraintSet.getVisibility(dateView.id)).isEqualTo(GONE)
}
-
- private fun assertWeatherSmartspaceConstrains(cs: ConstraintSet) {
- val weatherConstraints = cs.getConstraint(weatherView.id)
- assertThat(weatherConstraints.layout.topToTop).isEqualTo(dateView.id)
- assertThat(weatherConstraints.layout.bottomToBottom).isEqualTo(dateView.id)
- assertThat(weatherConstraints.layout.startToEnd).isEqualTo(dateView.id)
- assertThat(weatherConstraints.layout.startMargin).isEqualTo(4)
- }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/data/ShellRecentTaskListProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/data/ShellRecentTaskListProviderTest.kt
index 2f61579..7211620 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/data/ShellRecentTaskListProviderTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/data/ShellRecentTaskListProviderTest.kt
@@ -2,6 +2,7 @@
import android.app.ActivityManager.RecentTaskInfo
import android.content.pm.UserInfo
+import android.graphics.Rect
import android.os.UserManager
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
@@ -14,8 +15,10 @@
import com.android.systemui.util.mockito.any
import com.android.systemui.util.mockito.mock
import com.android.systemui.util.mockito.whenever
+import com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50
import com.android.wm.shell.recents.RecentTasks
import com.android.wm.shell.util.GroupedRecentTaskInfo
+import com.android.wm.shell.util.SplitBounds
import com.google.common.truth.Truth.assertThat
import java.util.Optional
import java.util.function.Consumer
@@ -101,6 +104,17 @@
}
@Test
+ fun loadRecentTasks_singleTaskPair_returnsTasksAsForeground() {
+ givenRecentTasks(
+ createTaskPair(taskId1 = 2, taskId2 = 3, isVisible = true),
+ )
+
+ val result = runBlocking { recentTaskListProvider.loadRecentTasks() }
+
+ assertThat(result[0].isForegroundTask).isTrue()
+ }
+
+ @Test
fun loadRecentTasks_multipleTasks_returnsSecondVisibleTaskAsForegroundTask() {
givenRecentTasks(
createSingleTask(taskId = 1),
@@ -144,6 +158,21 @@
}
@Test
+ fun loadRecentTasks_firstTaskIsGroupedAndVisible_marksBothGroupedTasksAsForeground() {
+ givenRecentTasks(
+ createTaskPair(taskId1 = 1, taskId2 = 2, isVisible = true),
+ createSingleTask(taskId = 3),
+ createSingleTask(taskId = 4),
+ )
+
+ val result = runBlocking { recentTaskListProvider.loadRecentTasks() }
+
+ assertThat(result.map { it.isForegroundTask })
+ .containsExactly(true, true, false, false)
+ .inOrder()
+ }
+
+ @Test
fun loadRecentTasks_secondTaskIsGroupedAndInvisible_marksBothGroupedTasksAsNotForeground() {
givenRecentTasks(
createSingleTask(taskId = 1),
@@ -159,6 +188,21 @@
}
@Test
+ fun loadRecentTasks_firstTaskIsGroupedAndInvisible_marksBothGroupedTasksAsNotForeground() {
+ givenRecentTasks(
+ createTaskPair(taskId1 = 1, taskId2 = 2, isVisible = false),
+ createSingleTask(taskId = 3),
+ createSingleTask(taskId = 4),
+ )
+
+ val result = runBlocking { recentTaskListProvider.loadRecentTasks() }
+
+ assertThat(result.map { it.isForegroundTask })
+ .containsExactly(false, false, false, false)
+ .inOrder()
+ }
+
+ @Test
fun loadRecentTasks_assignsCorrectUserType() {
givenRecentTasks(
createSingleTask(taskId = 1, userId = 10, userType = STANDARD),
@@ -224,7 +268,7 @@
GroupedRecentTaskInfo.forSplitTasks(
createTaskInfo(taskId1, userId1, isVisible),
createTaskInfo(taskId2, userId2, isVisible),
- null
+ SplitBounds(Rect(), Rect(), taskId1, taskId2, SNAP_TO_50_50)
)
private fun createTaskInfo(taskId: Int, userId: Int, isVisible: Boolean = false) =
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.kt
index 2d282dc..8aaa121 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.kt
@@ -14,6 +14,7 @@
package com.android.systemui.qs
import android.graphics.Rect
+import android.platform.test.flag.junit.FlagsParameterization
import android.testing.TestableContext
import android.testing.TestableLooper
import android.testing.TestableLooper.RunWithLooper
@@ -25,15 +26,16 @@
import android.view.accessibility.AccessibilityNodeInfo
import android.widget.FrameLayout
import android.widget.LinearLayout
-import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
-import com.android.systemui.res.R
import com.android.systemui.SysuiTestCase
+import com.android.systemui.flags.DisableSceneContainer
+import com.android.systemui.flags.parameterizeSceneContainerFlag
import com.android.systemui.plugins.qs.QSTile
import com.android.systemui.plugins.qs.QSTileView
import com.android.systemui.qs.QSPanelControllerBase.TileRecord
import com.android.systemui.qs.logging.QSLogger
import com.android.systemui.qs.tileimpl.QSTileViewImpl
+import com.android.systemui.res.R
import com.google.common.truth.Truth.assertThat
import org.junit.After
import org.junit.Before
@@ -44,11 +46,17 @@
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.mockito.MockitoAnnotations
+import platform.test.runner.parameterized.ParameterizedAndroidJunit4
+import platform.test.runner.parameterized.Parameters
-@RunWith(AndroidJUnit4::class)
+@RunWith(ParameterizedAndroidJunit4::class)
@RunWithLooper
@SmallTest
-class QSPanelTest : SysuiTestCase() {
+class QSPanelTest(flags: FlagsParameterization) : SysuiTestCase() {
+
+ init {
+ mSetFlagsRule.setFlagsParameterization(flags)
+ }
@Mock private lateinit var qsLogger: QSLogger
@@ -57,9 +65,8 @@
private lateinit var footer: View
- private val themedContext = TestableContext(
- ContextThemeWrapper(context, R.style.Theme_SystemUI_QuickSettings)
- )
+ private val themedContext =
+ TestableContext(ContextThemeWrapper(context, R.style.Theme_SystemUI_QuickSettings))
@Before
@Throws(Exception::class)
@@ -106,38 +113,8 @@
}
@Test
- fun testTilesFooterVisibleRTLLandscapeMedia() {
- qsPanel.layoutDirection = View.LAYOUT_DIRECTION_RTL
- // We need at least a tile so the layout has a height
- qsPanel.tileLayout?.addTile(
- QSPanelControllerBase.TileRecord(
- mock(QSTile::class.java),
- QSTileViewImpl(themedContext)
- )
- )
-
- val mediaView = FrameLayout(themedContext)
- mediaView.addView(View(themedContext), MATCH_PARENT, 800)
-
- qsPanel.setUsingHorizontalLayout(/* horizontal */ true, mediaView, /* force */ true)
- qsPanel.measure(
- /* width */ View.MeasureSpec.makeMeasureSpec(3000, View.MeasureSpec.EXACTLY),
- /* height */ View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
- )
- qsPanel.layout(0, 0, qsPanel.measuredWidth, qsPanel.measuredHeight)
-
- val tiles = qsPanel.tileLayout as View
- // Tiles are effectively to the right of media
- assertThat(mediaView isLeftOf tiles)
- assertThat(tiles.isVisibleToUser).isTrue()
-
- assertThat(mediaView isLeftOf footer)
- assertThat(footer.isVisibleToUser).isTrue()
- }
-
- @Test
+ @DisableSceneContainer
fun testTilesFooterVisibleLandscapeMedia() {
- qsPanel.layoutDirection = View.LAYOUT_DIRECTION_LTR
// We need at least a tile so the layout has a height
qsPanel.tileLayout?.addTile(
QSPanelControllerBase.TileRecord(
@@ -158,10 +135,10 @@
val tiles = qsPanel.tileLayout as View
// Tiles are effectively to the left of media
- assertThat(tiles isLeftOf mediaView)
+ assertThat(tiles isLeftOf mediaView).isTrue()
assertThat(tiles.isVisibleToUser).isTrue()
- assertThat(footer isLeftOf mediaView)
+ assertThat(footer isLeftOf mediaView).isTrue()
assertThat(footer.isVisibleToUser).isTrue()
}
@@ -169,8 +146,8 @@
fun testBottomPadding() {
val padding = 10
themedContext.orCreateTestableResources.addOverride(
- R.dimen.qs_panel_padding_bottom,
- padding
+ R.dimen.qs_panel_padding_bottom,
+ padding
)
qsPanel.updatePadding()
assertThat(qsPanel.paddingBottom).isEqualTo(padding)
@@ -182,8 +159,8 @@
val paddingCombined = 100
themedContext.orCreateTestableResources.addOverride(R.dimen.qs_panel_padding_top, padding)
themedContext.orCreateTestableResources.addOverride(
- R.dimen.qs_panel_padding_top,
- paddingCombined
+ R.dimen.qs_panel_padding_top,
+ paddingCombined
)
qsPanel.updatePadding()
@@ -220,7 +197,8 @@
}
@Test
- fun initializedWithNoMedia_tileLayoutParentIsAlwaysQsPanel() {
+ @DisableSceneContainer
+ fun initializedWithNoMedia_sceneContainerDisabled_tileLayoutParentIsAlwaysQsPanel() {
lateinit var panel: QSPanel
lateinit var tileLayout: View
testableLooper.runWithLooper {
@@ -249,6 +227,7 @@
}
@Test
+ @DisableSceneContainer
fun initializeWithNoMedia_mediaNeverAttached() {
lateinit var panel: QSPanel
testableLooper.runWithLooper {
@@ -288,6 +267,10 @@
assertThat(qsPanel.tileLayout!!.maxColumns).isEqualTo(2)
}
+ companion object {
+ @Parameters(name = "{0}") @JvmStatic fun getParams() = parameterizeSceneContainerFlag()
+ }
+
private infix fun View.isLeftOf(other: View): Boolean {
val rect = Rect()
getBoundsOnScreen(rect)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java
index 59ee0b8..76c8cf0 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java
@@ -28,6 +28,7 @@
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.provider.Settings;
+import android.service.quicksettings.Tile;
import android.testing.TestableLooper;
import android.view.View;
@@ -37,14 +38,18 @@
import com.android.internal.logging.MetricsLogger;
import com.android.systemui.Flags;
import com.android.systemui.SysuiTestCase;
+import com.android.systemui.accessibility.hearingaid.HearingDevicesChecker;
import com.android.systemui.accessibility.hearingaid.HearingDevicesDialogManager;
import com.android.systemui.animation.Expandable;
import com.android.systemui.classifier.FalsingManagerFake;
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.res.R;
+import com.android.systemui.statusbar.policy.BluetoothController;
import org.junit.After;
import org.junit.Before;
@@ -78,7 +83,11 @@
@Mock
private QSLogger mQSLogger;
@Mock
+ private HearingDevicesChecker mDevicesChecker;
+ @Mock
HearingDevicesDialogManager mHearingDevicesDialogManager;
+ @Mock
+ BluetoothController mBluetoothController;
private TestableLooper mTestableLooper;
private HearingDevicesTile mTile;
@@ -98,7 +107,9 @@
mStatusBarStateController,
mActivityStarter,
mQSLogger,
- mHearingDevicesDialogManager);
+ mHearingDevicesDialogManager,
+ mDevicesChecker,
+ mBluetoothController);
mTile.initialize();
mTestableLooper.processAllMessages();
@@ -142,4 +153,41 @@
verify(mHearingDevicesDialogManager).showDialog(expandable);
}
+
+ @Test
+ public void handleUpdateState_activeHearingDevice_stateActiveConnectedLabel() {
+ when(mDevicesChecker.isAnyActiveHearingDevice()).thenReturn(true);
+ when(mDevicesChecker.isAnyPairedHearingDevice()).thenReturn(true);
+
+ BooleanState activeState = new BooleanState();
+ mTile.handleUpdateState(activeState, null);
+
+ assertThat(activeState.state).isEqualTo(Tile.STATE_ACTIVE);
+ assertThat(activeState.secondaryLabel.toString()).isEqualTo(
+ mContext.getString(R.string.quick_settings_hearing_devices_connected));
+ }
+
+ @Test
+ public void handleUpdateState_bondedInactiveHearingDevice_stateInactiveDisconnectedLabel() {
+ when(mDevicesChecker.isAnyActiveHearingDevice()).thenReturn(false);
+ when(mDevicesChecker.isAnyPairedHearingDevice()).thenReturn(true);
+
+ BooleanState disconnectedState = new BooleanState();
+ mTile.handleUpdateState(disconnectedState, null);
+
+ assertThat(disconnectedState.state).isEqualTo(Tile.STATE_INACTIVE);
+ assertThat(disconnectedState.secondaryLabel.toString()).isEqualTo(
+ mContext.getString(R.string.quick_settings_hearing_devices_disconnected));
+ }
+
+ @Test
+ public void handleUpdateState_noHearingDevice_stateInactive() {
+ when(mDevicesChecker.isAnyActiveHearingDevice()).thenReturn(false);
+ when(mDevicesChecker.isAnyPairedHearingDevice()).thenReturn(false);
+
+ BooleanState inactiveState = new BooleanState();
+ mTile.handleUpdateState(inactiveState, null);
+
+ assertThat(inactiveState.state).isEqualTo(Tile.STATE_INACTIVE);
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt
index df59e57..73548ba 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt
@@ -72,13 +72,13 @@
@Mock private lateinit var dialogLauncherAnimator: DialogTransitionAnimator
@Mock private lateinit var panelInteractor: PanelInteractor
@Mock private lateinit var userContextProvider: UserContextProvider
+ @Mock private lateinit var issueRecordingState: IssueRecordingState
@Mock private lateinit var traceurMessageSender: TraceurMessageSender
@Mock private lateinit var delegateFactory: RecordIssueDialogDelegate.Factory
@Mock private lateinit var dialogDelegate: RecordIssueDialogDelegate
@Mock private lateinit var dialog: SystemUIDialog
private lateinit var testableLooper: TestableLooper
- private val issueRecordingState = IssueRecordingState()
private lateinit var tile: RecordIssueTile
@Before
@@ -114,7 +114,7 @@
@Test
fun qsTileUi_shouldLookCorrect_whenInactive() {
- issueRecordingState.isRecording = false
+ whenever(issueRecordingState.isRecording).thenReturn(false)
val testState = tile.newTileState()
tile.handleUpdateState(testState, null)
@@ -126,7 +126,7 @@
@Test
fun qsTileUi_shouldLookCorrect_whenRecording() {
- issueRecordingState.isRecording = true
+ whenever(issueRecordingState.isRecording).thenReturn(true)
val testState = tile.newTileState()
tile.handleUpdateState(testState, null)
@@ -137,7 +137,7 @@
@Test
fun inActiveQsTile_switchesToActive_whenClicked() {
- issueRecordingState.isRecording = false
+ whenever(issueRecordingState.isRecording).thenReturn(false)
val testState = tile.newTileState()
tile.handleUpdateState(testState, null)
@@ -147,7 +147,7 @@
@Test
fun activeQsTile_switchesToInActive_whenClicked() {
- issueRecordingState.isRecording = true
+ whenever(issueRecordingState.isRecording).thenReturn(true)
val testState = tile.newTileState()
tile.handleUpdateState(testState, null)
@@ -157,7 +157,7 @@
@Test
fun showPrompt_shouldUseKeyguardDismissUtil_ToShowDialog() {
- issueRecordingState.isRecording = false
+ whenever(issueRecordingState.isRecording).thenReturn(false)
tile.handleClick(null)
testableLooper.processAllMessages()
diff --git a/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt
index ca60650..503c52f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt
@@ -17,7 +17,6 @@
package com.android.systemui.recordissue
import android.app.Dialog
-import android.content.Context
import android.content.SharedPreferences
import android.os.UserHandle
import android.testing.TestableLooper
@@ -35,9 +34,8 @@
import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDevicePolicyResolver
import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDisabledDialogDelegate
import com.android.systemui.model.SysUiState
-import com.android.systemui.qs.tiles.RecordIssueTile
+import com.android.systemui.recordissue.IssueRecordingState.Companion.ISSUE_TYPE_NOT_SET
import com.android.systemui.res.R
-import com.android.systemui.settings.UserFileManager
import com.android.systemui.settings.UserTracker
import com.android.systemui.statusbar.phone.SystemUIDialog
import com.android.systemui.statusbar.phone.SystemUIDialogManager
@@ -72,7 +70,7 @@
@Mock private lateinit var dprLazy: dagger.Lazy<ScreenCaptureDevicePolicyResolver>
@Mock private lateinit var mediaProjectionMetricsLogger: MediaProjectionMetricsLogger
@Mock private lateinit var userTracker: UserTracker
- @Mock private lateinit var userFileManager: UserFileManager
+ @Mock private lateinit var state: IssueRecordingState
@Mock private lateinit var sharedPreferences: SharedPreferences
@Mock
private lateinit var screenCaptureDisabledDialogDelegate: ScreenCaptureDisabledDialogDelegate
@@ -90,7 +88,6 @@
private lateinit var dialog: SystemUIDialog
private lateinit var factory: SystemUIDialog.Factory
private lateinit var latch: CountDownLatch
- private var issueRecordingState = IssueRecordingState()
@Before
fun setup() {
@@ -99,14 +96,7 @@
whenever(sysuiState.setFlag(anyLong(), anyBoolean())).thenReturn(sysuiState)
whenever(screenCaptureDisabledDialogDelegate.createSysUIDialog())
.thenReturn(screenCaptureDisabledDialog)
- whenever(
- userFileManager.getSharedPreferences(
- eq(RecordIssueTile.TILE_SPEC),
- eq(Context.MODE_PRIVATE),
- anyInt()
- )
- )
- .thenReturn(sharedPreferences)
+ whenever(state.issueTypeRes).thenReturn(ISSUE_TYPE_NOT_SET)
factory =
spy(
@@ -129,9 +119,8 @@
mainExecutor,
dprLazy,
mediaProjectionMetricsLogger,
- userFileManager,
screenCaptureDisabledDialogDelegate,
- issueRecordingState,
+ state,
traceurMessageSender
) {
latch.countDown()
@@ -190,8 +179,7 @@
whenever(devicePolicyResolver.isScreenCaptureCompletelyDisabled(any<UserHandle>()))
.thenReturn(false)
whenever(flags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING)).thenReturn(true)
- whenever(sharedPreferences.getBoolean(HAS_APPROVED_SCREEN_RECORDING, false))
- .thenReturn(false)
+ whenever(state.hasUserApprovedScreenRecording).thenReturn(false)
val screenRecordSwitch = dialog.requireViewById<Switch>(R.id.screenrecord_switch)
screenRecordSwitch.isChecked = true
diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/policy/PolicyRequestProcessorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/policy/PolicyRequestProcessorTest.kt
new file mode 100644
index 0000000..4945ace
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/policy/PolicyRequestProcessorTest.kt
@@ -0,0 +1,81 @@
+/*
+ * 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.screenshot.policy
+
+import android.content.ComponentName
+import android.graphics.Insets
+import android.graphics.Rect
+import android.os.UserHandle
+import android.view.Display.DEFAULT_DISPLAY
+import android.view.WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD
+import android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN
+import com.android.systemui.screenshot.ImageCapture
+import com.android.systemui.screenshot.ScreenshotData
+import com.android.systemui.screenshot.data.model.DisplayContentScenarios.ActivityNames.FILES
+import com.android.systemui.screenshot.data.model.DisplayContentScenarios.TaskSpec
+import com.android.systemui.screenshot.data.model.DisplayContentScenarios.singleFullScreen
+import com.android.systemui.screenshot.data.repository.DisplayContentRepository
+import com.android.systemui.screenshot.policy.TestUserIds.PERSONAL
+import com.android.systemui.screenshot.policy.TestUserIds.WORK
+import com.google.common.truth.Truth.assertWithMessage
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+
+class PolicyRequestProcessorTest {
+
+ val imageCapture = object : ImageCapture {
+ override fun captureDisplay(displayId: Int, crop: Rect?) = null
+ override suspend fun captureTask(taskId: Int) = null
+ }
+
+ /** Tests behavior when no policies are applied */
+ @Test
+ fun testProcess_defaultOwner_whenNoPolicyApplied() {
+ val fullScreenWork = DisplayContentRepository {
+ singleFullScreen(TaskSpec(taskId = 1001, name = FILES, userId = WORK))
+ }
+
+ val request =
+ ScreenshotData(TAKE_SCREENSHOT_FULLSCREEN,
+ SCREENSHOT_KEY_CHORD,
+ null,
+ topComponent = null,
+ screenBounds = Rect(0, 0, 1, 1),
+ taskId = -1,
+ insets = Insets.NONE,
+ bitmap = null,
+ displayId = DEFAULT_DISPLAY)
+
+ /* Create a policy request processor with no capture policies */
+ val requestProcessor =
+ PolicyRequestProcessor(Dispatchers.Unconfined,
+ imageCapture,
+ policies = emptyList(),
+ defaultOwner = UserHandle.of(PERSONAL),
+ defaultComponent = ComponentName("default", "Component"),
+ displayTasks = fullScreenWork)
+
+ val result = runBlocking { requestProcessor.process(request) }
+
+ assertWithMessage(
+ "With no policy, the screenshot should be assigned to the default user"
+ ).that(result.userHandle).isEqualTo(UserHandle.of(PERSONAL))
+
+ assertWithMessage("The topComponent of the screenshot").that(result.topComponent)
+ .isEqualTo(ComponentName.unflattenFromString(FILES))
+ }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt
index 4a867a8..586adbd 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt
@@ -519,6 +519,46 @@
}
@Test
+ fun handleExternalTouch_intercepted_sendsOnTouch() {
+ // Accept dispatch and also intercept.
+ whenever(view.dispatchTouchEvent(any())).thenReturn(true)
+ whenever(view.onInterceptTouchEvent(any())).thenReturn(true)
+
+ underTest.handleExternalTouch(DOWN_EVENT)
+ underTest.handleExternalTouch(MOVE_EVENT)
+
+ // Once intercepted, both events are sent to the view.
+ verify(view).onTouchEvent(DOWN_EVENT)
+ verify(view).onTouchEvent(MOVE_EVENT)
+ }
+
+ @Test
+ fun handleExternalTouch_notDispatched_interceptNotCalled() {
+ // Don't accept dispatch
+ whenever(view.dispatchTouchEvent(any())).thenReturn(false)
+
+ underTest.handleExternalTouch(DOWN_EVENT)
+
+ // Interception is not offered.
+ verify(view, never()).onInterceptTouchEvent(any())
+ }
+
+ @Test
+ fun handleExternalTouch_notIntercepted_onTouchNotSent() {
+ // Accept dispatch, but don't dispatch
+ whenever(view.dispatchTouchEvent(any())).thenReturn(true)
+ whenever(view.onInterceptTouchEvent(any())).thenReturn(false)
+
+ underTest.handleExternalTouch(DOWN_EVENT)
+ underTest.handleExternalTouch(MOVE_EVENT)
+
+ // Interception offered for both events, but onTouchEvent is never called.
+ verify(view).onInterceptTouchEvent(DOWN_EVENT)
+ verify(view).onInterceptTouchEvent(MOVE_EVENT)
+ verify(view, never()).onTouchEvent(any())
+ }
+
+ @Test
fun testGetKeyguardMessageArea() =
testScope.runTest {
underTest.keyguardMessageArea
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsTest.java
index 2b3f139..6ad8b8b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsTest.java
@@ -18,12 +18,16 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static java.util.Collections.singletonList;
+
+import android.annotation.Nullable;
import android.app.Dialog;
import android.graphics.drawable.Icon;
import android.os.Handler;
@@ -44,11 +48,13 @@
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
+import org.mockito.invocation.InvocationOnMock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
+import org.mockito.stubbing.Answer;
import java.util.Arrays;
-import java.util.Collections;
+import java.util.List;
@SmallTest
@RunWith(AndroidJUnit4.class)
@@ -56,7 +62,7 @@
@Rule public MockitoRule mockito = MockitoJUnit.rule();
- private static int DEVICE_ID = 1;
+ private static final int DEVICE_ID = 1;
private KeyboardShortcuts mKeyboardShortcuts;
@Mock private Dialog mDialog;
@@ -66,26 +72,35 @@
@Before
public void setUp() {
mKeyboardShortcuts = new KeyboardShortcuts(mContext, mWindowManager);
- mKeyboardShortcuts.sInstance = mKeyboardShortcuts;
+ KeyboardShortcuts.sInstance = mKeyboardShortcuts;
mKeyboardShortcuts.mKeyboardShortcutsDialog = mDialog;
mKeyboardShortcuts.mContext = mContext;
mKeyboardShortcuts.mBackgroundHandler = mHandler;
+ when(mHandler.post(any()))
+ .thenAnswer(
+ new Answer<>() {
+ @Override
+ public Object answer(InvocationOnMock invocation) {
+ ((Runnable) invocation.getArgument(0)).run();
+ return null;
+ }
+ });
}
@Test
public void toggle_isShowingTrue_instanceShouldBeNull() {
when(mDialog.isShowing()).thenReturn(true);
- mKeyboardShortcuts.toggle(mContext, DEVICE_ID);
+ KeyboardShortcuts.toggle(mContext, DEVICE_ID);
- assertThat(mKeyboardShortcuts.sInstance).isNull();
+ assertThat(KeyboardShortcuts.sInstance).isNull();
}
@Test
public void toggle_isShowingFalse_showKeyboardShortcuts() {
when(mDialog.isShowing()).thenReturn(false);
- mKeyboardShortcuts.toggle(mContext, DEVICE_ID);
+ KeyboardShortcuts.toggle(mContext, DEVICE_ID);
verify(mWindowManager).requestAppKeyboardShortcuts(any(), anyInt());
verify(mWindowManager).requestImeKeyboardShortcuts(any(), anyInt());
@@ -95,7 +110,7 @@
public void sanitiseShortcuts_clearsIcons() {
KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();
- KeyboardShortcuts.sanitiseShortcuts(Collections.singletonList(group));
+ KeyboardShortcuts.sanitiseShortcuts(singletonList(group));
verify(group.getItems().get(0)).clearIcon();
verify(group.getItems().get(1)).clearIcon();
@@ -106,7 +121,7 @@
KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();
group.setPackageName(null);
- KeyboardShortcuts.sanitiseShortcuts(Collections.singletonList(group));
+ KeyboardShortcuts.sanitiseShortcuts(singletonList(group));
verify(group.getItems().get(0)).clearIcon();
verify(group.getItems().get(1)).clearIcon();
@@ -116,16 +131,9 @@
@EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)
public void requestAppKeyboardShortcuts_callback_sanitisesIcons() {
KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();
+ KeyboardShortcuts.toggle(mContext, DEVICE_ID);
- mKeyboardShortcuts.toggle(mContext, DEVICE_ID);
-
- ArgumentCaptor<WindowManager.KeyboardShortcutsReceiver> callbackCaptor =
- ArgumentCaptor.forClass(WindowManager.KeyboardShortcutsReceiver.class);
- ArgumentCaptor<Runnable> handlerRunnableCaptor = ArgumentCaptor.forClass(Runnable.class);
- verify(mWindowManager).requestAppKeyboardShortcuts(callbackCaptor.capture(), anyInt());
- callbackCaptor.getValue().onKeyboardShortcutsReceived(Collections.singletonList(group));
- verify(mHandler).post(handlerRunnableCaptor.capture());
- handlerRunnableCaptor.getValue().run();
+ emitAppShortcuts(singletonList(group), DEVICE_ID);
verify(group.getItems().get(0)).clearIcon();
verify(group.getItems().get(1)).clearIcon();
@@ -135,20 +143,38 @@
@EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)
public void requestImeKeyboardShortcuts_callback_sanitisesIcons() {
KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();
+ KeyboardShortcuts.toggle(mContext, DEVICE_ID);
- mKeyboardShortcuts.toggle(mContext, DEVICE_ID);
-
- ArgumentCaptor<WindowManager.KeyboardShortcutsReceiver> callbackCaptor =
- ArgumentCaptor.forClass(WindowManager.KeyboardShortcutsReceiver.class);
- ArgumentCaptor<Runnable> handlerRunnableCaptor = ArgumentCaptor.forClass(Runnable.class);
- verify(mWindowManager).requestImeKeyboardShortcuts(callbackCaptor.capture(), anyInt());
- callbackCaptor.getValue().onKeyboardShortcutsReceived(Collections.singletonList(group));
- verify(mHandler).post(handlerRunnableCaptor.capture());
- handlerRunnableCaptor.getValue().run();
+ emitImeShortcuts(singletonList(group), DEVICE_ID);
verify(group.getItems().get(0)).clearIcon();
verify(group.getItems().get(1)).clearIcon();
+ }
+ @Test
+ public void onImeAndAppShortcutsReceived_appShortcutsNull_doesNotCrash() {
+ KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();
+ KeyboardShortcuts.toggle(mContext, DEVICE_ID);
+
+ emitImeShortcuts(singletonList(group), DEVICE_ID);
+ emitAppShortcuts(/* groups= */ null, DEVICE_ID);
+ }
+
+ @Test
+ public void onImeAndAppShortcutsReceived_imeShortcutsNull_doesNotCrash() {
+ KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();
+ KeyboardShortcuts.toggle(mContext, DEVICE_ID);
+
+ emitAppShortcuts(singletonList(group), DEVICE_ID);
+ emitImeShortcuts(/* groups= */ null, DEVICE_ID);
+ }
+
+ @Test
+ public void onImeAndAppShortcutsReceived_bothNull_doesNotCrash() {
+ KeyboardShortcuts.toggle(mContext, DEVICE_ID);
+
+ emitImeShortcuts(/* groups= */ null, DEVICE_ID);
+ emitAppShortcuts(/* groups= */ null, DEVICE_ID);
}
private KeyboardShortcutGroup createKeyboardShortcutGroupForIconTests() {
@@ -159,9 +185,23 @@
when(info1.getIcon()).thenReturn(icon);
when(info2.getIcon()).thenReturn(icon);
- KeyboardShortcutGroup group = new KeyboardShortcutGroup("label",
- Arrays.asList(new KeyboardShortcutInfo[]{ info1, info2}));
+ KeyboardShortcutGroup group =
+ new KeyboardShortcutGroup("label", Arrays.asList(info1, info2));
group.setPackageName("com.example");
return group;
}
+
+ private void emitImeShortcuts(@Nullable List<KeyboardShortcutGroup> groups, int deviceId) {
+ ArgumentCaptor<WindowManager.KeyboardShortcutsReceiver> callbackCaptor =
+ ArgumentCaptor.forClass(WindowManager.KeyboardShortcutsReceiver.class);
+ verify(mWindowManager).requestImeKeyboardShortcuts(callbackCaptor.capture(), eq(deviceId));
+ callbackCaptor.getValue().onKeyboardShortcutsReceived(groups);
+ }
+
+ private void emitAppShortcuts(@Nullable List<KeyboardShortcutGroup> groups, int deviceId) {
+ ArgumentCaptor<WindowManager.KeyboardShortcutsReceiver> callbackCaptor =
+ ArgumentCaptor.forClass(WindowManager.KeyboardShortcutsReceiver.class);
+ verify(mWindowManager).requestAppKeyboardShortcuts(callbackCaptor.capture(), eq(deviceId));
+ callbackCaptor.getValue().onKeyboardShortcutsReceived(groups);
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
index b6ee46d..50131cb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
@@ -97,7 +97,8 @@
mIconView = new StatusBarIconView(mContext, "test_slot", null);
mStatusBarIcon = new StatusBarIcon(UserHandle.ALL, "mockPackage",
- Icon.createWithResource(mContext, R.drawable.ic_android), 0, 0, "");
+ Icon.createWithResource(mContext, R.drawable.ic_android), 0, 0, "",
+ StatusBarIcon.Type.SystemIcon);
}
@Test
@@ -138,7 +139,7 @@
Bitmap largeBitmap = Bitmap.createBitmap(6000, 6000, Bitmap.Config.ARGB_8888);
Icon icon = Icon.createWithBitmap(largeBitmap);
StatusBarIcon largeIcon = new StatusBarIcon(UserHandle.ALL, "mockPackage",
- icon, 0, 0, "");
+ icon, 0, 0, "", StatusBarIcon.Type.SystemIcon);
assertTrue(mIconView.set(largeIcon));
// The view should downscale the bitmap.
@@ -152,7 +153,7 @@
Bitmap bitmap = Bitmap.createBitmap(60, 60, Bitmap.Config.ARGB_8888);
Icon icon = Icon.createWithBitmap(bitmap);
StatusBarIcon largeIcon = new StatusBarIcon(UserHandle.ALL, "mockPackage",
- icon, 0, 0, "");
+ icon, 0, 0, "", StatusBarIcon.Type.SystemIcon);
mIconView.setNotification(getMockSbn());
mIconView.getIcon(largeIcon);
// no crash? good
@@ -172,7 +173,7 @@
Bitmap bitmap = Bitmap.createBitmap(60, 60, Bitmap.Config.ARGB_8888);
Icon icon = Icon.createWithBitmap(bitmap);
StatusBarIcon largeIcon = new StatusBarIcon(UserHandle.ALL, "mockPackage",
- icon, 0, 0, "");
+ icon, 0, 0, "", StatusBarIcon.Type.SystemIcon);
mIconView.getIcon(largeIcon);
// No crash? good
}
@@ -430,7 +431,7 @@
width, height, Bitmap.Config.ARGB_8888);
Icon icon = Icon.createWithBitmap(bitmap);
mStatusBarIcon = new StatusBarIcon(UserHandle.ALL, "mockPackage",
- icon, 0, 0, "");
+ icon, 0, 0, "", StatusBarIcon.Type.SystemIcon);
// Since we only want to verify icon scale logic here, we directly use
// {@link StatusBarIconView#setImageDrawable(Drawable)} to set the image drawable
// to iconView instead of call {@link StatusBarIconView#set(StatusBarIcon)}. It's to prevent
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt
index 9e733be..acb005f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt
@@ -19,71 +19,86 @@
import android.platform.test.annotations.DisableFlags
import android.provider.DeviceConfig
import android.provider.Settings
-
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
import com.android.dx.mockito.inline.extended.ExtendedMockito
-
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.NOTIFICATIONS_USE_PEOPLE_FILTERING
import com.android.systemui.SysuiTestCase
+import com.android.systemui.statusbar.notification.shared.NotificationMinimalismPrototype
import com.android.systemui.statusbar.notification.shared.PriorityPeopleSection
import com.android.systemui.util.DeviceConfigProxyFake
import com.android.systemui.util.Utils
import com.android.systemui.util.mockito.any
-
import org.junit.After
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
-import org.mockito.Mockito.`when`
import org.mockito.MockitoSession
+import org.mockito.kotlin.whenever
import org.mockito.quality.Strictness
@RunWith(AndroidJUnit4::class)
@SmallTest
-@DisableFlags(PriorityPeopleSection.FLAG_NAME) // this class has no logic with the flag enabled
+// this class has no testable logic with either of these flags enabled
+@DisableFlags(PriorityPeopleSection.FLAG_NAME, NotificationMinimalismPrototype.V2.FLAG_NAME)
class NotificationSectionsFeatureManagerTest : SysuiTestCase() {
- var manager: NotificationSectionsFeatureManager? = null
- val proxyFake = DeviceConfigProxyFake()
+ lateinit var manager: NotificationSectionsFeatureManager
+ private val proxyFake = DeviceConfigProxyFake()
private lateinit var staticMockSession: MockitoSession
@Before
- public fun setup() {
+ fun setup() {
manager = NotificationSectionsFeatureManager(proxyFake, mContext)
- manager!!.clearCache()
- staticMockSession = ExtendedMockito.mockitoSession()
- .mockStatic<Utils>(Utils::class.java)
- .strictness(Strictness.LENIENT)
- .startMocking()
- `when`(Utils.useQsMediaPlayer(any())).thenReturn(false)
- Settings.Global.putInt(context.getContentResolver(),
- Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 0)
+ manager.clearCache()
+ staticMockSession =
+ ExtendedMockito.mockitoSession()
+ .mockStatic(Utils::class.java)
+ .strictness(Strictness.LENIENT)
+ .startMocking()
+ whenever(Utils.useQsMediaPlayer(any())).thenReturn(false)
+ Settings.Global.putInt(
+ context.getContentResolver(),
+ Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS,
+ 0
+ )
}
@After
- public fun teardown() {
+ fun teardown() {
staticMockSession.finishMocking()
}
@Test
- public fun testPeopleFilteringOff_newInterruptionModelOn() {
+ fun testPeopleFilteringOff_newInterruptionModelOn() {
proxyFake.setProperty(
- DeviceConfig.NAMESPACE_SYSTEMUI, NOTIFICATIONS_USE_PEOPLE_FILTERING, "false", false)
+ DeviceConfig.NAMESPACE_SYSTEMUI,
+ NOTIFICATIONS_USE_PEOPLE_FILTERING,
+ "false",
+ false
+ )
- assertFalse("People filtering should be disabled", manager!!.isFilteringEnabled())
- assertTrue("Expecting 2 buckets when people filtering is disabled",
- manager!!.getNumberOfBuckets() == 2)
+ assertFalse("People filtering should be disabled", manager.isFilteringEnabled())
+ assertTrue(
+ "Expecting 2 buckets when people filtering is disabled",
+ manager.getNumberOfBuckets() == 2
+ )
}
@Test
- public fun testPeopleFilteringOn_newInterruptionModelOn() {
+ fun testPeopleFilteringOn_newInterruptionModelOn() {
proxyFake.setProperty(
- DeviceConfig.NAMESPACE_SYSTEMUI, NOTIFICATIONS_USE_PEOPLE_FILTERING, "true", false)
+ DeviceConfig.NAMESPACE_SYSTEMUI,
+ NOTIFICATIONS_USE_PEOPLE_FILTERING,
+ "true",
+ false
+ )
- assertTrue("People filtering should be enabled", manager!!.isFilteringEnabled())
- assertTrue("Expecting 5 buckets when people filtering is enabled",
- manager!!.getNumberOfBuckets() == 5)
+ assertTrue("People filtering should be enabled", manager.isFilteringEnabled())
+ assertTrue(
+ "Expecting 5 buckets when people filtering is enabled",
+ manager.getNumberOfBuckets() == 5
+ )
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java
index 0d3ab86..b278f1a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java
@@ -41,6 +41,7 @@
import android.os.CancellationSignal;
import android.os.Handler;
import android.os.Looper;
+import android.platform.test.annotations.DisableFlags;
import android.testing.TestableLooper;
import android.testing.TestableLooper.RunWithLooper;
import android.util.TypedValue;
@@ -60,6 +61,7 @@
import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.BindParams;
import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationCallback;
import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;
+import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor;
import com.android.systemui.statusbar.policy.InflatedSmartReplyState;
import com.android.systemui.statusbar.policy.InflatedSmartReplyViewHolder;
import com.android.systemui.statusbar.policy.SmartReplyStateInflater;
@@ -81,6 +83,7 @@
@SmallTest
@RunWith(AndroidJUnit4.class)
@RunWithLooper(setAsMainLooper = true)
+@DisableFlags(NotificationRowContentBinderRefactor.FLAG_NAME)
public class NotificationContentInflaterTest extends SysuiTestCase {
private NotificationContentInflater mNotificationInflater;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt
new file mode 100644
index 0000000..e6cba1c
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt
@@ -0,0 +1,572 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.systemui.statusbar.notification.row
+
+import android.app.Notification
+import android.content.Context
+import android.os.AsyncTask
+import android.os.Build
+import android.os.CancellationSignal
+import android.platform.test.annotations.EnableFlags
+import android.testing.TestableLooper.RunWithLooper
+import android.util.TypedValue
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RemoteViews
+import android.widget.TextView
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import com.android.systemui.SysuiTestCase
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.notification.ConversationNotificationProcessor
+import com.android.systemui.statusbar.notification.collection.NotificationEntry
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.BindParams
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationCallback
+import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag
+import com.android.systemui.statusbar.notification.row.shared.HeadsUpStatusBarModel
+import com.android.systemui.statusbar.notification.row.shared.NewRemoteViews
+import com.android.systemui.statusbar.notification.row.shared.NotificationContentModel
+import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor
+import com.android.systemui.statusbar.policy.InflatedSmartReplyState
+import com.android.systemui.statusbar.policy.InflatedSmartReplyViewHolder
+import com.android.systemui.statusbar.policy.SmartReplyStateInflater
+import com.android.systemui.util.concurrency.mockExecutorHandler
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.Executor
+import java.util.concurrent.TimeUnit
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+
+@SmallTest
+@RunWith(AndroidJUnit4::class)
+@RunWithLooper
+@EnableFlags(NotificationRowContentBinderRefactor.FLAG_NAME)
+class NotificationRowContentBinderImplTest : SysuiTestCase() {
+ private lateinit var mNotificationInflater: NotificationRowContentBinderImpl
+ private lateinit var mBuilder: Notification.Builder
+ private lateinit var mRow: ExpandableNotificationRow
+ private lateinit var mHelper: NotificationTestHelper
+
+ private var mCache: NotifRemoteViewCache = mock()
+ private var mConversationNotificationProcessor: ConversationNotificationProcessor = mock()
+ private var mInflatedSmartReplyState: InflatedSmartReplyState = mock()
+ private var mInflatedSmartReplies: InflatedSmartReplyViewHolder = mock()
+ private var mNotifLayoutInflaterFactoryProvider: NotifLayoutInflaterFactory.Provider = mock()
+ private var mHeadsUpStyleProvider: HeadsUpStyleProvider = mock()
+ private var mNotifLayoutInflaterFactory: NotifLayoutInflaterFactory = mock()
+ private val mSmartReplyStateInflater: SmartReplyStateInflater =
+ object : SmartReplyStateInflater {
+ override fun inflateSmartReplyViewHolder(
+ sysuiContext: Context,
+ notifPackageContext: Context,
+ entry: NotificationEntry,
+ existingSmartReplyState: InflatedSmartReplyState?,
+ newSmartReplyState: InflatedSmartReplyState
+ ): InflatedSmartReplyViewHolder {
+ return mInflatedSmartReplies
+ }
+
+ override fun inflateSmartReplyState(entry: NotificationEntry): InflatedSmartReplyState {
+ return mInflatedSmartReplyState
+ }
+ }
+
+ @Before
+ fun setUp() {
+ allowTestableLooperAsMainThread()
+ mBuilder =
+ Notification.Builder(mContext, "no-id")
+ .setSmallIcon(R.drawable.ic_person)
+ .setContentTitle("Title")
+ .setContentText("Text")
+ .setStyle(Notification.BigTextStyle().bigText("big text"))
+ mHelper = NotificationTestHelper(mContext, mDependency)
+ val row = mHelper.createRow(mBuilder.build())
+ mRow = spy(row)
+ whenever(mNotifLayoutInflaterFactoryProvider.provide(any(), any()))
+ .thenReturn(mNotifLayoutInflaterFactory)
+ mNotificationInflater =
+ NotificationRowContentBinderImpl(
+ mCache,
+ mock(),
+ mConversationNotificationProcessor,
+ mock(),
+ mSmartReplyStateInflater,
+ mNotifLayoutInflaterFactoryProvider,
+ mHeadsUpStyleProvider,
+ mock()
+ )
+ }
+
+ @Test
+ fun testIncreasedHeadsUpBeingUsed() {
+ val params = BindParams()
+ params.usesIncreasedHeadsUpHeight = true
+ val builder = spy(mBuilder)
+ mNotificationInflater.inflateNotificationViews(
+ mRow.entry,
+ mRow,
+ params,
+ true /* inflateSynchronously */,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL,
+ builder,
+ mContext,
+ mSmartReplyStateInflater
+ )
+ verify(builder).createHeadsUpContentView(true)
+ }
+
+ @Test
+ fun testIncreasedHeightBeingUsed() {
+ val params = BindParams()
+ params.usesIncreasedHeight = true
+ val builder = spy(mBuilder)
+ mNotificationInflater.inflateNotificationViews(
+ mRow.entry,
+ mRow,
+ params,
+ true /* inflateSynchronously */,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL,
+ builder,
+ mContext,
+ mSmartReplyStateInflater
+ )
+ verify(builder).createContentView(true)
+ }
+
+ @Test
+ fun testInflationCallsUpdated() {
+ inflateAndWait(
+ mNotificationInflater,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL,
+ mRow
+ )
+ verify(mRow).onNotificationUpdated()
+ }
+
+ @Test
+ fun testInflationOnlyInflatesSetFlags() {
+ inflateAndWait(
+ mNotificationInflater,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_HEADS_UP,
+ mRow
+ )
+ Assert.assertNotNull(mRow.privateLayout.headsUpChild)
+ verify(mRow).onNotificationUpdated()
+ }
+
+ @Test
+ fun testInflationThrowsErrorDoesntCallUpdated() {
+ mRow.privateLayout.removeAllViews()
+ mRow.entry.sbn.notification.contentView =
+ RemoteViews(mContext.packageName, R.layout.status_bar)
+ inflateAndWait(
+ true /* expectingException */,
+ mNotificationInflater,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL,
+ mRow
+ )
+ Assert.assertTrue(mRow.privateLayout.childCount == 0)
+ verify(mRow, times(0)).onNotificationUpdated()
+ }
+
+ @Test
+ fun testAsyncTaskRemoved() {
+ mRow.entry.abortTask()
+ inflateAndWait(
+ mNotificationInflater,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL,
+ mRow
+ )
+ verify(mRow).onNotificationUpdated()
+ }
+
+ @Test
+ fun testRemovedNotInflated() {
+ mRow.setRemoved()
+ mNotificationInflater.setInflateSynchronously(true)
+ mNotificationInflater.bindContent(
+ mRow.entry,
+ mRow,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL,
+ BindParams(),
+ false /* forceInflate */,
+ null /* callback */
+ )
+ Assert.assertNull(mRow.entry.runningTask)
+ }
+
+ @Test
+ @Ignore("b/345418902")
+ fun testInflationIsRetriedIfAsyncFails() {
+ val headsUpStatusBarModel = HeadsUpStatusBarModel("private", "public")
+ val result =
+ NotificationRowContentBinderImpl.InflationProgress(
+ packageContext = mContext,
+ remoteViews = NewRemoteViews(),
+ contentModel = NotificationContentModel(headsUpStatusBarModel)
+ )
+ val countDownLatch = CountDownLatch(1)
+ NotificationRowContentBinderImpl.applyRemoteView(
+ AsyncTask.SERIAL_EXECUTOR,
+ inflateSynchronously = false,
+ isMinimized = false,
+ result = result,
+ reInflateFlags = NotificationRowContentBinder.FLAG_CONTENT_VIEW_EXPANDED,
+ inflationId = 0,
+ remoteViewCache = mock(),
+ entry = mRow.entry,
+ row = mRow,
+ isNewView = true, /* isNewView */
+ remoteViewClickHandler = { _, _, _ -> true },
+ callback =
+ object : InflationCallback {
+ override fun handleInflationException(entry: NotificationEntry, e: Exception) {
+ countDownLatch.countDown()
+ throw RuntimeException("No Exception expected")
+ }
+
+ override fun onAsyncInflationFinished(entry: NotificationEntry) {
+ countDownLatch.countDown()
+ }
+ },
+ parentLayout = mRow.privateLayout,
+ existingView = null,
+ existingWrapper = null,
+ runningInflations = HashMap(),
+ applyCallback =
+ object : NotificationRowContentBinderImpl.ApplyCallback() {
+ override fun setResultView(v: View) {}
+
+ override val remoteView: RemoteViews
+ get() =
+ AsyncFailRemoteView(
+ mContext.packageName,
+ com.android.systemui.tests.R.layout.custom_view_dark
+ )
+ },
+ logger = mock(),
+ )
+ Assert.assertTrue(countDownLatch.await(500, TimeUnit.MILLISECONDS))
+ }
+
+ @Test
+ fun doesntReapplyDisallowedRemoteView() {
+ mBuilder.setStyle(Notification.MediaStyle())
+ val mediaView = mBuilder.createContentView()
+ mBuilder.setStyle(Notification.DecoratedCustomViewStyle())
+ mBuilder.setCustomContentView(
+ RemoteViews(context.packageName, com.android.systemui.tests.R.layout.custom_view_dark)
+ )
+ val decoratedMediaView = mBuilder.createContentView()
+ Assert.assertFalse(
+ "The decorated media style doesn't allow a view to be reapplied!",
+ NotificationRowContentBinderImpl.canReapplyRemoteView(mediaView, decoratedMediaView)
+ )
+ }
+
+ @Test
+ @Ignore("b/345418902")
+ fun testUsesSameViewWhenCachedPossibleToReuse() {
+ // GIVEN a cached view.
+ val contractedRemoteView = mBuilder.createContentView()
+ whenever(
+ mCache.hasCachedView(
+ mRow.entry,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED
+ )
+ )
+ .thenReturn(true)
+ whenever(
+ mCache.getCachedView(
+ mRow.entry,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED
+ )
+ )
+ .thenReturn(contractedRemoteView)
+
+ // GIVEN existing bound view with same layout id.
+ val view = contractedRemoteView.apply(mContext, null /* parent */)
+ mRow.privateLayout.setContractedChild(view)
+
+ // WHEN inflater inflates
+ inflateAndWait(
+ mNotificationInflater,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED,
+ mRow
+ )
+
+ // THEN the view should be re-used
+ Assert.assertEquals(
+ "Binder inflated a new view even though the old one was cached and usable.",
+ view,
+ mRow.privateLayout.contractedChild
+ )
+ }
+
+ @Test
+ fun testInflatesNewViewWhenCachedNotPossibleToReuse() {
+ // GIVEN a cached remote view.
+ val contractedRemoteView = mBuilder.createHeadsUpContentView()
+ whenever(
+ mCache.hasCachedView(
+ mRow.entry,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED
+ )
+ )
+ .thenReturn(true)
+ whenever(
+ mCache.getCachedView(
+ mRow.entry,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED
+ )
+ )
+ .thenReturn(contractedRemoteView)
+
+ // GIVEN existing bound view with different layout id.
+ val view: View = TextView(mContext)
+ mRow.privateLayout.setContractedChild(view)
+
+ // WHEN inflater inflates
+ inflateAndWait(
+ mNotificationInflater,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED,
+ mRow
+ )
+
+ // THEN the view should be a new view
+ Assert.assertNotEquals(
+ "Binder (somehow) used the same view when inflating.",
+ view,
+ mRow.privateLayout.contractedChild
+ )
+ }
+
+ @Test
+ fun testInflationCachesCreatedRemoteView() {
+ // WHEN inflater inflates
+ inflateAndWait(
+ mNotificationInflater,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED,
+ mRow
+ )
+
+ // THEN inflater informs cache of the new remote view
+ verify(mCache)
+ .putCachedView(
+ eq(mRow.entry),
+ eq(NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED),
+ any()
+ )
+ }
+
+ @Test
+ fun testUnbindRemovesCachedRemoteView() {
+ // WHEN inflated unbinds content
+ mNotificationInflater.unbindContent(
+ mRow.entry,
+ mRow,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_HEADS_UP
+ )
+
+ // THEN inflated informs cache to remove remote view
+ verify(mCache)
+ .removeCachedView(
+ eq(mRow.entry),
+ eq(NotificationRowContentBinder.FLAG_CONTENT_VIEW_HEADS_UP)
+ )
+ }
+
+ @Test
+ fun testNotificationViewHeightTooSmallFailsValidation() {
+ val validationError =
+ getValidationError(
+ measuredHeightDp = 5f,
+ targetSdk = Build.VERSION_CODES.R,
+ contentView = mock(),
+ )
+ Assert.assertNotNull(validationError)
+ }
+
+ @Test
+ fun testNotificationViewHeightPassesForNewerSDK() {
+ val validationError =
+ getValidationError(
+ measuredHeightDp = 5f,
+ targetSdk = Build.VERSION_CODES.S,
+ contentView = mock(),
+ )
+ Assert.assertNull(validationError)
+ }
+
+ @Test
+ fun testNotificationViewHeightPassesForTemplatedViews() {
+ val validationError =
+ getValidationError(
+ measuredHeightDp = 5f,
+ targetSdk = Build.VERSION_CODES.R,
+ contentView = null,
+ )
+ Assert.assertNull(validationError)
+ }
+
+ @Test
+ fun testNotificationViewPassesValidation() {
+ val validationError =
+ getValidationError(
+ measuredHeightDp = 20f,
+ targetSdk = Build.VERSION_CODES.R,
+ contentView = mock(),
+ )
+ Assert.assertNull(validationError)
+ }
+
+ private fun getValidationError(
+ measuredHeightDp: Float,
+ targetSdk: Int,
+ contentView: RemoteViews?
+ ): String? {
+ val view: View = mock()
+ whenever(view.measuredHeight)
+ .thenReturn(
+ TypedValue.applyDimension(
+ TypedValue.COMPLEX_UNIT_SP,
+ measuredHeightDp,
+ mContext.resources.displayMetrics
+ )
+ .toInt()
+ )
+ mRow.entry.targetSdk = targetSdk
+ mRow.entry.sbn.notification.contentView = contentView
+ return NotificationRowContentBinderImpl.isValidView(view, mRow.entry, mContext.resources)
+ }
+
+ @Test
+ fun testInvalidNotificationDoesNotInvokeCallback() {
+ mRow.privateLayout.removeAllViews()
+ mRow.entry.sbn.notification.contentView =
+ RemoteViews(
+ mContext.packageName,
+ com.android.systemui.tests.R.layout.invalid_notification_height
+ )
+ inflateAndWait(
+ true,
+ mNotificationInflater,
+ NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL,
+ mRow
+ )
+ Assert.assertEquals(0, mRow.privateLayout.childCount.toLong())
+ verify(mRow, times(0)).onNotificationUpdated()
+ }
+
+ private class ExceptionHolder {
+ var mException: Exception? = null
+
+ fun setException(exception: Exception?) {
+ mException = exception
+ }
+ }
+
+ private class AsyncFailRemoteView(packageName: String?, layoutId: Int) :
+ RemoteViews(packageName, layoutId) {
+ var mHandler = mockExecutorHandler { p0 -> p0.run() }
+
+ override fun apply(context: Context, parent: ViewGroup): View {
+ return super.apply(context, parent)
+ }
+
+ override fun applyAsync(
+ context: Context,
+ parent: ViewGroup,
+ executor: Executor,
+ listener: OnViewAppliedListener,
+ handler: InteractionHandler?
+ ): CancellationSignal {
+ mHandler.post { listener.onError(RuntimeException("Failed to inflate async")) }
+ return CancellationSignal()
+ }
+
+ override fun applyAsync(
+ context: Context,
+ parent: ViewGroup,
+ executor: Executor,
+ listener: OnViewAppliedListener
+ ): CancellationSignal {
+ return applyAsync(context, parent, executor, listener, null)
+ }
+ }
+
+ companion object {
+ private fun inflateAndWait(
+ inflater: NotificationRowContentBinderImpl,
+ @InflationFlag contentToInflate: Int,
+ row: ExpandableNotificationRow
+ ) {
+ inflateAndWait(false /* expectingException */, inflater, contentToInflate, row)
+ }
+
+ private fun inflateAndWait(
+ expectingException: Boolean,
+ inflater: NotificationRowContentBinderImpl,
+ @InflationFlag contentToInflate: Int,
+ row: ExpandableNotificationRow,
+ ) {
+ val countDownLatch = CountDownLatch(1)
+ val exceptionHolder = ExceptionHolder()
+ inflater.setInflateSynchronously(true)
+ val callback: InflationCallback =
+ object : InflationCallback {
+ override fun handleInflationException(entry: NotificationEntry, e: Exception) {
+ if (!expectingException) {
+ exceptionHolder.setException(e)
+ }
+ countDownLatch.countDown()
+ }
+
+ override fun onAsyncInflationFinished(entry: NotificationEntry) {
+ if (expectingException) {
+ exceptionHolder.setException(
+ RuntimeException(
+ "Inflation finished even though there should be an error"
+ )
+ )
+ }
+ countDownLatch.countDown()
+ }
+ }
+ inflater.bindContent(
+ row.entry,
+ row,
+ contentToInflate,
+ BindParams(),
+ false /* forceInflate */,
+ callback /* callback */
+ )
+ Assert.assertTrue(countDownLatch.await(500, TimeUnit.MILLISECONDS))
+ exceptionHolder.mException?.let { throw it }
+ }
+ }
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java
index 65941ad..21d586b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java
@@ -84,6 +84,7 @@
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow.ExpandableNotificationRowLogger;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow.OnExpandClickListener;
import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;
+import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor;
import com.android.systemui.statusbar.notification.stack.NotificationChildrenContainerLogger;
import com.android.systemui.statusbar.phone.KeyguardBypassController;
import com.android.systemui.statusbar.policy.HeadsUpManager;
@@ -192,16 +193,27 @@
mBgCoroutineContext,
mMainCoroutineContext);
- NotificationRowContentBinder contentBinder = new NotificationContentInflater(
- mock(NotifRemoteViewCache.class),
- mock(NotificationRemoteInputManager.class),
- mock(ConversationNotificationProcessor.class),
- mock(MediaFeatureFlag.class),
- mock(Executor.class),
- new MockSmartReplyInflater(),
- mock(NotifLayoutInflaterFactory.Provider.class),
- mock(HeadsUpStyleProvider.class),
- mock(NotificationRowContentBinderLogger.class));
+ NotificationRowContentBinder contentBinder =
+ NotificationRowContentBinderRefactor.isEnabled()
+ ? new NotificationRowContentBinderImpl(
+ mock(NotifRemoteViewCache.class),
+ mock(NotificationRemoteInputManager.class),
+ mock(ConversationNotificationProcessor.class),
+ mock(Executor.class),
+ new MockSmartReplyInflater(),
+ mock(NotifLayoutInflaterFactory.Provider.class),
+ mock(HeadsUpStyleProvider.class),
+ mock(NotificationRowContentBinderLogger.class))
+ : new NotificationContentInflater(
+ mock(NotifRemoteViewCache.class),
+ mock(NotificationRemoteInputManager.class),
+ mock(ConversationNotificationProcessor.class),
+ mock(MediaFeatureFlag.class),
+ mock(Executor.class),
+ new MockSmartReplyInflater(),
+ mock(NotifLayoutInflaterFactory.Provider.class),
+ mock(HeadsUpStyleProvider.class),
+ mock(NotificationRowContentBinderLogger.class));
contentBinder.setInflateSynchronously(true);
mBindStage = new RowContentBindStage(contentBinder,
mock(NotifInflationErrorManager.class),
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImplTest.kt
index 617c553..7e523fb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImplTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImplTest.kt
@@ -86,6 +86,7 @@
/* iconLevel= */ 0,
/* number= */ 0,
"contentDescription",
+ StatusBarIcon.Type.SystemIcon,
)
underTest.setIconFromTile(slotName, externalIcon)
@@ -114,6 +115,7 @@
/* iconLevel= */ 0,
/* number= */ 0,
"contentDescription",
+ StatusBarIcon.Type.SystemIcon,
)
commandQueueCallbacks.setIcon(slotName, externalIcon)
@@ -240,6 +242,7 @@
/* iconLevel= */ 0,
/* number= */ 0,
"externalDescription",
+ StatusBarIcon.Type.SystemIcon,
)
underTest.setIconFromTile(slotName, startingExternalIcon)
@@ -278,6 +281,7 @@
/* iconLevel= */ 0,
/* number= */ 0,
"externalDescription",
+ StatusBarIcon.Type.SystemIcon,
)
underTest.setIconFromTile(slotName, startingExternalIcon)
@@ -290,6 +294,7 @@
/* iconLevel= */ 0,
/* number= */ 0,
"newExternalDescription",
+ StatusBarIcon.Type.SystemIcon,
)
underTest.setIconFromTile(slotName, newExternalIcon)
@@ -325,6 +330,7 @@
/* iconLevel= */ 0,
/* number= */ 0,
"externalDescription",
+ StatusBarIcon.Type.SystemIcon,
)
commandQueueCallbacks.setIcon(slotName, startingExternalIcon)
@@ -337,6 +343,7 @@
/* iconLevel= */ 0,
/* number= */ 0,
"newExternalDescription",
+ StatusBarIcon.Type.SystemIcon,
)
commandQueueCallbacks.setIcon(slotName, newExternalIcon)
@@ -404,6 +411,7 @@
/* iconLevel= */ 0,
/* number= */ 0,
"contentDescription",
+ StatusBarIcon.Type.SystemIcon,
)
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/settings/SettingsProxyTest.kt b/packages/SystemUI/tests/src/com/android/systemui/util/settings/SettingsProxyTest.kt
index 92dd391..eb11e38 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/util/settings/SettingsProxyTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/util/settings/SettingsProxyTest.kt
@@ -27,12 +27,6 @@
import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase
import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.StandardTestDispatcher
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.runTest
-import kotlinx.coroutines.test.setMain
import org.junit.Assert.assertThrows
import org.junit.Before
import org.junit.Test
@@ -47,16 +41,11 @@
@TestableLooper.RunWithLooper
class SettingsProxyTest : SysuiTestCase() {
- private val testDispatcher = StandardTestDispatcher()
-
private lateinit var mSettings: SettingsProxy
private lateinit var mContentObserver: ContentObserver
- private lateinit var testScope: TestScope
@Before
fun setUp() {
- testScope = TestScope(testDispatcher)
- Dispatchers.setMain(testDispatcher)
mSettings = FakeSettingsProxy()
mContentObserver = object : ContentObserver(Handler(Looper.getMainLooper())) {}
}
@@ -69,23 +58,6 @@
}
@Test
- fun registerContentObserverSuspend_inputString_success() =
- testScope.runTest {
- mSettings.registerContentObserver(TEST_SETTING, mContentObserver)
- verify(mSettings.getContentResolver())
- .registerContentObserver(eq(TEST_SETTING_URI), eq(false), eq(mContentObserver))
- }
-
- @Test
- fun registerContentObserverAsync_inputString_success() {
- mSettings.registerContentObserverAsync(TEST_SETTING, mContentObserver)
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(eq(TEST_SETTING_URI), eq(false), eq(mContentObserver))
- }
- }
-
- @Test
fun registerContentObserver_inputString_notifyForDescendants_true() {
mSettings.registerContentObserverSync(
TEST_SETTING,
@@ -97,31 +69,6 @@
}
@Test
- fun registerContentObserverSuspend_inputString_notifyForDescendants_true() =
- testScope.runTest {
- mSettings.registerContentObserver(
- TEST_SETTING,
- notifyForDescendants = true,
- mContentObserver
- )
- verify(mSettings.getContentResolver())
- .registerContentObserver(eq(TEST_SETTING_URI), eq(true), eq(mContentObserver))
- }
-
- @Test
- fun registerContentObserverAsync_inputString_notifyForDescendants_true() {
- mSettings.registerContentObserverAsync(
- TEST_SETTING,
- notifyForDescendants = true,
- mContentObserver
- )
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(eq(TEST_SETTING_URI), eq(true), eq(mContentObserver))
- }
- }
-
- @Test
fun registerContentObserver_inputUri_success() {
mSettings.registerContentObserverSync(TEST_SETTING_URI, mContentObserver)
verify(mSettings.getContentResolver())
@@ -129,23 +76,6 @@
}
@Test
- fun registerContentObserverSuspend_inputUri_success() =
- testScope.runTest {
- mSettings.registerContentObserver(TEST_SETTING_URI, mContentObserver)
- verify(mSettings.getContentResolver())
- .registerContentObserver(eq(TEST_SETTING_URI), eq(false), eq(mContentObserver))
- }
-
- @Test
- fun registerContentObserverAsync_inputUri_success() {
- mSettings.registerContentObserverAsync(TEST_SETTING_URI, mContentObserver)
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(eq(TEST_SETTING_URI), eq(false), eq(mContentObserver))
- }
- }
-
- @Test
fun registerContentObserver_inputUri_notifyForDescendants_true() {
mSettings.registerContentObserverSync(
TEST_SETTING_URI,
@@ -157,52 +87,12 @@
}
@Test
- fun registerContentObserverSuspend_inputUri_notifyForDescendants_true() =
- testScope.runTest {
- mSettings.registerContentObserver(
- TEST_SETTING_URI,
- notifyForDescendants = true,
- mContentObserver
- )
- verify(mSettings.getContentResolver())
- .registerContentObserver(eq(TEST_SETTING_URI), eq(true), eq(mContentObserver))
- }
-
- @Test
- fun registerContentObserverAsync_inputUri_notifyForDescendants_true() {
- mSettings.registerContentObserverAsync(
- TEST_SETTING_URI,
- notifyForDescendants = true,
- mContentObserver
- )
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(eq(TEST_SETTING_URI), eq(true), eq(mContentObserver))
- }
- }
-
- @Test
- fun unregisterContentObserverSync() {
+ fun unregisterContentObserver() {
mSettings.unregisterContentObserverSync(mContentObserver)
verify(mSettings.getContentResolver()).unregisterContentObserver(eq(mContentObserver))
}
@Test
- fun unregisterContentObserverSuspend_inputString_success() =
- testScope.runTest {
- mSettings.unregisterContentObserver(mContentObserver)
- verify(mSettings.getContentResolver()).unregisterContentObserver(eq(mContentObserver))
- }
-
- @Test
- fun unregisterContentObserverAsync_inputString_success() {
- mSettings.unregisterContentObserverAsync(mContentObserver)
- testScope.launch {
- verify(mSettings.getContentResolver()).unregisterContentObserver(eq(mContentObserver))
- }
- }
-
- @Test
fun getString_keyPresent_returnValidValue() {
mSettings.putString(TEST_SETTING, "test")
assertThat(mSettings.getString(TEST_SETTING)).isEqualTo("test")
@@ -313,15 +203,12 @@
private val mContentResolver = mock(ContentResolver::class.java)
private val settingToValueMap: MutableMap<String, String> = mutableMapOf()
- private val testDispatcher = StandardTestDispatcher()
override fun getContentResolver() = mContentResolver
override fun getUriFor(name: String) =
Uri.parse(StringBuilder().append("content://settings/").append(name).toString())
- override fun getBackgroundDispatcher() = testDispatcher
-
override fun getString(name: String): String {
return settingToValueMap[name] ?: ""
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/settings/UserSettingsProxyTest.kt b/packages/SystemUI/tests/src/com/android/systemui/util/settings/UserSettingsProxyTest.kt
index 4cb5fa9..38469ee 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/util/settings/UserSettingsProxyTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/util/settings/UserSettingsProxyTest.kt
@@ -30,12 +30,6 @@
import com.android.systemui.settings.FakeUserTracker
import com.android.systemui.settings.UserTracker
import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.StandardTestDispatcher
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.runTest
-import kotlinx.coroutines.test.setMain
import org.junit.Assert.assertThrows
import org.junit.Before
import org.junit.Test
@@ -53,7 +47,6 @@
private var mUserTracker = FakeUserTracker()
private var mSettings: UserSettingsProxy = FakeUserSettingsProxy(mUserTracker)
private var mContentObserver = object : ContentObserver(Handler(Looper.getMainLooper())) {}
- private lateinit var testScope: TestScope
@Before
fun setUp() {
@@ -61,9 +54,6 @@
listOf(UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_MAIN)),
selectedUserIndex = 0
)
- val testDispatcher = StandardTestDispatcher()
- testScope = TestScope(testDispatcher)
- Dispatchers.setMain(testDispatcher)
}
@Test
@@ -83,41 +73,6 @@
}
@Test
- fun registerContentObserverForUserSuspend_inputString_success() =
- testScope.runTest {
- mSettings.registerContentObserverForUser(
- TEST_SETTING,
- mContentObserver,
- mUserTracker.userId
- )
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(false),
- eq(mContentObserver),
- eq(MAIN_USER_ID)
- )
- }
-
- @Test
- fun registerContentObserverForUserAsync_inputString_success() {
- mSettings.registerContentObserverForUserAsync(
- TEST_SETTING,
- mContentObserver,
- mUserTracker.userId
- )
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(false),
- eq(mContentObserver),
- eq(MAIN_USER_ID)
- )
- }
- }
-
- @Test
fun registerContentObserverForUser_inputString_notifyForDescendants_true() {
mSettings.registerContentObserverForUserSync(
TEST_SETTING,
@@ -135,45 +90,6 @@
}
@Test
- fun registerContentObserverForUserSuspend_inputString_notifyForDescendants_true() =
- testScope.runTest {
- mSettings.registerContentObserverForUser(
- TEST_SETTING,
- notifyForDescendants = true,
- mContentObserver,
- mUserTracker.userId
- )
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(
- true,
- ),
- eq(mContentObserver),
- eq(MAIN_USER_ID)
- )
- }
-
- @Test
- fun registerContentObserverForUserAsync_inputString_notifyForDescendants_true() {
- mSettings.registerContentObserverForUserAsync(
- TEST_SETTING,
- notifyForDescendants = true,
- mContentObserver,
- mUserTracker.userId
- )
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(true),
- eq(mContentObserver),
- eq(MAIN_USER_ID)
- )
- }
- }
-
- @Test
fun registerContentObserverForUser_inputUri_success() {
mSettings.registerContentObserverForUserSync(
TEST_SETTING_URI,
@@ -190,41 +106,6 @@
}
@Test
- fun registerContentObserverForUserSuspend_inputUri_success() =
- testScope.runTest {
- mSettings.registerContentObserverForUser(
- TEST_SETTING_URI,
- mContentObserver,
- mUserTracker.userId
- )
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(false),
- eq(mContentObserver),
- eq(MAIN_USER_ID)
- )
- }
-
- @Test
- fun registerContentObserverForUserAsync_inputUri_success() {
- mSettings.registerContentObserverForUserAsync(
- TEST_SETTING_URI,
- mContentObserver,
- mUserTracker.userId
- )
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(false),
- eq(mContentObserver),
- eq(MAIN_USER_ID)
- )
- }
- }
-
- @Test
fun registerContentObserverForUser_inputUri_notifyForDescendants_true() {
mSettings.registerContentObserverForUserSync(
TEST_SETTING_URI,
@@ -242,45 +123,6 @@
}
@Test
- fun registerContentObserverForUserSuspend_inputUri_notifyForDescendants_true() =
- testScope.runTest {
- mSettings.registerContentObserverForUser(
- TEST_SETTING_URI,
- notifyForDescendants = true,
- mContentObserver,
- mUserTracker.userId
- )
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(
- true,
- ),
- eq(mContentObserver),
- eq(MAIN_USER_ID)
- )
- }
-
- @Test
- fun registerContentObserverForUserAsync_inputUri_notifyForDescendants_true() {
- mSettings.registerContentObserverForUserAsync(
- TEST_SETTING_URI,
- notifyForDescendants = true,
- mContentObserver,
- mUserTracker.userId
- )
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(true),
- eq(mContentObserver),
- eq(MAIN_USER_ID)
- )
- }
- }
-
- @Test
fun registerContentObserver_inputUri_success() {
mSettings.registerContentObserverSync(TEST_SETTING_URI, mContentObserver)
verify(mSettings.getContentResolver())
@@ -288,33 +130,6 @@
}
@Test
- fun registerContentObserverSuspend_inputUri_success() =
- testScope.runTest {
- mSettings.registerContentObserver(TEST_SETTING_URI, mContentObserver)
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(false),
- eq(mContentObserver),
- eq(0)
- )
- }
-
- @Test
- fun registerContentObserverAsync_inputUri_success() {
- mSettings.registerContentObserverAsync(TEST_SETTING_URI, mContentObserver)
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(false),
- eq(mContentObserver),
- eq(0)
- )
- }
- }
-
- @Test
fun registerContentObserver_inputUri_notifyForDescendants_true() {
mSettings.registerContentObserverSync(
TEST_SETTING_URI,
@@ -326,33 +141,6 @@
}
@Test
- fun registerContentObserverSuspend_inputUri_notifyForDescendants_true() =
- testScope.runTest {
- mSettings.registerContentObserver(TEST_SETTING_URI, mContentObserver)
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(false),
- eq(mContentObserver),
- eq(0)
- )
- }
-
- @Test
- fun registerContentObserverAsync_inputUri_notifyForDescendants_true() {
- mSettings.registerContentObserverAsync(TEST_SETTING_URI, mContentObserver)
- testScope.launch {
- verify(mSettings.getContentResolver())
- .registerContentObserver(
- eq(TEST_SETTING_URI),
- eq(false),
- eq(mContentObserver),
- eq(0)
- )
- }
- }
-
- @Test
fun getString_keyPresent_returnValidValue() {
mSettings.putString(TEST_SETTING, "test")
assertThat(mSettings.getString(TEST_SETTING)).isEqualTo("test")
@@ -517,15 +305,12 @@
private val mContentResolver = mock(ContentResolver::class.java)
private val userIdToSettingsValueMap: MutableMap<Int, MutableMap<String, String>> =
mutableMapOf()
- private val testDispatcher = StandardTestDispatcher()
override fun getContentResolver() = mContentResolver
override fun getUriFor(name: String) =
Uri.parse(StringBuilder().append(URI_PREFIX).append(name).toString())
- override fun getBackgroundDispatcher() = testDispatcher
-
override fun getStringForUser(name: String, userHandle: Int) =
userIdToSettingsValueMap[userHandle]?.get(name) ?: ""
diff --git a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java
index 05d07e5..dbdbe65 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java
@@ -87,6 +87,7 @@
import com.android.systemui.util.settings.SecureSettings;
import com.android.systemui.util.time.FakeSystemClock;
import com.android.systemui.volume.domain.interactor.VolumePanelNavigationInteractor;
+import com.android.systemui.volume.ui.binder.VolumeDialogMenuIconBinder;
import com.android.systemui.volume.ui.navigation.VolumeNavigator;
import dagger.Lazy;
@@ -148,6 +149,8 @@
private VolumePanelNavigationInteractor mVolumePanelNavigationInteractor;
@Mock
private VolumeNavigator mVolumeNavigator;
+ @Mock
+ private VolumeDialogMenuIconBinder mVolumeDialogMenuIconBinder;
private final CsdWarningDialog.Factory mCsdWarningDialogFactory =
new CsdWarningDialog.Factory() {
@@ -211,6 +214,7 @@
mDumpManager,
mLazySecureSettings,
mVibratorHelper,
+ mVolumeDialogMenuIconBinder,
new FakeSystemClock());
mDialog.init(0, null);
State state = createShellState();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java
index 0f89dcc..fabb9b7 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java
@@ -169,6 +169,7 @@
import com.android.wm.shell.bubbles.BubbleViewProvider;
import com.android.wm.shell.bubbles.Bubbles;
import com.android.wm.shell.bubbles.StackEducationView;
+import com.android.wm.shell.bubbles.bar.BubbleBarLayerView;
import com.android.wm.shell.bubbles.properties.BubbleProperties;
import com.android.wm.shell.common.DisplayController;
import com.android.wm.shell.common.FloatingContentCoordinator;
@@ -2109,6 +2110,33 @@
}
@Test
+ public void registerBubbleBarListener_switchToBarWhileExpanded() {
+ mBubbleProperties.mIsBubbleBarEnabled = true;
+ mPositioner.setIsLargeScreen(true);
+
+ mEntryListener.onEntryAdded(mRow);
+ mBubbleController.updateBubble(mBubbleEntry);
+ BubbleStackView stackView = mBubbleController.getStackView();
+ spyOn(stackView);
+
+ mBubbleData.setExpanded(true);
+
+ assertStackMode();
+ assertThat(mBubbleData.isExpanded()).isTrue();
+ assertThat(stackView.isExpanded()).isTrue();
+
+ FakeBubbleStateListener bubbleStateListener = new FakeBubbleStateListener();
+ mBubbleController.registerBubbleStateListener(bubbleStateListener);
+
+ BubbleBarLayerView layerView = mBubbleController.getLayerView();
+ spyOn(layerView);
+
+ assertBarMode();
+ assertThat(mBubbleData.isExpanded()).isTrue();
+ assertThat(layerView.isExpanded()).isTrue();
+ }
+
+ @Test
public void switchBetweenBarAndStack_noBubbles_shouldBeIgnored() {
mBubbleProperties.mIsBubbleBarEnabled = false;
mPositioner.setIsLargeScreen(true);
diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeGlobalSettings.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeGlobalSettings.java
index 136b129..3a70cdf 100644
--- a/packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeGlobalSettings.java
+++ b/packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeGlobalSettings.java
@@ -22,8 +22,6 @@
import android.database.ContentObserver;
import android.net.Uri;
-import kotlinx.coroutines.CoroutineDispatcher;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -46,13 +44,6 @@
}
@Override
- public CoroutineDispatcher getBackgroundDispatcher() {
- throw new UnsupportedOperationException(
- "GlobalSettings.getBackgroundDispatcher is not implemented, but you may find "
- + "GlobalSettings.getBackgroundDispatcher helpful instead.");
- }
-
- @Override
public void registerContentObserverSync(Uri uri, boolean notifyDescendants,
ContentObserver settingsObserver) {
List<ContentObserver> observers;
diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeSettings.java b/packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeSettings.java
index 6cefa34..cd219ec 100644
--- a/packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeSettings.java
+++ b/packages/SystemUI/tests/utils/src/com/android/systemui/util/settings/FakeSettings.java
@@ -27,8 +27,6 @@
import com.android.systemui.settings.UserTracker;
-import kotlinx.coroutines.CoroutineDispatcher;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -68,11 +66,6 @@
}
@Override
- public CoroutineDispatcher getBackgroundDispatcher() {
- return null;
- }
-
- @Override
public void registerContentObserverForUserSync(Uri uri, boolean notifyDescendants,
ContentObserver settingsObserver, int userHandle) {
List<ContentObserver> observers;
diff --git a/ravenwood/OWNERS b/ravenwood/OWNERS
index a90328c..badfca0 100644
--- a/ravenwood/OWNERS
+++ b/ravenwood/OWNERS
@@ -2,6 +2,7 @@
jsharkey@google.com
omakoto@google.com
+dplotnikov@google.com
per-file ravenwood-annotation-allowed-classes.txt = dplotnikov@google.com
per-file texts/ravenwood-annotation-allowed-classes.txt = dplotnikov@google.com
diff --git a/ravenwood/runtime-helper-src/framework/com/android/platform/test/ravenwood/nativesubstitution/Parcel_host.java b/ravenwood/runtime-helper-src/framework/com/android/platform/test/ravenwood/nativesubstitution/Parcel_host.java
index 61ec7b4..22e11e1 100644
--- a/ravenwood/runtime-helper-src/framework/com/android/platform/test/ravenwood/nativesubstitution/Parcel_host.java
+++ b/ravenwood/runtime-helper-src/framework/com/android/platform/test/ravenwood/nativesubstitution/Parcel_host.java
@@ -164,6 +164,9 @@
p.mPos = pos;
}
public static void nativeSetDataCapacity(long nativePtr, int size) {
+ if (size < 0) {
+ throw new IllegalArgumentException("size < 0: size=" + size);
+ }
var p = getInstance(nativePtr);
if (p.getCapacity() < size) {
p.forceSetCapacity(size);
diff --git a/ravenwood/test-authors.md b/ravenwood/test-authors.md
index 2ab43bb..0a0b200 100644
--- a/ravenwood/test-authors.md
+++ b/ravenwood/test-authors.md
@@ -6,6 +6,20 @@
When writing tests under Ravenwood, all Android API symbols associated with your declared `sdk_version` are available to link against using, but unsupported APIs will throw an exception. This design choice enables mocking of unsupported APIs, and supports sharing of test code to build “bivalent” test suites that run against either Ravenwood or a traditional device.
+## Manually running tests
+
+To run all Ravenwood tests, use:
+
+```
+./frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
+```
+
+To run a specific test, use "atest" as normal, selecting the test from a Ravenwood suite such as:
+
+```
+atest CtsOsTestCasesRavenwood:ParcelTest\#testSetDataCapacityNegative
+```
+
## Typical test structure
Below are the typical steps needed to add a straightforward “small” unit test:
diff --git a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java
index 7342b00..edb6390 100644
--- a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java
+++ b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java
@@ -1379,30 +1379,6 @@
}
}
- @RequiresNoPermission
- @Override
- public boolean isMagnificationSystemUIConnected() {
- if (svcConnTracingEnabled()) {
- logTraceSvcConn("isMagnificationSystemUIConnected", "");
- }
- synchronized (mLock) {
- if (!hasRightsToCurrentUserLocked()) {
- return false;
- }
- if (!mSecurityPolicy.canControlMagnification(this)) {
- return false;
- }
- final long identity = Binder.clearCallingIdentity();
- try {
- MagnificationProcessor magnificationProcessor =
- mSystemSupport.getMagnificationProcessor();
- return magnificationProcessor.isMagnificationSystemUIConnected();
- } finally {
- Binder.restoreCallingIdentity(identity);
- }
- }
- }
-
public boolean isMagnificationCallbackEnabled(int displayId) {
return mInvocationHandler.isMagnificationCallbackEnabled(displayId);
}
@@ -1947,11 +1923,6 @@
InvocationHandler.MSG_CLEAR_ACCESSIBILITY_CACHE);
}
- public void notifyMagnificationSystemUIConnectionChangedLocked(boolean connected) {
- mInvocationHandler
- .notifyMagnificationSystemUIConnectionChangedLocked(connected);
- }
-
public void notifyMagnificationChangedLocked(int displayId, @NonNull Region region,
@NonNull MagnificationConfig config) {
mInvocationHandler
@@ -2003,21 +1974,6 @@
return (mGenericMotionEventSources & eventSourceWithoutClass) != 0;
}
- /**
- * Called by the invocation handler to notify the service that the
- * magnification systemui connection has changed.
- */
- private void notifyMagnificationSystemUIConnectionChangedInternal(boolean connected) {
- final IAccessibilityServiceClient listener = getServiceInterfaceSafely();
- if (listener != null) {
- try {
- listener.onMagnificationSystemUIConnectionChanged(connected);
- } catch (RemoteException re) {
- Slog.e(LOG_TAG,
- "Error sending magnification sysui connection changes to " + mService, re);
- }
- }
- }
/**
* Called by the invocation handler to notify the service that the
@@ -2414,7 +2370,6 @@
private static final int MSG_BIND_INPUT = 12;
private static final int MSG_UNBIND_INPUT = 13;
private static final int MSG_START_INPUT = 14;
- private static final int MSG_ON_MAGNIFICATION_SYSTEM_UI_CONNECTION_CHANGED = 15;
/** List of magnification callback states, mapping from displayId -> Boolean */
@GuardedBy("mlock")
@@ -2441,13 +2396,6 @@
notifyClearAccessibilityCacheInternal();
} break;
- case MSG_ON_MAGNIFICATION_SYSTEM_UI_CONNECTION_CHANGED: {
- final SomeArgs args = (SomeArgs) message.obj;
- final boolean connected = args.argi1 == 1;
- notifyMagnificationSystemUIConnectionChangedInternal(connected);
- args.recycle();
- } break;
-
case MSG_ON_MAGNIFICATION_CHANGED: {
final SomeArgs args = (SomeArgs) message.obj;
final Region region = (Region) args.arg1;
@@ -2505,15 +2453,6 @@
}
}
- public void notifyMagnificationSystemUIConnectionChangedLocked(boolean connected) {
- final SomeArgs args = SomeArgs.obtain();
- args.argi1 = connected ? 1 : 0;
-
- final Message msg =
- obtainMessage(MSG_ON_MAGNIFICATION_SYSTEM_UI_CONNECTION_CHANGED, args);
- msg.sendToTarget();
- }
-
public void notifyMagnificationChangedLocked(int displayId, @NonNull Region region,
@NonNull MagnificationConfig config) {
synchronized (mLock) {
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index d09cb3e..4f9db8b 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1812,17 +1812,6 @@
}
/**
- * Called by the MagnificationController when the magnification systemui connection changes.
- *
- * @param connected Whether the connection is ready.
- */
- public void notifyMagnificationSystemUIConnectionChanged(boolean connected) {
- synchronized (mLock) {
- notifyMagnificationSystemUIConnectionChangedLocked(connected);
- }
- }
-
- /**
* Called by the MagnificationController when the state of display
* magnification changes.
*
@@ -2254,14 +2243,6 @@
mProxyManager.clearCacheLocked();
}
- private void notifyMagnificationSystemUIConnectionChangedLocked(boolean connected) {
- final AccessibilityUserState state = getCurrentUserStateLocked();
- for (int i = state.mBoundServices.size() - 1; i >= 0; i--) {
- final AccessibilityServiceConnection service = state.mBoundServices.get(i);
- service.notifyMagnificationSystemUIConnectionChangedLocked(connected);
- }
- }
-
private void notifyMagnificationChangedLocked(int displayId, @NonNull Region region,
@NonNull MagnificationConfig config) {
final AccessibilityUserState state = getCurrentUserStateLocked();
diff --git a/services/accessibility/java/com/android/server/accessibility/ProxyAccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/ProxyAccessibilityServiceConnection.java
index 420bac7..4cb3d24 100644
--- a/services/accessibility/java/com/android/server/accessibility/ProxyAccessibilityServiceConnection.java
+++ b/services/accessibility/java/com/android/server/accessibility/ProxyAccessibilityServiceConnection.java
@@ -489,14 +489,6 @@
/** @throws UnsupportedOperationException since a proxy does not need magnification */
@RequiresNoPermission
@Override
- public boolean isMagnificationSystemUIConnected() throws UnsupportedOperationException {
- throw new UnsupportedOperationException("isMagnificationSystemUIConnected is not"
- + " supported");
- }
-
- /** @throws UnsupportedOperationException since a proxy does not need magnification */
- @RequiresNoPermission
- @Override
public boolean isMagnificationCallbackEnabled(int displayId) {
throw new UnsupportedOperationException("isMagnificationCallbackEnabled is not supported");
}
diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java
index 7f4c808..19e3e69 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java
@@ -18,6 +18,7 @@
import static android.accessibilityservice.AccessibilityTrace.FLAGS_MAGNIFICATION_CONNECTION;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_MAGNIFICATION_CONNECTION_CALLBACK;
+import static android.os.Build.HW_TIMEOUT_MULTIPLIER;
import static android.view.accessibility.MagnificationAnimationCallback.STUB_ANIMATION_CALLBACK;
import static com.android.server.accessibility.AccessibilityManagerService.INVALID_SERVICE_ID;
@@ -126,9 +127,8 @@
@ConnectionState
private int mConnectionState = DISCONNECTED;
- ConnectionStateChangedCallback mConnectionStateChangedCallback = null;
- private static final int WAIT_CONNECTION_TIMEOUT_MILLIS = 100;
+ private static final int WAIT_CONNECTION_TIMEOUT_MILLIS = 200 * HW_TIMEOUT_MULTIPLIER;
private final Object mLock;
private final Context mContext;
@@ -265,9 +265,6 @@
}
}
}
- if (mConnectionStateChangedCallback != null) {
- mConnectionStateChangedCallback.onConnectionStateChanged(connection != null);
- }
}
/**
@@ -275,7 +272,7 @@
*/
public boolean isConnected() {
synchronized (mLock) {
- return mConnectionWrapper != null && mConnectionState == CONNECTED;
+ return mConnectionWrapper != null;
}
}
@@ -683,8 +680,7 @@
*/
public boolean onFullscreenMagnificationActivationChanged(int displayId, boolean activated) {
synchronized (mLock) {
- waitForConnectionIfNeeded();
- if (mConnectionWrapper == null) {
+ if (!waitConnectionWithTimeoutIfNeeded()) {
Slog.w(TAG,
"onFullscreenMagnificationActivationChanged mConnectionWrapper is null. "
+ "mConnectionState=" + connectionStateToString(mConnectionState));
@@ -1294,8 +1290,7 @@
float centerY, float magnificationFrameOffsetRatioX,
float magnificationFrameOffsetRatioY,
MagnificationAnimationCallback animationCallback) {
- waitForConnectionIfNeeded();
- if (mConnectionWrapper == null) {
+ if (!waitConnectionWithTimeoutIfNeeded()) {
Slog.w(TAG,
"enableWindowMagnificationInternal mConnectionWrapper is null. "
+ "mConnectionState=" + connectionStateToString(mConnectionState));
@@ -1337,7 +1332,7 @@
displayId, positionX, positionY, animationCallback);
}
- private void waitForConnectionIfNeeded() {
+ boolean waitConnectionWithTimeoutIfNeeded() {
// Wait for the connection with a timeout.
final long endMillis = SystemClock.uptimeMillis() + WAIT_CONNECTION_TIMEOUT_MILLIS;
while (mConnectionState == CONNECTING && (SystemClock.uptimeMillis() < endMillis)) {
@@ -1347,9 +1342,6 @@
/* ignore */
}
}
- }
-
- interface ConnectionStateChangedCallback {
- void onConnectionStateChanged(boolean connected);
+ return isConnected();
}
}
diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java
index 9b78847..1489d16 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java
@@ -799,14 +799,18 @@
this,
mScaleProvider,
mBackgroundExecutor,
- () -> (isMagnificationConnectionManagerInitialized()
- && getMagnificationConnectionManager().isConnected())
+ () -> isMagnificationSystemUIConnectionReady()
);
}
}
return mFullScreenMagnificationController;
}
+ private boolean isMagnificationSystemUIConnectionReady() {
+ return isMagnificationConnectionManagerInitialized()
+ && getMagnificationConnectionManager().waitConnectionWithTimeoutIfNeeded();
+ }
+
/**
* Is {@link #mFullScreenMagnificationController} is initialized.
* @return {code true} if {@link #mFullScreenMagnificationController} is initialized.
@@ -828,8 +832,6 @@
mMagnificationConnectionManager = new MagnificationConnectionManager(mContext,
mLock, this, mAms.getTraceManager(),
mScaleProvider);
- mMagnificationConnectionManager.mConnectionStateChangedCallback =
- mAms::notifyMagnificationSystemUIConnectionChanged;
}
return mMagnificationConnectionManager;
}
diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationProcessor.java b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationProcessor.java
index 6036839..ed8f1ab 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationProcessor.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationProcessor.java
@@ -147,10 +147,6 @@
return false;
}
- public boolean isMagnificationSystemUIConnected() {
- return mController.getMagnificationConnectionManager().isConnected();
- }
-
private boolean setScaleAndCenterForFullScreenMagnification(int displayId, float scale,
float centerX, float centerY, boolean animate, int id) {
diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
index 4a99007..6704049 100644
--- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
+++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
@@ -1055,7 +1055,7 @@
@Override // Binder call
@EnforcePermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
- public int getVirtualCameraId(@NonNull VirtualCameraConfig cameraConfig)
+ public String getVirtualCameraId(@NonNull VirtualCameraConfig cameraConfig)
throws RemoteException {
super.getVirtualCameraId_enforcePermission();
Objects.requireNonNull(cameraConfig);
diff --git a/services/companion/java/com/android/server/companion/virtual/camera/VirtualCameraController.java b/services/companion/java/com/android/server/companion/virtual/camera/VirtualCameraController.java
index 743086e..62efafb 100644
--- a/services/companion/java/com/android/server/companion/virtual/camera/VirtualCameraController.java
+++ b/services/companion/java/com/android/server/companion/virtual/camera/VirtualCameraController.java
@@ -135,7 +135,7 @@
}
/** Return the id of the virtual camera with the given config. */
- public int getCameraId(@NonNull VirtualCameraConfig cameraConfig) {
+ public String getCameraId(@NonNull VirtualCameraConfig cameraConfig) {
connectVirtualCameraServiceIfNeeded();
try {
diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS
index 2545620..c4d38e4 100644
--- a/services/core/java/com/android/server/OWNERS
+++ b/services/core/java/com/android/server/OWNERS
@@ -1,5 +1,5 @@
# BootReceiver / Watchdog
-per-file BootReceiver.java,Watchdog.java = gaillard@google.com
+per-file BootReceiver.java,Watchdog.java = benmiles@google.com
# Connectivity / Networking
per-file ConnectivityService.java,ConnectivityServiceInitializer.java,NetworkManagementService.java,NsdService.java,VpnManagerService.java = file:/services/core/java/com/android/server/net/OWNERS
diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java
index 8c1bb3b..44aea15 100644
--- a/services/core/java/com/android/server/SystemConfig.java
+++ b/services/core/java/com/android/server/SystemConfig.java
@@ -352,7 +352,7 @@
@NonNull private final Set<String> mInitialNonStoppedSystemPackages = new ArraySet<>();
// Which packages (key) are allowed to join particular SharedUid (value).
- @NonNull private final Map<String, String> mPackageToSharedUidAllowList = new ArrayMap<>();
+ @NonNull private final ArrayMap<String, String> mPackageToSharedUidAllowList = new ArrayMap<>();
// A map of preloaded package names and the path to its app metadata file path.
private final ArrayMap<String, String> mAppMetadataFilePaths = new ArrayMap<>();
@@ -574,7 +574,7 @@
}
@NonNull
- public Map<String, String> getPackageToSharedUidAllowList() {
+ public ArrayMap<String, String> getPackageToSharedUidAllowList() {
return mPackageToSharedUidAllowList;
}
@@ -720,6 +720,9 @@
}
// Read configuration of features, libs and priv-app permissions from apex module.
int apexPermissionFlag = ALLOW_LIBS | ALLOW_FEATURES | ALLOW_PRIVAPP_PERMISSIONS;
+ if (android.permission.flags.Flags.apexSignaturePermissionAllowlistEnabled()) {
+ apexPermissionFlag |= ALLOW_SIGNATURE_PERMISSIONS;
+ }
// TODO: Use a solid way to filter apex module folders?
for (File f: FileUtils.listFilesOrEmpty(Environment.getApexDirectory())) {
if (f.isFile() || f.getPath().contains("@")) {
@@ -1322,6 +1325,8 @@
Environment.getProductDirectory().toPath() + "/");
boolean systemExt = permFile.toPath().startsWith(
Environment.getSystemExtDirectory().toPath() + "/");
+ boolean apex = permFile.toPath().startsWith(
+ Environment.getApexDirectory().toPath() + "/");
if (vendor) {
readSignatureAppPermissions(parser,
mPermissionAllowlist.getVendorSignatureAppAllowlist());
@@ -1331,6 +1336,9 @@
} else if (systemExt) {
readSignatureAppPermissions(parser,
mPermissionAllowlist.getSystemExtSignatureAppAllowlist());
+ } else if (apex) {
+ readSignatureAppPermissions(parser,
+ mPermissionAllowlist.getApexSignatureAppAllowlist());
} else {
readSignatureAppPermissions(parser,
mPermissionAllowlist.getSignatureAppAllowlist());
diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java
index f1d3584..1c13ad5 100644
--- a/services/core/java/com/android/server/UiModeManagerService.java
+++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -32,6 +32,7 @@
import static android.app.UiModeManager.PROJECTION_TYPE_NONE;
import static android.os.UserHandle.USER_SYSTEM;
import static android.os.UserHandle.getCallingUserId;
+import static android.os.UserManager.isVisibleBackgroundUsersEnabled;
import static android.provider.Settings.Secure.CONTRAST_LEVEL;
import static android.util.TimeUtils.isTimeBetween;
@@ -99,6 +100,7 @@
import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
import com.android.internal.notification.SystemNotificationChannels;
import com.android.internal.util.DumpUtils;
+import com.android.server.pm.UserManagerService;
import com.android.server.twilight.TwilightListener;
import com.android.server.twilight.TwilightManager;
import com.android.server.twilight.TwilightState;
@@ -848,6 +850,8 @@
}
final int user = UserHandle.getCallingUserId();
+ enforceValidCallingUser(user);
+
final long ident = Binder.clearCallingIdentity();
try {
synchronized (mLock) {
@@ -910,6 +914,8 @@
@AttentionModeThemeOverlayType int attentionModeThemeOverlayType) {
setAttentionModeThemeOverlay_enforcePermission();
+ enforceValidCallingUser(UserHandle.getCallingUserId());
+
synchronized (mLock) {
if (mAttentionModeThemeOverlay != attentionModeThemeOverlayType) {
mAttentionModeThemeOverlay = attentionModeThemeOverlayType;
@@ -999,6 +1005,8 @@
return false;
}
final int user = Binder.getCallingUserHandle().getIdentifier();
+ enforceValidCallingUser(user);
+
if (user != mCurrentUser && getContext().checkCallingOrSelfPermission(
android.Manifest.permission.INTERACT_ACROSS_USERS)
!= PackageManager.PERMISSION_GRANTED) {
@@ -1056,6 +1064,8 @@
return;
}
final int user = UserHandle.getCallingUserId();
+ enforceValidCallingUser(user);
+
final long ident = Binder.clearCallingIdentity();
try {
LocalTime newTime = LocalTime.ofNanoOfDay(time * 1000);
@@ -1084,6 +1094,8 @@
return;
}
final int user = UserHandle.getCallingUserId();
+ enforceValidCallingUser(user);
+
final long ident = Binder.clearCallingIdentity();
try {
LocalTime newTime = LocalTime.ofNanoOfDay(time * 1000);
@@ -1104,6 +1116,8 @@
assertLegit(callingPackage);
assertSingleProjectionType(projectionType);
enforceProjectionTypePermissions(projectionType);
+ enforceValidCallingUser(getCallingUserId());
+
synchronized (mLock) {
if (mProjectionHolders == null) {
mProjectionHolders = new SparseArray<>(1);
@@ -1148,6 +1162,8 @@
assertLegit(callingPackage);
assertSingleProjectionType(projectionType);
enforceProjectionTypePermissions(projectionType);
+ enforceValidCallingUser(getCallingUserId());
+
return releaseProjectionUnchecked(projectionType, callingPackage);
}
@@ -1187,6 +1203,9 @@
if (projectionType == PROJECTION_TYPE_NONE) {
return;
}
+
+ enforceValidCallingUser(getCallingUserId());
+
synchronized (mLock) {
if (mProjectionListeners == null) {
mProjectionListeners = new SparseArray<>(1);
@@ -1234,6 +1253,32 @@
}
};
+ // This method validates whether calling user is valid in visible background users
+ // feature. Valid user is the current user or the system or in the same profile group as
+ // the current user.
+ private void enforceValidCallingUser(int userId) {
+ if (!isVisibleBackgroundUsersEnabled()) {
+ return;
+ }
+ if (LOG) {
+ Slog.d(TAG, "enforceValidCallingUser: userId=" + userId
+ + " isSystemUser=" + (userId == USER_SYSTEM) + " current user=" + mCurrentUser
+ + " callingPid=" + Binder.getCallingPid()
+ + " callingUid=" + mInjector.getCallingUid());
+ }
+ long ident = Binder.clearCallingIdentity();
+ try {
+ if (userId != USER_SYSTEM && userId != mCurrentUser
+ && !UserManagerService.getInstance().isSameProfileGroup(userId, mCurrentUser)) {
+ throw new SecurityException(
+ "Calling user is not valid for level-1 compatibility in MUMD. "
+ + "callingUserId=" + userId + " currentUserId=" + mCurrentUser);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(ident);
+ }
+ }
+
private void enforceProjectionTypePermissions(@UiModeManager.ProjectionType int p) {
if ((p & PROJECTION_TYPE_AUTOMOTIVE) != 0) {
getContext().enforceCallingPermission(
diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java
index 26aa053..95c0e0e 100644
--- a/services/core/java/com/android/server/am/ActivityManagerConstants.java
+++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java
@@ -169,7 +169,6 @@
*/
static final String KEY_ENABLE_NEW_OOMADJ = "enable_new_oom_adj";
- private static final int DEFAULT_MAX_CACHED_PROCESSES = 1024;
private static final boolean DEFAULT_PRIORITIZE_ALARM_BROADCASTS = true;
private static final long DEFAULT_FGSERVICE_MIN_SHOWN_TIME = 2*1000;
private static final long DEFAULT_FGSERVICE_MIN_REPORT_TIME = 3*1000;
@@ -294,12 +293,7 @@
private static final long DEFAULT_SERVICE_BACKGROUND_TIMEOUT = DEFAULT_SERVICE_TIMEOUT * 10;
/**
- * Maximum number of cached processes.
- */
- private static final String KEY_MAX_CACHED_PROCESSES = "max_cached_processes";
-
- /**
- * Maximum number of cached processes.
+ * Maximum number of phantom processes.
*/
private static final String KEY_MAX_PHANTOM_PROCESSES = "max_phantom_processes";
@@ -446,9 +440,6 @@
volatile int mProcStateDebugSetProcStateDelay = 0;
volatile int mProcStateDebugSetUidStateDelay = 0;
- // Maximum number of cached processes we will allow.
- public int MAX_CACHED_PROCESSES = DEFAULT_MAX_CACHED_PROCESSES;
-
// This is the amount of time we allow an app to settle after it goes into the background,
// before we start restricting what it can do.
public long BACKGROUND_SETTLE_TIME = DEFAULT_BACKGROUND_SETTLE_TIME;
@@ -857,24 +848,6 @@
private ContentResolver mResolver;
private final KeyValueListParser mParser = new KeyValueListParser(',');
- private int mOverrideMaxCachedProcesses = -1;
- private final int mCustomizedMaxCachedProcesses;
-
- // The maximum number of cached processes we will keep around before killing them.
- // NOTE: this constant is *only* a control to not let us go too crazy with
- // keeping around processes on devices with large amounts of RAM. For devices that
- // are tighter on RAM, the out of memory killer is responsible for killing background
- // processes as RAM is needed, and we should *never* be relying on this limit to
- // kill them. Also note that this limit only applies to cached background processes;
- // we have no limit on the number of service, visible, foreground, or other such
- // processes and the number of those processes does not count against the cached
- // process limit. This will be initialized in the constructor.
- public int CUR_MAX_CACHED_PROCESSES;
-
- // The maximum number of empty app processes we will let sit around. This will be
- // initialized in the constructor.
- public int CUR_MAX_EMPTY_PROCESSES;
-
/** @see #mNoKillCachedProcessesUntilBootCompleted */
private static final String KEY_NO_KILL_CACHED_PROCESSES_UNTIL_BOOT_COMPLETED =
"no_kill_cached_processes_until_boot_completed";
@@ -906,15 +879,6 @@
volatile long mNoKillCachedProcessesPostBootCompletedDurationMillis =
DEFAULT_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS;
- // The number of empty apps at which we don't consider it necessary to do
- // memory trimming.
- public int CUR_TRIM_EMPTY_PROCESSES = computeEmptyProcessLimit(MAX_CACHED_PROCESSES) / 2;
-
- // The number of cached at which we don't consider it necessary to do
- // memory trimming.
- public int CUR_TRIM_CACHED_PROCESSES =
- (MAX_CACHED_PROCESSES - computeEmptyProcessLimit(MAX_CACHED_PROCESSES)) / 3;
-
/** @see #mNoKillCachedProcessesUntilBootCompleted */
private static final String KEY_MAX_EMPTY_TIME_MILLIS =
"max_empty_time_millis";
@@ -1165,9 +1129,6 @@
return;
}
switch (name) {
- case KEY_MAX_CACHED_PROCESSES:
- updateMaxCachedProcesses();
- break;
case KEY_DEFAULT_BACKGROUND_ACTIVITY_STARTS_ENABLED:
updateBackgroundActivityStarts();
break;
@@ -1417,16 +1378,7 @@
context.getResources().getStringArray(
com.android.internal.R.array.config_keep_warming_services))
.map(ComponentName::unflattenFromString).collect(Collectors.toSet()));
- mCustomizedMaxCachedProcesses = context.getResources().getInteger(
- com.android.internal.R.integer.config_customizedMaxCachedProcesses);
- CUR_MAX_CACHED_PROCESSES = mCustomizedMaxCachedProcesses;
- CUR_MAX_EMPTY_PROCESSES = computeEmptyProcessLimit(CUR_MAX_CACHED_PROCESSES);
- final int rawMaxEmptyProcesses = computeEmptyProcessLimit(
- Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES));
- CUR_TRIM_EMPTY_PROCESSES = rawMaxEmptyProcesses / 2;
- CUR_TRIM_CACHED_PROCESSES = (Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES)
- - rawMaxEmptyProcesses) / 3;
loadNativeBootDeviceConfigConstants();
mDefaultDisableAppProfilerPssProfiling = context.getResources().getBoolean(
R.bool.config_am_disablePssProfiling);
@@ -1481,19 +1433,6 @@
DEFAULT_ENABLE_NEW_OOM_ADJ);
}
- public void setOverrideMaxCachedProcesses(int value) {
- mOverrideMaxCachedProcesses = value;
- updateMaxCachedProcesses();
- }
-
- public int getOverrideMaxCachedProcesses() {
- return mOverrideMaxCachedProcesses;
- }
-
- public static int computeEmptyProcessLimit(int totalProcessLimit) {
- return totalProcessLimit/2;
- }
-
@Override
public void onChange(boolean selfChange, Uri uri) {
if (uri == null) return;
@@ -1994,29 +1933,6 @@
mSystemServerAutomaticHeapDumpPackageName);
}
- private void updateMaxCachedProcesses() {
- String maxCachedProcessesFlag = DeviceConfig.getProperty(
- DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, KEY_MAX_CACHED_PROCESSES);
- try {
- CUR_MAX_CACHED_PROCESSES = mOverrideMaxCachedProcesses < 0
- ? (TextUtils.isEmpty(maxCachedProcessesFlag)
- ? mCustomizedMaxCachedProcesses : Integer.parseInt(maxCachedProcessesFlag))
- : mOverrideMaxCachedProcesses;
- } catch (NumberFormatException e) {
- // Bad flag value from Phenotype, revert to default.
- Slog.e(TAG,
- "Unable to parse flag for max_cached_processes: " + maxCachedProcessesFlag, e);
- CUR_MAX_CACHED_PROCESSES = mCustomizedMaxCachedProcesses;
- }
- CUR_MAX_EMPTY_PROCESSES = computeEmptyProcessLimit(CUR_MAX_CACHED_PROCESSES);
-
- final int rawMaxEmptyProcesses = computeEmptyProcessLimit(
- Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES));
- CUR_TRIM_EMPTY_PROCESSES = rawMaxEmptyProcesses / 2;
- CUR_TRIM_CACHED_PROCESSES = (Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES)
- - rawMaxEmptyProcesses) / 3;
- }
-
private void updateProactiveKillsEnabled() {
PROACTIVE_KILLS_ENABLED = DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
@@ -2275,8 +2191,6 @@
pw.println("ACTIVITY MANAGER SETTINGS (dumpsys activity settings) "
+ Settings.Global.ACTIVITY_MANAGER_CONSTANTS + ":");
- pw.print(" "); pw.print(KEY_MAX_CACHED_PROCESSES); pw.print("=");
- pw.println(MAX_CACHED_PROCESSES);
pw.print(" "); pw.print(KEY_BACKGROUND_SETTLE_TIME); pw.print("=");
pw.println(BACKGROUND_SETTLE_TIME);
pw.print(" "); pw.print(KEY_FGSERVICE_MIN_SHOWN_TIME); pw.print("=");
@@ -2477,14 +2391,6 @@
pw.print("="); pw.println(MAX_PREVIOUS_TIME);
pw.println();
- if (mOverrideMaxCachedProcesses >= 0) {
- pw.print(" mOverrideMaxCachedProcesses="); pw.println(mOverrideMaxCachedProcesses);
- }
- pw.print(" mCustomizedMaxCachedProcesses="); pw.println(mCustomizedMaxCachedProcesses);
- pw.print(" CUR_MAX_CACHED_PROCESSES="); pw.println(CUR_MAX_CACHED_PROCESSES);
- pw.print(" CUR_MAX_EMPTY_PROCESSES="); pw.println(CUR_MAX_EMPTY_PROCESSES);
- pw.print(" CUR_TRIM_EMPTY_PROCESSES="); pw.println(CUR_TRIM_EMPTY_PROCESSES);
- pw.print(" CUR_TRIM_CACHED_PROCESSES="); pw.println(CUR_TRIM_CACHED_PROCESSES);
pw.print(" OOMADJ_UPDATE_QUICK="); pw.println(OOMADJ_UPDATE_QUICK);
pw.print(" ENABLE_WAIT_FOR_FINISH_ATTACH_APPLICATION=");
pw.println(mEnableWaitForFinishAttachApplication);
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 2600f10..e0ec171 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5846,19 +5846,13 @@
@Override
public void setProcessLimit(int max) {
- enforceCallingPermission(android.Manifest.permission.SET_PROCESS_LIMIT,
- "setProcessLimit()");
- synchronized (this) {
- mConstants.setOverrideMaxCachedProcesses(max);
- trimApplicationsLocked(true, OOM_ADJ_REASON_PROCESS_END);
- }
+ // Process limits are deprecated since b/253908413
}
@Override
public int getProcessLimit() {
- synchronized (this) {
- return mConstants.getOverrideMaxCachedProcesses();
- }
+ // Process limits are deprecated since b/253908413
+ return Integer.MAX_VALUE;
}
void importanceTokenDied(ImportanceToken token) {
@@ -10424,11 +10418,6 @@
public void onShellCommand(FileDescriptor in, FileDescriptor out,
FileDescriptor err, String[] args, ShellCallback callback,
ResultReceiver resultReceiver) {
- final int callingUid = Binder.getCallingUid();
- if (callingUid != ROOT_UID && callingUid != Process.SHELL_UID) {
- resultReceiver.send(-1, null);
- throw new SecurityException("Shell commands are only callable by root or shell");
- }
(new ActivityManagerShellCommand(this, false)).exec(
this, in, out, err, args, callback, resultReceiver);
}
diff --git a/services/core/java/com/android/server/am/AppProfiler.java b/services/core/java/com/android/server/am/AppProfiler.java
index dda48ad..3ed60fc 100644
--- a/services/core/java/com/android/server/am/AppProfiler.java
+++ b/services/core/java/com/android/server/am/AppProfiler.java
@@ -507,8 +507,7 @@
final int lruSize = mService.mProcessList.getLruSizeLOSP();
if (mCachedAppFrozenDurations == null
|| mCachedAppFrozenDurations.length < lruSize) {
- mCachedAppFrozenDurations = new long[Math.max(
- lruSize, mService.mConstants.CUR_MAX_CACHED_PROCESSES)];
+ mCachedAppFrozenDurations = new long[lruSize];
}
mService.mProcessList.forEachLruProcessesLOSP(true, app -> {
if (app.mOptRecord.isFrozen()) {
@@ -1370,18 +1369,13 @@
// are managing to keep around is less than half the maximum we desire;
// if we are keeping a good number around, we'll let them use whatever
// memory they want.
- if (numCached <= mService.mConstants.CUR_TRIM_CACHED_PROCESSES
- && numEmpty <= mService.mConstants.CUR_TRIM_EMPTY_PROCESSES) {
- final int numCachedAndEmpty = numCached + numEmpty;
- if (numCachedAndEmpty <= ProcessList.TRIM_CRITICAL_THRESHOLD) {
- memFactor = ADJ_MEM_FACTOR_CRITICAL;
- } else if (numCachedAndEmpty <= ProcessList.TRIM_LOW_THRESHOLD) {
- memFactor = ADJ_MEM_FACTOR_LOW;
- } else {
- memFactor = ADJ_MEM_FACTOR_MODERATE;
- }
+ final int numCachedAndEmpty = numCached + numEmpty;
+ if (numCachedAndEmpty <= ProcessList.TRIM_CRITICAL_THRESHOLD) {
+ memFactor = ADJ_MEM_FACTOR_CRITICAL;
+ } else if (numCachedAndEmpty <= ProcessList.TRIM_LOW_THRESHOLD) {
+ memFactor = ADJ_MEM_FACTOR_LOW;
} else {
- memFactor = ADJ_MEM_FACTOR_NORMAL;
+ memFactor = ADJ_MEM_FACTOR_MODERATE;
}
}
// We always allow the memory level to go up (better). We only allow it to go
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index d642b02..29e0f7a 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -122,12 +122,14 @@
import com.android.server.pm.UserManagerInternal;
import com.android.server.power.optimization.Flags;
import com.android.server.power.stats.AggregatedPowerStatsConfig;
+import com.android.server.power.stats.AudioPowerStatsProcessor;
import com.android.server.power.stats.BatteryExternalStatsWorker;
import com.android.server.power.stats.BatteryStatsDumpHelperImpl;
import com.android.server.power.stats.BatteryStatsImpl;
import com.android.server.power.stats.BatteryUsageStatsProvider;
import com.android.server.power.stats.BluetoothPowerStatsProcessor;
import com.android.server.power.stats.CpuPowerStatsProcessor;
+import com.android.server.power.stats.FlashlightPowerStatsProcessor;
import com.android.server.power.stats.MobileRadioPowerStatsProcessor;
import com.android.server.power.stats.PhoneCallPowerStatsProcessor;
import com.android.server.power.stats.PowerStatsAggregator;
@@ -136,6 +138,7 @@
import com.android.server.power.stats.PowerStatsStore;
import com.android.server.power.stats.PowerStatsUidResolver;
import com.android.server.power.stats.SystemServerCpuThreadReader.SystemServiceCpuThreadTimes;
+import com.android.server.power.stats.VideoPowerStatsProcessor;
import com.android.server.power.stats.WifiPowerStatsProcessor;
import com.android.server.power.stats.wakeups.CpuWakeupStats;
@@ -194,7 +197,7 @@
private final BatteryUsageStatsProvider mBatteryUsageStatsProvider;
private final AtomicFile mConfigFile;
private final BatteryStats.BatteryStatsDumpHelper mDumpHelper;
- private final PowerStatsUidResolver mPowerStatsUidResolver;
+ private final PowerStatsUidResolver mPowerStatsUidResolver = new PowerStatsUidResolver();
private final AggregatedPowerStatsConfig mAggregatedPowerStatsConfig;
private volatile boolean mMonitorEnabled = true;
@@ -422,7 +425,6 @@
setPowerStatsThrottlePeriods(batteryStatsConfigBuilder, context.getResources().getString(
com.android.internal.R.string.config_powerStatsThrottlePeriods));
mBatteryStatsConfig = batteryStatsConfigBuilder.build();
- mPowerStatsUidResolver = new PowerStatsUidResolver();
mStats = new BatteryStatsImpl(mBatteryStatsConfig, Clock.SYSTEM_CLOCK, mMonotonicClock,
systemDir, mHandler, this, this, mUserManagerUserInfoProvider, mPowerProfile,
mCpuScalingPolicies, mPowerStatsUidResolver);
@@ -516,6 +518,42 @@
AggregatedPowerStatsConfig.STATE_PROCESS_STATE)
.setProcessor(
new BluetoothPowerStatsProcessor(mPowerProfile));
+
+ config.trackPowerComponent(BatteryConsumer.POWER_COMPONENT_AUDIO)
+ .trackDeviceStates(
+ AggregatedPowerStatsConfig.STATE_POWER,
+ AggregatedPowerStatsConfig.STATE_SCREEN)
+ .trackUidStates(
+ AggregatedPowerStatsConfig.STATE_POWER,
+ AggregatedPowerStatsConfig.STATE_SCREEN,
+ AggregatedPowerStatsConfig.STATE_PROCESS_STATE)
+ .setProcessor(
+ new AudioPowerStatsProcessor(mPowerProfile,
+ mPowerStatsUidResolver));
+
+ config.trackPowerComponent(BatteryConsumer.POWER_COMPONENT_VIDEO)
+ .trackDeviceStates(
+ AggregatedPowerStatsConfig.STATE_POWER,
+ AggregatedPowerStatsConfig.STATE_SCREEN)
+ .trackUidStates(
+ AggregatedPowerStatsConfig.STATE_POWER,
+ AggregatedPowerStatsConfig.STATE_SCREEN,
+ AggregatedPowerStatsConfig.STATE_PROCESS_STATE)
+ .setProcessor(
+ new VideoPowerStatsProcessor(mPowerProfile,
+ mPowerStatsUidResolver));
+
+ config.trackPowerComponent(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT)
+ .trackDeviceStates(
+ AggregatedPowerStatsConfig.STATE_POWER,
+ AggregatedPowerStatsConfig.STATE_SCREEN)
+ .trackUidStates(
+ AggregatedPowerStatsConfig.STATE_POWER,
+ AggregatedPowerStatsConfig.STATE_SCREEN,
+ AggregatedPowerStatsConfig.STATE_PROCESS_STATE)
+ .setProcessor(
+ new FlashlightPowerStatsProcessor(mPowerProfile,
+ mPowerStatsUidResolver));
return config;
}
@@ -583,6 +621,24 @@
BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
Flags.streamlinedConnectivityBatteryStats());
+ mStats.setPowerStatsCollectorEnabled(BatteryConsumer.POWER_COMPONENT_AUDIO,
+ Flags.streamlinedMiscBatteryStats());
+ mBatteryUsageStatsProvider.setPowerStatsExporterEnabled(
+ BatteryConsumer.POWER_COMPONENT_AUDIO,
+ Flags.streamlinedMiscBatteryStats());
+
+ mStats.setPowerStatsCollectorEnabled(BatteryConsumer.POWER_COMPONENT_VIDEO,
+ Flags.streamlinedMiscBatteryStats());
+ mBatteryUsageStatsProvider.setPowerStatsExporterEnabled(
+ BatteryConsumer.POWER_COMPONENT_VIDEO,
+ Flags.streamlinedMiscBatteryStats());
+
+ mStats.setPowerStatsCollectorEnabled(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT,
+ Flags.streamlinedMiscBatteryStats());
+ mBatteryUsageStatsProvider.setPowerStatsExporterEnabled(
+ BatteryConsumer.POWER_COMPONENT_FLASHLIGHT,
+ Flags.streamlinedMiscBatteryStats());
+
mWorker.systemServicesReady();
mStats.systemServicesReady(mContext);
mCpuWakeupStats.systemServicesReady();
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index ab34dd4..105e201 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -470,7 +470,7 @@
return true;
});
mTmpUidRecords = new ActiveUids(service, false);
- mTmpQueue = new ArrayDeque<ProcessRecord>(mConstants.CUR_MAX_CACHED_PROCESSES << 1);
+ mTmpQueue = new ArrayDeque<ProcessRecord>();
mNumSlots = ((CACHED_APP_MAX_ADJ - CACHED_APP_MIN_ADJ + 1) >> 1)
/ CACHED_APP_IMPORTANCE_LEVELS;
}
@@ -1079,23 +1079,11 @@
int curEmptyAdj = CACHED_APP_MIN_ADJ + CACHED_APP_IMPORTANCE_LEVELS;
int nextEmptyAdj = curEmptyAdj + (CACHED_APP_IMPORTANCE_LEVELS * 2);
- final int emptyProcessLimit = mConstants.CUR_MAX_EMPTY_PROCESSES;
- final int cachedProcessLimit = mConstants.CUR_MAX_CACHED_PROCESSES
- - emptyProcessLimit;
// Let's determine how many processes we have running vs.
// how many slots we have for background processes; we may want
// to put multiple processes in a slot of there are enough of
// them.
int numEmptyProcs = numLru - mNumNonCachedProcs - mNumCachedHiddenProcs;
- if (numEmptyProcs > cachedProcessLimit) {
- // If there are more empty processes than our limit on cached
- // processes, then use the cached process limit for the factor.
- // This ensures that the really old empty processes get pushed
- // down to the bottom, so if we are running low on memory we will
- // have a better chance at keeping around more cached processes
- // instead of a gazillion empty processes.
- numEmptyProcs = cachedProcessLimit;
- }
int cachedFactor = (mNumCachedHiddenProcs > 0
? (mNumCachedHiddenProcs + mNumSlots - 1) : 1)
/ mNumSlots;
@@ -1217,17 +1205,6 @@
ArrayList<ProcessRecord> lruList = mProcessList.getLruProcessesLOSP();
final int numLru = lruList.size();
- final boolean doKillExcessiveProcesses = shouldKillExcessiveProcesses(now);
- if (!doKillExcessiveProcesses) {
- if (mNextNoKillDebugMessageTime < now) {
- Slog.d(TAG, "Not killing cached processes"); // STOPSHIP Remove it b/222365734
- mNextNoKillDebugMessageTime = now + 5000; // Every 5 seconds
- }
- }
- final int emptyProcessLimit = doKillExcessiveProcesses
- ? mConstants.CUR_MAX_EMPTY_PROCESSES : Integer.MAX_VALUE;
- final int cachedProcessLimit = doKillExcessiveProcesses
- ? (mConstants.CUR_MAX_CACHED_PROCESSES - emptyProcessLimit) : Integer.MAX_VALUE;
int lastCachedGroup = 0;
int lastCachedGroupUid = 0;
int numCached = 0;
@@ -1279,36 +1256,14 @@
} else {
lastCachedGroupUid = lastCachedGroup = 0;
}
- if ((numCached - numCachedExtraGroup) > cachedProcessLimit) {
- app.killLocked("cached #" + numCached,
- "too many cached",
- ApplicationExitInfo.REASON_OTHER,
- ApplicationExitInfo.SUBREASON_TOO_MANY_CACHED,
- true);
- } else if (proactiveKillsEnabled) {
+ if (proactiveKillsEnabled) {
lruCachedApp = app;
}
break;
case PROCESS_STATE_CACHED_EMPTY:
- if (numEmpty > mConstants.CUR_TRIM_EMPTY_PROCESSES
- && app.getLastActivityTime() < oldTime) {
- app.killLocked("empty for " + ((now
- - app.getLastActivityTime()) / 1000) + "s",
- "empty for too long",
- ApplicationExitInfo.REASON_OTHER,
- ApplicationExitInfo.SUBREASON_TRIM_EMPTY,
- true);
- } else {
- numEmpty++;
- if (numEmpty > emptyProcessLimit) {
- app.killLocked("empty #" + numEmpty,
- "too many empty",
- ApplicationExitInfo.REASON_OTHER,
- ApplicationExitInfo.SUBREASON_TOO_MANY_EMPTY,
- true);
- } else if (proactiveKillsEnabled) {
- lruCachedApp = app;
- }
+ numEmpty++;
+ if (proactiveKillsEnabled) {
+ lruCachedApp = app;
}
break;
default:
@@ -1349,7 +1304,6 @@
}
if (proactiveKillsEnabled // Proactive kills enabled?
- && doKillExcessiveProcesses // Should kill excessive processes?
&& freeSwapPercent < lowSwapThresholdPercent // Swap below threshold?
&& lruCachedApp != null // If no cached app, let LMKD decide
// If swap is non-decreasing, give reclaim a chance to catch up
@@ -1544,25 +1498,6 @@
}
}
- /**
- * Return true if we should kill excessive cached/empty processes.
- */
- private boolean shouldKillExcessiveProcesses(long nowUptime) {
- final long lastUserUnlockingUptime = mService.mUserController.getLastUserUnlockingUptime();
-
- if (lastUserUnlockingUptime == 0) {
- // No users have been unlocked.
- return !mConstants.mNoKillCachedProcessesUntilBootCompleted;
- }
- final long noKillCachedProcessesPostBootCompletedDurationMillis =
- mConstants.mNoKillCachedProcessesPostBootCompletedDurationMillis;
- if ((lastUserUnlockingUptime + noKillCachedProcessesPostBootCompletedDurationMillis)
- > nowUptime) {
- return false;
- }
- return true;
- }
-
protected final ComputeOomAdjWindowCallback mTmpComputeOomAdjWindowCallback =
new ComputeOomAdjWindowCallback();
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index 032093b..9a3b575 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -141,6 +141,7 @@
"app_widgets",
"arc_next",
"art_mainline",
+ "art_performance",
"avic",
"biometrics",
"biometrics_framework",
diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index 4c3020f..0afca92 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -30,7 +30,6 @@
import android.annotation.UserIdInt;
import android.annotation.WorkerThread;
import android.app.ActivityManagerInternal;
-import android.app.AppGlobals;
import android.app.AppOpsManager;
import android.app.IUriGrantsManager;
import android.app.KeyguardManager;
@@ -48,9 +47,8 @@
import android.content.IOnPrimaryClipChangedListener;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.content.pm.PackageManagerInternal;
import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
import android.hardware.display.DisplayManager;
@@ -1247,20 +1245,13 @@
@GuardedBy("mLock")
private void addActiveOwnerLocked(int uid, int deviceId, String pkg) {
- final IPackageManager pm = AppGlobals.getPackageManager();
+ final PackageManagerInternal pm = LocalServices.getService(PackageManagerInternal.class);
final int targetUserHandle = UserHandle.getCallingUserId();
final long oldIdentity = Binder.clearCallingIdentity();
try {
- PackageInfo pi = pm.getPackageInfo(pkg, 0, targetUserHandle);
- if (pi == null) {
- throw new IllegalArgumentException("Unknown package " + pkg);
+ if (!pm.isSameApp(pkg, 0, uid, targetUserHandle)) {
+ throw new SecurityException("Calling uid " + uid + " does not own package " + pkg);
}
- if (!UserHandle.isSameApp(pi.applicationInfo.uid, uid)) {
- throw new SecurityException("Calling uid " + uid
- + " does not own package " + pkg);
- }
- } catch (RemoteException e) {
- // Can't happen; the package manager is in the same process
} finally {
Binder.restoreCallingIdentity(oldIdentity);
}
diff --git a/services/core/java/com/android/server/criticalevents/OWNERS b/services/core/java/com/android/server/criticalevents/OWNERS
index 9c3136c..7935bed 100644
--- a/services/core/java/com/android/server/criticalevents/OWNERS
+++ b/services/core/java/com/android/server/criticalevents/OWNERS
@@ -1,2 +1 @@
benmiles@google.com
-gaillard@google.com
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 60d0353..195a516 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -159,7 +159,7 @@
private static final int MSG_STATSD_HBM_BRIGHTNESS = 11;
private static final int MSG_SWITCH_USER = 12;
private static final int MSG_BOOT_COMPLETED = 13;
- private static final int MSG_SET_DWBC_STRONG_MODE = 14;
+ private static final int MSG_SWITCH_AUTOBRIGHTNESS_MODE = 14;
private static final int MSG_SET_DWBC_COLOR_OVERRIDE = 15;
private static final int MSG_SET_DWBC_LOGGING_ENABLED = 16;
private static final int MSG_SET_BRIGHTNESS_FROM_OFFLOAD = 17;
@@ -1184,15 +1184,9 @@
@Override
public void setAutomaticScreenBrightnessMode(
@AutomaticBrightnessController.AutomaticBrightnessMode int mode) {
- boolean isIdle = mode == AUTO_BRIGHTNESS_MODE_IDLE;
- if (mAutomaticBrightnessController != null) {
- // Set sendUpdate to true to make sure that updatePowerState() gets called
- mAutomaticBrightnessController.switchMode(mode, /* sendUpdate= */ true);
- setAnimatorRampSpeeds(isIdle);
- }
Message msg = mHandler.obtainMessage();
- msg.what = MSG_SET_DWBC_STRONG_MODE;
- msg.arg1 = isIdle ? 1 : 0;
+ msg.what = MSG_SWITCH_AUTOBRIGHTNESS_MODE;
+ msg.arg1 = mode;
mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());
}
@@ -1866,7 +1860,7 @@
private void setDwbcStrongMode(int arg) {
if (mDisplayWhiteBalanceController != null) {
- final boolean isIdle = (arg == 1);
+ final boolean isIdle = (arg == AUTO_BRIGHTNESS_MODE_IDLE);
mDisplayWhiteBalanceController.setStrongModeEnabled(isIdle);
}
}
@@ -3032,7 +3026,12 @@
updatePowerState();
break;
- case MSG_SET_DWBC_STRONG_MODE:
+ case MSG_SWITCH_AUTOBRIGHTNESS_MODE:
+ boolean isIdle = msg.arg1 == AUTO_BRIGHTNESS_MODE_IDLE;
+ if (mAutomaticBrightnessController != null) {
+ mAutomaticBrightnessController.switchMode(msg.arg1, /* sendUpdate= */ true);
+ setAnimatorRampSpeeds(isIdle);
+ }
setDwbcStrongMode(msg.arg1);
break;
diff --git a/services/core/java/com/android/server/display/mode/Vote.java b/services/core/java/com/android/server/display/mode/Vote.java
index 1ec469c..cacc8b4 100644
--- a/services/core/java/com/android/server/display/mode/Vote.java
+++ b/services/core/java/com/android/server/display/mode/Vote.java
@@ -16,10 +16,13 @@
package com.android.server.display.mode;
+import android.annotation.IntDef;
import android.annotation.NonNull;
import com.android.server.display.config.SupportedModeData;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.List;
@@ -132,15 +135,40 @@
// to function, so this needs to be the highest priority of all votes.
int PRIORITY_UDFPS = 20;
+ @IntDef(prefix = { "PRIORITY_" }, value = {
+ PRIORITY_DEFAULT_RENDER_FRAME_RATE,
+ PRIORITY_FLICKER_REFRESH_RATE,
+ PRIORITY_HIGH_BRIGHTNESS_MODE,
+ PRIORITY_USER_SETTING_MIN_RENDER_FRAME_RATE,
+ PRIORITY_USER_SETTING_DISPLAY_PREFERRED_SIZE,
+ PRIORITY_APP_REQUEST_RENDER_FRAME_RATE_RANGE,
+ PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE,
+ PRIORITY_APP_REQUEST_SIZE,
+ PRIORITY_USER_SETTING_PEAK_REFRESH_RATE,
+ PRIORITY_USER_SETTING_PEAK_RENDER_FRAME_RATE,
+ PRIORITY_SYNCHRONIZED_REFRESH_RATE,
+ PRIORITY_LIMIT_MODE,
+ PRIORITY_AUTH_OPTIMIZER_RENDER_FRAME_RATE,
+ PRIORITY_LAYOUT_LIMITED_FRAME_RATE,
+ PRIORITY_SYSTEM_REQUESTED_MODES,
+ PRIORITY_LOW_POWER_MODE_MODES,
+ PRIORITY_LOW_POWER_MODE_RENDER_RATE,
+ PRIORITY_FLICKER_REFRESH_RATE_SWITCH,
+ PRIORITY_SKIN_TEMPERATURE,
+ PRIORITY_PROXIMITY,
+ PRIORITY_UDFPS
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @interface Priority {}
+
// Whenever a new priority is added, remember to update MIN_PRIORITY, MAX_PRIORITY, and
// APP_REQUEST_REFRESH_RATE_RANGE_PRIORITY_CUTOFF, as well as priorityToString.
-
- int MIN_PRIORITY = PRIORITY_DEFAULT_RENDER_FRAME_RATE;
- int MAX_PRIORITY = PRIORITY_UDFPS;
+ @Priority int MIN_PRIORITY = PRIORITY_DEFAULT_RENDER_FRAME_RATE;
+ @Priority int MAX_PRIORITY = PRIORITY_UDFPS;
// The cutoff for the app request refresh rate range. Votes with priorities lower than this
// value will not be considered when constructing the app request refresh rate range.
- int APP_REQUEST_REFRESH_RATE_RANGE_PRIORITY_CUTOFF =
+ @Priority int APP_REQUEST_REFRESH_RATE_RANGE_PRIORITY_CUTOFF =
PRIORITY_APP_REQUEST_RENDER_FRAME_RATE_RANGE;
/**
diff --git a/services/core/java/com/android/server/display/mode/VotesStorage.java b/services/core/java/com/android/server/display/mode/VotesStorage.java
index 6becf1c..d41ef65 100644
--- a/services/core/java/com/android/server/display/mode/VotesStorage.java
+++ b/services/core/java/com/android/server/display/mode/VotesStorage.java
@@ -79,12 +79,12 @@
}
/** updates vote storage for all displays */
- void updateGlobalVote(int priority, @Nullable Vote vote) {
+ void updateGlobalVote(@Vote.Priority int priority, @Nullable Vote vote) {
updateVote(GLOBAL_ID, priority, vote);
}
/** updates vote storage */
- void updateVote(int displayId, int priority, @Nullable Vote vote) {
+ void updateVote(int displayId, @Vote.Priority int priority, @Nullable Vote vote) {
if (mLoggingEnabled) {
Slog.i(TAG, "updateVoteLocked(displayId=" + displayId
+ ", priority=" + Vote.priorityToString(priority)
@@ -126,7 +126,7 @@
}
/** removes all votes with certain priority from vote storage */
- void removeAllVotesForPriority(int priority) {
+ void removeAllVotesForPriority(@Vote.Priority int priority) {
if (mLoggingEnabled) {
Slog.i(TAG, "removeAllVotesForPriority(priority="
+ Vote.priorityToString(priority) + ")");
diff --git a/services/core/java/com/android/server/dreams/OWNERS b/services/core/java/com/android/server/dreams/OWNERS
index 7302f6e..b9286f8 100644
--- a/services/core/java/com/android/server/dreams/OWNERS
+++ b/services/core/java/com/android/server/dreams/OWNERS
@@ -1,4 +1,3 @@
-brycelee@google.com
-dsandler@android.com
-michaelwr@google.com
-roosa@google.com
+# Bug component: 66910
+include /core/java/android/service/dreams/OWNERS
+
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 48cccd5..0bd40d1 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -3348,6 +3348,10 @@
mPointerIconCache.setUseLargePointerIcons(useLargeIcons);
}
+ void setPointerFillStyle(@PointerIcon.PointerIconVectorStyleFill int fillStyle) {
+ mPointerIconCache.setPointerFillStyle(fillStyle);
+ }
+
interface KeyboardBacklightControllerInterface {
default void incrementKeyboardBacklight(int deviceId) {}
default void decrementKeyboardBacklight(int deviceId) {}
diff --git a/services/core/java/com/android/server/input/InputSettingsObserver.java b/services/core/java/com/android/server/input/InputSettingsObserver.java
index a1341b7..9585b49 100644
--- a/services/core/java/com/android/server/input/InputSettingsObserver.java
+++ b/services/core/java/com/android/server/input/InputSettingsObserver.java
@@ -16,6 +16,9 @@
package com.android.server.input;
+import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_FILL_BLACK;
+import static android.view.flags.Flags.enableVectorCursorA11ySettings;
+
import static com.android.input.flags.Flags.rateLimitUserActivityPokeInDispatcher;
import android.content.BroadcastReceiver;
@@ -96,7 +99,9 @@
Map.entry(Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_STICKY_KEYS),
(reason) -> updateAccessibilityStickyKeys()),
Map.entry(Settings.Secure.getUriFor(Settings.Secure.STYLUS_POINTER_ICON_ENABLED),
- (reason) -> updateStylusPointerIconEnabled()));
+ (reason) -> updateStylusPointerIconEnabled()),
+ Map.entry(Settings.System.getUriFor(Settings.System.POINTER_FILL_STYLE),
+ (reason) -> updatePointerFillStyleFromSettings()));
}
/**
@@ -261,4 +266,15 @@
mNative.setStylusPointerIconEnabled(
InputSettings.isStylusPointerIconEnabled(mContext, true /* forceReloadSetting */));
}
+
+ private void updatePointerFillStyleFromSettings() {
+ if (!enableVectorCursorA11ySettings()) {
+ return;
+ }
+ final int pointerFillStyle = Settings.System.getIntForUser(
+ mContext.getContentResolver(), Settings.System.POINTER_FILL_STYLE,
+ POINTER_ICON_VECTOR_STYLE_FILL_BLACK,
+ UserHandle.USER_CURRENT);
+ mService.setPointerFillStyle(pointerFillStyle);
+ }
}
diff --git a/services/core/java/com/android/server/input/PointerIconCache.java b/services/core/java/com/android/server/input/PointerIconCache.java
index 233b865..936e17f 100644
--- a/services/core/java/com/android/server/input/PointerIconCache.java
+++ b/services/core/java/com/android/server/input/PointerIconCache.java
@@ -16,13 +16,17 @@
package com.android.server.input;
+import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_FILL_BLACK;
+
import android.annotation.NonNull;
import android.content.Context;
+import android.content.res.Resources;
import android.hardware.display.DisplayManager;
import android.os.Handler;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseIntArray;
+import android.view.ContextThemeWrapper;
import android.view.Display;
import android.view.DisplayInfo;
import android.view.PointerIcon;
@@ -56,6 +60,9 @@
private final SparseArray<Context> mDisplayContexts = new SparseArray<>();
@GuardedBy("mLoadedPointerIconsByDisplayAndType")
private final SparseIntArray mDisplayDensities = new SparseIntArray();
+ @GuardedBy("mLoadedPointerIconsByDisplayAndType")
+ private @PointerIcon.PointerIconVectorStyleFill int mPointerIconFillStyle =
+ POINTER_ICON_VECTOR_STYLE_FILL_BLACK;
private final DisplayManager.DisplayListener mDisplayListener =
new DisplayManager.DisplayListener() {
@@ -105,6 +112,11 @@
mUiThreadHandler.post(() -> handleSetUseLargePointerIcons(useLargeIcons));
}
+ /** Set the fill style for vector pointer icons. */
+ public void setPointerFillStyle(@PointerIcon.PointerIconVectorStyleFill int fillStyle) {
+ mUiThreadHandler.post(() -> handleSetPointerFillStyle(fillStyle));
+ }
+
/**
* Get a loaded system pointer icon. This will fetch the icon from the cache, or load it if
* it isn't already cached.
@@ -119,8 +131,13 @@
}
PointerIcon icon = iconsByType.get(type);
if (icon == null) {
- icon = PointerIcon.getLoadedSystemIcon(getContextForDisplayLocked(displayId), type,
- mUseLargePointerIcons);
+ Context context = getContextForDisplayLocked(displayId);
+ Resources.Theme theme = context.getResources().newTheme();
+ theme.setTo(context.getTheme());
+ theme.applyStyle(PointerIcon.vectorFillStyleToResource(mPointerIconFillStyle),
+ /* force= */ true);
+ icon = PointerIcon.getLoadedSystemIcon(new ContextThemeWrapper(context, theme),
+ type, mUseLargePointerIcons);
iconsByType.put(type, icon);
}
return Objects.requireNonNull(icon);
@@ -185,6 +202,19 @@
mNative.reloadPointerIcons();
}
+ @android.annotation.UiThread
+ private void handleSetPointerFillStyle(@PointerIcon.PointerIconVectorStyleFill int fillStyle) {
+ synchronized (mLoadedPointerIconsByDisplayAndType) {
+ if (mPointerIconFillStyle == fillStyle) {
+ return;
+ }
+ mPointerIconFillStyle = fillStyle;
+ // Clear all cached icons on all displays.
+ mLoadedPointerIconsByDisplayAndType.clear();
+ }
+ mNative.reloadPointerIcons();
+ }
+
// Updates the cached display density for the given displayId, and returns true if
// the cached density changed.
@GuardedBy("mLoadedPointerIconsByDisplayAndType")
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index fb5f5ae..8665a39 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -2695,25 +2695,27 @@
final boolean canImeDrawsImeNavBar =
mImeDrawsImeNavBarRes != null && mImeDrawsImeNavBarRes.get() && hasNavigationBar;
final boolean shouldShowImeSwitcherWhenImeIsShown = shouldShowImeSwitcherLocked(
- InputMethodService.IME_ACTIVE | InputMethodService.IME_VISIBLE);
+ InputMethodService.IME_ACTIVE | InputMethodService.IME_VISIBLE,
+ mCurrentUserId);
return (canImeDrawsImeNavBar ? InputMethodNavButtonFlags.IME_DRAWS_IME_NAV_BAR : 0)
| (shouldShowImeSwitcherWhenImeIsShown
? InputMethodNavButtonFlags.SHOW_IME_SWITCHER_WHEN_IME_IS_SHOWN : 0);
}
@GuardedBy("ImfLock.class")
- private boolean shouldShowImeSwitcherLocked(int visibility) {
+ private boolean shouldShowImeSwitcherLocked(int visibility, @UserIdInt int userId) {
if (!mShowOngoingImeSwitcherForPhones) return false;
// When the IME switcher dialog is shown, the IME switcher button should be hidden.
+ // TODO(b/305849394): Make mMenuController multi-user aware.
if (mMenuController.getSwitchingDialogLocked() != null) return false;
// When we are switching IMEs, the IME switcher button should be hidden.
- final var bindingController = getInputMethodBindingController(mCurrentUserId);
+ final var bindingController = getInputMethodBindingController(userId);
if (!Objects.equals(bindingController.getCurId(),
bindingController.getSelectedMethodId())) {
return false;
}
if (mWindowManagerInternal.isKeyguardShowingAndNotOccluded()
- && mWindowManagerInternal.isKeyguardSecure(mCurrentUserId)) {
+ && mWindowManagerInternal.isKeyguardSecure(userId)) {
return false;
}
if ((visibility & InputMethodService.IME_ACTIVE) == 0
@@ -2730,7 +2732,7 @@
return false;
}
- final InputMethodSettings settings = InputMethodSettingsRepository.get(mCurrentUserId);
+ final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);
List<InputMethodInfo> imes = settings.getEnabledInputMethodListWithFilter(
InputMethodInfo::shouldShowInInputMethodPicker);
final int numImes = imes.size();
@@ -2845,14 +2847,22 @@
// Caution! This method is called in this class. Handle multi-user carefully
@GuardedBy("ImfLock.class")
private void updateSystemUiLocked(int vis, int backDisposition) {
- if (getCurTokenLocked() == null) {
+ updateSystemUiLocked(vis, backDisposition, mCurrentUserId);
+ }
+
+ @GuardedBy("ImfLock.class")
+ private void updateSystemUiLocked(int vis, int backDisposition, @UserIdInt int userId) {
+ final var bindingController = getInputMethodBindingController(userId);
+ final var curToken = bindingController.getCurToken();
+ if (curToken == null) {
return;
}
+ final int curTokenDisplayId = bindingController.getCurTokenDisplayId();
if (DEBUG) {
Slog.d(TAG, "IME window vis: " + vis
+ " active: " + (vis & InputMethodService.IME_ACTIVE)
+ " inv: " + (vis & InputMethodService.IME_INVISIBLE)
- + " displayId: " + getCurTokenDisplayIdLocked());
+ + " displayId: " + curTokenDisplayId);
}
final IBinder focusedWindowToken = mImeBindingState != null
? mImeBindingState.mFocusedWindow : null;
@@ -2871,17 +2881,18 @@
} else {
vis &= ~InputMethodService.IME_VISIBLE_IMPERCEPTIBLE;
}
- final var curId = getInputMethodBindingController(mCurrentUserId).getCurId();
+ final var curId = bindingController.getCurId();
+ // TODO(b/305849394): Make mMenuController multi-user aware.
if (mMenuController.getSwitchingDialogLocked() != null
- || !Objects.equals(curId, getSelectedMethodIdLocked())) {
+ || !Objects.equals(curId, bindingController.getSelectedMethodId())) {
// When the IME switcher dialog is shown, or we are switching IMEs,
// the back button should be in the default state (as if the IME is not shown).
backDisposition = InputMethodService.BACK_DISPOSITION_ADJUST_NOTHING;
}
- final boolean needsToShowImeSwitcher = shouldShowImeSwitcherLocked(vis);
+ final boolean needsToShowImeSwitcher = shouldShowImeSwitcherLocked(vis, userId);
if (mStatusBarManagerInternal != null) {
- mStatusBarManagerInternal.setImeWindowStatus(getCurTokenDisplayIdLocked(),
- getCurTokenLocked(), vis, backDisposition, needsToShowImeSwitcher);
+ mStatusBarManagerInternal.setImeWindowStatus(curTokenDisplayId,
+ curToken, vis, backDisposition, needsToShowImeSwitcher);
}
} finally {
Binder.restoreCallingIdentity(ident);
diff --git a/services/core/java/com/android/server/locales/OWNERS b/services/core/java/com/android/server/locales/OWNERS
index e1e946b..7e35dac 100644
--- a/services/core/java/com/android/server/locales/OWNERS
+++ b/services/core/java/com/android/server/locales/OWNERS
@@ -1,5 +1,4 @@
roosa@google.com
-pratyushmore@google.com
goldmanj@google.com
ankitavyas@google.com
allenwtsu@google.com
diff --git a/services/core/java/com/android/server/media/MediaRoute2Provider.java b/services/core/java/com/android/server/media/MediaRoute2Provider.java
index 09605fe..b0fa523 100644
--- a/services/core/java/com/android/server/media/MediaRoute2Provider.java
+++ b/services/core/java/com/android/server/media/MediaRoute2Provider.java
@@ -22,6 +22,7 @@
import android.media.MediaRoute2Info;
import android.media.MediaRoute2ProviderInfo;
import android.media.MediaRouter2;
+import android.media.MediaRouter2Utils;
import android.media.RouteDiscoveryPreference;
import android.media.RoutingSessionInfo;
import android.os.Bundle;
@@ -226,8 +227,23 @@
return route2Info != null && mTargetOriginalRouteId.equals(route2Info.getOriginalId());
}
- public boolean isTargetRouteIdInList(@NonNull List<String> routeOriginalIdList) {
- return routeOriginalIdList.stream().anyMatch(mTargetOriginalRouteId::equals);
+ /**
+ * Returns whether the given list of {@link MediaRoute2Info#getOriginalId() original ids}
+ * contains the {@link #mTargetOriginalRouteId target route id}.
+ */
+ public boolean isTargetRouteIdInRouteOriginalIdList(
+ @NonNull List<String> originalRouteIdList) {
+ return originalRouteIdList.stream().anyMatch(mTargetOriginalRouteId::equals);
+ }
+
+ /**
+ * Returns whether the given list of {@link MediaRoute2Info#getId() unique ids} contains the
+ * {@link #mTargetOriginalRouteId target route id}.
+ */
+ public boolean isTargetRouteIdInRouteUniqueIdList(@NonNull List<String> uniqueRouteIdList) {
+ return uniqueRouteIdList.stream()
+ .map(MediaRouter2Utils::getOriginalId)
+ .anyMatch(mTargetOriginalRouteId::equals);
}
}
}
diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
index 71cbcb9..d5e85da 100644
--- a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
+++ b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
@@ -21,6 +21,7 @@
import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -41,6 +42,7 @@
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
+import android.util.LongSparseArray;
import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
@@ -49,7 +51,9 @@
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.Set;
@@ -77,7 +81,16 @@
private boolean mLastDiscoveryPreferenceIncludesThisPackage = false;
@GuardedBy("mLock")
- final List<RoutingSessionInfo> mReleasingSessions = new ArrayList<>();
+ private final List<RoutingSessionInfo> mReleasingSessions = new ArrayList<>();
+
+ // We keep pending requests for transfers and sessions creation separately because transfers
+ // don't have an associated request id and session creations don't have a session id.
+ @GuardedBy("mLock")
+ private final LongSparseArray<SessionCreationOrTransferRequest>
+ mRequestIdToSessionCreationRequest;
+
+ @GuardedBy("mLock")
+ private final Map<String, SessionCreationOrTransferRequest> mSessionOriginalIdToTransferRequest;
MediaRoute2ProviderServiceProxy(
@NonNull Context context,
@@ -87,6 +100,8 @@
int userId) {
super(componentName);
mContext = Objects.requireNonNull(context, "Context must not be null.");
+ mRequestIdToSessionCreationRequest = new LongSparseArray<>();
+ mSessionOriginalIdToTransferRequest = new HashMap<>();
mIsSelfScanOnlyProvider = isSelfScanOnlyProvider;
mUserId = userId;
mHandler = new Handler(looper);
@@ -109,6 +124,18 @@
@NonNull UserHandle transferInitiatorUserHandle,
@NonNull String transferInitiatorPackageName) {
if (mConnectionReady) {
+ if (Flags.enableBuiltInSpeakerRouteSuitabilityStatuses()) {
+ synchronized (mLock) {
+ mRequestIdToSessionCreationRequest.put(
+ requestId,
+ new SessionCreationOrTransferRequest(
+ requestId,
+ routeOriginalId,
+ transferReason,
+ transferInitiatorUserHandle,
+ transferInitiatorPackageName));
+ }
+ }
mActiveConnection.requestCreateSession(
requestId, packageName, routeOriginalId, sessionHints);
updateBinding();
@@ -118,6 +145,11 @@
@Override
public void releaseSession(long requestId, String sessionId) {
if (mConnectionReady) {
+ if (Flags.enableBuiltInSpeakerRouteSuitabilityStatuses()) {
+ synchronized (mLock) {
+ mSessionOriginalIdToTransferRequest.remove(sessionId);
+ }
+ }
mActiveConnection.releaseSession(requestId, sessionId);
updateBinding();
}
@@ -158,6 +190,18 @@
String routeOriginalId,
@RoutingSessionInfo.TransferReason int transferReason) {
if (mConnectionReady) {
+ if (Flags.enableBuiltInSpeakerRouteSuitabilityStatuses()) {
+ synchronized (mLock) {
+ mSessionOriginalIdToTransferRequest.put(
+ sessionOriginalId,
+ new SessionCreationOrTransferRequest(
+ requestId,
+ routeOriginalId,
+ transferReason,
+ transferInitiatorUserHandle,
+ transferInitiatorPackageName));
+ }
+ }
mActiveConnection.transferToRoute(requestId, sessionOriginalId, routeOriginalId);
}
}
@@ -384,6 +428,11 @@
String newSessionId = newSession.getId();
synchronized (mLock) {
+ if (Flags.enableBuiltInSpeakerRouteSuitabilityStatuses()) {
+ newSession =
+ createSessionWithPopulatedTransferInitiationDataLocked(
+ requestId, /* oldSessionInfo= */ null, newSession);
+ }
if (mSessionInfos.stream()
.anyMatch(session -> TextUtils.equals(session.getId(), newSessionId))
|| mReleasingSessions.stream()
@@ -397,6 +446,7 @@
mCallback.onSessionCreated(this, requestId, newSession);
}
+ @GuardedBy("mLock")
private int findSessionByIdLocked(RoutingSessionInfo session) {
for (int i = 0; i < mSessionInfos.size(); i++) {
if (TextUtils.equals(mSessionInfos.get(i).getId(), session.getId())) {
@@ -417,7 +467,6 @@
for (RoutingSessionInfo session : sessions) {
if (session == null) continue;
session = assignProviderIdForSession(session);
-
int sourceIndex = findSessionByIdLocked(session);
if (sourceIndex < 0) {
mSessionInfos.add(targetIndex++, session);
@@ -425,6 +474,12 @@
} else if (sourceIndex < targetIndex) {
Slog.w(TAG, "Ignoring duplicate session ID: " + session.getId());
} else {
+ if (Flags.enableBuiltInSpeakerRouteSuitabilityStatuses()) {
+ RoutingSessionInfo oldSessionInfo = mSessionInfos.get(sourceIndex);
+ session =
+ createSessionWithPopulatedTransferInitiationDataLocked(
+ REQUEST_ID_NONE, oldSessionInfo, session);
+ }
mSessionInfos.set(sourceIndex, session);
Collections.swap(mSessionInfos, sourceIndex, targetIndex++);
dispatchSessionUpdated(session);
@@ -432,11 +487,65 @@
}
for (int i = mSessionInfos.size() - 1; i >= targetIndex; i--) {
RoutingSessionInfo releasedSession = mSessionInfos.remove(i);
+ mSessionOriginalIdToTransferRequest.remove(releasedSession.getId());
dispatchSessionReleased(releasedSession);
}
}
}
+ /**
+ * Returns a {@link RoutingSessionInfo} with transfer initiation data from the given {@code
+ * oldSessionInfo}, and any pending transfer or session creation requests.
+ */
+ @GuardedBy("mLock")
+ private RoutingSessionInfo createSessionWithPopulatedTransferInitiationDataLocked(
+ long requestId,
+ @Nullable RoutingSessionInfo oldSessionInfo,
+ @NonNull RoutingSessionInfo newSessionInfo) {
+ SessionCreationOrTransferRequest pendingRequest =
+ oldSessionInfo != null
+ ? mSessionOriginalIdToTransferRequest.get(newSessionInfo.getOriginalId())
+ : mRequestIdToSessionCreationRequest.get(requestId);
+ boolean pendingTargetRouteInSelectedRoutes =
+ pendingRequest != null
+ && pendingRequest.isTargetRouteIdInRouteUniqueIdList(
+ newSessionInfo.getSelectedRoutes());
+ boolean pendingTargetRouteInTransferableRoutes =
+ pendingRequest != null
+ && pendingRequest.isTargetRouteIdInRouteUniqueIdList(
+ newSessionInfo.getTransferableRoutes());
+
+ int transferReason;
+ UserHandle transferInitiatorUserHandle;
+ String transferInitiatorPackageName;
+ if (pendingTargetRouteInSelectedRoutes) { // The pending request has been satisfied.
+ transferReason = pendingRequest.mTransferReason;
+ transferInitiatorUserHandle = pendingRequest.mTransferInitiatorUserHandle;
+ transferInitiatorPackageName = pendingRequest.mTransferInitiatorPackageName;
+ } else if (oldSessionInfo != null) {
+ // No pending request, we copy the values from the old session object.
+ transferReason = oldSessionInfo.getTransferReason();
+ transferInitiatorUserHandle = oldSessionInfo.getTransferInitiatorUserHandle();
+ transferInitiatorPackageName = oldSessionInfo.getTransferInitiatorPackageName();
+ } else { // There's a new session with no associated creation request, we use defaults.
+ transferReason = RoutingSessionInfo.TRANSFER_REASON_FALLBACK;
+ transferInitiatorUserHandle = UserHandle.of(mUserId);
+ transferInitiatorPackageName = newSessionInfo.getClientPackageName();
+ }
+ if (pendingTargetRouteInSelectedRoutes || !pendingTargetRouteInTransferableRoutes) {
+ // The pending request has been satisfied, or the target route is no longer available.
+ if (oldSessionInfo != null) {
+ mSessionOriginalIdToTransferRequest.remove(newSessionInfo.getId());
+ } else if (pendingRequest != null) {
+ mRequestIdToSessionCreationRequest.remove(pendingRequest.mRequestId);
+ }
+ }
+ return new RoutingSessionInfo.Builder(newSessionInfo)
+ .setTransferInitiator(transferInitiatorUserHandle, transferInitiatorPackageName)
+ .setTransferReason(transferReason)
+ .build();
+ }
+
private void onSessionReleased(Connection connection, RoutingSessionInfo releasedSession) {
if (mActiveConnection != connection) {
return;
@@ -450,6 +559,7 @@
boolean found = false;
synchronized (mLock) {
+ mSessionOriginalIdToTransferRequest.remove(releasedSession.getId());
for (RoutingSessionInfo session : mSessionInfos) {
if (TextUtils.equals(session.getId(), releasedSession.getId())) {
mSessionInfos.remove(session);
@@ -498,6 +608,11 @@
}
private void onRequestFailed(Connection connection, long requestId, int reason) {
+ if (Flags.enableBuiltInSpeakerRouteSuitabilityStatuses()) {
+ synchronized (mLock) {
+ mRequestIdToSessionCreationRequest.remove(requestId);
+ }
+ }
if (mActiveConnection != connection) {
return;
}
@@ -522,18 +637,29 @@
}
mSessionInfos.clear();
mReleasingSessions.clear();
+ mRequestIdToSessionCreationRequest.clear();
+ mSessionOriginalIdToTransferRequest.clear();
}
}
}
@Override
protected String getDebugString() {
+ int pendingSessionCreationCount;
+ int pendingTransferCount;
+ synchronized (mLock) {
+ pendingSessionCreationCount = mRequestIdToSessionCreationRequest.size();
+ pendingTransferCount = mSessionOriginalIdToTransferRequest.size();
+ }
return TextUtils.formatSimple(
- "ProviderServiceProxy - package: %s, bound: %b, connection (active:%b, ready:%b)",
+ "ProviderServiceProxy - package: %s, bound: %b, connection (active:%b, ready:%b), "
+ + "pending (session creations: %d, transfers: %d)",
mComponentName.getPackageName(),
mBound,
mActiveConnection != null,
- mConnectionReady);
+ mConnectionReady,
+ pendingSessionCreationCount,
+ pendingTransferCount);
}
private final class Connection implements DeathRecipient {
diff --git a/services/core/java/com/android/server/media/MediaSession2Record.java b/services/core/java/com/android/server/media/MediaSession2Record.java
index dfb2b0a..89555a9 100644
--- a/services/core/java/com/android/server/media/MediaSession2Record.java
+++ b/services/core/java/com/android/server/media/MediaSession2Record.java
@@ -67,7 +67,6 @@
// The lock is required to prevent `Controller2Callback` from using partially initialized
// `MediaSession2Record.this`.
synchronized (mLock) {
- mUniqueId = sNextMediaSessionRecordId.getAndIncrement();
mSessionToken = sessionToken;
mService = service;
mHandlerExecutor = new HandlerExecutor(new Handler(handlerLooper));
diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index 69f07d5..0a9109b 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -81,6 +81,8 @@
import android.util.Slog;
import android.view.KeyEvent;
+import com.android.internal.annotations.GuardedBy;
+import com.android.media.flags.Flags;
import com.android.server.LocalServices;
import com.android.server.uri.UriGrantsManagerInternal;
@@ -229,6 +231,14 @@
private int mPolicies;
+ private final Runnable mUserEngagementTimeoutExpirationRunnable =
+ () -> {
+ synchronized (mLock) {
+ updateUserEngagedStateIfNeededLocked(/* isTimeoutExpired= */ true);
+ }
+ };
+
+ @GuardedBy("mLock")
private @UserEngagementState int mUserEngagementState = USER_DISENGAGED;
@IntDef({USER_PERMANENTLY_ENGAGED, USER_TEMPORARY_ENGAGED, USER_DISENGAGED})
@@ -238,26 +248,26 @@
/**
* Indicates that the session is active and in one of the user engaged states.
*
- * @see #updateUserEngagedStateIfNeededLocked(boolean) ()
+ * @see #updateUserEngagedStateIfNeededLocked(boolean)
*/
private static final int USER_PERMANENTLY_ENGAGED = 0;
/**
* Indicates that the session is active and in {@link PlaybackState#STATE_PAUSED} state.
*
- * @see #updateUserEngagedStateIfNeededLocked(boolean) ()
+ * @see #updateUserEngagedStateIfNeededLocked(boolean)
*/
private static final int USER_TEMPORARY_ENGAGED = 1;
/**
* Indicates that the session is either not active or in one of the user disengaged states
*
- * @see #updateUserEngagedStateIfNeededLocked(boolean) ()
+ * @see #updateUserEngagedStateIfNeededLocked(boolean)
*/
private static final int USER_DISENGAGED = 2;
/**
- * Indicates the duration of the temporary engaged states.
+ * Indicates the duration of the temporary engaged states, in milliseconds.
*
* <p>Some {@link MediaSession} states like {@link PlaybackState#STATE_PAUSED} are temporarily
* engaged, meaning the corresponding session is only considered in an engaged state for the
@@ -270,7 +280,7 @@
* user-engaged state is not considered user-engaged when transitioning from a non-user engaged
* state {@link PlaybackState#STATE_STOPPED}.
*/
- private static final int TEMP_USER_ENGAGED_TIMEOUT = 600000;
+ private static final int TEMP_USER_ENGAGED_TIMEOUT_MS = 600000;
public MediaSessionRecord(
int ownerPid,
@@ -284,7 +294,6 @@
Looper handlerLooper,
int policies)
throws RemoteException {
- mUniqueId = sNextMediaSessionRecordId.getAndIncrement();
mOwnerPid = ownerPid;
mOwnerUid = ownerUid;
mUserId = userId;
@@ -609,8 +618,7 @@
@Override
public void expireTempEngaged() {
- mHandler.removeCallbacks(mHandleTempEngagedSessionTimeout);
- updateUserEngagedStateIfNeededLocked(/* isTimeoutExpired= */ true);
+ mHandler.post(mUserEngagementTimeoutExpirationRunnable);
}
/**
@@ -1086,11 +1094,6 @@
}
};
- private final Runnable mHandleTempEngagedSessionTimeout =
- () -> {
- updateUserEngagedStateIfNeededLocked(/* isTimeoutExpired= */ true);
- };
-
@RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS)
private static boolean componentNameExists(
@NonNull ComponentName componentName, @NonNull Context context, int userId) {
@@ -1107,10 +1110,14 @@
return !resolveInfos.isEmpty();
}
+ @GuardedBy("mLock")
private void updateUserEngagedStateIfNeededLocked(boolean isTimeoutExpired) {
+ if (!Flags.enableNotifyingActivityManagerWithMediaSessionStatusChange()) {
+ return;
+ }
int oldUserEngagedState = mUserEngagementState;
int newUserEngagedState;
- if (!isActive() || mPlaybackState == null) {
+ if (!isActive() || mPlaybackState == null || mDestroyed) {
newUserEngagedState = USER_DISENGAGED;
} else if (isActive() && mPlaybackState.isActive()) {
newUserEngagedState = USER_PERMANENTLY_ENGAGED;
@@ -1126,18 +1133,22 @@
return;
}
+ mUserEngagementState = newUserEngagedState;
if (newUserEngagedState == USER_TEMPORARY_ENGAGED) {
- mHandler.postDelayed(mHandleTempEngagedSessionTimeout, TEMP_USER_ENGAGED_TIMEOUT);
- } else if (oldUserEngagedState == USER_TEMPORARY_ENGAGED) {
- mHandler.removeCallbacks(mHandleTempEngagedSessionTimeout);
+ mHandler.postDelayed(
+ mUserEngagementTimeoutExpirationRunnable, TEMP_USER_ENGAGED_TIMEOUT_MS);
+ } else {
+ mHandler.removeCallbacks(mUserEngagementTimeoutExpirationRunnable);
}
boolean wasUserEngaged = oldUserEngagedState != USER_DISENGAGED;
boolean isNowUserEngaged = newUserEngagedState != USER_DISENGAGED;
- mUserEngagementState = newUserEngagedState;
if (wasUserEngaged != isNowUserEngaged) {
- mService.onSessionUserEngagementStateChange(
- /* mediaSessionRecord= */ this, /* isUserEngaged= */ isNowUserEngaged);
+ mHandler.post(
+ () ->
+ mService.onSessionUserEngagementStateChange(
+ /* mediaSessionRecord= */ this,
+ /* isUserEngaged= */ isNowUserEngaged));
}
}
diff --git a/services/core/java/com/android/server/media/MediaSessionRecordImpl.java b/services/core/java/com/android/server/media/MediaSessionRecordImpl.java
index b57b148..15f90d4 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecordImpl.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecordImpl.java
@@ -34,8 +34,12 @@
*/
public abstract class MediaSessionRecordImpl {
- static final AtomicInteger sNextMediaSessionRecordId = new AtomicInteger(1);
- int mUniqueId;
+ private static final AtomicInteger sNextMediaSessionRecordId = new AtomicInteger(1);
+ private final int mUniqueId;
+
+ protected MediaSessionRecordImpl() {
+ mUniqueId = sNextMediaSessionRecordId.getAndIncrement();
+ }
/**
* Get the info for this session.
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index 3998667..f02a3ff 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -715,6 +715,12 @@
ForegroundServiceDelegationOptions foregroundServiceDelegationOptions) {
final long token = Binder.clearCallingIdentity();
try {
+ Log.i(
+ TAG,
+ TextUtils.formatSimple(
+ "startFgsDelegate: pkg=%s uid=%d",
+ foregroundServiceDelegationOptions.mClientPackageName,
+ foregroundServiceDelegationOptions.mClientUid));
mActivityManagerInternal.startForegroundServiceDelegate(
foregroundServiceDelegationOptions, /* connection= */ null);
} finally {
@@ -756,6 +762,12 @@
ForegroundServiceDelegationOptions foregroundServiceDelegationOptions) {
final long token = Binder.clearCallingIdentity();
try {
+ Log.i(
+ TAG,
+ TextUtils.formatSimple(
+ "stopFgsDelegate: pkg=%s uid=%d",
+ foregroundServiceDelegationOptions.mClientPackageName,
+ foregroundServiceDelegationOptions.mClientUid));
mActivityManagerInternal.stopForegroundServiceDelegate(
foregroundServiceDelegationOptions);
} finally {
@@ -2679,6 +2691,9 @@
@Override
public void expireTempEngagedSessions() {
+ if (!Flags.enableNotifyingActivityManagerWithMediaSessionStatusChange()) {
+ return;
+ }
synchronized (mLock) {
for (Set<MediaSessionRecordImpl> uidSessions :
mUserEngagedSessionsForFgs.values()) {
diff --git a/services/core/java/com/android/server/media/MediaShellCommand.java b/services/core/java/com/android/server/media/MediaShellCommand.java
index bea71dc..19f16cc 100644
--- a/services/core/java/com/android/server/media/MediaShellCommand.java
+++ b/services/core/java/com/android/server/media/MediaShellCommand.java
@@ -113,6 +113,7 @@
mWriter.println(" media_session list-sessions");
mWriter.println(" media_session monitor <tag>");
mWriter.println(" media_session volume [options]");
+ mWriter.println(" media_session expire-temp-engaged-sessions");
mWriter.println();
mWriter.println("media_session dispatch: dispatch a media key to the system.");
mWriter.println(" KEY may be: play, pause, play-pause, mute, headsethook,");
@@ -121,6 +122,9 @@
mWriter.println("media_session monitor: monitor updates to the specified session.");
mWriter.println(" Use the tag from list-sessions.");
mWriter.println("media_session volume: " + VolumeCtrl.USAGE);
+ mWriter.println("media_session expire-temp-engaged-sessions: Expires any ongoing");
+ mWriter.println(" timers for media sessions in a temporary user-engaged");
+ mWriter.println(" state.");
mWriter.println();
}
diff --git a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
index 6b409ee..8c6273c 100644
--- a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
+++ b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
@@ -443,7 +443,8 @@
boolean isTransferringToTheSelectedRoute =
mPendingTransferRequest.isTargetRoute(selectedRoute);
boolean canBePotentiallyTransferred =
- mPendingTransferRequest.isTargetRouteIdInList(transferableRoutes);
+ mPendingTransferRequest.isTargetRouteIdInRouteOriginalIdList(
+ transferableRoutes);
if (isTransferringToTheSelectedRoute) {
transferReason = mPendingTransferRequest.mTransferReason;
diff --git a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerInternal.java b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerInternal.java
index 81f11b5..07af8d0 100644
--- a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerInternal.java
+++ b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerInternal.java
@@ -17,5 +17,5 @@
package com.android.server.ondeviceintelligence;
public interface OnDeviceIntelligenceManagerInternal {
- String getRemoteServicePackageName();
+ int getInferenceServiceUid();
}
\ No newline at end of file
diff --git a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java
index f540f1d..59964e0 100644
--- a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java
+++ b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java
@@ -56,6 +56,7 @@
import android.os.Handler;
import android.os.IBinder;
import android.os.ICancellationSignal;
+import android.os.IRemoteCallback;
import android.os.Looper;
import android.os.Message;
import android.os.ParcelFileDescriptor;
@@ -143,6 +144,9 @@
volatile boolean mIsServiceEnabled;
@GuardedBy("mLock")
+ private int remoteInferenceServiceUid = -1;
+
+ @GuardedBy("mLock")
private String[] mTemporaryServiceNames;
@GuardedBy("mLock")
private String[] mTemporaryBroadcastKeys;
@@ -174,7 +178,7 @@
Context.ON_DEVICE_INTELLIGENCE_SERVICE, getOnDeviceIntelligenceManagerService(),
/* allowIsolated = */true);
LocalServices.addService(OnDeviceIntelligenceManagerInternal.class,
- OnDeviceIntelligenceManagerService.this::getRemoteConfiguredPackageName);
+ this::getRemoteInferenceServiceUid);
}
@Override
@@ -603,7 +607,13 @@
try {
ensureRemoteIntelligenceServiceInitialized();
service.registerRemoteStorageService(
- getIRemoteStorageService());
+ getIRemoteStorageService(), new IRemoteCallback.Stub() {
+ @Override
+ public void sendResult(Bundle bundle) {
+ final int uid = Binder.getCallingUid();
+ setRemoteInferenceServiceUid(uid);
+ }
+ });
mRemoteOnDeviceIntelligenceService.run(
IOnDeviceIntelligenceService::notifyInferenceServiceConnected);
broadcastExecutor.execute(
@@ -1038,4 +1048,16 @@
Settings.Secure.ON_DEVICE_INTELLIGENCE_IDLE_TIMEOUT_MS, TimeUnit.HOURS.toMillis(1),
mContext.getUserId());
}
+
+ private int getRemoteInferenceServiceUid() {
+ synchronized (mLock) {
+ return remoteInferenceServiceUid;
+ }
+ }
+
+ private void setRemoteInferenceServiceUid(int remoteInferenceServiceUid) {
+ synchronized (mLock){
+ this.remoteInferenceServiceUid = remoteInferenceServiceUid;
+ }
+ }
}
diff --git a/services/core/java/com/android/server/os/OWNERS b/services/core/java/com/android/server/os/OWNERS
index 70be161..e130d9c0 100644
--- a/services/core/java/com/android/server/os/OWNERS
+++ b/services/core/java/com/android/server/os/OWNERS
@@ -2,4 +2,4 @@
per-file Bugreport* = file:/platform/frameworks/native:/cmds/dumpstate/OWNERS
# NativeTombstone
-per-file NativeTombstone* = gaillard@google.com
+per-file NativeTombstone* = benmiles@google.com
diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index e2a6b81..f59ae16 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -4364,7 +4364,7 @@
uid = getBaseSdkSandboxUid();
}
final int callingUserId = UserHandle.getUserId(callingUid);
- if (isKnownIsolatedComputeApp(uid, callingUserId)) {
+ if (isKnownIsolatedComputeApp(uid)) {
try {
uid = getIsolatedOwner(uid);
} catch (IllegalStateException e) {
@@ -4407,7 +4407,7 @@
if (Process.isSdkSandboxUid(uid)) {
uid = getBaseSdkSandboxUid();
}
- if (isKnownIsolatedComputeApp(uid, callingUserId)) {
+ if (isKnownIsolatedComputeApp(uid)) {
try {
uid = getIsolatedOwner(uid);
} catch (IllegalStateException e) {
@@ -5809,7 +5809,7 @@
}
- private boolean isKnownIsolatedComputeApp(int uid, int callingUserId) {
+ private boolean isKnownIsolatedComputeApp(int uid) {
if (!Process.isIsolatedUid(uid)) {
return false;
}
@@ -5822,27 +5822,8 @@
}
OnDeviceIntelligenceManagerInternal onDeviceIntelligenceManagerInternal =
mInjector.getLocalService(OnDeviceIntelligenceManagerInternal.class);
- if (onDeviceIntelligenceManagerInternal == null) {
- return false;
- }
-
- String onDeviceIntelligencePackage =
- onDeviceIntelligenceManagerInternal.getRemoteServicePackageName();
- if (onDeviceIntelligencePackage == null) {
- return false;
- }
-
- try {
- if (getIsolatedOwner(uid) == getPackageUid(onDeviceIntelligencePackage, 0,
- callingUserId)) {
- return true;
- }
- } catch (IllegalStateException e) {
- // If the owner uid doesn't exist, just use the current uid
- Slog.wtf(TAG, "Expected isolated uid " + uid + " to have an owner", e);
- }
-
- return false;
+ return onDeviceIntelligenceManagerInternal != null
+ && uid == onDeviceIntelligenceManagerInternal.getInferenceServiceUid();
}
@Nullable
diff --git a/services/core/java/com/android/server/pm/PackageHandler.java b/services/core/java/com/android/server/pm/PackageHandler.java
index 68f6ca1..0a0882d 100644
--- a/services/core/java/com/android/server/pm/PackageHandler.java
+++ b/services/core/java/com/android/server/pm/PackageHandler.java
@@ -123,19 +123,10 @@
}
} break;
case WRITE_SETTINGS: {
- if (!mPm.tryWriteSettings(/*sync=*/false)) {
- // Failed to write.
- this.removeMessages(WRITE_SETTINGS);
- mPm.scheduleWriteSettings();
- }
+ mPm.writeSettings(/*sync=*/false);
} break;
case WRITE_PACKAGE_LIST: {
- int userId = msg.arg1;
- if (!mPm.tryWritePackageList(userId)) {
- // Failed to write.
- this.removeMessages(WRITE_PACKAGE_LIST);
- mPm.scheduleWritePackageList(userId);
- }
+ mPm.writePackageList(msg.arg1);
} break;
case CHECK_PENDING_VERIFICATION: {
final int verificationId = msg.arg1;
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 2b0e62c..ca84d68 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -485,9 +485,6 @@
*/
static final long WATCHDOG_TIMEOUT = 1000*60*10; // ten minutes
- // How long to wait for Lock in async writeSettings and writePackageList.
- private static final long WRITE_LOCK_TIMEOUT_MS = 1000 * 10; // 10 seconds
-
/**
* Default IncFs timeouts. Maximum values in IncFs is 1hr.
*
@@ -1576,7 +1573,7 @@
}
}
- void scheduleWritePackageList(int userId) {
+ void scheduleWritePackageListLocked(int userId) {
invalidatePackageInfoCache();
if (!mHandler.hasMessages(WRITE_PACKAGE_LIST)) {
Message msg = mHandler.obtainMessage(WRITE_PACKAGE_LIST);
@@ -1628,42 +1625,22 @@
mSettings.writePackageRestrictions(dirtyUsers);
}
- private boolean tryUnderLock(boolean sync, long timeoutMs, Runnable runnable) {
- try {
- PackageManagerTracedLock.RawLock lock = mLock.getRawLock();
- if (sync) {
- lock.lock();
- } else if (!lock.tryLock(timeoutMs, TimeUnit.MILLISECONDS)) {
- return false;
- }
- try {
- runnable.run();
- return true;
- } finally {
- lock.unlock();
- }
- } catch (InterruptedException e) {
- Slog.e(TAG, "Failed to obtain mLock", e);
- }
- return false;
- }
-
- boolean tryWriteSettings(boolean sync) {
- return tryUnderLock(sync, WRITE_LOCK_TIMEOUT_MS, () -> {
+ void writeSettings(boolean sync) {
+ synchronized (mLock) {
mHandler.removeMessages(WRITE_SETTINGS);
mBackgroundHandler.removeMessages(WRITE_DIRTY_PACKAGE_RESTRICTIONS);
writeSettingsLPrTEMP(sync);
synchronized (mDirtyUsers) {
mDirtyUsers.clear();
}
- });
+ }
}
- boolean tryWritePackageList(int userId) {
- return tryUnderLock(/*sync=*/false, WRITE_LOCK_TIMEOUT_MS, () -> {
+ void writePackageList(int userId) {
+ synchronized (mLock) {
mHandler.removeMessages(WRITE_PACKAGE_LIST);
mSettings.writePackageListLPr(userId);
- });
+ }
}
private static final Handler.Callback BACKGROUND_HANDLER_CALLBACK = new Handler.Callback() {
@@ -3068,9 +3045,7 @@
if (mHandler.hasMessages(WRITE_SETTINGS)
|| mBackgroundHandler.hasMessages(WRITE_DIRTY_PACKAGE_RESTRICTIONS)
|| mHandler.hasMessages(WRITE_PACKAGE_LIST)) {
- while (!tryWriteSettings(/*sync=*/true)) {
- Slog.wtf(TAG, "Failed to write settings on shutdown");
- }
+ writeSettings(/*sync=*/true);
}
}
}
@@ -4432,7 +4407,7 @@
}
synchronized (mLock) {
scheduleWritePackageRestrictions(userId);
- scheduleWritePackageList(userId);
+ scheduleWritePackageListLocked(userId);
mAppsFilter.onUserCreated(snapshotComputer(), userId);
}
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index c40563f..a876616 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -330,6 +330,8 @@
return runGetOemPermissions();
case "get-signature-permission-allowlist":
return runGetSignaturePermissionAllowlist();
+ case "get-shared-uid-allowlist":
+ return runGetSharedUidAllowlist();
case "trim-caches":
return runTrimCaches();
case "create-user":
@@ -2944,6 +2946,9 @@
case "system-ext":
allowlist = permissionAllowlist.getSystemExtSignatureAppAllowlist();
break;
+ case "apex":
+ allowlist = permissionAllowlist.getApexSignatureAppAllowlist();
+ break;
default:
getErrPrintWriter().println("Error: unknown partition: " + partition);
return 1;
@@ -2970,6 +2975,20 @@
return 0;
}
+ private int runGetSharedUidAllowlist() {
+ final var allowlist = SystemConfig.getInstance().getPackageToSharedUidAllowList();
+ final var pw = getOutPrintWriter();
+ final var allowlistSize = allowlist.size();
+ for (var allowlistIndex = 0; allowlistIndex < allowlistSize; allowlistIndex++) {
+ final var packageName = allowlist.keyAt(allowlistIndex);
+ final var sharedUserName = allowlist.valueAt(allowlistIndex);
+ pw.print(packageName);
+ pw.print(" ");
+ pw.println(sharedUserName);
+ }
+ return 0;
+ }
+
private int runTrimCaches() throws RemoteException {
String size = getNextArg();
if (size == null) {
@@ -4907,7 +4926,10 @@
pw.println("");
pw.println(" get-signature-permission-allowlist PARTITION");
pw.println(" Prints the signature permission allowlist for a partition.");
- pw.println(" PARTITION is one of system, vendor, product and system-ext");
+ pw.println(" PARTITION is one of system, vendor, product, system-ext and apex");
+ pw.println("");
+ pw.println(" get-shared-uid-allowlist");
+ pw.println(" Prints the shared UID allowlist.");
pw.println("");
pw.println(" trim-caches DESIRED_FREE_SPACE [internal|UUID]");
pw.println(" Trim cache files to reach the given free space.");
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 29acbcd..db94d0e 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -281,6 +281,10 @@
private static final String RESTRICTIONS_FILE_PREFIX = "res_";
private static final String XML_SUFFIX = ".xml";
+ private static final String CUSTOM_BIOMETRIC_PROMPT_LOGO_RES_ID_KEY = "custom_logo_res_id";
+ private static final String CUSTOM_BIOMETRIC_PROMPT_LOGO_DESCRIPTION_KEY =
+ "custom_logo_description";
+
private static final int ALLOWED_FLAGS_FOR_CREATE_USERS_PERMISSION =
UserInfo.FLAG_MANAGED_PROFILE
| UserInfo.FLAG_PROFILE
@@ -1970,6 +1974,14 @@
// intentSender
unlockIntent.putExtra(Intent.EXTRA_INTENT, pendingIntent.getIntentSender());
unlockIntent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+
+ if (Flags.enablePrivateSpaceFeatures() && Flags.usePrivateSpaceIconInBiometricPrompt()
+ && getUserInfo(userId).isPrivateProfile()) {
+ unlockIntent.putExtra(CUSTOM_BIOMETRIC_PROMPT_LOGO_RES_ID_KEY,
+ com.android.internal.R.drawable.stat_sys_private_profile_status);
+ unlockIntent.putExtra(CUSTOM_BIOMETRIC_PROMPT_LOGO_DESCRIPTION_KEY,
+ mContext.getString(R.string.private_space_biometric_prompt_title));
+ }
mContext.startActivityAsUser(
unlockIntent, UserHandle.of(getProfileParentIdUnchecked(userId)));
}
diff --git a/services/core/java/com/android/server/pm/permission/PermissionAllowlist.java b/services/core/java/com/android/server/pm/permission/PermissionAllowlist.java
index d138606..6b99cbb 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionAllowlist.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionAllowlist.java
@@ -55,6 +55,9 @@
@NonNull
private final ArrayMap<String, ArrayMap<String, Boolean>> mSystemExtSignatureAppAllowlist =
new ArrayMap<>();
+ @NonNull
+ private final ArrayMap<String, ArrayMap<String, Boolean>> mApexSignatureAppAllowlist =
+ new ArrayMap<>();
@NonNull
public ArrayMap<String, ArrayMap<String, Boolean>> getOemAppAllowlist() {
@@ -107,6 +110,11 @@
return mSystemExtSignatureAppAllowlist;
}
+ @NonNull
+ public ArrayMap<String, ArrayMap<String, Boolean>> getApexSignatureAppAllowlist() {
+ return mApexSignatureAppAllowlist;
+ }
+
@Nullable
public Boolean getOemAppAllowlistState(@NonNull String packageName,
@NonNull String permissionName) {
@@ -211,4 +219,14 @@
}
return permissions.get(permissionName);
}
+
+ @Nullable
+ public Boolean getApexSignatureAppAllowlistState(@NonNull String packageName,
+ @NonNull String permissionName) {
+ ArrayMap<String, Boolean> permissions = mApexSignatureAppAllowlist.get(packageName);
+ if (permissions == null) {
+ return null;
+ }
+ return permissions.get(permissionName);
+ }
}
diff --git a/services/core/java/com/android/server/power/ThermalManagerService.java b/services/core/java/com/android/server/power/ThermalManagerService.java
index f5882a3..0052d4f 100644
--- a/services/core/java/com/android/server/power/ThermalManagerService.java
+++ b/services/core/java/com/android/server/power/ThermalManagerService.java
@@ -74,7 +74,6 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
@@ -1610,7 +1609,7 @@
/** Map of skin temperature sensor name to a corresponding list of samples */
@GuardedBy("mSamples")
@VisibleForTesting
- final ArrayMap<String, LinkedList<Sample>> mSamples = new ArrayMap<>();
+ final ArrayMap<String, ArrayList<Sample>> mSamples = new ArrayMap<>();
/** Map of skin temperature sensor name to the corresponding SEVERE temperature threshold */
@GuardedBy("mSamples")
@@ -1707,8 +1706,8 @@
continue;
}
- LinkedList<Sample> samples = mSamples.computeIfAbsent(temperature.getName(),
- k -> new LinkedList<>());
+ ArrayList<Sample> samples = mSamples.computeIfAbsent(temperature.getName(),
+ k -> new ArrayList<>(RING_BUFFER_SIZE));
if (samples.size() == RING_BUFFER_SIZE) {
samples.removeFirst();
}
@@ -1725,7 +1724,8 @@
float getSlopeOf(List<Sample> samples) {
long sumTimes = 0L;
float sumTemperatures = 0.0f;
- for (final Sample sample : samples) {
+ for (int s = 0; s < samples.size(); ++s) {
+ Sample sample = samples.get(s);
sumTimes += sample.time;
sumTemperatures += sample.temperature;
}
@@ -1734,7 +1734,8 @@
long sampleVariance = 0L;
float sampleCovariance = 0.0f;
- for (final Sample sample : samples) {
+ for (int s = 0; s < samples.size(); ++s) {
+ Sample sample = samples.get(s);
long timeDelta = sample.time - meanTime;
float temperatureDelta = sample.temperature - meanTemperature;
sampleVariance += timeDelta * timeDelta;
@@ -1794,9 +1795,9 @@
float maxNormalized = Float.NaN;
int noThresholdSampleCount = 0;
- for (Map.Entry<String, LinkedList<Sample>> entry : mSamples.entrySet()) {
+ for (Map.Entry<String, ArrayList<Sample>> entry : mSamples.entrySet()) {
String name = entry.getKey();
- LinkedList<Sample> samples = entry.getValue();
+ ArrayList<Sample> samples = entry.getValue();
Float threshold = mSevereThresholds.get(name);
if (threshold == null) {
diff --git a/services/core/java/com/android/server/power/stats/AudioPowerStatsProcessor.java b/services/core/java/com/android/server/power/stats/AudioPowerStatsProcessor.java
new file mode 100644
index 0000000..a48f162
--- /dev/null
+++ b/services/core/java/com/android/server/power/stats/AudioPowerStatsProcessor.java
@@ -0,0 +1,37 @@
+/*
+ * 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.server.power.stats;
+
+import android.os.BatteryConsumer;
+import android.os.BatteryStats;
+
+import com.android.internal.os.PowerProfile;
+
+public class AudioPowerStatsProcessor extends BinaryStatePowerStatsProcessor {
+ public AudioPowerStatsProcessor(PowerProfile powerProfile,
+ PowerStatsUidResolver uidResolver) {
+ super(BatteryConsumer.POWER_COMPONENT_AUDIO, uidResolver,
+ powerProfile.getAveragePower(PowerProfile.POWER_AUDIO));
+ }
+
+ @Override
+ protected @BinaryState int getBinaryState(BatteryStats.HistoryItem item) {
+ return (item.states & BatteryStats.HistoryItem.STATE_AUDIO_ON_FLAG) != 0
+ ? STATE_ON
+ : STATE_OFF;
+ }
+}
diff --git a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
index efaa7a8..5bae5a4 100644
--- a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
+++ b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
@@ -6490,12 +6490,14 @@
uid = mapUid(uid);
if (mAudioOnNesting == 0) {
mHistory.recordStateStartEvent(elapsedRealtimeMs, uptimeMs,
- HistoryItem.STATE_AUDIO_ON_FLAG);
+ HistoryItem.STATE_AUDIO_ON_FLAG, uid, "audio");
mAudioOnTimer.startRunningLocked(elapsedRealtimeMs);
}
mAudioOnNesting++;
- getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
- .noteAudioTurnedOnLocked(elapsedRealtimeMs);
+ if (!mPowerStatsCollectorEnabled.get(BatteryConsumer.POWER_COMPONENT_AUDIO)) {
+ getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
+ .noteAudioTurnedOnLocked(elapsedRealtimeMs);
+ }
}
@GuardedBy("this")
@@ -6506,11 +6508,13 @@
uid = mapUid(uid);
if (--mAudioOnNesting == 0) {
mHistory.recordStateStopEvent(elapsedRealtimeMs, uptimeMs,
- HistoryItem.STATE_AUDIO_ON_FLAG);
+ HistoryItem.STATE_AUDIO_ON_FLAG, uid, "audio");
mAudioOnTimer.stopRunningLocked(elapsedRealtimeMs);
}
- getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
- .noteAudioTurnedOffLocked(elapsedRealtimeMs);
+ if (!mPowerStatsCollectorEnabled.get(BatteryConsumer.POWER_COMPONENT_AUDIO)) {
+ getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
+ .noteAudioTurnedOffLocked(elapsedRealtimeMs);
+ }
}
@GuardedBy("this")
@@ -6518,12 +6522,14 @@
uid = mapUid(uid);
if (mVideoOnNesting == 0) {
mHistory.recordState2StartEvent(elapsedRealtimeMs, uptimeMs,
- HistoryItem.STATE2_VIDEO_ON_FLAG);
+ HistoryItem.STATE2_VIDEO_ON_FLAG, uid, "video");
mVideoOnTimer.startRunningLocked(elapsedRealtimeMs);
}
mVideoOnNesting++;
- getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
- .noteVideoTurnedOnLocked(elapsedRealtimeMs);
+ if (!mPowerStatsCollectorEnabled.get(BatteryConsumer.POWER_COMPONENT_VIDEO)) {
+ getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
+ .noteVideoTurnedOnLocked(elapsedRealtimeMs);
+ }
}
@GuardedBy("this")
@@ -6534,11 +6540,13 @@
uid = mapUid(uid);
if (--mVideoOnNesting == 0) {
mHistory.recordState2StopEvent(elapsedRealtimeMs, uptimeMs,
- HistoryItem.STATE2_VIDEO_ON_FLAG);
+ HistoryItem.STATE2_VIDEO_ON_FLAG, uid, "video");
mVideoOnTimer.stopRunningLocked(elapsedRealtimeMs);
}
- getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
- .noteVideoTurnedOffLocked(elapsedRealtimeMs);
+ if (!mPowerStatsCollectorEnabled.get(BatteryConsumer.POWER_COMPONENT_VIDEO)) {
+ getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
+ .noteVideoTurnedOffLocked(elapsedRealtimeMs);
+ }
}
@GuardedBy("this")
@@ -6613,11 +6621,13 @@
uid = mapUid(uid);
if (mFlashlightOnNesting++ == 0) {
mHistory.recordState2StartEvent(elapsedRealtimeMs, uptimeMs,
- HistoryItem.STATE2_FLASHLIGHT_FLAG);
+ HistoryItem.STATE2_FLASHLIGHT_FLAG, uid, "flashlight");
mFlashlightOnTimer.startRunningLocked(elapsedRealtimeMs);
}
- getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
- .noteFlashlightTurnedOnLocked(elapsedRealtimeMs);
+ if (!mPowerStatsCollectorEnabled.get(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT)) {
+ getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
+ .noteFlashlightTurnedOnLocked(elapsedRealtimeMs);
+ }
}
@GuardedBy("this")
@@ -6628,11 +6638,13 @@
uid = mapUid(uid);
if (--mFlashlightOnNesting == 0) {
mHistory.recordState2StopEvent(elapsedRealtimeMs, uptimeMs,
- HistoryItem.STATE2_FLASHLIGHT_FLAG);
+ HistoryItem.STATE2_FLASHLIGHT_FLAG, uid, "flashlight");
mFlashlightOnTimer.stopRunningLocked(elapsedRealtimeMs);
}
- getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
- .noteFlashlightTurnedOffLocked(elapsedRealtimeMs);
+ if (!mPowerStatsCollectorEnabled.get(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT)) {
+ getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
+ .noteFlashlightTurnedOffLocked(elapsedRealtimeMs);
+ }
}
@GuardedBy("this")
diff --git a/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java b/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java
index b252395..ba6e4a9 100644
--- a/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java
+++ b/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java
@@ -97,9 +97,15 @@
mContext.getSystemService(SensorManager.class)));
mPowerCalculators.add(new GnssPowerCalculator(mPowerProfile));
mPowerCalculators.add(new CameraPowerCalculator(mPowerProfile));
- mPowerCalculators.add(new FlashlightPowerCalculator(mPowerProfile));
- mPowerCalculators.add(new AudioPowerCalculator(mPowerProfile));
- mPowerCalculators.add(new VideoPowerCalculator(mPowerProfile));
+ if (!mPowerStatsExporterEnabled.get(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT)) {
+ mPowerCalculators.add(new FlashlightPowerCalculator(mPowerProfile));
+ }
+ if (!mPowerStatsExporterEnabled.get(BatteryConsumer.POWER_COMPONENT_AUDIO)) {
+ mPowerCalculators.add(new AudioPowerCalculator(mPowerProfile));
+ }
+ if (!mPowerStatsExporterEnabled.get(BatteryConsumer.POWER_COMPONENT_VIDEO)) {
+ mPowerCalculators.add(new VideoPowerCalculator(mPowerProfile));
+ }
mPowerCalculators.add(new ScreenPowerCalculator(mPowerProfile));
mPowerCalculators.add(new AmbientDisplayPowerCalculator(mPowerProfile));
mPowerCalculators.add(new IdlePowerCalculator(mPowerProfile));
diff --git a/services/core/java/com/android/server/power/stats/FlashlightPowerStatsProcessor.java b/services/core/java/com/android/server/power/stats/FlashlightPowerStatsProcessor.java
new file mode 100644
index 0000000..f7216c9
--- /dev/null
+++ b/services/core/java/com/android/server/power/stats/FlashlightPowerStatsProcessor.java
@@ -0,0 +1,37 @@
+/*
+ * 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.server.power.stats;
+
+import android.os.BatteryConsumer;
+import android.os.BatteryStats;
+
+import com.android.internal.os.PowerProfile;
+
+public class FlashlightPowerStatsProcessor extends BinaryStatePowerStatsProcessor {
+ public FlashlightPowerStatsProcessor(PowerProfile powerProfile,
+ PowerStatsUidResolver uidResolver) {
+ super(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT, uidResolver,
+ powerProfile.getAveragePower(PowerProfile.POWER_FLASHLIGHT));
+ }
+
+ @Override
+ protected @BinaryState int getBinaryState(BatteryStats.HistoryItem item) {
+ return (item.states2 & BatteryStats.HistoryItem.STATE2_FLASHLIGHT_FLAG) != 0
+ ? STATE_ON
+ : STATE_OFF;
+ }
+}
diff --git a/services/core/java/com/android/server/power/stats/VideoPowerStatsProcessor.java b/services/core/java/com/android/server/power/stats/VideoPowerStatsProcessor.java
new file mode 100644
index 0000000..48dac8a
--- /dev/null
+++ b/services/core/java/com/android/server/power/stats/VideoPowerStatsProcessor.java
@@ -0,0 +1,37 @@
+/*
+ * 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.server.power.stats;
+
+import android.os.BatteryConsumer;
+import android.os.BatteryStats;
+
+import com.android.internal.os.PowerProfile;
+
+public class VideoPowerStatsProcessor extends BinaryStatePowerStatsProcessor {
+ public VideoPowerStatsProcessor(PowerProfile powerProfile,
+ PowerStatsUidResolver uidResolver) {
+ super(BatteryConsumer.POWER_COMPONENT_VIDEO, uidResolver,
+ powerProfile.getAveragePower(PowerProfile.POWER_VIDEO));
+ }
+
+ @Override
+ protected @BinaryState int getBinaryState(BatteryStats.HistoryItem item) {
+ return (item.states2 & BatteryStats.HistoryItem.STATE2_VIDEO_ON_FLAG) != 0
+ ? STATE_ON
+ : STATE_OFF;
+ }
+}
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index 4264e91..85c8900 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -1296,7 +1296,7 @@
synchronized (mIcons) {
StatusBarIcon icon = new StatusBarIcon(iconPackage, UserHandle.SYSTEM, iconId,
- iconLevel, 0, contentDescription);
+ iconLevel, 0, contentDescription, StatusBarIcon.Type.SystemIcon);
//Slog.d(TAG, "setIcon slot=" + slot + " index=" + index + " icon=" + icon);
mIcons.put(slot, icon);
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 2d2a88a86..fec1af4 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -803,6 +803,11 @@
final LetterboxUiController mLetterboxUiController;
/**
+ * The policy for transparent activities
+ */
+ final TransparentPolicy mTransparentPolicy;
+
+ /**
* The scale to fit at least one side of the activity to its parent. If the activity uses
* 1920x1080, and the actually size on the screen is 960x540, then the scale is 0.5.
*/
@@ -1698,7 +1703,7 @@
if (isState(RESUMED)) {
newParent.setResumedActivity(this, "onParentChanged");
}
- mLetterboxUiController.updateInheritedLetterbox();
+ mTransparentPolicy.start();
}
if (rootTask != null && rootTask.topRunningActivity() == this) {
@@ -2136,6 +2141,7 @@
// Don't move below setOrientation(info.screenOrientation) since it triggers
// getOverrideOrientation that requires having mLetterboxUiController
// initialised.
+ mTransparentPolicy = new TransparentPolicy(this, mWmService.mLetterboxConfiguration);
mLetterboxUiController = new LetterboxUiController(mWmService, this);
mCameraCompatControlEnabled = mWmService.mContext.getResources()
.getBoolean(R.bool.config_isCameraCompatControlForStretchedIssuesEnabled);
@@ -8080,13 +8086,13 @@
@Configuration.Orientation
int getRequestedConfigurationOrientation(boolean forDisplay,
@ActivityInfo.ScreenOrientation int requestedOrientation) {
- if (mLetterboxUiController.hasInheritedOrientation()) {
+ if (mTransparentPolicy.hasInheritedOrientation()) {
final RootDisplayArea root = getRootDisplayArea();
if (forDisplay && root != null && root.isOrientationDifferentFromDisplay()) {
return reverseConfigurationOrientation(
- mLetterboxUiController.getInheritedOrientation());
+ mTransparentPolicy.getInheritedOrientation());
} else {
- return mLetterboxUiController.getInheritedOrientation();
+ return mTransparentPolicy.getInheritedOrientation();
}
}
if (task != null && requestedOrientation == SCREEN_ORIENTATION_BEHIND) {
@@ -8302,8 +8308,8 @@
@Nullable
CompatDisplayInsets getCompatDisplayInsets() {
- if (mLetterboxUiController.hasInheritedLetterboxBehavior()) {
- return mLetterboxUiController.getInheritedCompatDisplayInsets();
+ if (mTransparentPolicy.isRunning()) {
+ return mTransparentPolicy.getInheritedCompatDisplayInsets();
}
return mCompatDisplayInsets;
}
@@ -8466,7 +8472,7 @@
}
mSizeCompatBounds = null;
mCompatDisplayInsets = null;
- mLetterboxUiController.clearInheritedCompatDisplayInsets();
+ mTransparentPolicy.clearInheritedCompatDisplayInsets();
}
@VisibleForTesting
@@ -8784,8 +8790,8 @@
return APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE;
}
// TODO(b/256564921): Investigate if we need new metrics for translucent activities
- if (mLetterboxUiController.hasInheritedLetterboxBehavior()) {
- return mLetterboxUiController.getInheritedAppCompatState();
+ if (mTransparentPolicy.isRunning()) {
+ return mTransparentPolicy.getInheritedAppCompatState();
}
if (mInSizeCompatModeForBounds) {
return APP_COMPAT_STATE_CHANGED__STATE__LETTERBOXED_FOR_SIZE_COMPAT_MODE;
@@ -8938,7 +8944,7 @@
// We check if the current activity is transparent. In that case we need to
// recomputeConfiguration of the first opaque activity beneath, to allow a
// proper computation of the new bounds.
- if (!mLetterboxUiController.applyOnOpaqueActivityBelow(
+ if (!mTransparentPolicy.applyOnOpaqueActivityBelow(
ActivityRecord::recomputeConfiguration)) {
onRequestedOverrideConfigurationChanged(getRequestedOverrideConfiguration());
}
@@ -9411,7 +9417,7 @@
void updateSizeCompatScale(Rect resolvedAppBounds, Rect containerAppBounds) {
// Only allow to scale down.
- mSizeCompatScale = mLetterboxUiController.findOpaqueNotFinishingActivityBelow()
+ mSizeCompatScale = mTransparentPolicy.findOpaqueNotFinishingActivityBelow()
.map(activityRecord -> activityRecord.mSizeCompatScale)
.orElseGet(() -> {
final int contentW = resolvedAppBounds.width();
@@ -9424,7 +9430,7 @@
}
private boolean isInSizeCompatModeForBounds(final Rect appBounds, final Rect containerBounds) {
- if (mLetterboxUiController.hasInheritedLetterboxBehavior()) {
+ if (mTransparentPolicy.isRunning()) {
// To avoid wrong app behaviour, we decided to disable SCM when a translucent activity
// is letterboxed.
return false;
@@ -9487,7 +9493,7 @@
public Rect getBounds() {
// TODO(b/268458693): Refactor configuration inheritance in case of translucent activities
final Rect superBounds = super.getBounds();
- return mLetterboxUiController.findOpaqueNotFinishingActivityBelow()
+ return mTransparentPolicy.findOpaqueNotFinishingActivityBelow()
.map(ActivityRecord::getBounds)
.orElseGet(() -> {
if (mSizeCompatBounds != null) {
@@ -9851,8 +9857,8 @@
* Returns the min aspect ratio of this activity.
*/
float getMinAspectRatio() {
- if (mLetterboxUiController.hasInheritedLetterboxBehavior()) {
- return mLetterboxUiController.getInheritedMinAspectRatio();
+ if (mTransparentPolicy.isRunning()) {
+ return mTransparentPolicy.getInheritedMinAspectRatio();
}
if (info.applicationInfo == null) {
return info.getMinAspectRatio();
@@ -9902,8 +9908,8 @@
}
float getMaxAspectRatio() {
- if (mLetterboxUiController.hasInheritedLetterboxBehavior()) {
- return mLetterboxUiController.getInheritedMaxAspectRatio();
+ if (mTransparentPolicy.isRunning()) {
+ return mTransparentPolicy.getInheritedMaxAspectRatio();
}
return info.getMaxAspectRatio();
}
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index a9192c4c..d7a696f 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -1365,18 +1365,6 @@
request.outActivity[0] = mLastStartActivityRecord;
}
- // Reset the ActivityRecord#mCurrentLaunchCanTurnScreenOn state of activity started
- // before this one if it is no longer the top-most focusable activity.
- // Doing so in case the state is not yet consumed during rapid activity launch.
- if (previousStart != null && !previousStart.finishing && previousStart.isAttached()
- && previousStart.currentLaunchCanTurnScreenOn()) {
- final ActivityRecord topFocusable = previousStart.getDisplayContent().getActivity(
- ar -> ar.isFocusable() && !ar.finishing);
- if (previousStart != topFocusable) {
- previousStart.setCurrentLaunchCanTurnScreenOn(false);
- }
- }
-
return mLastStartActivityResult;
}
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 3aa63af..cfd5300 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -1439,6 +1439,8 @@
resultTo.removeResultsLocked(r, resultWho, requestCode);
}
+ final int origCallingUid = Binder.getCallingUid();
+ final int origCallingPid = Binder.getCallingPid();
final long origId = Binder.clearCallingIdentity();
// TODO(b/64750076): Check if calling pid should really be -1.
try {
@@ -1446,13 +1448,14 @@
options = new SafeActivityOptions(ActivityOptions.makeBasic());
}
- // Fixes b/230492947
+ // Fixes b/230492947 b/337726734
// Prevents background activity launch through #startNextMatchingActivity
- // An activity going into the background could still go back to the foreground
- // if the intent used matches both:
- // - the activity in the background
- // - a second activity.
- options.getOptions(r).setAvoidMoveToFront();
+ // launchedFromUid of the calling activity represents the app that launches it.
+ // It may have BAL privileges (i.e. the Launcher App). Using its identity to
+ // launch to launch next matching activity causes BAL.
+ // Change the realCallingUid to the calling activity's uid.
+ // In ActivityStarter, when caller is set, the callingUid and callingPid are
+ // ignored. So now both callingUid and realCallingUid is set to the caller app.
final int res = getActivityStartController()
.obtainStarter(intent, "startNextMatchingActivity")
.setCaller(r.app.getThread())
@@ -1465,8 +1468,8 @@
.setCallingUid(r.launchedFromUid)
.setCallingPackage(r.launchedFromPackage)
.setCallingFeatureId(r.launchedFromFeatureId)
- .setRealCallingPid(-1)
- .setRealCallingUid(r.launchedFromUid)
+ .setRealCallingPid(origCallingPid)
+ .setRealCallingUid(origCallingUid)
.setActivityOptions(options)
.setUserId(userId)
.execute();
@@ -1507,7 +1510,7 @@
a.persistableMode = ActivityInfo.PERSIST_NEVER;
a.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
a.colorMode = ActivityInfo.COLOR_MODE_DEFAULT;
- a.flags |= ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS;
+ a.flags |= ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS | ActivityInfo.FLAG_SHOW_WHEN_LOCKED;
a.configChanges = 0xffffffff;
if (homePanelDream()) {
diff --git a/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java b/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java
index 125eb2a..be44629 100644
--- a/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java
+++ b/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java
@@ -194,6 +194,16 @@
final Rect startBounds = new Rect(0, 0, mDisplayContent.mInitialDisplayWidth,
mDisplayContent.mInitialDisplayHeight);
final int fromRotation = mDisplayContent.getRotation();
+ if (Flags.blastSyncNotificationShadeOnDisplaySwitch() && physicalDisplayUpdated) {
+ final WindowState notificationShade =
+ mDisplayContent.getDisplayPolicy().getNotificationShade();
+ if (notificationShade != null && notificationShade.isVisible()
+ && mDisplayContent.mAtmService.mKeyguardController.isKeyguardOrAodShowing(
+ mDisplayContent.mDisplayId)) {
+ Slog.i(TAG, notificationShade + " uses blast for display switch");
+ notificationShade.mSyncMethodOverride = BLASTSyncEngine.METHOD_BLAST;
+ }
+ }
mDisplayContent.mAtmService.deferWindowLayout();
try {
diff --git a/services/core/java/com/android/server/wm/EventLogTags.logtags b/services/core/java/com/android/server/wm/EventLogTags.logtags
index d957591..cc2249de 100644
--- a/services/core/java/com/android/server/wm/EventLogTags.logtags
+++ b/services/core/java/com/android/server/wm/EventLogTags.logtags
@@ -59,6 +59,10 @@
31002 wm_task_moved (TaskId|1|5),(Root Task ID|1|5),(Display Id|1|5),(ToTop|1),(Index|1)
# Task removed with source explanation.
31003 wm_task_removed (TaskId|1|5),(Root Task ID|1|5),(Display Id|1|5),(Reason|3)
+# Embedded TaskFragment created
+31004 wm_tf_created (Token|1|5),(TaskId|1|5)
+# Embedded TaskFragment removed
+31005 wm_tf_removed (Token|1|5),(TaskId|1|5)
# Set the requested orientation of an activity.
31006 wm_set_requested_orientation (Orientation|1|5),(Component Name|3)
diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java
index b8d0694..194771f 100644
--- a/services/core/java/com/android/server/wm/LetterboxUiController.java
+++ b/services/core/java/com/android/server/wm/LetterboxUiController.java
@@ -40,7 +40,6 @@
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER;
import static android.content.pm.ActivityInfo.isFixedOrientation;
import static android.content.pm.ActivityInfo.isFixedOrientationLandscape;
@@ -54,10 +53,6 @@
import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_SPLIT_SCREEN;
import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_UNSET;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
-import static android.content.res.Configuration.ORIENTATION_UNDEFINED;
-import static android.content.res.Configuration.SCREEN_HEIGHT_DP_UNDEFINED;
-import static android.content.res.Configuration.SCREEN_WIDTH_DP_UNDEFINED;
-import static android.content.res.Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
@@ -80,7 +75,6 @@
import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__LETTERBOX_POSITION__RIGHT;
import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__LETTERBOX_POSITION__TOP;
import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__LETTERBOX_POSITION__UNKNOWN_POSITION;
-import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__UNKNOWN;
import static com.android.internal.util.FrameworkStatsLog.LETTERBOX_POSITION_CHANGED__POSITION_CHANGE__BOTTOM_TO_CENTER;
import static com.android.internal.util.FrameworkStatsLog.LETTERBOX_POSITION_CHANGED__POSITION_CHANGE__CENTER_TO_BOTTOM;
import static com.android.internal.util.FrameworkStatsLog.LETTERBOX_POSITION_CHANGED__POSITION_CHANGE__CENTER_TO_LEFT;
@@ -135,12 +129,7 @@
import com.android.window.flags.Flags;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
import java.util.function.BooleanSupplier;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
/** Controls behaviour of the letterbox UI for {@link mActivityRecord}. */
// TODO(b/185262487): Improve test coverage of this class. Parts of it are tested in
@@ -150,13 +139,8 @@
// TODO(b/263021211): Consider renaming to more generic CompatUIController.
final class LetterboxUiController {
- private static final Predicate<ActivityRecord> FIRST_OPAQUE_NOT_FINISHING_ACTIVITY_PREDICATE =
- ActivityRecord::occludesParent;
-
private static final String TAG = TAG_WITH_CLASS_NAME ? "LetterboxUiController" : TAG_ATM;
- private static final float UNDEFINED_ASPECT_RATIO = 0f;
-
// Minimum value of mSetOrientationRequestCounter before qualifying as orientation request loop
@VisibleForTesting
static final int MIN_COUNT_TO_IGNORE_REQUEST_IN_LOOP = 2;
@@ -188,10 +172,6 @@
// Corresponds to OVERRIDE_RESPECT_REQUESTED_ORIENTATION
private final boolean mIsOverrideRespectRequestedOrientationEnabled;
- // The list of observers for the destroy event of candidate opaque activities
- // when dealing with translucent activities.
- private final List<LetterboxUiController> mDestroyListeners = new ArrayList<>();
-
@NonNull
private final OptProp mAllowOrientationOverrideOptProp;
@NonNull
@@ -206,34 +186,11 @@
@NonNull
private final OptProp mAllowUserAspectRatioFullscreenOverrideOptProp;
- /*
- * WindowContainerListener responsible to make translucent activities inherit
- * constraints from the first opaque activity beneath them. It's null for not
- * translucent activities.
- */
- @Nullable
- private WindowContainerListener mLetterboxConfigListener;
-
- @Nullable
- @VisibleForTesting
- ActivityRecord mFirstOpaqueActivityBeneath;
-
private boolean mShowWallpaperForLetterboxBackground;
- // In case of transparent activities we might need to access the aspectRatio of the
- // first opaque activity beneath.
- private float mInheritedMinAspectRatio = UNDEFINED_ASPECT_RATIO;
- private float mInheritedMaxAspectRatio = UNDEFINED_ASPECT_RATIO;
-
// Updated when ActivityRecord#setRequestedOrientation is called
private long mTimeMsLastSetOrientationRequest = 0;
- @Configuration.Orientation
- private int mInheritedOrientation = ORIENTATION_UNDEFINED;
-
- // The app compat state for the opaque activity if any
- private int mInheritedAppCompatState = APP_COMPAT_STATE_CHANGED__STATE__UNKNOWN;
-
// Counter for ActivityRecord#setRequestedOrientation
private int mSetOrientationRequestCounter = 0;
@@ -242,9 +199,6 @@
@PackageManager.UserMinAspectRatio
private int mUserAspectRatio = USER_MIN_ASPECT_RATIO_UNSET;
- // The CompatDisplayInsets of the opaque activity beneath the translucent one.
- private ActivityRecord.CompatDisplayInsets mInheritedCompatDisplayInsets;
-
@Nullable
private Letterbox mLetterbox;
@@ -361,14 +315,7 @@
mLetterbox.destroy();
mLetterbox = null;
}
- for (int i = mDestroyListeners.size() - 1; i >= 0; i--) {
- mDestroyListeners.get(i).updateInheritedLetterbox();
- }
- mDestroyListeners.clear();
- if (mLetterboxConfigListener != null) {
- mLetterboxConfigListener.onRemoved();
- mLetterboxConfigListener = null;
- }
+ mActivityRecord.mTransparentPolicy.stop();
}
void onMovedToDisplay(int displayId) {
@@ -877,7 +824,7 @@
// For this reason we use ActivityRecord#getBounds() that the translucent activity
// inherits from the first opaque activity beneath and also takes care of the scaling
// in case of activities in size compat mode.
- final Rect innerFrame = hasInheritedLetterboxBehavior()
+ final Rect innerFrame = mActivityRecord.mTransparentPolicy.isRunning()
? mActivityRecord.getBounds() : w.getFrame();
mLetterbox.layout(spaceToFill, innerFrame, mTmpPoint);
if (mDoubleTapEvent) {
@@ -1343,9 +1290,9 @@
}
// Use screen resolved bounds which uses resolved bounds or size compat bounds
// as activity bounds can sometimes be empty
- final Rect opaqueActivityBounds = hasInheritedLetterboxBehavior()
- ? mFirstOpaqueActivityBeneath.getScreenResolvedBounds()
- : mActivityRecord.getScreenResolvedBounds();
+ final Rect opaqueActivityBounds = mActivityRecord.mTransparentPolicy
+ .getFirstOpaqueActivity().map(ActivityRecord::getScreenResolvedBounds)
+ .orElse(mActivityRecord.getScreenResolvedBounds());
return mLetterboxConfiguration.getIsHorizontalReachabilityEnabled()
&& parentConfiguration.windowConfiguration.getWindowingMode()
== WINDOWING_MODE_FULLSCREEN
@@ -1380,10 +1327,10 @@
return false;
}
// Use screen resolved bounds which uses resolved bounds or size compat bounds
- // as activity bounds can sometimes be empty
- final Rect opaqueActivityBounds = hasInheritedLetterboxBehavior()
- ? mFirstOpaqueActivityBeneath.getScreenResolvedBounds()
- : mActivityRecord.getScreenResolvedBounds();
+ // as activity bounds can sometimes be empty.
+ final Rect opaqueActivityBounds = mActivityRecord.mTransparentPolicy
+ .getFirstOpaqueActivity().map(ActivityRecord::getScreenResolvedBounds)
+ .orElse(mActivityRecord.getScreenResolvedBounds());
return mLetterboxConfiguration.getIsVerticalReachabilityEnabled()
&& parentConfiguration.windowConfiguration.getWindowingMode()
== WINDOWING_MODE_FULLSCREEN
@@ -1490,7 +1437,8 @@
// corners because we assume the specific layout would. This is the case when the layout
// of the translucent activity uses only a part of all the bounds because of the use of
// LayoutParams.WRAP_CONTENT.
- if (hasInheritedLetterboxBehavior() && (cropBounds.width() != mainWindow.mRequestedWidth
+ if (mActivityRecord.mTransparentPolicy.isRunning()
+ && (cropBounds.width() != mainWindow.mRequestedWidth
|| cropBounds.height() != mainWindow.mRequestedHeight)) {
return null;
}
@@ -1794,173 +1742,6 @@
);
}
- /**
- * Handles translucent activities letterboxing inheriting constraints from the
- * first opaque activity beneath.
- * @param parent The parent container.
- */
- void updateInheritedLetterbox() {
- final WindowContainer<?> parent = mActivityRecord.getParent();
- if (parent == null) {
- return;
- }
- if (!mLetterboxConfiguration.isTranslucentLetterboxingEnabled()) {
- return;
- }
- if (mLetterboxConfigListener != null) {
- mLetterboxConfigListener.onRemoved();
- clearInheritedConfig();
- }
- // In case mActivityRecord.hasCompatDisplayInsetsWithoutOverride() we don't apply the
- // opaque activity constraints because we're expecting the activity is already letterboxed.
- mFirstOpaqueActivityBeneath = mActivityRecord.getTask().getActivity(
- FIRST_OPAQUE_NOT_FINISHING_ACTIVITY_PREDICATE /* callback */,
- mActivityRecord /* boundary */, false /* includeBoundary */,
- true /* traverseTopToBottom */);
- if (mFirstOpaqueActivityBeneath == null || mFirstOpaqueActivityBeneath.isEmbedded()) {
- // We skip letterboxing if the translucent activity doesn't have any opaque
- // activities beneath or the activity below is embedded which never has letterbox.
- mActivityRecord.recomputeConfiguration();
- return;
- }
- if (mActivityRecord.getTask() == null || mActivityRecord.fillsParent()
- || mActivityRecord.hasCompatDisplayInsetsWithoutInheritance()) {
- return;
- }
- mFirstOpaqueActivityBeneath.mLetterboxUiController.mDestroyListeners.add(this);
- inheritConfiguration(mFirstOpaqueActivityBeneath);
- mLetterboxConfigListener = WindowContainer.overrideConfigurationPropagation(
- mActivityRecord, mFirstOpaqueActivityBeneath,
- (opaqueConfig, transparentOverrideConfig) -> {
- resetTranslucentOverrideConfig(transparentOverrideConfig);
- final Rect parentBounds = parent.getWindowConfiguration().getBounds();
- final Rect bounds = transparentOverrideConfig.windowConfiguration.getBounds();
- final Rect letterboxBounds = opaqueConfig.windowConfiguration.getBounds();
- // We cannot use letterboxBounds directly here because the position relies on
- // letterboxing. Using letterboxBounds directly, would produce a double offset.
- bounds.set(parentBounds.left, parentBounds.top,
- parentBounds.left + letterboxBounds.width(),
- parentBounds.top + letterboxBounds.height());
- // We need to initialize appBounds to avoid NPE. The actual value will
- // be set ahead when resolving the Configuration for the activity.
- transparentOverrideConfig.windowConfiguration.setAppBounds(new Rect());
- inheritConfiguration(mFirstOpaqueActivityBeneath);
- return transparentOverrideConfig;
- });
- }
-
- /**
- * @return {@code true} if the current activity is translucent with an opaque activity
- * beneath. In this case it will inherit bounds, orientation and aspect ratios from
- * the first opaque activity beneath.
- */
- boolean hasInheritedLetterboxBehavior() {
- return mLetterboxConfigListener != null;
- }
-
- /**
- * @return {@code true} if the current activity is translucent with an opaque activity
- * beneath and needs to inherit its orientation.
- */
- boolean hasInheritedOrientation() {
- // To force a different orientation, the transparent one needs to have an explicit one
- // otherwise the existing one is fine and the actual orientation will depend on the
- // bounds.
- // To avoid wrong behaviour, we're not forcing orientation for activities with not
- // fixed orientation (e.g. permission dialogs).
- return hasInheritedLetterboxBehavior()
- && mActivityRecord.getOverrideOrientation()
- != SCREEN_ORIENTATION_UNSPECIFIED;
- }
-
- float getInheritedMinAspectRatio() {
- return mInheritedMinAspectRatio;
- }
-
- float getInheritedMaxAspectRatio() {
- return mInheritedMaxAspectRatio;
- }
-
- int getInheritedAppCompatState() {
- return mInheritedAppCompatState;
- }
-
- @Configuration.Orientation
- int getInheritedOrientation() {
- return mInheritedOrientation;
- }
-
- ActivityRecord.CompatDisplayInsets getInheritedCompatDisplayInsets() {
- return mInheritedCompatDisplayInsets;
- }
-
- void clearInheritedCompatDisplayInsets() {
- mInheritedCompatDisplayInsets = null;
- }
-
- /**
- * In case of translucent activities, it consumes the {@link ActivityRecord} of the first opaque
- * activity beneath using the given consumer and returns {@code true}.
- */
- boolean applyOnOpaqueActivityBelow(@NonNull Consumer<ActivityRecord> consumer) {
- return findOpaqueNotFinishingActivityBelow()
- .map(activityRecord -> {
- consumer.accept(activityRecord);
- return true;
- }).orElse(false);
- }
-
- /**
- * @return The first not finishing opaque activity beneath the current translucent activity
- * if it exists and the strategy is enabled.
- */
- Optional<ActivityRecord> findOpaqueNotFinishingActivityBelow() {
- if (!hasInheritedLetterboxBehavior() || mActivityRecord.getTask() == null) {
- return Optional.empty();
- }
- return Optional.ofNullable(mFirstOpaqueActivityBeneath);
- }
-
- /** Resets the screen size related fields so they can be resolved by requested bounds later. */
- private static void resetTranslucentOverrideConfig(Configuration config) {
- // The values for the following properties will be defined during the configuration
- // resolution in {@link ActivityRecord#resolveOverrideConfiguration} using the
- // properties inherited from the first not finishing opaque activity beneath.
- config.orientation = ORIENTATION_UNDEFINED;
- config.screenWidthDp = config.compatScreenWidthDp = SCREEN_WIDTH_DP_UNDEFINED;
- config.screenHeightDp = config.compatScreenHeightDp = SCREEN_HEIGHT_DP_UNDEFINED;
- config.smallestScreenWidthDp = config.compatSmallestScreenWidthDp =
- SMALLEST_SCREEN_WIDTH_DP_UNDEFINED;
- }
-
- private void inheritConfiguration(ActivityRecord firstOpaque) {
- // To avoid wrong behaviour, we're not forcing a specific aspect ratio to activities
- // which are not already providing one (e.g. permission dialogs) and presumably also
- // not resizable.
- if (mActivityRecord.getMinAspectRatio() != UNDEFINED_ASPECT_RATIO) {
- mInheritedMinAspectRatio = firstOpaque.getMinAspectRatio();
- }
- if (mActivityRecord.getMaxAspectRatio() != UNDEFINED_ASPECT_RATIO) {
- mInheritedMaxAspectRatio = firstOpaque.getMaxAspectRatio();
- }
- mInheritedOrientation = firstOpaque.getRequestedConfigurationOrientation();
- mInheritedAppCompatState = firstOpaque.getAppCompatState();
- mInheritedCompatDisplayInsets = firstOpaque.getCompatDisplayInsets();
- }
-
- private void clearInheritedConfig() {
- if (mFirstOpaqueActivityBeneath != null) {
- mFirstOpaqueActivityBeneath.mLetterboxUiController.mDestroyListeners.remove(this);
- }
- mFirstOpaqueActivityBeneath = null;
- mLetterboxConfigListener = null;
- mInheritedMinAspectRatio = UNDEFINED_ASPECT_RATIO;
- mInheritedMaxAspectRatio = UNDEFINED_ASPECT_RATIO;
- mInheritedOrientation = ORIENTATION_UNDEFINED;
- mInheritedAppCompatState = APP_COMPAT_STATE_CHANGED__STATE__UNKNOWN;
- mInheritedCompatDisplayInsets = null;
- }
-
@NonNull
private static BooleanSupplier asLazy(@NonNull BooleanSupplier supplier) {
return new BooleanSupplier() {
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 69a8aed..13883fd 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -3739,7 +3739,13 @@
return !isOwnActivity && !isTrustedTaskFragment;
}
- void setDecorSurfaceBoosted(
+ /**
+ * Sets the requested boosted state for the decor surface.
+ *
+ * The caller must call {@link #commitDecorSurfaceBoostedState()} to ensure that the change is
+ * applied.
+ */
+ void requestDecorSurfaceBoosted(
@NonNull TaskFragment ownerTaskFragment,
boolean isBoosted,
@Nullable SurfaceControl.Transaction clientTransaction) {
@@ -3747,9 +3753,17 @@
|| mDecorSurfaceContainer.mOwnerTaskFragment != ownerTaskFragment) {
return;
}
- mDecorSurfaceContainer.setBoosted(isBoosted, clientTransaction);
- // scheduleAnimation() is called inside assignChildLayers(), which ensures that child
- // surface visibility is updated with prepareSurfaces()
+ mDecorSurfaceContainer.requestBoosted(isBoosted, clientTransaction);
+ }
+
+ void commitDecorSurfaceBoostedState() {
+ if (mDecorSurfaceContainer == null) {
+ return;
+ }
+ mDecorSurfaceContainer.commitBoostedState();
+
+ // assignChildLayers() calls scheduleAnimation(), which calls prepareSurfaces()
+ // to ensure child surface visibility.
assignChildLayers();
}
@@ -6790,11 +6804,11 @@
* Associates the decor surface with the given TF, or create one if there
* isn't one in the Task yet. The surface will be removed with the TF,
* and become invisible if the TF is invisible. */
- void moveOrCreateDecorSurfaceFor(TaskFragment taskFragment) {
+ void moveOrCreateDecorSurfaceFor(TaskFragment taskFragment, boolean visible) {
if (mDecorSurfaceContainer != null) {
mDecorSurfaceContainer.mOwnerTaskFragment = taskFragment;
} else {
- mDecorSurfaceContainer = new DecorSurfaceContainer(taskFragment);
+ mDecorSurfaceContainer = new DecorSurfaceContainer(taskFragment, visible);
assignChildLayers();
sendTaskFragmentParentInfoChangedIfNeeded();
}
@@ -6813,6 +6827,13 @@
return mDecorSurfaceContainer != null ? mDecorSurfaceContainer.mDecorSurface : null;
}
+ void setDecorSurfaceVisible(@NonNull SurfaceControl.Transaction t) {
+ if (mDecorSurfaceContainer == null) {
+ return;
+ }
+ t.show(mDecorSurfaceContainer.mDecorSurface);
+ }
+
/**
* A class managing the decor surface.
*
@@ -6852,12 +6873,13 @@
@NonNull TaskFragment mOwnerTaskFragment;
private boolean mIsBoosted;
+ private boolean mIsBoostedRequested;
// The surface transactions that will be applied when the layer is reassigned.
@NonNull private final List<SurfaceControl.Transaction> mPendingClientTransactions =
new ArrayList<>();
- private DecorSurfaceContainer(@NonNull TaskFragment initialOwner) {
+ private DecorSurfaceContainer(@NonNull TaskFragment initialOwner, boolean visible) {
mOwnerTaskFragment = initialOwner;
mContainerSurface = makeSurface().setContainerLayer()
.setParent(mSurfaceControl)
@@ -6870,23 +6892,36 @@
mDecorSurface = makeSurface()
.setParent(mContainerSurface)
.setName(mSurfaceControl + " - decor surface")
- .setHidden(false)
+ .setHidden(!visible)
.setCallsite("Task.DecorSurfaceContainer")
.build();
}
- private void setBoosted(
+ /**
+ * Sets the requested boosted state. The state is not applied until
+ * {@link commitBoostedState} is called.
+ */
+ private void requestBoosted(
boolean isBoosted, @Nullable SurfaceControl.Transaction clientTransaction) {
- mIsBoosted = isBoosted;
- // The client transaction will be applied together with the next assignLayer.
+ mIsBoostedRequested = isBoosted;
+ // The client transaction will be applied together with the next commitBoostedState.
if (clientTransaction != null) {
mPendingClientTransactions.add(clientTransaction);
}
}
+ /** Applies the last requested boosted state. */
+ private void commitBoostedState() {
+ mIsBoosted = mIsBoostedRequested;
+ applyPendingClientTransactions(getSyncTransaction());
+ }
+
private void assignLayer(@NonNull SurfaceControl.Transaction t, int layer) {
t.setLayer(mContainerSurface, layer);
t.setVisibility(mContainerSurface, mOwnerTaskFragment.isVisible() || mIsBoosted);
+ }
+
+ private void applyPendingClientTransactions(@NonNull SurfaceControl.Transaction t) {
for (int i = 0; i < mPendingClientTransactions.size(); i++) {
t.merge(mPendingClientTransactions.get(i));
}
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index 61022cc..b8b746a 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -2999,6 +2999,9 @@
@Override
void removeImmediately() {
+ if (asTask() == null) {
+ EventLogTags.writeWmTfRemoved(System.identityHashCode(this), getTaskId());
+ }
mIsRemovalRequested = false;
resetAdjacentTaskFragment();
cleanUpEmbeddedTaskFragment();
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 86c6f8d..4aa3e36 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -1374,13 +1374,22 @@
// processed all the participants first (in particular, we want to trigger pip-enter first)
for (int i = 0; i < mParticipants.size(); ++i) {
final ActivityRecord ar = mParticipants.valueAt(i).asActivityRecord();
+ if (ar == null) continue;
+
// If the activity was just inserted to an invisible task, it will keep INITIALIZING
// state. Then no need to notify the callback to avoid clearing some states
// unexpectedly, e.g. launch-task-behind.
- if (ar != null && (ar.isVisibleRequested()
- || !ar.isState(ActivityRecord.State.INITIALIZING))) {
+ if (ar.isVisibleRequested() || !ar.isState(ActivityRecord.State.INITIALIZING)) {
mController.dispatchLegacyAppTransitionFinished(ar);
}
+
+ // Reset the ActivityRecord#mCurrentLaunchCanTurnScreenOn state if it is not the top
+ // running activity. Doing so in case the state is not yet consumed during rapid
+ // activity launch.
+ if (ar.currentLaunchCanTurnScreenOn() && ar.getDisplayContent() != null
+ && ar.getDisplayContent().topRunningActivity() != ar) {
+ ar.setCurrentLaunchCanTurnScreenOn(false);
+ }
}
// Update the input-sink (touch-blocking) state now that the animation is finished.
@@ -1895,6 +1904,8 @@
for (int i = changes.size() - 1; i >= 0; --i) {
if (mTargets.get(i).mContainer.asActivityRecord() != null) {
changes.get(i).setAnimationOptions(mOverrideOptions);
+ // TODO(b/295805497): Extract mBackgroundColor from AnimationOptions.
+ changes.get(i).setBackgroundColor(mOverrideOptions.getBackgroundColor());
}
}
}
diff --git a/services/core/java/com/android/server/wm/TransparentPolicy.java b/services/core/java/com/android/server/wm/TransparentPolicy.java
new file mode 100644
index 0000000..b408397
--- /dev/null
+++ b/services/core/java/com/android/server/wm/TransparentPolicy.java
@@ -0,0 +1,353 @@
+/*
+ * 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.server.wm;
+
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+import static android.content.res.Configuration.ORIENTATION_UNDEFINED;
+import static android.content.res.Configuration.SCREEN_HEIGHT_DP_UNDEFINED;
+import static android.content.res.Configuration.SCREEN_WIDTH_DP_UNDEFINED;
+import static android.content.res.Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED;
+
+import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__UNKNOWN;
+import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;
+import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.res.Configuration;
+import android.graphics.Rect;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+/**
+ * Encapsulate logic about translucent activities.
+ * <p/>
+ * An activity is defined as translucent if {@link ActivityRecord#fillsParent()} returns
+ * {@code false}. When the policy is running for a letterboxed activity, a transparent activity
+ * will inherit constraints about bounds, aspect ratios and orientation from the first not finishing
+ * activity below.
+ */
+class TransparentPolicy {
+
+ private static final String TAG = TAG_WITH_CLASS_NAME ? "TransparentPolicy" : TAG_ATM;
+
+ // The predicate used to find the first opaque not finishing activity below the potential
+ // transparent activity.
+ private static final Predicate<ActivityRecord> FIRST_OPAQUE_NOT_FINISHING_ACTIVITY_PREDICATE =
+ ActivityRecord::occludesParent;
+
+ // The ActivityRecord this policy relates to.
+ @NonNull
+ private final ActivityRecord mActivityRecord;
+
+ // If transparent activity policy is enabled.
+ @NonNull
+ private final BooleanSupplier mIsTranslucentLetterboxingEnabledSupplier;
+
+ // The list of observers for the destroy event of candidate opaque activities
+ // when dealing with translucent activities.
+ @NonNull
+ private final List<TransparentPolicy> mDestroyListeners = new ArrayList<>();
+
+ // The current state for the possible transparent activity
+ @NonNull
+ private final TransparentPolicyState mTransparentPolicyState;
+
+ TransparentPolicy(@NonNull ActivityRecord activityRecord,
+ @NonNull LetterboxConfiguration letterboxConfiguration) {
+ mActivityRecord = activityRecord;
+ mIsTranslucentLetterboxingEnabledSupplier =
+ letterboxConfiguration::isTranslucentLetterboxingEnabled;
+ mTransparentPolicyState = new TransparentPolicyState(activityRecord);
+ }
+
+ /**
+ * Handles translucent activities letterboxing inheriting constraints from the
+ * first opaque activity beneath.
+ */
+ void start() {
+ if (!mIsTranslucentLetterboxingEnabledSupplier.getAsBoolean()) {
+ return;
+ }
+ final WindowContainer<?> parent = mActivityRecord.getParent();
+ if (parent == null) {
+ return;
+ }
+ mTransparentPolicyState.reset();
+ // In case mActivityRecord.hasCompatDisplayInsetsWithoutOverride() we don't apply the
+ // opaque activity constraints because we're expecting the activity is already letterboxed.
+ final ActivityRecord firstOpaqueActivity = mActivityRecord.getTask().getActivity(
+ FIRST_OPAQUE_NOT_FINISHING_ACTIVITY_PREDICATE /* callback */,
+ mActivityRecord /* boundary */, false /* includeBoundary */,
+ true /* traverseTopToBottom */);
+ // We check if we need for some reason to skip the policy gievn the specific first
+ // opaque activity
+ if (shouldSkipTransparentPolicy(firstOpaqueActivity)) {
+ return;
+ }
+ mTransparentPolicyState.start(firstOpaqueActivity);
+ }
+
+ void stop() {
+ for (int i = mDestroyListeners.size() - 1; i >= 0; i--) {
+ mDestroyListeners.get(i).start();
+ }
+ mDestroyListeners.clear();
+ mTransparentPolicyState.reset();
+ }
+
+ /**
+ * @return {@code true} if the current activity is translucent with an opaque activity
+ * beneath and the related policy is running. In this case it will inherit bounds, orientation
+ * and aspect ratios from the first opaque activity beneath.
+ */
+ boolean isRunning() {
+ return mTransparentPolicyState.isRunning();
+ }
+
+ /**
+ * @return {@code true} if the current activity is translucent with an opaque activity
+ * beneath and needs to inherit its orientation.
+ */
+ boolean hasInheritedOrientation() {
+ // To avoid wrong behaviour (e.g. permission dialogs not centered or with wrong size),
+ // transparent activities inherit orientation from the first opaque activity below only if
+ // they explicitly define an orientation different from SCREEN_ORIENTATION_UNSPECIFIED.
+ return isRunning()
+ && mActivityRecord.getOverrideOrientation()
+ != SCREEN_ORIENTATION_UNSPECIFIED;
+ }
+
+ float getInheritedMinAspectRatio() {
+ return mTransparentPolicyState.mInheritedMinAspectRatio;
+ }
+
+ float getInheritedMaxAspectRatio() {
+ return mTransparentPolicyState.mInheritedMaxAspectRatio;
+ }
+
+ int getInheritedAppCompatState() {
+ return mTransparentPolicyState.mInheritedAppCompatState;
+ }
+
+ @Configuration.Orientation
+ int getInheritedOrientation() {
+ return mTransparentPolicyState.mInheritedOrientation;
+ }
+
+ ActivityRecord.CompatDisplayInsets getInheritedCompatDisplayInsets() {
+ return mTransparentPolicyState.mInheritedCompatDisplayInsets;
+ }
+
+ void clearInheritedCompatDisplayInsets() {
+ mTransparentPolicyState.clearInheritedCompatDisplayInsets();
+ }
+
+ TransparentPolicyState getTransparentPolicyState() {
+ return mTransparentPolicyState;
+ }
+
+ /**
+ * In case of translucent activities, it consumes the {@link ActivityRecord} of the first opaque
+ * activity beneath using the given consumer and returns {@code true}.
+ */
+ boolean applyOnOpaqueActivityBelow(@NonNull Consumer<ActivityRecord> consumer) {
+ return mTransparentPolicyState.applyOnOpaqueActivityBelow(consumer);
+ }
+
+ @NonNull
+ Optional<ActivityRecord> getFirstOpaqueActivity() {
+ return isRunning() ? Optional.of(mTransparentPolicyState.mFirstOpaqueActivity)
+ : Optional.empty();
+ }
+
+ /**
+ * @return The first not finishing opaque activity beneath the current translucent activity
+ * if it exists and the strategy is enabled.
+ */
+ Optional<ActivityRecord> findOpaqueNotFinishingActivityBelow() {
+ return mTransparentPolicyState.findOpaqueNotFinishingActivityBelow();
+ }
+
+ // We evaluate the case when the policy should not be applied.
+ private boolean shouldSkipTransparentPolicy(@Nullable ActivityRecord opaqueActivity) {
+ if (opaqueActivity == null || opaqueActivity.isEmbedded()) {
+ // We skip letterboxing if the translucent activity doesn't have any
+ // opaque activities beneath or the activity below is embedded which
+ // never has letterbox.
+ mActivityRecord.recomputeConfiguration();
+ return true;
+ }
+ if (mActivityRecord.getTask() == null || mActivityRecord.fillsParent()
+ || mActivityRecord.hasCompatDisplayInsetsWithoutInheritance()) {
+ return true;
+ }
+ return false;
+ }
+
+ /** Resets the screen size related fields so they can be resolved by requested bounds later. */
+ private static void resetTranslucentOverrideConfig(Configuration config) {
+ // The values for the following properties will be defined during the configuration
+ // resolution in {@link ActivityRecord#resolveOverrideConfiguration} using the
+ // properties inherited from the first not finishing opaque activity beneath.
+ config.orientation = ORIENTATION_UNDEFINED;
+ config.screenWidthDp = config.compatScreenWidthDp = SCREEN_WIDTH_DP_UNDEFINED;
+ config.screenHeightDp = config.compatScreenHeightDp = SCREEN_HEIGHT_DP_UNDEFINED;
+ config.smallestScreenWidthDp = config.compatSmallestScreenWidthDp =
+ SMALLEST_SCREEN_WIDTH_DP_UNDEFINED;
+ }
+
+ private void inheritConfiguration(ActivityRecord firstOpaque) {
+ mTransparentPolicyState.inheritFromOpaque(firstOpaque);
+ }
+
+ /**
+ * Encapsulate the state for the current translucent activity when the transparent policy
+ * has started.
+ */
+ static class TransparentPolicyState {
+ // Aspect ratio value to consider as undefined.
+ private static final float UNDEFINED_ASPECT_RATIO = 0f;
+
+ @NonNull
+ private final ActivityRecord mActivityRecord;
+
+ @Configuration.Orientation
+ private int mInheritedOrientation = ORIENTATION_UNDEFINED;
+ private float mInheritedMinAspectRatio = UNDEFINED_ASPECT_RATIO;
+ private float mInheritedMaxAspectRatio = UNDEFINED_ASPECT_RATIO;
+
+ // The app compat state for the opaque activity if any
+ private int mInheritedAppCompatState = APP_COMPAT_STATE_CHANGED__STATE__UNKNOWN;
+
+ // The CompatDisplayInsets of the opaque activity beneath the translucent one.
+ @Nullable
+ private ActivityRecord.CompatDisplayInsets mInheritedCompatDisplayInsets;
+
+ @Nullable
+ private ActivityRecord mFirstOpaqueActivity;
+
+ /*
+ * WindowContainerListener responsible to make translucent activities inherit
+ * constraints from the first opaque activity beneath them. It's null for not
+ * translucent activities.
+ */
+ @Nullable
+ private WindowContainerListener mLetterboxConfigListener;
+
+ TransparentPolicyState(@NonNull ActivityRecord activityRecord) {
+ mActivityRecord = activityRecord;
+ }
+
+ private void start(@NonNull ActivityRecord firstOpaqueActivity) {
+ mFirstOpaqueActivity = firstOpaqueActivity;
+ mFirstOpaqueActivity.mTransparentPolicy
+ .mDestroyListeners.add(mActivityRecord.mTransparentPolicy);
+ inheritFromOpaque(firstOpaqueActivity);
+ final WindowContainer<?> parent = mActivityRecord.getParent();
+ mLetterboxConfigListener = WindowContainer.overrideConfigurationPropagation(
+ mActivityRecord, mFirstOpaqueActivity,
+ (opaqueConfig, transparentOverrideConfig) -> {
+ resetTranslucentOverrideConfig(transparentOverrideConfig);
+ final Rect parentBounds = parent.getWindowConfiguration().getBounds();
+ final Rect bounds = transparentOverrideConfig
+ .windowConfiguration.getBounds();
+ final Rect letterboxBounds = opaqueConfig.windowConfiguration.getBounds();
+ // We cannot use letterboxBounds directly here because the position relies
+ // on letterboxing. Using letterboxBounds directly, would produce a
+ // double offset.
+ bounds.set(parentBounds.left, parentBounds.top,
+ parentBounds.left + letterboxBounds.width(),
+ parentBounds.top + letterboxBounds.height());
+ // We need to initialize appBounds to avoid NPE. The actual value will
+ // be set ahead when resolving the Configuration for the activity.
+ transparentOverrideConfig.windowConfiguration.setAppBounds(new Rect());
+ inheritFromOpaque(mFirstOpaqueActivity);
+ return transparentOverrideConfig;
+ });
+ }
+
+ private void inheritFromOpaque(@NonNull ActivityRecord opaqueActivity) {
+ // To avoid wrong behaviour, we're not forcing a specific aspect ratio to activities
+ // which are not already providing one (e.g. permission dialogs) and presumably also
+ // not resizable.
+ if (mActivityRecord.getMinAspectRatio() != UNDEFINED_ASPECT_RATIO) {
+ mInheritedMinAspectRatio = opaqueActivity.getMinAspectRatio();
+ }
+ if (mActivityRecord.getMaxAspectRatio() != UNDEFINED_ASPECT_RATIO) {
+ mInheritedMaxAspectRatio = opaqueActivity.getMaxAspectRatio();
+ }
+ mInheritedOrientation = opaqueActivity.getRequestedConfigurationOrientation();
+ mInheritedAppCompatState = opaqueActivity.getAppCompatState();
+ mInheritedCompatDisplayInsets = opaqueActivity.getCompatDisplayInsets();
+ }
+
+ private void reset() {
+ if (mLetterboxConfigListener != null) {
+ mLetterboxConfigListener.onRemoved();
+ }
+ mLetterboxConfigListener = null;
+ mInheritedOrientation = ORIENTATION_UNDEFINED;
+ mInheritedMinAspectRatio = UNDEFINED_ASPECT_RATIO;
+ mInheritedMaxAspectRatio = UNDEFINED_ASPECT_RATIO;
+ mInheritedAppCompatState = APP_COMPAT_STATE_CHANGED__STATE__UNKNOWN;
+ mInheritedCompatDisplayInsets = null;
+ if (mFirstOpaqueActivity != null) {
+ mFirstOpaqueActivity.mTransparentPolicy
+ .mDestroyListeners.remove(mActivityRecord.mTransparentPolicy);
+ }
+ mFirstOpaqueActivity = null;
+ }
+
+ private boolean isRunning() {
+ return mLetterboxConfigListener != null;
+ }
+
+ private void clearInheritedCompatDisplayInsets() {
+ mInheritedCompatDisplayInsets = null;
+ }
+
+ /**
+ * @return The first not finishing opaque activity beneath the current translucent activity
+ * if it exists and the strategy is enabled.
+ */
+ private Optional<ActivityRecord> findOpaqueNotFinishingActivityBelow() {
+ if (!isRunning() || mActivityRecord.getTask() == null) {
+ return Optional.empty();
+ }
+ return Optional.ofNullable(mFirstOpaqueActivity);
+ }
+
+ /**
+ * In case of translucent activities, it consumes the {@link ActivityRecord} of the first
+ * opaque activity beneath using the given consumer and returns {@code true}.
+ */
+ private boolean applyOnOpaqueActivityBelow(@NonNull Consumer<ActivityRecord> consumer) {
+ return findOpaqueNotFinishingActivityBelow()
+ .map(activityRecord -> {
+ consumer.accept(activityRecord);
+ return true;
+ }).orElse(false);
+ }
+ }
+
+}
diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java
index 1034611..72109d34 100644
--- a/services/core/java/com/android/server/wm/WindowOrganizerController.java
+++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java
@@ -1595,11 +1595,31 @@
break;
}
case OP_TYPE_CREATE_OR_MOVE_TASK_FRAGMENT_DECOR_SURFACE: {
- taskFragment.getTask().moveOrCreateDecorSurfaceFor(taskFragment);
+ final Task task = taskFragment.getTask();
+ if (task == null) {
+ break;
+ }
+ // If any TaskFragment in the Task is collected by the transition, we make the decor
+ // surface visible in sync with the TaskFragment transition. Otherwise, we make the
+ // decor surface visible immediately.
+ final TaskFragment syncTaskFragment = transition != null
+ ? task.getTaskFragment(transition.mParticipants::contains)
+ : null;
+
+ if (syncTaskFragment != null) {
+ task.moveOrCreateDecorSurfaceFor(taskFragment, false /* visible */);
+ task.setDecorSurfaceVisible(syncTaskFragment.getSyncTransaction());
+ } else {
+ task.moveOrCreateDecorSurfaceFor(taskFragment, true /* visible */);
+ }
break;
}
case OP_TYPE_REMOVE_TASK_FRAGMENT_DECOR_SURFACE: {
- taskFragment.getTask().removeDecorSurface();
+ final Task task = taskFragment.getTask();
+ if (task == null) {
+ break;
+ }
+ task.removeDecorSurface();
break;
}
case OP_TYPE_SET_DIM_ON_TASK: {
@@ -1627,21 +1647,15 @@
clientTransaction.sanitize(caller.mPid, caller.mUid);
}
- if (transition != null) {
- // The decor surface boost/unboost must happen after the transition is
- // completed. Otherwise, the decor surface could be moved before Shell
- // completes the transition, causing flicker.
- transition.addTransitionEndedListener(() ->
- task.setDecorSurfaceBoosted(
- taskFragment,
- operation.getBooleanValue() /* isBoosted */,
- clientTransaction));
- } else {
- task.setDecorSurfaceBoosted(
- taskFragment,
- operation.getBooleanValue() /* isBoosted */,
- clientTransaction);
- }
+ task.requestDecorSurfaceBoosted(
+ taskFragment,
+ operation.getBooleanValue() /* isBoosted */,
+ clientTransaction);
+
+ // The decor surface boost/unboost must be applied after the transition is
+ // completed. Otherwise, the decor surface could be moved before Shell completes
+ // the transition, causing flicker.
+ runAfterTransition(transition, task::commitDecorSurfaceBoostedState);
}
break;
}
@@ -1654,6 +1668,19 @@
return effects;
}
+ /**
+ * Executes the provided {@code runnable} after the {@code transition}. If the
+ * {@code transition} is {@code null}, the {@code runnable} is executed immediately.
+ */
+ private static void runAfterTransition(
+ @Nullable Transition transition, @NonNull Runnable runnable) {
+ if (transition == null) {
+ runnable.run();
+ } else {
+ transition.addTransitionEndedListener(runnable);
+ }
+ }
+
private boolean validateTaskFragmentOperation(
@NonNull WindowContainerTransaction.HierarchyOp hop,
@Nullable IBinder errorCallbackToken, @Nullable ITaskFragmentOrganizer organizer) {
@@ -2361,6 +2388,7 @@
position = POSITION_TOP;
}
ownerTask.addChild(taskFragment, position);
+ EventLogTags.writeWmTfCreated(System.identityHashCode(taskFragment), ownerTask.mTaskId);
taskFragment.setWindowingMode(creationParams.getWindowingMode());
if (!creationParams.getInitialRelativeBounds().isEmpty()) {
// The surface operations for the task fragment should sync with the transition.
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java
index a0ea4e9..901cafa 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java
@@ -240,7 +240,7 @@
POLICY_FLAG_LOCAL_ONLY_POLICY | POLICY_FLAG_INHERITABLE
| POLICY_FLAG_NON_COEXISTABLE_POLICY
| POLICY_FLAG_SKIP_ENFORCEMENT_IF_UNCHANGED,
- PolicyEnforcerCallbacks::noOp,
+ PolicyEnforcerCallbacks::setApplicationRestrictions,
new BundlePolicySerializer());
/**
diff --git a/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt b/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
index d307200..bb0838d 100644
--- a/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
+++ b/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
@@ -1277,10 +1277,11 @@
permissionName
)
else ->
- permissionAllowlist.getProductSignatureAppAllowlistState(
- packageName,
- permissionName
- )
+ permissionAllowlist.getApexSignatureAppAllowlistState(packageName, permissionName)
+ ?: permissionAllowlist.getProductSignatureAppAllowlistState(
+ packageName,
+ permissionName
+ )
?: permissionAllowlist.getVendorSignatureAppAllowlistState(
packageName,
permissionName
diff --git a/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java b/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
index 33bf4bd..cd70ed2 100644
--- a/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
+++ b/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
@@ -25,6 +25,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.hardware.camera2.CameraManager;
import android.os.Handler;
import android.os.IBinder.DeathRecipient;
import android.os.Looper;
@@ -258,6 +259,7 @@
BackgroundThread.get().getThreadHandler().post(
() -> {
registerAppLaunchObserver();
+ registerCameraOpenObserver();
registerDex2oatObserver();
registerOTAObserver();
});
@@ -321,16 +323,14 @@
"dex2oat_trace_freq", 25);
int randomNum = ThreadLocalRandom.current().nextInt(100);
if (randomNum < traceFrequency) {
- BackgroundThread.get().getThreadHandler().post(() -> {
+ // Dex2oat could take a while before it starts. Add a short delay before start tracing.
+ BackgroundThread.get().getThreadHandler().postDelayed(() -> {
try {
- // Dex2oat could take a while before it starts. Add a short delay before start
- // tracing.
- Thread.sleep(1000);
mIProfcollect.trace_once("dex2oat");
- } catch (RemoteException | InterruptedException e) {
+ } catch (RemoteException e) {
Log.e(LOG_TAG, "Failed to initiate trace: " + e.getMessage());
}
- });
+ }, 1000);
}
}
@@ -371,4 +371,36 @@
pfs.getContext().sendBroadcast(intent);
});
}
+
+ private void registerCameraOpenObserver() {
+ CameraManager cm = getContext().getSystemService(CameraManager.class);
+ cm.registerAvailabilityCallback(new CameraManager.AvailabilityCallback() {
+ @Override
+ public void onCameraOpened(String cameraId, String packageId) {
+ Log.d(LOG_TAG, "Received camera open event from: " + packageId);
+ // Skip face auth and Android System Intelligence, since they trigger way too
+ // often.
+ if (packageId.startsWith("client.pid")
+ || packageId.equals("com.google.android.as")) {
+ return;
+ }
+ // Sample for a fraction of camera events.
+ final int traceFrequency =
+ DeviceConfig.getInt(DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,
+ "camera_trace_freq", 10);
+ int randomNum = ThreadLocalRandom.current().nextInt(100);
+ if (randomNum >= traceFrequency) {
+ return;
+ }
+ // Wait for 1s before starting tracing.
+ BackgroundThread.get().getThreadHandler().postDelayed(() -> {
+ try {
+ mIProfcollect.trace_once("camera");
+ } catch (RemoteException e) {
+ Log.e(LOG_TAG, "Failed to initiate trace: " + e.getMessage());
+ }
+ }, 1000);
+ }
+ }, null);
+ }
}
diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java
index 8fd1e6b..efa224f 100644
--- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java
+++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java
@@ -39,6 +39,7 @@
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import android.app.ActivityManager;
@@ -1284,14 +1285,37 @@
@Test
public void testDwbcCallsHappenOnHandler() {
+ when(mDisplayManagerFlagsMock.isAdaptiveTone1Enabled()).thenReturn(true);
mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID);
- mHolder.dpc.setAutomaticScreenBrightnessMode(AUTO_BRIGHTNESS_MODE_IDLE);
- verify(mDisplayWhiteBalanceControllerMock, never()).setStrongModeEnabled(true);
+ // Send a display power request
+ DisplayPowerRequest dpr = new DisplayPowerRequest();
+ dpr.policy = DisplayPowerRequest.POLICY_BRIGHT;
+ dpr.useProximitySensor = true;
+ mHolder.dpc.requestPowerState(dpr, false /* waitForNegativeProximity */);
+
+ // Run updatePowerState
+ advanceTime(1);
+
+ setUpDisplay(DISPLAY_ID, "new_unique_id", mHolder.display, mock(DisplayDevice.class),
+ mHolder.config, /* isEnabled= */ true);
// dispatch handler looper
advanceTime(1);
- verify(mDisplayWhiteBalanceControllerMock, times(1)).setStrongModeEnabled(true);
+ clearInvocations(mDisplayWhiteBalanceControllerMock, mHolder.automaticBrightnessController,
+ mHolder.animator);
+ mHolder.dpc.setAutomaticScreenBrightnessMode(AUTO_BRIGHTNESS_MODE_IDLE);
+ verifyNoMoreInteractions(mDisplayWhiteBalanceControllerMock,
+ mHolder.automaticBrightnessController,
+ mHolder.animator);
+
+ // dispatch handler looper
+ advanceTime(1);
+ verify(mHolder.automaticBrightnessController).switchMode(AUTO_BRIGHTNESS_MODE_IDLE,
+ /* sendUpdate= */ true);
+ verify(mHolder.animator).setAnimationTimeLimits(BRIGHTNESS_RAMP_INCREASE_MAX_IDLE,
+ BRIGHTNESS_RAMP_DECREASE_MAX_IDLE);
+ verify(mDisplayWhiteBalanceControllerMock).setStrongModeEnabled(true);
}
@Test
@@ -1506,6 +1530,9 @@
// switch to idle mode
mHolder.dpc.setAutomaticScreenBrightnessMode(AUTO_BRIGHTNESS_MODE_IDLE);
+ // Process the MSG_SWITCH_AUTOBRIGHTNESS_MODE event
+ advanceTime(1);
+
// A second time when switching to idle mode.
verify(mHolder.animator, times(2)).setAnimationTimeLimits(BRIGHTNESS_RAMP_INCREASE_MAX,
BRIGHTNESS_RAMP_DECREASE_MAX);
@@ -1532,6 +1559,8 @@
// switch to idle mode
mHolder.dpc.setAutomaticScreenBrightnessMode(AUTO_BRIGHTNESS_MODE_IDLE);
+ // Process the MSG_SWITCH_AUTOBRIGHTNESS_MODE event
+ advanceTime(1);
verify(mHolder.animator).setAnimationTimeLimits(BRIGHTNESS_RAMP_INCREASE_MAX_IDLE,
BRIGHTNESS_RAMP_DECREASE_MAX_IDLE);
}
diff --git a/services/tests/displayservicetests/src/com/android/server/display/mode/VotesStorageTest.java b/services/tests/displayservicetests/src/com/android/server/display/mode/VotesStorageTest.java
index a248d6de..0125ddb 100644
--- a/services/tests/displayservicetests/src/com/android/server/display/mode/VotesStorageTest.java
+++ b/services/tests/displayservicetests/src/com/android/server/display/mode/VotesStorageTest.java
@@ -38,10 +38,10 @@
@RunWith(AndroidJUnit4.class)
public class VotesStorageTest {
private static final int DISPLAY_ID = 100;
- private static final int PRIORITY = Vote.PRIORITY_APP_REQUEST_SIZE;
+ private static final @Vote.Priority int PRIORITY = Vote.PRIORITY_APP_REQUEST_SIZE;
private static final Vote VOTE = Vote.forDisableRefreshRateSwitching();
private static final int DISPLAY_ID_OTHER = 101;
- private static final int PRIORITY_OTHER = Vote.PRIORITY_FLICKER_REFRESH_RATE;
+ private static final @Vote.Priority int PRIORITY_OTHER = Vote.PRIORITY_FLICKER_REFRESH_RATE;
private static final Vote VOTE_OTHER = Vote.forBaseModeRefreshRate(10f);
@Mock
diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java
index 851cf4a..976cc18 100644
--- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java
+++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryUsageStatsTest.java
@@ -91,7 +91,7 @@
final Parcel parcel = Parcel.obtain();
parcel.writeParcelable(outBatteryUsageStats, 0);
- assertThat(parcel.dataSize()).isLessThan(8000);
+ assertThat(parcel.dataSize()).isLessThan(10000);
parcel.setDataPosition(0);
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java
index d4f0d5a..52b33db 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java
@@ -593,12 +593,6 @@
}
@Override
- public void onMagnificationSystemUIConnectionChanged(boolean connected)
- throws RemoteException {
-
- }
-
- @Override
public void onMagnificationChanged(int displayId, Region region, MagnificationConfig config)
throws RemoteException {
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java
index 0de5807..87fe6cf 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java
@@ -59,7 +59,6 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.filters.FlakyTest;
-import com.android.compatibility.common.util.TestUtils;
import com.android.internal.util.test.FakeSettingsProvider;
import com.android.server.LocalServices;
import com.android.server.accessibility.AccessibilityTraceManager;
@@ -77,7 +76,6 @@
*/
public class MagnificationConnectionManagerTest {
- private static final int WAIT_CONNECTION_TIMEOUT_SECOND = 1;
private static final int CURRENT_USER_ID = UserHandle.USER_SYSTEM;
private static final int SERVICE_ID = 1;
@@ -117,19 +115,17 @@
private void stubSetConnection(boolean needDelay) {
doAnswer((InvocationOnMock invocation) -> {
final boolean connect = (Boolean) invocation.getArguments()[0];
- // Use post to simulate setConnection() called by another process.
- final Context context = ApplicationProvider.getApplicationContext();
+ // Simulates setConnection() called by another process.
if (needDelay) {
+ final Context context = ApplicationProvider.getApplicationContext();
context.getMainThreadHandler().postDelayed(
() -> {
mMagnificationConnectionManager.setConnection(
connect ? mMockConnection.getConnection() : null);
}, 10);
} else {
- context.getMainThreadHandler().post(() -> {
- mMagnificationConnectionManager.setConnection(
- connect ? mMockConnection.getConnection() : null);
- });
+ mMagnificationConnectionManager.setConnection(
+ connect ? mMockConnection.getConnection() : null);
}
return true;
}).when(mMockStatusBarManagerInternal).requestMagnificationConnection(anyBoolean());
@@ -633,10 +629,9 @@
}
@Test
- public void isConnected_requestConnection_expectedValue() throws Exception {
+ public void isConnected_requestConnection_expectedValue() throws RemoteException {
mMagnificationConnectionManager.requestConnection(true);
- TestUtils.waitUntil("connection is not ready", WAIT_CONNECTION_TIMEOUT_SECOND,
- () -> mMagnificationConnectionManager.isConnected());
+ assertTrue(mMagnificationConnectionManager.isConnected());
mMagnificationConnectionManager.requestConnection(false);
assertFalse(mMagnificationConnectionManager.isConnected());
diff --git a/services/tests/servicestests/src/com/android/server/companion/virtual/camera/VirtualCameraControllerTest.java b/services/tests/servicestests/src/com/android/server/companion/virtual/camera/VirtualCameraControllerTest.java
index 4505a8b..627ca03 100644
--- a/services/tests/servicestests/src/com/android/server/companion/virtual/camera/VirtualCameraControllerTest.java
+++ b/services/tests/servicestests/src/com/android/server/companion/virtual/camera/VirtualCameraControllerTest.java
@@ -95,7 +95,7 @@
mVirtualCameraController = new VirtualCameraController(mVirtualCameraServiceMock,
DEVICE_POLICY_CUSTOM, DEVICE_ID);
when(mVirtualCameraServiceMock.registerCamera(any(), any(), anyInt())).thenReturn(true);
- when(mVirtualCameraServiceMock.getCameraId(any())).thenReturn(0);
+ when(mVirtualCameraServiceMock.getCameraId(any())).thenReturn("0");
}
@After
diff --git a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java
index 3685afd..6d79ae4 100644
--- a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java
@@ -68,7 +68,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -514,7 +513,7 @@
@Test
public void testTemperatureWatcherGetSlopeOf() throws RemoteException {
TemperatureWatcher watcher = mService.mTemperatureWatcher;
- List<TemperatureWatcher.Sample> samples = new LinkedList<>();
+ List<TemperatureWatcher.Sample> samples = new ArrayList<>();
for (int i = 0; i < 30; ++i) {
samples.add(watcher.createSampleForTesting(i, (float) (i / 2 * 2)));
}
@@ -539,7 +538,7 @@
public void testTemperatureWatcherGetForecast() throws RemoteException {
TemperatureWatcher watcher = mService.mTemperatureWatcher;
- LinkedList<TemperatureWatcher.Sample> samples = new LinkedList<>();
+ ArrayList<TemperatureWatcher.Sample> samples = new ArrayList<>();
// Add a single sample
samples.add(watcher.createSampleForTesting(0, 25.0f));
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
index 2030b30..1fd8f50 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
@@ -16,10 +16,8 @@
package com.android.server.wm;
-import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.ActivityManager.PROCESS_STATE_BOUND_TOP;
-import static android.app.ActivityManager.PROCESS_STATE_TOP;
import static android.app.ActivityManager.START_ABORTED;
import static android.app.ActivityManager.START_CANCELED;
import static android.app.ActivityManager.START_CLASS_NOT_FOUND;
@@ -44,7 +42,6 @@
import static android.content.pm.ActivityInfo.LAUNCH_MULTIPLE;
import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_INSTANCE;
import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TASK;
-import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.Process.SYSTEM_UID;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.clearInvocations;
@@ -52,7 +49,6 @@
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.mock;
-import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.never;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;
@@ -79,15 +75,12 @@
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.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.notNull;
import android.app.ActivityOptions;
-import android.app.ActivityOptions.BackgroundActivityStartMode;
import android.app.AppOpsManager;
-import android.app.BackgroundStartPrivileges;
import android.app.IApplicationThread;
import android.app.PictureInPictureParams;
import android.content.ComponentName;
@@ -101,10 +94,8 @@
import android.graphics.Rect;
import android.os.Binder;
import android.os.IBinder;
-import android.os.Process;
import android.os.RemoteException;
import android.platform.test.annotations.Presubmit;
-import android.platform.test.annotations.RequiresFlagsDisabled;
import android.provider.DeviceConfig;
import android.service.voice.IVoiceInteractionSession;
import android.util.Pair;
@@ -116,8 +107,6 @@
import androidx.test.filters.SmallTest;
import com.android.compatibility.common.util.DeviceConfigStateHelper;
-import com.android.internal.util.FrameworkStatsLog;
-import com.android.server.am.PendingIntentRecord;
import com.android.server.pm.PackageArchiver;
import com.android.server.pm.pkg.AndroidPackage;
import com.android.server.wm.BackgroundActivityStartController.BalVerdict;
@@ -126,11 +115,8 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.MockitoSession;
-import org.mockito.quality.Strictness;
import java.util.ArrayList;
import java.util.Arrays;
@@ -726,497 +712,68 @@
eq(FAKE_REAL_CALLING_UID), anyInt(), anyBoolean(), eq(false));
}
- /**
- * This test ensures that unsupported usecases aren't aborted when background starts are
- * allowed.
- */
- @Test
- public void testBackgroundActivityStartsAllowed_noStartsAborted() {
- doReturn(true).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest("allowed_noStartsAborted", false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, false);
- }
/**
* This test ensures that unsupported usecases are aborted when background starts are
* disallowed.
*/
@Test
- public void testBackgroundActivityStartsDisallowed_unsupportedUsecaseAborted() {
+ public void testPinnedSingleInstanceAborted() {
doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_unsupportedUsecase_aborted", true,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures that unsupported usecases are aborted when background starts are
- * disallowed.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_callingUidProcessStateTopAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_callingUidProcessStateTop_aborted", true,
- UNIMPORTANT_UID, false, PROCESS_STATE_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures that unsupported usecases are aborted when background starts are
- * disallowed.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_realCallingUidProcessStateTopAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_realCallingUidProcessStateTop_aborted", true,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_TOP,
- false, false, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures that unsupported usecases are aborted when background starts are
- * disallowed.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_hasForegroundActivitiesAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_hasForegroundActivities_aborted", true,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- true, false, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures that unsupported usecases are aborted when background starts are
- * disallowed.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_pinnedSingleInstanceAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_pinned_singleinstance_aborted", true,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, true, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the calling process runs as ROOT_UID.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_rootUidNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest("disallowed_rootUid_notAborted", false,
- Process.ROOT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the calling process is running as SYSTEM_UID.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_systemUidNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest("disallowed_systemUid_notAborted", false,
- Process.SYSTEM_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the calling process is running as NFC_UID.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_nfcUidNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest("disallowed_nfcUid_notAborted", false,
- Process.NFC_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the calling process has a visible window.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_callingUidHasVisibleWindowNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_callingUidHasVisibleWindow_notAborted", false,
- UNIMPORTANT_UID, true, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, false);
- }
-
- /**
- * The sending app has a visible window, but does not (by default) allow the pending intent to
- * start the background activity.
- */
- @Test
- @Ignore("b/266015587")
- public void testBackgroundActivityStartsDisallowed_realCallingUidHasVisibleWindowAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
-
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_realCallingUidHasVisibleWindow_abortedInU", true,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, true, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the caller is in the recent activity list.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_callerIsRecentsNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_callerIsRecents_notAborted", false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, true, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the caller is temporarily (10s) allowed to start.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_callerIsAllowedNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_callerIsAllowed_notAborted", false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, true, false, false, false, false, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the caller explicitly has background activity start privilege.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_callerIsInstrumentingWithBASPnotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_callerIsInstrumentingWithBackgroundActivityStartPrivileges_notAborted",
- false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, true, false, false, false, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the caller is a device owner.
- */
- @Test
- public void
- testBackgroundActivityStartsDisallowed_callingPackageNameIsDeviceOwnerNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_callingPackageNameIsDeviceOwner_notAborted", false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, true, false, false, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the caller is a affiliated profile owner.
- */
- @Test
- public void
- testBackgroundActivityStartsDisallowed_isAffiliatedProfileOwnerNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_callingUidIsAffiliatedProfileOwner_notAborted", false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, true, false, false);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the caller has the OP_SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION appop.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_callerHasSystemExemptAppOpNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_callerHasSystemExemptAppOpNotAborted", false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, true);
- }
-
- /**
- * This test ensures that supported usecases aren't aborted when background starts are
- * disallowed. Each scenarios tests one condition that makes them supported in isolation. In
- * this case the caller is an IME.
- */
- @Test
- public void testBackgroundActivityStartsDisallowed_callingPackageNameIsImeNotAborted() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- setupImeWindow();
- runAndVerifyBackgroundActivityStartsSubtest(
- "disallowed_callingPackageNameIsIme_notAborted", false,
- CURRENT_IME_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, false, false, false, false, false, false, false);
- }
-
- /**
- * This test ensures proper logging for BAL_ALLOW_PERMISSION.
- */
- @Test
- public void testBackgroundActivityStartsAllowed_logging() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- MockitoSession mockingSession = mockitoSession()
- .mockStatic(ActivityTaskManagerService.class)
- .mockStatic(FrameworkStatsLog.class)
- .strictness(Strictness.LENIENT)
- .startMocking();
- try {
- doReturn(PERMISSION_GRANTED).when(() -> ActivityTaskManagerService.checkPermission(
- eq(START_ACTIVITIES_FROM_BACKGROUND),
- anyInt(), anyInt()));
- runAndVerifyBackgroundActivityStartsSubtest(
- "allowed_notAborted", false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- UNIMPORTANT_UID2, false, PROCESS_STATE_BOUND_TOP,
- false, true, false, false, false, false, false, false);
- verify(() -> FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED,
- "", // activity name
- BackgroundActivityStartController.BAL_ALLOW_PERMISSION,
- UNIMPORTANT_UID,
- UNIMPORTANT_UID2,
- BackgroundActivityStartController.BAL_ALLOW_PERMISSION,
- true, // opt in
- false, // but no explicit opt in
- BackgroundActivityStartController.BAL_BLOCK,
- true, // opt in
- false // but no explicit opt in
- ));
- } finally {
- mockingSession.finishMocking();
- }
- }
-
- /**
- * This test ensures proper logging for BAL_ALLOW_PENDING_INTENT, when the PendingIntent sender
- * is the only reason BAL is allowed.
- */
- @Test
- @RequiresFlagsDisabled(com.android.window.flags.Flags.FLAG_BAL_IMPROVED_METRICS)
- public void testBackgroundActivityStartsAllowed_loggingOnlyPendingIntentAllowed() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- MockitoSession mockingSession = mockitoSession()
- .mockStatic(ActivityTaskManagerService.class)
- .mockStatic(FrameworkStatsLog.class)
- .mockStatic(PendingIntentRecord.class)
- .strictness(Strictness.LENIENT)
- .startMocking();
- try {
- doReturn(PERMISSION_GRANTED).when(() -> ActivityTaskManagerService.checkPermission(
- eq(START_ACTIVITIES_FROM_BACKGROUND),
- anyInt(), anyInt()));
- doReturn(BackgroundStartPrivileges.allowBackgroundActivityStarts(null)).when(
- () -> PendingIntentRecord.getBackgroundStartPrivilegesAllowedByCaller(
- anyObject(), anyInt(), anyObject()));
- runAndVerifyBackgroundActivityStartsSubtest(
- "allowed_notAborted", false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- Process.SYSTEM_UID, true, PROCESS_STATE_BOUND_TOP,
- false, true, false, false, false, false, false, false,
- ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED);
- verify(() -> FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED,
- DEFAULT_COMPONENT_PACKAGE_NAME + "/" + DEFAULT_COMPONENT_PACKAGE_NAME,
- BackgroundActivityStartController.BAL_ALLOW_PENDING_INTENT,
- UNIMPORTANT_UID,
- Process.SYSTEM_UID,
- BackgroundActivityStartController.BAL_ALLOW_PERMISSION,
- false, // opt in
- true, // explicit opt out
- BackgroundActivityStartController.BAL_ALLOW_VISIBLE_WINDOW,
- true, // opt in
- false // but no explicit opt in
- ));
- } finally {
- mockingSession.finishMocking();
- }
- }
-
- /**
- * This test ensures proper logging for BAL_ALLOW_PENDING_INTENT, when the PendingIntent sender
- * is not the primary reason to allow BAL (but the creator).
- */
- @Test
- @RequiresFlagsDisabled(com.android.window.flags.Flags.FLAG_BAL_IMPROVED_METRICS)
- public void testBackgroundActivityStartsAllowed_loggingPendingIntentAllowed() {
- doReturn(false).when(mAtm).isBackgroundActivityStartsEnabled();
- MockitoSession mockingSession = mockitoSession()
- .mockStatic(ActivityTaskManagerService.class)
- .mockStatic(FrameworkStatsLog.class)
- .mockStatic(PendingIntentRecord.class)
- .strictness(Strictness.LENIENT)
- .startMocking();
- try {
- doReturn(PERMISSION_GRANTED).when(() -> ActivityTaskManagerService.checkPermission(
- eq(START_ACTIVITIES_FROM_BACKGROUND),
- anyInt(), anyInt()));
- doReturn(BackgroundStartPrivileges.allowBackgroundActivityStarts(null)).when(
- () -> PendingIntentRecord.getBackgroundStartPrivilegesAllowedByCaller(
- anyObject(), anyInt(), anyObject()));
- runAndVerifyBackgroundActivityStartsSubtest(
- "allowed_notAborted", false,
- UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,
- Process.SYSTEM_UID, true, PROCESS_STATE_BOUND_TOP,
- false, true, false, false, false, false, false, false,
- ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
- verify(() -> FrameworkStatsLog.write(FrameworkStatsLog.BAL_ALLOWED,
- "",
- BackgroundActivityStartController.BAL_ALLOW_PERMISSION,
- UNIMPORTANT_UID,
- Process.SYSTEM_UID,
- BackgroundActivityStartController.BAL_ALLOW_PERMISSION,
- true, // opt in
- true, // explicit opt in
- BackgroundActivityStartController.BAL_ALLOW_VISIBLE_WINDOW,
- true, // opt in
- false // but no explicit opt in
- ));
- } finally {
- mockingSession.finishMocking();
- }
- }
-
- private void runAndVerifyBackgroundActivityStartsSubtest(String name, boolean shouldHaveAborted,
- int callingUid, boolean callingUidHasVisibleWindow, int callingUidProcState,
- int realCallingUid, boolean realCallingUidHasVisibleWindow, int realCallingUidProcState,
- boolean hasForegroundActivities, boolean callerIsRecents,
- boolean callerIsTempAllowed,
- boolean callerIsInstrumentingWithBackgroundActivityStartPrivileges,
- boolean isCallingUidDeviceOwner,
- boolean isCallingUidAffiliatedProfileOwner,
- boolean isPinnedSingleInstance,
- boolean hasSystemExemptAppOp) {
- runAndVerifyBackgroundActivityStartsSubtest(name, shouldHaveAborted, callingUid,
- callingUidHasVisibleWindow, callingUidProcState, realCallingUid,
- realCallingUidHasVisibleWindow, realCallingUidProcState, hasForegroundActivities,
- callerIsRecents, callerIsTempAllowed,
- callerIsInstrumentingWithBackgroundActivityStartPrivileges,
- isCallingUidDeviceOwner, isCallingUidAffiliatedProfileOwner, isPinnedSingleInstance,
- hasSystemExemptAppOp,
- ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED);
- }
-
- private void runAndVerifyBackgroundActivityStartsSubtest(String name, boolean shouldHaveAborted,
- int callingUid, boolean callingUidHasVisibleWindow, int callingUidProcState,
- int realCallingUid, boolean realCallingUidHasVisibleWindow, int realCallingUidProcState,
- boolean hasForegroundActivities, boolean callerIsRecents,
- boolean callerIsTempAllowed,
- boolean callerIsInstrumentingWithBackgroundActivityStartPrivileges,
- boolean isCallingUidDeviceOwner,
- boolean isCallingUidAffiliatedProfileOwner,
- boolean isPinnedSingleInstance,
- boolean hasSystemExemptAppOp,
- @BackgroundActivityStartMode int pendingIntentCreatorBackgroundActivityStartMode) {
// window visibility
- doReturn(callingUidHasVisibleWindow).when(mAtm).hasActiveVisibleWindow(callingUid);
- doReturn(realCallingUidHasVisibleWindow).when(mAtm).hasActiveVisibleWindow(realCallingUid);
+ doReturn(false).when(mAtm).hasActiveVisibleWindow(UNIMPORTANT_UID);
+ doReturn(false).when(mAtm).hasActiveVisibleWindow(UNIMPORTANT_UID2);
// process importance
- mAtm.mActiveUids.onUidActive(callingUid, callingUidProcState);
- mAtm.mActiveUids.onUidActive(realCallingUid, realCallingUidProcState);
+ mAtm.mActiveUids.onUidActive(UNIMPORTANT_UID, PROCESS_STATE_BOUND_TOP);
+ mAtm.mActiveUids.onUidActive(UNIMPORTANT_UID2, PROCESS_STATE_BOUND_TOP);
// foreground activities
final IApplicationThread caller = mock(IApplicationThread.class);
final WindowProcessListener listener = mock(WindowProcessListener.class);
final ApplicationInfo ai = new ApplicationInfo();
- ai.uid = callingUid;
+ ai.uid = UNIMPORTANT_UID;
ai.packageName = "com.android.test.package";
- final WindowProcessController callerApp =
- spy(new WindowProcessController(mAtm, ai, null, callingUid, -1, null, listener));
- doReturn(hasForegroundActivities).when(callerApp).hasForegroundActivities();
+ final WindowProcessController callerApp = spy(new WindowProcessController(
+ mAtm, ai, null, UNIMPORTANT_UID, -1, null, listener));
+ doReturn(false).when(callerApp).hasForegroundActivities();
doReturn(callerApp).when(mAtm).getProcessController(caller);
// caller is recents
RecentTasks recentTasks = mock(RecentTasks.class);
mAtm.mTaskSupervisor.setRecentTasks(recentTasks);
- doReturn(callerIsRecents).when(recentTasks).isCallerRecents(callingUid);
+ doReturn(false).when(recentTasks).isCallerRecents(UNIMPORTANT_UID);
// caller is temp allowed
- if (callerIsTempAllowed) {
- callerApp.addOrUpdateBackgroundStartPrivileges(new Binder(),
- BackgroundStartPrivileges.ALLOW_BAL);
- }
// caller is instrumenting with background activity starts privileges
- callerApp.setInstrumenting(callerIsInstrumentingWithBackgroundActivityStartPrivileges,
- callerIsInstrumentingWithBackgroundActivityStartPrivileges ? Process.SHELL_UID : -1,
- callerIsInstrumentingWithBackgroundActivityStartPrivileges);
+ callerApp.setInstrumenting(false, -1, false);
// callingUid is the device owner
- doReturn(isCallingUidDeviceOwner).when(mAtm).isDeviceOwner(callingUid);
+ doReturn(false).when(mAtm).isDeviceOwner(UNIMPORTANT_UID);
// callingUid is the affiliated profile owner
- doReturn(isCallingUidAffiliatedProfileOwner).when(mAtm)
- .isAffiliatedProfileOwner(callingUid);
+ doReturn(false).when(mAtm).isAffiliatedProfileOwner(UNIMPORTANT_UID);
// caller has OP_SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION appop
- doReturn(hasSystemExemptAppOp ? AppOpsManager.MODE_ALLOWED
- : AppOpsManager.MODE_DEFAULT).when(mAppOpsManager).checkOpNoThrow(
+ doReturn(AppOpsManager.MODE_DEFAULT).when(mAppOpsManager).checkOpNoThrow(
eq(AppOpsManager.OP_SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION),
anyInt(), any());
- int launchMode = LAUNCH_MULTIPLE;
- if (isPinnedSingleInstance) {
- final ActivityRecord baseActivity =
- new ActivityBuilder(mAtm).setCreateTask(true).build();
- baseActivity.getRootTask()
- .setWindowingMode(WINDOWING_MODE_PINNED);
- doReturn(baseActivity).when(mRootWindowContainer).findTask(any(), any());
- launchMode = LAUNCH_SINGLE_INSTANCE;
- }
+ final ActivityRecord baseActivity = new ActivityBuilder(mAtm).setCreateTask(true).build();
+ baseActivity.getRootTask().setWindowingMode(WINDOWING_MODE_PINNED);
+ doReturn(baseActivity).when(mRootWindowContainer).findTask(any(), any());
ActivityOptions rawOptions = ActivityOptions.makeBasic()
.setPendingIntentCreatorBackgroundActivityStartMode(
- pendingIntentCreatorBackgroundActivityStartMode);
+ ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED);
final ActivityOptions options = spy(rawOptions);
ActivityRecord[] outActivity = new ActivityRecord[1];
ActivityStarter starter = prepareStarter(
- FLAG_ACTIVITY_NEW_TASK, true, launchMode)
+ FLAG_ACTIVITY_NEW_TASK, true, LAUNCH_SINGLE_INSTANCE)
.setCallingPackage("com.whatever.dude")
.setCaller(caller)
- .setCallingUid(callingUid)
- .setRealCallingUid(realCallingUid)
+ .setCallingUid(UNIMPORTANT_UID)
+ .setRealCallingUid(UNIMPORTANT_UID2)
.setActivityOptions(new SafeActivityOptions(options))
.setOutActivity(outActivity);
- final int result = starter.setReason("testBackgroundActivityStarts_" + name).execute();
-
- assertEquals(ActivityStarter.getExternalResult(
- shouldHaveAborted ? START_ABORTED : START_SUCCESS), result);
- verify(options, times(shouldHaveAborted ? 1 : 0)).abort();
+ final int result = starter.setReason("testPinnedSingleInstanceAborted").execute();
+ assertEquals(ActivityStarter.getExternalResult(START_ABORTED), result);
+ verify(options, times(1)).abort();
final ActivityRecord startedActivity = outActivity[0];
if (startedActivity != null && startedActivity.getTask() != null) {
diff --git a/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java
index a39a1a8..c67d1ec 100644
--- a/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java
@@ -550,7 +550,7 @@
}).when(appWindow.mSession).setOnBackInvokedCallbackInfo(eq(appWindow.mClient), any());
addToWindowMap(appWindow, true);
- dispatcher.attachToWindow(appWindow.mSession, appWindow.mClient, null);
+ dispatcher.attachToWindow(appWindow.mSession, appWindow.mClient, null, null);
OnBackInvokedCallback appCallback = createBackCallback(appLatch);
diff --git a/services/tests/wmtests/src/com/android/server/wm/BackgroundActivityStartControllerExemptionTests.java b/services/tests/wmtests/src/com/android/server/wm/BackgroundActivityStartControllerExemptionTests.java
index 4afc8ac..366e519 100644
--- a/services/tests/wmtests/src/com/android/server/wm/BackgroundActivityStartControllerExemptionTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/BackgroundActivityStartControllerExemptionTests.java
@@ -29,6 +29,7 @@
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.when;
import android.app.ActivityOptions;
@@ -564,4 +565,136 @@
assertWithMessage(balState.toString()).that(callerVerdict.getCode()).isEqualTo(
BAL_ALLOW_SAW_PERMISSION);
}
+
+ @Test
+ public void testCaller_isRecents() {
+ int callingUid = REGULAR_UID_1;
+ int callingPid = REGULAR_PID_1;
+ final String callingPackage = REGULAR_PACKAGE_1;
+ int realCallingUid = REGULAR_UID_2;
+ int realCallingPid = REGULAR_PID_2;
+
+ // setup state
+ //if (mSupervisor.mRecentTasks.isCallerRecents(state.mCallingUid))
+ RecentTasks recentTasks = mock(RecentTasks.class);
+ when(recentTasks.isCallerRecents(eq(callingUid))).thenReturn(true);
+ mSupervisor.mRecentTasks = recentTasks;
+
+ // prepare call
+ PendingIntentRecord originatingPendingIntent = mPendingIntentRecord;
+ BackgroundStartPrivileges forcedBalByPiSender = BackgroundStartPrivileges.NONE;
+ Intent intent = TEST_INTENT;
+ ActivityOptions checkedOptions = mCheckedOptions;
+ BackgroundActivityStartController.BalState balState = mController.new BalState(callingUid,
+ callingPid, callingPackage, realCallingUid, realCallingPid, null,
+ originatingPendingIntent, forcedBalByPiSender, mResultRecord, intent,
+ checkedOptions);
+
+ // call
+ BalVerdict callerVerdict = mController.checkBackgroundActivityStartAllowedByCaller(
+ balState);
+ balState.setResultForCaller(callerVerdict);
+
+ // assertions
+ assertWithMessage(balState.toString()).that(callerVerdict.getCode()).isEqualTo(
+ BAL_ALLOW_ALLOWLISTED_COMPONENT);
+ }
+
+ @Test
+ public void testCaller_isDeviceOwner() {
+ int callingUid = REGULAR_UID_1;
+ int callingPid = REGULAR_PID_1;
+ final String callingPackage = REGULAR_PACKAGE_1;
+ int realCallingUid = REGULAR_UID_2;
+ int realCallingPid = REGULAR_PID_2;
+
+ // setup state
+ when(mService.isDeviceOwner(eq(callingUid))).thenReturn(true);
+
+ // prepare call
+ PendingIntentRecord originatingPendingIntent = mPendingIntentRecord;
+ BackgroundStartPrivileges forcedBalByPiSender = BackgroundStartPrivileges.NONE;
+ Intent intent = TEST_INTENT;
+ ActivityOptions checkedOptions = mCheckedOptions;
+ BackgroundActivityStartController.BalState balState = mController.new BalState(callingUid,
+ callingPid, callingPackage, realCallingUid, realCallingPid, null,
+ originatingPendingIntent, forcedBalByPiSender, mResultRecord, intent,
+ checkedOptions);
+
+ // call
+ BalVerdict callerVerdict = mController.checkBackgroundActivityStartAllowedByCaller(
+ balState);
+ balState.setResultForCaller(callerVerdict);
+
+ // assertions
+ assertWithMessage(balState.toString()).that(callerVerdict.getCode()).isEqualTo(
+ BAL_ALLOW_ALLOWLISTED_COMPONENT);
+ }
+
+ @Test
+ public void testCaller_isAffiliatedProfileOwner() {
+ int callingUid = REGULAR_UID_1;
+ int callingPid = REGULAR_PID_1;
+ final String callingPackage = REGULAR_PACKAGE_1;
+ int realCallingUid = REGULAR_UID_2;
+ int realCallingPid = REGULAR_PID_2;
+
+ // setup state
+ when(mService.isAffiliatedProfileOwner(eq(callingUid))).thenReturn(true);
+
+ // prepare call
+ PendingIntentRecord originatingPendingIntent = mPendingIntentRecord;
+ BackgroundStartPrivileges forcedBalByPiSender = BackgroundStartPrivileges.NONE;
+ Intent intent = TEST_INTENT;
+ ActivityOptions checkedOptions = mCheckedOptions;
+ BackgroundActivityStartController.BalState balState = mController.new BalState(callingUid,
+ callingPid, callingPackage, realCallingUid, realCallingPid, null,
+ originatingPendingIntent, forcedBalByPiSender, mResultRecord, intent,
+ checkedOptions);
+
+ // call
+ BalVerdict callerVerdict = mController.checkBackgroundActivityStartAllowedByCaller(
+ balState);
+ balState.setResultForCaller(callerVerdict);
+
+ // assertions
+ assertWithMessage(balState.toString()).that(callerVerdict.getCode()).isEqualTo(
+ BAL_ALLOW_ALLOWLISTED_COMPONENT);
+ }
+
+ @Test
+ public void testCaller_isExemptFromBgStartRestriction() {
+ int callingUid = REGULAR_UID_1;
+ int callingPid = REGULAR_PID_1;
+ final String callingPackage = REGULAR_PACKAGE_1;
+ int realCallingUid = REGULAR_UID_2;
+ int realCallingPid = REGULAR_PID_2;
+
+ mDeviceConfig.set("system_exempt_from_activity_bg_start_restriction_enabled", "true");
+ AppOpsManager appOpsManager = mock(AppOpsManager.class);
+ when(mService.getAppOpsManager()).thenReturn(appOpsManager);
+ when(appOpsManager.checkOpNoThrow(eq(
+ AppOpsManager.OP_SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION),
+ eq(callingUid), eq(callingPackage))).thenReturn(AppOpsManager.MODE_ALLOWED);
+
+
+ // prepare call
+ PendingIntentRecord originatingPendingIntent = mPendingIntentRecord;
+ BackgroundStartPrivileges forcedBalByPiSender = BackgroundStartPrivileges.NONE;
+ Intent intent = TEST_INTENT;
+ ActivityOptions checkedOptions = mCheckedOptions;
+ BackgroundActivityStartController.BalState balState = mController.new BalState(callingUid,
+ callingPid, callingPackage, realCallingUid, realCallingPid, null,
+ originatingPendingIntent, forcedBalByPiSender, mResultRecord, intent,
+ checkedOptions);
+
+ // call
+ BalVerdict callerVerdict = mController.checkBackgroundActivityStartAllowedByCaller(
+ balState);
+ balState.setResultForCaller(callerVerdict);
+
+ // assertions
+ assertWithMessage(balState.toString()).that(callerVerdict.getCode()).isEqualTo(
+ BAL_ALLOW_PERMISSION);
+ }
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/BackgroundLaunchProcessControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/BackgroundLaunchProcessControllerTests.java
new file mode 100644
index 0000000..a4df034
--- /dev/null
+++ b/services/tests/wmtests/src/com/android/server/wm/BackgroundLaunchProcessControllerTests.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm;
+
+import static com.android.server.wm.ActivityTaskManagerService.APP_SWITCH_ALLOW;
+import static com.android.server.wm.ActivityTaskManagerService.APP_SWITCH_DISALLOW;
+import static com.android.server.wm.BackgroundActivityStartController.BAL_ALLOW_FOREGROUND;
+import static com.android.server.wm.BackgroundActivityStartController.BAL_ALLOW_GRACE_PERIOD;
+import static com.android.server.wm.BackgroundActivityStartController.BAL_ALLOW_PERMISSION;
+import static com.android.server.wm.BackgroundActivityStartController.BAL_ALLOW_VISIBLE_WINDOW;
+import static com.android.server.wm.BackgroundActivityStartController.BAL_BLOCK;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.BackgroundStartPrivileges;
+import android.content.Context;
+import android.os.Binder;
+import android.os.IBinder;
+import android.platform.test.annotations.Presubmit;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.server.wm.BackgroundActivityStartController.BalVerdict;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Tests for the {@link BackgroundLaunchProcessController} class.
+ *
+ * Build/Install/Run:
+ * atest WmTests:BackgroundLaunchProcessControllerTests
+ */
+@SmallTest
+@Presubmit
+@RunWith(JUnit4.class)
+public class BackgroundLaunchProcessControllerTests {
+
+ Set<IBinder> mActivityStartAllowed = new HashSet<>();
+ Set<Integer> mHasActiveVisibleWindow = new HashSet<>();
+
+ BackgroundActivityStartCallback mCallback = new BackgroundActivityStartCallback() {
+ @Override
+ public boolean isActivityStartAllowed(Collection<IBinder> tokens, int uid,
+ String packageName) {
+ for (IBinder token : tokens) {
+ if (token == null || mActivityStartAllowed.contains(token)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean canCloseSystemDialogs(Collection<IBinder> tokens, int uid) {
+ return false;
+ }
+ };
+ BackgroundLaunchProcessController mController = new BackgroundLaunchProcessController(
+ mHasActiveVisibleWindow::contains, mCallback);
+
+ int mPid = 123;
+ int mUid = 234;
+ String mPackageName = "package.name";
+ int mAppSwitchState = APP_SWITCH_DISALLOW;
+ boolean mIsCheckingForFgsStart = false;
+ boolean mHasActivityInVisibleTask = false;
+ boolean mHasBackgroundActivityStartPrivileges = false;
+ long mLastStopAppSwitchesTime = 0L;
+ long mLastActivityLaunchTime = 0L;
+ long mLastActivityFinishTime = 0L;
+
+ @Test
+ public void testNothingAllows() {
+ BalVerdict balVerdict = mController.areBackgroundActivityStartsAllowed(
+ mPid, mUid, mPackageName,
+ mAppSwitchState, mIsCheckingForFgsStart,
+ mHasActivityInVisibleTask, mHasBackgroundActivityStartPrivileges,
+ mLastStopAppSwitchesTime, mLastActivityLaunchTime,
+ mLastActivityFinishTime);
+ assertThat(balVerdict.getCode()).isEqualTo(BAL_BLOCK);
+ }
+
+ @Test
+ public void testInstrumenting() {
+ mHasBackgroundActivityStartPrivileges = true;
+ BalVerdict balVerdict = mController.areBackgroundActivityStartsAllowed(
+ mPid, mUid, mPackageName,
+ mAppSwitchState, mIsCheckingForFgsStart,
+ mHasActivityInVisibleTask, mHasBackgroundActivityStartPrivileges,
+ mLastStopAppSwitchesTime, mLastActivityLaunchTime,
+ mLastActivityFinishTime);
+ assertThat(balVerdict.getCode()).isEqualTo(BAL_ALLOW_PERMISSION);
+ }
+
+ @Test
+ public void testAllowedByTokenNoCallback() {
+ mController = new BackgroundLaunchProcessController(mHasActiveVisibleWindow::contains,
+ null);
+ Binder token = new Binder();
+ mActivityStartAllowed.add(token);
+ mController.addOrUpdateAllowBackgroundStartPrivileges(token,
+ BackgroundStartPrivileges.ALLOW_BAL);
+ BalVerdict balVerdict = mController.areBackgroundActivityStartsAllowed(
+ mPid, mUid, mPackageName,
+ mAppSwitchState, mIsCheckingForFgsStart,
+ mHasActivityInVisibleTask, mHasBackgroundActivityStartPrivileges,
+ mLastStopAppSwitchesTime, mLastActivityLaunchTime,
+ mLastActivityFinishTime);
+ assertThat(balVerdict.getCode()).isEqualTo(BAL_ALLOW_PERMISSION);
+ }
+
+ @Test
+ public void testAllowedByToken() {
+ Binder token = new Binder();
+ mActivityStartAllowed.add(token);
+ mController.addOrUpdateAllowBackgroundStartPrivileges(token,
+ BackgroundStartPrivileges.ALLOW_BAL);
+ BalVerdict balVerdict = mController.areBackgroundActivityStartsAllowed(
+ mPid, mUid, mPackageName,
+ mAppSwitchState, mIsCheckingForFgsStart,
+ mHasActivityInVisibleTask, mHasBackgroundActivityStartPrivileges,
+ mLastStopAppSwitchesTime, mLastActivityLaunchTime,
+ mLastActivityFinishTime);
+ assertThat(balVerdict.getCode()).isEqualTo(BAL_ALLOW_PERMISSION);
+ }
+
+ @Test
+ public void testBoundByForeground() {
+ mAppSwitchState = APP_SWITCH_ALLOW;
+ mController.addBoundClientUid(999, "visible.package", Context.BIND_ALLOW_ACTIVITY_STARTS);
+ mHasActiveVisibleWindow.add(999);
+ BalVerdict balVerdict = mController.areBackgroundActivityStartsAllowed(
+ mPid, mUid, mPackageName,
+ mAppSwitchState, mIsCheckingForFgsStart,
+ mHasActivityInVisibleTask, mHasBackgroundActivityStartPrivileges,
+ mLastStopAppSwitchesTime, mLastActivityLaunchTime,
+ mLastActivityFinishTime);
+ assertThat(balVerdict.getCode()).isEqualTo(BAL_ALLOW_VISIBLE_WINDOW);
+ }
+
+ @Test
+ public void testForegroundTask() {
+ mAppSwitchState = APP_SWITCH_ALLOW;
+ mHasActivityInVisibleTask = true;
+ BalVerdict balVerdict = mController.areBackgroundActivityStartsAllowed(
+ mPid, mUid, mPackageName,
+ mAppSwitchState, mIsCheckingForFgsStart,
+ mHasActivityInVisibleTask, mHasBackgroundActivityStartPrivileges,
+ mLastStopAppSwitchesTime, mLastActivityLaunchTime,
+ mLastActivityFinishTime);
+ assertThat(balVerdict.getCode()).isEqualTo(BAL_ALLOW_FOREGROUND);
+ }
+
+ @Test
+ public void testGracePeriod() {
+ mAppSwitchState = APP_SWITCH_ALLOW;
+ long now = System.currentTimeMillis();
+ mLastStopAppSwitchesTime = now - 10000;
+ mLastActivityLaunchTime = now - 9000;
+ mLastActivityFinishTime = now - 100;
+ BalVerdict balVerdict = mController.areBackgroundActivityStartsAllowed(
+ mPid, mUid, mPackageName,
+ mAppSwitchState, mIsCheckingForFgsStart,
+ mHasActivityInVisibleTask, mHasBackgroundActivityStartPrivileges,
+ mLastStopAppSwitchesTime, mLastActivityLaunchTime,
+ mLastActivityFinishTime);
+ assertThat(balVerdict.getCode()).isEqualTo(BAL_ALLOW_GRACE_PERIOD);
+ }
+}
diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java
index c7f5020..8129c3d 100644
--- a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java
@@ -77,6 +77,7 @@
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.annotation.Nullable;
import android.compat.testing.PlatformCompatChangeRule;
@@ -110,7 +111,7 @@
import org.junit.runner.RunWith;
/**
- * Test class for {@link LetterboxUiControllerTest}.
+ * Test class for {@link LetterboxUiController}.
*
* Build/Install/Run:
* atest WmTests:LetterboxUiControllerTest
@@ -521,8 +522,8 @@
final Rect opaqueBounds = new Rect(0, 0, 500, 300);
doReturn(opaqueBounds).when(mActivity).getBounds();
// Activity is translucent
- spyOn(mActivity.mLetterboxUiController);
- doReturn(true).when(mActivity.mLetterboxUiController).hasInheritedLetterboxBehavior();
+ spyOn(mActivity.mTransparentPolicy);
+ when(mActivity.mTransparentPolicy.isRunning()).thenReturn(true);
// Makes requested sizes different
mainWindow.mRequestedWidth = opaqueBounds.width() - 1;
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 7ced9d5..7adac5b 100644
--- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
@@ -16,8 +16,6 @@
package com.android.server.wm;
-import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
-import static android.app.WindowConfiguration.ROTATION_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;
@@ -62,7 +60,6 @@
import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__LETTERBOXED_FOR_SIZE_COMPAT_MODE;
import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED;
import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE;
-import static com.android.server.wm.ActivityRecord.State.DESTROYED;
import static com.android.server.wm.ActivityRecord.State.PAUSED;
import static com.android.server.wm.ActivityRecord.State.RESTARTING_PROCESS;
import static com.android.server.wm.ActivityRecord.State.RESUMED;
@@ -77,7 +74,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
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;
@@ -199,26 +195,6 @@
}
@Test
- public void testCleanLetterboxConfigListenerWhenTranslucentIsDestroyed() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2000, 1000);
- prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- // Translucent Activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
- .build();
- mTask.addChild(translucentActivity);
-
- translucentActivity.setState(DESTROYED, "testing");
- translucentActivity.removeImmediately();
-
- assertFalse(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());
- }
-
- @Test
public void testHorizontalReachabilityEnabledForTranslucentActivities() {
testReachabilityEnabledForTranslucentActivity(/* dw */ 2500, /* dh */1000,
SCREEN_ORIENTATION_PORTRAIT, /* minAspectRatio */ 0f,
@@ -363,42 +339,6 @@
}
}
- @Test
- public void testApplyStrategyAgainWhenOpaqueIsDestroyed() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2000, 1000);
- prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- // Launch another opaque activity
- final ActivityRecord opaqueActivity = new ActivityBuilder(mAtm)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
- .build();
- mTask.addChild(opaqueActivity);
- // Transparent activity strategy not applied
- assertFalse(opaqueActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());
-
- // Launch translucent Activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
- .build();
- mTask.addChild(translucentActivity);
- // Transparent strategy applied
- assertTrue(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());
-
- spyOn(translucentActivity.mLetterboxUiController);
- clearInvocations(translucentActivity.mLetterboxUiController);
-
- // We destroy the first opaque activity
- opaqueActivity.setState(DESTROYED, "testing");
- opaqueActivity.removeImmediately();
-
- // Check that updateInheritedLetterbox() is invoked again
- verify(translucentActivity.mLetterboxUiController).updateInheritedLetterbox();
- }
-
// TODO(b/333663877): Enable test after fix
@Test
@RequiresFlagsDisabled({Flags.FLAG_INSETS_DECOUPLED_CONFIGURATION})
@@ -450,283 +390,6 @@
}
@Test
- public void testResetOpaqueReferenceWhenOpaqueIsDestroyed() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2000, 1000);
- prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
-
- // Launch translucent Activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
- .build();
- mTask.addChild(translucentActivity);
- // Transparent strategy applied
- assertTrue(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());
- assertNotNull(translucentActivity.mLetterboxUiController.mFirstOpaqueActivityBeneath);
-
- spyOn(translucentActivity.mLetterboxUiController);
- clearInvocations(translucentActivity.mLetterboxUiController);
-
- // We destroy the first opaque activity
- mActivity.removeImmediately();
-
- // Check that updateInheritedLetterbox() is invoked again
- verify(translucentActivity.mLetterboxUiController).updateInheritedLetterbox();
- assertNull(translucentActivity.mLetterboxUiController.mFirstOpaqueActivityBeneath);
- }
-
- @Test
- public void testNotApplyStrategyAgainWhenOpaqueIsNotDestroyed() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2000, 1000);
- prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- // Launch another opaque activity
- final ActivityRecord opaqueActivity = new ActivityBuilder(mAtm)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
- .build();
- mTask.addChild(opaqueActivity);
- // Transparent activity strategy not applied
- assertFalse(opaqueActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());
-
- // Launch translucent Activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
- .build();
- mTask.addChild(translucentActivity);
- // Transparent strategy applied
- assertTrue(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());
-
- spyOn(translucentActivity.mLetterboxUiController);
- clearInvocations(translucentActivity.mLetterboxUiController);
-
- // Check that updateInheritedLetterbox() is invoked again
- verify(translucentActivity.mLetterboxUiController, never()).updateInheritedLetterbox();
- }
-
- @Test
- public void testApplyStrategyToTranslucentActivities() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2000, 1000);
- prepareUnresizable(mActivity, 1.5f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT);
- mActivity.info.setMinAspectRatio(1.2f);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- // Translucent Activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_LANDSCAPE)
- .setMinAspectRatio(1.1f)
- .setMaxAspectRatio(3f)
- .build();
- mTask.addChild(translucentActivity);
- // We check bounds
- final Rect opaqueBounds = mActivity.getConfiguration().windowConfiguration.getBounds();
- final Rect translucentRequestedBounds = translucentActivity.getRequestedOverrideBounds();
- assertEquals(opaqueBounds, translucentRequestedBounds);
- // We check orientation
- final int translucentOrientation =
- translucentActivity.getRequestedConfigurationOrientation();
- assertEquals(ORIENTATION_PORTRAIT, translucentOrientation);
- // We check aspect ratios
- assertEquals(1.2f, translucentActivity.getMinAspectRatio(), 0.00001f);
- assertEquals(1.5f, translucentActivity.getMaxAspectRatio(), 0.00001f);
- }
-
- @Test
- public void testApplyStrategyToTranslucentActivitiesRetainsWindowConfigurationProperties() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2000, 1000);
- prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- // Translucent Activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .build();
- final Configuration requestedConfig =
- translucentActivity.getRequestedOverrideConfiguration();
- final WindowConfiguration translucentWinConf = requestedConfig.windowConfiguration;
- translucentWinConf.setActivityType(ACTIVITY_TYPE_STANDARD);
- translucentWinConf.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
- translucentWinConf.setAlwaysOnTop(true);
- translucentActivity.onRequestedOverrideConfigurationChanged(requestedConfig);
-
- mTask.addChild(translucentActivity);
-
- // The original override of WindowConfiguration should keep.
- assertEquals(ACTIVITY_TYPE_STANDARD, translucentActivity.getActivityType());
- assertEquals(WINDOWING_MODE_MULTI_WINDOW, translucentWinConf.getWindowingMode());
- assertTrue(translucentWinConf.isAlwaysOnTop());
- // Unless display is going to be rotated, it should always inherit from parent.
- assertEquals(ROTATION_UNDEFINED, translucentWinConf.getDisplayRotation());
- }
-
- @Test
- public void testApplyStrategyToMultipleTranslucentActivities() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2000, 1000);
- prepareUnresizable(mActivity, 1.5f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT);
- mActivity.info.setMinAspectRatio(1.2f);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- // Translucent Activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_LANDSCAPE)
- .setMinAspectRatio(1.1f)
- .setMaxAspectRatio(3f)
- .build();
- mTask.addChild(translucentActivity);
- // We check bounds
- final Rect opaqueBounds = mActivity.getConfiguration().windowConfiguration.getBounds();
- final Rect translucentRequestedBounds = translucentActivity.getRequestedOverrideBounds();
- assertEquals(opaqueBounds, translucentRequestedBounds);
- // Launch another translucent activity
- final ActivityRecord translucentActivity2 = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_LANDSCAPE)
- .build();
- mTask.addChild(translucentActivity2);
- // We check bounds
- final Rect translucent2RequestedBounds = translucentActivity2.getRequestedOverrideBounds();
- assertEquals(opaqueBounds, translucent2RequestedBounds);
- }
-
- @Test
- public void testNotApplyStrategyToTranslucentActivitiesOverEmbeddedActivities() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2000, 1000);
- mActivity.info.screenOrientation = SCREEN_ORIENTATION_PORTRAIT;
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- // Mock the activity as embedded without additional TaskFragment layer in the task for
- // simplicity.
- doReturn(true).when(mActivity).isEmbedded();
- // Translucent Activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent).build();
- doReturn(false).when(translucentActivity).matchParentBounds();
- mTask.addChild(translucentActivity);
- // Check the strategy has not being applied
- assertFalse(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());
- }
-
- @Test
- public void testTranslucentActivitiesDontGoInSizeCompatMode() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2800, 1400);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- prepareUnresizable(mActivity, -1f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT);
- // Rotate to put activity in size compat mode.
- rotateDisplay(mActivity.mDisplayContent, ROTATION_90);
- assertTrue(mActivity.inSizeCompatMode());
- // Rotate back
- rotateDisplay(mActivity.mDisplayContent, ROTATION_0);
- assertFalse(mActivity.inSizeCompatMode());
- // We launch a transparent activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
- .build();
- mTask.addChild(translucentActivity);
- // It should not be in SCM
- assertFalse(translucentActivity.inSizeCompatMode());
- // We rotate again
- rotateDisplay(translucentActivity.mDisplayContent, ROTATION_90);
- assertFalse(translucentActivity.inSizeCompatMode());
- }
-
- @Test
- public void testCheckOpaqueIsLetterboxedWhenStrategyIsApplied() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2000, 1000);
- prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- // Translucent Activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .build();
- assertFalse(translucentActivity.fillsParent());
- assertTrue(mActivity.fillsParent());
- mActivity.finishing = true;
- assertFalse(mActivity.occludesParent());
- mTask.addChild(translucentActivity);
- // The translucent activity won't inherit letterbox behavior from a finishing activity.
- assertFalse(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());
- }
-
- @Test
- public void testTranslucentActivitiesWhenUnfolding() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2800, 1400);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(
- true /* ignoreOrientationRequest */);
- mActivity.mWmService.mLetterboxConfiguration.setLetterboxHorizontalPositionMultiplier(
- 1.0f /*letterboxVerticalPositionMultiplier*/);
- prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);
- // We launch a transparent activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
- .build();
- mTask.addChild(translucentActivity);
- assertEquals(translucentActivity.getBounds(), mActivity.getBounds());
-
- mTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
- spyOn(mActivity);
-
- // Halffold
- setFoldablePosture(translucentActivity, true /* isHalfFolded */,
- false /* isTabletop */);
- verify(mActivity).recomputeConfiguration();
- assertEquals(translucentActivity.getBounds(), mActivity.getBounds());
- clearInvocations(mActivity);
-
- // Unfold
- setFoldablePosture(translucentActivity, false /* isHalfFolded */,
- false /* isTabletop */);
- verify(mActivity).recomputeConfiguration();
- assertEquals(translucentActivity.getBounds(), mActivity.getBounds());
- }
-
- @Test
- public void testTranslucentActivity_clearSizeCompatMode_inheritedCompatDisplayInsetsCleared() {
- mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
- setUpDisplaySizeWithApp(2800, 1400);
- mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
- prepareUnresizable(mActivity, -1f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT);
- // Rotate to put activity in size compat mode.
- rotateDisplay(mActivity.mDisplayContent, ROTATION_90);
- assertTrue(mActivity.inSizeCompatMode());
-
- // We launch a transparent activity
- final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
- .setActivityTheme(android.R.style.Theme_Translucent)
- .setLaunchedFromUid(mActivity.getUid())
- .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)
- .build();
- mTask.addChild(translucentActivity);
-
- // The transparent activity inherits the compat display insets of the opaque activity
- // beneath it
- assertNotNull(translucentActivity.getCompatDisplayInsets());
-
- // Clearing SCM should also clear the inherited compat display insets
- translucentActivity.clearSizeCompatMode();
- assertNull(translucentActivity.getCompatDisplayInsets());
- }
-
- @Test
public void testRestartProcessIfVisible() {
setUpDisplaySizeWithApp(1000, 2500);
doNothing().when(mSupervisor).scheduleRestartTimeout(mActivity);
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java
index d9fd312..9670a9a 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java
@@ -1902,7 +1902,7 @@
assertApplyTransactionAllowed(mTransaction);
- verify(task).moveOrCreateDecorSurfaceFor(tf);
+ verify(task).moveOrCreateDecorSurfaceFor(tf, true /* visible */);
}
@Test
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java
index 225e85e..6ecaea9 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java
@@ -1695,7 +1695,7 @@
// Decor surface should be created.
clearInvocations(task);
- task.moveOrCreateDecorSurfaceFor(fragment);
+ task.moveOrCreateDecorSurfaceFor(fragment, true /* visible */);
assertNotNull(task.mDecorSurfaceContainer);
assertNotNull(task.getDecorSurface());
@@ -1722,14 +1722,14 @@
final TaskFragment fragment2 = createTaskFragmentWithEmbeddedActivity(task, organizer);
doNothing().when(task).sendTaskFragmentParentInfoChangedIfNeeded();
- task.moveOrCreateDecorSurfaceFor(fragment1);
+ task.moveOrCreateDecorSurfaceFor(fragment1, true /* visible */);
assertNotNull(task.mDecorSurfaceContainer);
assertNotNull(task.getDecorSurface());
assertEquals(fragment1, task.mDecorSurfaceContainer.mOwnerTaskFragment);
// Transfer ownership
- task.moveOrCreateDecorSurfaceFor(fragment2);
+ task.moveOrCreateDecorSurfaceFor(fragment2, true /* visible */);
assertNotNull(task.mDecorSurfaceContainer);
assertNotNull(task.getDecorSurface());
@@ -1775,7 +1775,7 @@
doReturn(true).when(fragment2).isAllowedToBeEmbeddedInTrustedMode();
doReturn(true).when(fragment1).isVisible();
- task.moveOrCreateDecorSurfaceFor(fragment1);
+ task.moveOrCreateDecorSurfaceFor(fragment1, true /* visible */);
task.assignChildLayers(t);
verify(unembeddedActivity).assignLayer(t, 0);
@@ -1880,7 +1880,7 @@
doReturn(false).when(fragment2).isAllowedToBeEmbeddedInTrustedMode();
doReturn(true).when(fragment1).isVisible();
- task.moveOrCreateDecorSurfaceFor(fragment1);
+ task.moveOrCreateDecorSurfaceFor(fragment1, true /* visible */);
clearInvocations(t);
clearInvocations(unembeddedActivity);
@@ -1889,7 +1889,8 @@
// The decor surface should be placed above all the windows when boosted and the cover
// surface should show.
- task.setDecorSurfaceBoosted(fragment1, true /* isBoosted */, clientTransaction);
+ task.requestDecorSurfaceBoosted(fragment1, true /* isBoosted */, clientTransaction);
+ task.commitDecorSurfaceBoostedState();
verify(unembeddedActivity).assignLayer(t, 0);
verify(fragment1).assignLayer(t, 1);
@@ -1906,8 +1907,9 @@
// The decor surface should be placed just above the owner TaskFragment and the cover
// surface should hide.
- task.moveOrCreateDecorSurfaceFor(fragment1);
- task.setDecorSurfaceBoosted(fragment1, false /* isBoosted */, clientTransaction);
+ task.moveOrCreateDecorSurfaceFor(fragment1, true /* visible */);
+ task.requestDecorSurfaceBoosted(fragment1, false /* isBoosted */, clientTransaction);
+ task.commitDecorSurfaceBoostedState();
verify(unembeddedActivity).assignLayer(t, 0);
verify(fragment1).assignLayer(t, 1);
diff --git a/services/tests/wmtests/src/com/android/server/wm/TransparentPolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/TransparentPolicyTest.java
new file mode 100644
index 0000000..1d6e307
--- /dev/null
+++ b/services/tests/wmtests/src/com/android/server/wm/TransparentPolicyTest.java
@@ -0,0 +1,637 @@
+/*
+ * 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.server.wm;
+
+import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
+import static android.app.WindowConfiguration.ROTATION_UNDEFINED;
+import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
+import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;
+import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+import static android.view.Surface.ROTATION_0;
+import static android.view.Surface.ROTATION_90;
+
+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 static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.WindowConfiguration;
+import android.content.res.Configuration;
+import android.graphics.Rect;
+import android.platform.test.annotations.Presubmit;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * Test class for {@link TransparentPolicy}.
+ *
+ * Build/Install/Run:
+ * atest WmTests:TransparentPolicyTest
+ */
+@Presubmit
+@RunWith(WindowTestRunner.class)
+public class TransparentPolicyTest extends WindowTestsBase {
+
+ @Test
+ public void testNotStartingWhenDisabled() {
+ runTestScenario((robot) -> {
+ robot.launchTransparentActivityInTask();
+
+ robot.checkTopActivityPolicyStateIsNotRunning();
+ }, /* policyEnabled */ false);
+ }
+
+ @Test
+ public void testNotStartingWithoutTask() {
+ runTestScenario((robot) -> {
+ robot.launchTransparentActivity();
+
+ robot.checkTopActivityPolicyStartNotInvoked();
+ robot.checkTopActivityPolicyStateIsNotRunning();
+ });
+ }
+
+ @Test
+ public void testPolicyRunningWhenTransparentIsUsed() {
+ runTestScenario((robot) -> {
+ robot.launchTransparentActivityInTask();
+
+ robot.checkTopActivityPolicyStartNotInvoked();
+ robot.checkTopActivityPolicyStateIsRunning();
+ });
+ }
+
+ @Test
+ public void testCleanLetterboxConfigListenerWhenTranslucentIsDestroyed() {
+ runTestScenario((robot) -> {
+ robot.launchTransparentActivityInTask();
+ robot.checkTopActivityPolicyStartNotInvoked();
+ robot.checkTopActivityPolicyStateIsRunning();
+
+ robot.clearInteractions();
+ robot.destroyTopActivity();
+
+ robot.checkTopActivityPolicyStopInvoked();
+ robot.checkTopActivityPolicyStateIsNotRunning();
+ });
+ }
+
+ @Test
+ public void testApplyStrategyAgainWhenOpaqueIsDestroyed() {
+ runTestScenario((robot) -> {
+ robot.launchOpaqueActivityInTask();
+ robot.checkTopActivityPolicyStateIsNotRunning();
+
+ robot.launchTransparentActivityInTask();
+ robot.checkTopActivityPolicyStateIsRunning();
+
+ robot.destroyActivity(/* fromTop */ 1);
+ robot.checkTopActivityPolicyStartInvoked();
+ });
+ }
+
+ @Test
+ public void testResetOpaqueReferenceWhenOpaqueIsDestroyed() {
+ runTestScenario((robot) -> {
+ robot.launchTransparentActivityInTask();
+
+ robot.clearInteractions();
+ robot.destroyActivity(/* fromTop */ 1);
+
+ robot.checkTopActivityPolicyStartInvoked();
+ robot.checkTopActivityPolicyStateIsNotRunning();
+ });
+ }
+
+ @Test
+ public void testNotApplyStrategyAgainWhenOpaqueIsNotDestroyed() {
+ runTestScenario((robot) -> {
+ robot.launchOpaqueActivityInTask();
+ robot.checkTopActivityPolicyStateIsNotRunning();
+
+ robot.launchTransparentActivityInTask();
+ robot.checkTopActivityPolicyStateIsRunning();
+
+ robot.clearInteractions();
+ robot.checkTopActivityPolicyStopNotInvoked();
+ });
+ }
+
+ @Test
+ public void testApplyStrategyToTranslucentActivities() {
+ runTestScenario((robot) -> {
+ robot.configureTopActivity(/* minAspect */ 1.2f, /* maxAspect */ 1.5f,
+ SCREEN_ORIENTATION_PORTRAIT, /* isUnresizable */ true);
+ robot.configureTopActivityIgnoreOrientationRequest(true);
+ robot.launchActivity(/* minAspect */ 1.1f, /* maxAspect */ 3f,
+ SCREEN_ORIENTATION_LANDSCAPE, /* transparent */true, /* addToTask */true);
+ robot.checkTopActivityPolicyStateIsRunning();
+ robot.checkTopActivityHasInheritedBoundsFrom(/* fromTop */ 1);
+ robot.checkTopOrientation(SCREEN_ORIENTATION_PORTRAIT);
+ robot.checkTopAspectRatios(/* minAspectRatio */ 1.2f, /* maxAspectRatio */ 1.5f);
+ });
+ }
+
+ @Test
+ public void testApplyStrategyToTransparentActivitiesRetainsWindowConfigurationProperties() {
+ runTestScenario((robot) -> {
+ robot.launchTransparentActivity();
+
+ robot.forceChangeInTopActivityConfiguration();
+ robot.attachTopActivityToTask();
+
+ robot.checkTopActivityConfigurationConfiguration();
+ });
+ }
+
+ @Test
+ public void testApplyStrategyToMultipleTranslucentActivities() {
+ runTestScenario((robot) -> {
+ robot.launchTransparentActivityInTask();
+ robot.checkTopActivityPolicyStateIsRunning();
+ robot.checkTopActivityHasInheritedBoundsFrom(/* fromTop */ 1);
+
+ robot.launchTransparentActivityInTask();
+ robot.checkTopActivityPolicyStateIsRunning();
+ robot.checkTopActivityHasInheritedBoundsFrom(/* fromTop */ 2);
+ });
+ }
+
+ @Test
+ public void testNotApplyStrategyToTranslucentActivitiesOverEmbeddedActivities() {
+ runTestScenario((robot) -> {
+ robot.configureTopActivityAsEmbedded();
+ robot.launchTransparentActivityInTask();
+
+ robot.checkTopActivityPolicyStartNotInvoked();
+ robot.checkTopActivityPolicyStateIsNotRunning();
+ });
+ }
+
+ @Test
+ public void testTranslucentActivitiesDontGoInSizeCompatMode() {
+ runTestScenario((robot) -> {
+ robot.configureTopActivityIgnoreOrientationRequest(true);
+ robot.configureUnresizableTopActivity(SCREEN_ORIENTATION_PORTRAIT);
+ robot.rotateDisplayForTopActivity(ROTATION_90);
+ robot.checkTopActivitySizeCompatMode(/* inScm */ true);
+ robot.rotateDisplayForTopActivity(ROTATION_0);
+ robot.checkTopActivitySizeCompatMode(/* inScm */ false);
+
+ robot.launchTransparentActivityInTask();
+ robot.checkTopActivitySizeCompatMode(/* inScm */ false);
+ robot.rotateDisplayForTopActivity(ROTATION_90);
+ robot.checkTopActivitySizeCompatMode(/* inScm */ false);
+ }, /* displayWidth */ 2800, /* displayHeight */ 1400);
+ }
+
+ @Test
+ public void testCheckOpaqueIsLetterboxedWhenStrategyIsApplied() {
+ runTestScenario((robot) -> {
+ robot.configureUnresizableTopActivity(SCREEN_ORIENTATION_PORTRAIT);
+ robot.configureTopActivityIgnoreOrientationRequest(true);
+ robot.launchTransparentActivity();
+
+ robot.assertFalseOnTopActivity(ActivityRecord::fillsParent);
+ robot.assertTrueOnActivity(/* fromTop */ 1, ActivityRecord::fillsParent);
+ robot.applyTo(/* fromTop */ 1, (activity) -> {
+ activity.finishing = true;
+ });
+ robot.assertFalseOnActivity(/* fromTop */ 1, ActivityRecord::occludesParent);
+ robot.attachTopActivityToTask();
+
+ robot.checkTopActivityPolicyStateIsNotRunning();
+ });
+ }
+
+ @Test
+ public void testTranslucentActivitiesWhenUnfolding() {
+ runTestScenario((robot) -> {
+ robot.applyToTop((activity) -> {
+ activity.mWmService.mLetterboxConfiguration
+ .setLetterboxHorizontalPositionMultiplier(1.0f);
+ });
+ robot.configureUnresizableTopActivity(SCREEN_ORIENTATION_PORTRAIT);
+ robot.configureTopActivityIgnoreOrientationRequest(true);
+ robot.launchTransparentActivityInTask();
+ robot.checkTopActivityHasInheritedBoundsFrom(/* fromTop */ 1);
+
+ robot.configureTaskWindowingMode(WINDOWING_MODE_FULLSCREEN);
+
+ robot.configureTopActivityFoldablePosture(/* isHalfFolded */ true,
+ /* isTabletop */ false);
+ robot.checkTopActivityRecomputedConfiguration();
+ robot.checkTopActivityHasInheritedBoundsFrom(/* fromTop */ 1);
+ robot.clearInteractions();
+
+ robot.configureTopActivityFoldablePosture(/* isHalfFolded */ false,
+ /* isTabletop */ false);
+ robot.checkTopActivityRecomputedConfiguration();
+ robot.checkTopActivityHasInheritedBoundsFrom(/* fromTop */ 1);
+ }, /* displayWidth */ 2800, /* displayHeight */ 1400);
+ }
+
+
+ @Test
+ public void testTranslucentActivity_clearSizeCompatMode_inheritedCompatDisplayInsetsCleared() {
+ runTestScenario((robot) -> {
+ robot.configureTopActivityIgnoreOrientationRequest(true);
+ robot.configureUnresizableTopActivity(SCREEN_ORIENTATION_PORTRAIT);
+ // Rotate to put activity in size compat mode.
+ robot.rotateDisplayForTopActivity(ROTATION_90);
+ robot.checkTopActivitySizeCompatMode(/* inScm */ true);
+
+ robot.launchTransparentActivityInTask();
+ robot.assertNotNullOnTopActivity(ActivityRecord::getCompatDisplayInsets);
+ robot.applyToTop(ActivityRecord::clearSizeCompatMode);
+ robot.assertNullOnTopActivity(ActivityRecord::getCompatDisplayInsets);
+ });
+ }
+
+ private void runTestScenario(Consumer<TransparentPolicyRobotTest> consumer,
+ boolean policyEnabled, int displayWidth, int displayHeight) {
+ spyOn(mWm.mLetterboxConfiguration);
+ when(mWm.mLetterboxConfiguration.isTranslucentLetterboxingEnabled())
+ .thenReturn(policyEnabled);
+ final TestDisplayContent.Builder builder = new TestDisplayContent.Builder(mAtm,
+ displayWidth, displayHeight);
+ final Task task = new TaskBuilder(mSupervisor).setDisplay(builder.build())
+ .setCreateActivity(true).build();
+ final ActivityRecord opaqueActivity = task.getTopNonFinishingActivity();
+ final TransparentPolicyRobotTest robot = new TransparentPolicyRobotTest(mAtm, task,
+ opaqueActivity);
+ consumer.accept(robot);
+ }
+
+ private void runTestScenario(Consumer<TransparentPolicyRobotTest> consumer,
+ int displayWidth, int displayHeight) {
+ runTestScenario(consumer, /* policyEnabled */ true, displayWidth, displayHeight);
+ }
+
+ private void runTestScenario(Consumer<TransparentPolicyRobotTest> consumer,
+ boolean policyEnabled) {
+ runTestScenario(consumer, policyEnabled, /* displayWidth */ 2000,
+ /* displayHeight */ 1000);
+ }
+
+ private void runTestScenario(Consumer<TransparentPolicyRobotTest> consumer) {
+ runTestScenario(consumer, /* policyEnabled */ true);
+ }
+
+ /**
+ * Robot pattern implementation for TransparentPolicy
+ * TODO(b/344587983): Extract Robot to be reused in different test classes.
+ */
+ private static class TransparentPolicyRobotTest {
+
+ private final ActivityTaskManagerService mAtm;
+
+ private final Task mTask;
+
+ private final ActivityStackTest mActivityStack;
+
+ private WindowConfiguration mTopActivityWindowConfiguration;
+
+ private TransparentPolicyRobotTest(ActivityTaskManagerService atm, Task task,
+ ActivityRecord opaqueActivity) {
+ mAtm = atm;
+ mTask = task;
+ mActivityStack = new ActivityStackTest();
+ mActivityStack.pushActivity(opaqueActivity);
+ spyOn(opaqueActivity.mTransparentPolicy);
+ }
+
+ void configureTopActivityAsEmbedded() {
+ final ActivityRecord topActivity = mActivityStack.top();
+ spyOn(topActivity);
+ doReturn(true).when(topActivity).isEmbedded();
+ }
+
+ private void launchActivity(float minAspectRatio, float maxAspectRatio,
+ @Configuration.Orientation int orientation, boolean transparent,
+ boolean addToTask) {
+ final ActivityBuilder activityBuilder = new ActivityBuilder(mAtm)
+ .setScreenOrientation(orientation)
+ .setLaunchedFromUid(mActivityStack.base().getUid());
+ if (transparent) {
+ activityBuilder.setActivityTheme(android.R.style.Theme_Translucent);
+ }
+ if (minAspectRatio >= 0) {
+ activityBuilder.setMinAspectRatio(minAspectRatio);
+ }
+ if (maxAspectRatio >= 0) {
+ activityBuilder.setMaxAspectRatio(maxAspectRatio);
+ }
+ final ActivityRecord newActivity = activityBuilder.build();
+ if (addToTask) {
+ mTask.addChild(newActivity);
+ }
+ spyOn(newActivity.mTransparentPolicy);
+ mActivityStack.pushActivity(newActivity);
+ }
+
+ void attachTopActivityToTask() {
+ mTask.addChild(mActivityStack.top());
+ }
+
+ void launchTransparentActivity() {
+ launchActivity(/*minAspectRatio */ -1, /* maxAspectRatio */ -1,
+ SCREEN_ORIENTATION_PORTRAIT, /* transparent */ true,
+ /* addToTask */ false);
+ }
+
+ void launchTransparentActivityInTask() {
+ launchActivity(/*minAspectRatio */ -1, /* maxAspectRatio */ -1,
+ SCREEN_ORIENTATION_PORTRAIT, /* transparent */ true,
+ /* addToTask */true);
+ }
+
+ void launchOpaqueActivityInTask() {
+ launchActivity(/*minAspectRatio */ -1, /* maxAspectRatio */ -1,
+ SCREEN_ORIENTATION_PORTRAIT, /* transparent */ false,
+ /* addToTask */true);
+ }
+
+ void destroyTopActivity() {
+ mActivityStack.top().removeImmediately();
+ }
+
+ void destroyActivity(int fromTop) {
+ mActivityStack.applyTo(/* fromTop */ fromTop, ActivityRecord::removeImmediately);
+ }
+
+ void forceChangeInTopActivityConfiguration() {
+ mActivityStack.applyToTop((activity) -> {
+ final Configuration requestedConfig = activity.getRequestedOverrideConfiguration();
+ mTopActivityWindowConfiguration = requestedConfig.windowConfiguration;
+ mTopActivityWindowConfiguration.setActivityType(ACTIVITY_TYPE_STANDARD);
+ mTopActivityWindowConfiguration.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
+ mTopActivityWindowConfiguration.setAlwaysOnTop(true);
+ activity.onRequestedOverrideConfigurationChanged(requestedConfig);
+ });
+ }
+
+ void checkTopActivityPolicyStateIsRunning() {
+ assertTrue(mActivityStack.top().mTransparentPolicy.isRunning());
+ }
+
+ void checkTopActivityPolicyStateIsNotRunning() {
+ assertFalse(mActivityStack.top().mTransparentPolicy.isRunning());
+ }
+
+ void checkTopActivityPolicyStopInvoked() {
+ verify(mActivityStack.top().mTransparentPolicy).stop();
+ }
+
+ void checkTopActivityPolicyStopNotInvoked() {
+ mActivityStack.applyToTop((activity) -> {
+ verify(activity.mTransparentPolicy, never()).stop();
+ });
+ }
+
+ void checkTopActivityPolicyStartInvoked() {
+ mActivityStack.applyToTop((activity) -> {
+ verify(activity.mTransparentPolicy).start();
+ });
+ }
+
+ void checkTopActivityPolicyStartNotInvoked() {
+ verify(mActivityStack.top().mTransparentPolicy, never()).start();
+ }
+
+ void assertTrueOnActivity(int fromTop, Predicate<ActivityRecord> predicate) {
+ mActivityStack.applyTo(fromTop, (activity) -> {
+ Assert.assertTrue(predicate.test(activity));
+ });
+ }
+
+ void assertFalseOnTopActivity(Predicate<ActivityRecord> predicate) {
+ Assert.assertFalse(predicate.test(mActivityStack.top()));
+ }
+
+ void assertFalseOnActivity(int fromTop, Predicate<ActivityRecord> predicate) {
+ mActivityStack.applyTo(fromTop, (activity) -> {
+ Assert.assertFalse(predicate.test(activity));
+ });
+ }
+
+ void assertNotNullOnTopActivity(Function<ActivityRecord, Object> getter) {
+ Assert.assertNotNull(getter.apply(mActivityStack.top()));
+ }
+
+ void assertNullOnTopActivity(Function<ActivityRecord, Object> getter) {
+ Assert.assertNull(getter.apply(mActivityStack.top()));
+ }
+
+ void checkTopActivityConfigurationConfiguration() {
+ mActivityStack.applyToTop((activity) -> {
+ // The original override of WindowConfiguration should keep.
+ assertEquals(ACTIVITY_TYPE_STANDARD, activity.getActivityType());
+ assertEquals(WINDOWING_MODE_MULTI_WINDOW,
+ mTopActivityWindowConfiguration.getWindowingMode());
+ assertTrue(mTopActivityWindowConfiguration.isAlwaysOnTop());
+ // Unless display is going to be rotated, it should always inherit from parent.
+ assertEquals(ROTATION_UNDEFINED,
+ mTopActivityWindowConfiguration.getDisplayRotation());
+ });
+ }
+
+ void checkTopActivityHasInheritedBoundsFrom(int fromTop) {
+ final ActivityRecord topActivity = mActivityStack.top();
+ final ActivityRecord otherActivity = mActivityStack.getFromTop(/* fromTop */ fromTop);
+ final Rect opaqueBounds = otherActivity.getConfiguration().windowConfiguration
+ .getBounds();
+ final Rect translucentRequestedBounds = topActivity.getRequestedOverrideBounds();
+ Assert.assertEquals(opaqueBounds, translucentRequestedBounds);
+ }
+
+ void checkTopActivityRecomputedConfiguration() {
+ verify(mActivityStack.top()).recomputeConfiguration();
+ }
+
+ void checkTopOrientation(int orientation) {
+ Assert.assertEquals(orientation, mActivityStack.top()
+ .getRequestedConfigurationOrientation());
+ }
+
+ void configureTaskWindowingMode(int windowingMode) {
+ mTask.setWindowingMode(windowingMode);
+ }
+
+ void checkTopAspectRatios(float minAspectRatio, float maxAspectRatio) {
+ final ActivityRecord topActivity = mActivityStack.top();
+ Assert.assertEquals(minAspectRatio, topActivity.getMinAspectRatio(), 0.0001);
+ Assert.assertEquals(maxAspectRatio, topActivity.getMaxAspectRatio(), 0.0001);
+ }
+
+ void checkTopActivitySizeCompatMode(boolean inScm) {
+ Assert.assertEquals(inScm, mActivityStack.top().inSizeCompatMode());
+ }
+
+ void clearInteractions() {
+ mActivityStack.applyToAll((activity) -> {
+ clearInvocations(activity);
+ clearInvocations(activity.mTransparentPolicy);
+ });
+ }
+
+ void configureTopActivity(float minAspect, float maxAspect, int screenOrientation,
+ boolean isUnresizable) {
+ prepareLimitedBounds(mActivityStack.top(), minAspect, maxAspect, screenOrientation,
+ isUnresizable);
+ }
+
+ void configureTopActivityIgnoreOrientationRequest(boolean ignoreOrientationRequest) {
+ mActivityStack.top().mDisplayContent
+ .setIgnoreOrientationRequest(ignoreOrientationRequest);
+ }
+
+ void configureUnresizableTopActivity(int screenOrientation) {
+ configureTopActivity(-1, -1, screenOrientation, true);
+ }
+
+ void applyToTop(Consumer<ActivityRecord> consumer) {
+ consumer.accept(mActivityStack.top());
+ }
+
+ void applyTo(int fromTop, Consumer<ActivityRecord> consumer) {
+ mActivityStack.applyTo(fromTop, consumer);
+ }
+
+ void rotateDisplayForTopActivity(int rotation) {
+ rotateDisplay(mActivityStack.top().mDisplayContent, rotation);
+ }
+
+ /**
+ * Setups activity with restriction on its bounds, such as maxAspect, minAspect,
+ * fixed orientation, and/or whether it is resizable.
+ */
+ void prepareLimitedBounds(ActivityRecord activity, float minAspect, float maxAspect,
+ int screenOrientation, boolean isUnresizable) {
+ activity.info.resizeMode = isUnresizable
+ ? RESIZE_MODE_UNRESIZEABLE
+ : RESIZE_MODE_RESIZEABLE;
+ final Task task = activity.getTask();
+ if (task != null) {
+ // Update the Task resize value as activity will follow the task.
+ task.mResizeMode = activity.info.resizeMode;
+ task.getRootActivity().info.resizeMode = activity.info.resizeMode;
+ }
+ activity.setVisibleRequested(true);
+ if (maxAspect >= 0) {
+ activity.info.setMaxAspectRatio(maxAspect);
+ }
+ if (minAspect >= 0) {
+ activity.info.setMinAspectRatio(minAspect);
+ }
+ if (screenOrientation != SCREEN_ORIENTATION_UNSPECIFIED) {
+ activity.info.screenOrientation = screenOrientation;
+ activity.setRequestedOrientation(screenOrientation);
+ }
+ // Make sure to use the provided configuration to construct the size compat fields.
+ activity.clearSizeCompatMode();
+ activity.ensureActivityConfiguration();
+ // Make sure the display configuration reflects the change of activity.
+ if (activity.mDisplayContent.updateOrientation()) {
+ activity.mDisplayContent.sendNewConfiguration();
+ }
+ }
+
+ void configureTopActivityFoldablePosture(boolean isHalfFolded, boolean isTabletop) {
+ mActivityStack.applyToTop((activity) -> {
+ final DisplayRotation r = activity.mDisplayContent.getDisplayRotation();
+ doReturn(isHalfFolded).when(r).isDisplaySeparatingHinge();
+ doReturn(false).when(r)
+ .isDeviceInPosture(any(DeviceStateController.DeviceState.class),
+ anyBoolean());
+ if (isHalfFolded) {
+ doReturn(true).when(r)
+ .isDeviceInPosture(DeviceStateController.DeviceState.HALF_FOLDED,
+ isTabletop);
+ }
+ activity.recomputeConfiguration();
+ });
+ }
+
+ private static void rotateDisplay(DisplayContent display, int rotation) {
+ final Configuration c = new Configuration();
+ display.getDisplayRotation().setRotation(rotation);
+ display.computeScreenConfiguration(c);
+ display.onRequestedOverrideConfigurationChanged(c);
+ }
+
+ /**
+ * Contains all the ActivityRecord launched in the test. This is different from what's in
+ * the Task because activities are added here even if not added to tasks.
+ */
+ private static class ActivityStackTest {
+ private final List<ActivityRecord> mActivities = new ArrayList<>();
+
+ void pushActivity(ActivityRecord activityRecord) {
+ mActivities.add(activityRecord);
+ }
+
+ void applyToTop(Consumer<ActivityRecord> consumer) {
+ consumer.accept(top());
+ }
+
+ ActivityRecord getFromTop(int fromTop) {
+ return mActivities.get(mActivities.size() - fromTop - 1);
+ }
+
+ ActivityRecord base() {
+ return mActivities.get(0);
+ }
+
+ ActivityRecord top() {
+ return mActivities.get(mActivities.size() - 1);
+ }
+
+ // Allows access to the activity at position beforeLast from the top.
+ // If fromTop = 0 the activity used is the top one.
+ void applyTo(int fromTop, Consumer<ActivityRecord> consumer) {
+ consumer.accept(getFromTop(fromTop));
+ }
+
+ void applyToAll(Consumer<ActivityRecord> consumer) {
+ for (int i = mActivities.size() - 1; i >= 0; i--) {
+ consumer.accept(mActivities.get(i));
+ }
+ }
+ }
+ }
+}
diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index 2e93cba..27c383c 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -403,7 +403,9 @@
mAppStandby.addListener(mStandbyChangeListener);
- mPackageMonitor.register(getContext(), null, UserHandle.ALL, true);
+ mPackageMonitor.register(getContext(),
+ /* thread= */ USE_DEDICATED_HANDLER_THREAD ? mHandler.getLooper() : null,
+ UserHandle.ALL, true);
IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
filter.addAction(Intent.ACTION_USER_STARTED);
diff --git a/telephony/java/android/telephony/TelephonyFrameworkInitializer.java b/telephony/java/android/telephony/TelephonyFrameworkInitializer.java
index f5688bf..7356cdc 100644
--- a/telephony/java/android/telephony/TelephonyFrameworkInitializer.java
+++ b/telephony/java/android/telephony/TelephonyFrameworkInitializer.java
@@ -83,7 +83,7 @@
// Check SDK version of the vendor partition.
final int vendorApiLevel = SystemProperties.getInt(
"ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);
- if (vendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) return true;
+ if (vendorApiLevel < Build.VENDOR_API_2024_Q2) return true;
// Check SDK version of the client app.
if (!Compatibility.isChangeEnabled(ENABLE_CHECKING_TELEPHONY_FEATURES)) return true;
diff --git a/telephony/java/android/telephony/satellite/SatelliteManager.java b/telephony/java/android/telephony/satellite/SatelliteManager.java
index 47f53f3..2a359cd 100644
--- a/telephony/java/android/telephony/satellite/SatelliteManager.java
+++ b/telephony/java/android/telephony/satellite/SatelliteManager.java
@@ -193,6 +193,14 @@
/**
* Bundle key to get the response from
+ * {@link #requestSessionStats(Executor, OutcomeReceiver)}.
+ * @hide
+ */
+
+ public static final String KEY_SESSION_STATS = "session_stats";
+
+ /**
+ * Bundle key to get the response from
* {@link #requestIsProvisioned(Executor, OutcomeReceiver)}.
* @hide
*/
@@ -2493,6 +2501,65 @@
}
}
+ /**
+ * Request to get the {@link SatelliteSessionStats} of the satellite service.
+ *
+ * @param executor The executor on which the callback will be called.
+ * @param callback The callback object to which the result will be delivered.
+ * If the request is successful, {@link OutcomeReceiver#onResult(Object)}
+ * will return the {@link SatelliteSessionStats} of the satellite service.
+ * If the request is not successful, {@link OutcomeReceiver#onError(Throwable)}
+ * will return a {@link SatelliteException} with the {@link SatelliteResult}.
+ *
+ * @throws SecurityException if the caller doesn't have required permission.
+ * @hide
+ */
+ @RequiresPermission(allOf = {Manifest.permission.PACKAGE_USAGE_STATS,
+ Manifest.permission.MODIFY_PHONE_STATE})
+ @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
+ public void requestSessionStats(@NonNull @CallbackExecutor Executor executor,
+ @NonNull OutcomeReceiver<SatelliteSessionStats, SatelliteException> callback) {
+ Objects.requireNonNull(executor);
+ Objects.requireNonNull(callback);
+
+ try {
+ ITelephony telephony = getITelephony();
+ if (telephony != null) {
+ ResultReceiver receiver = new ResultReceiver(null) {
+ @Override
+ protected void onReceiveResult(int resultCode, Bundle resultData) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
+ if (resultData.containsKey(KEY_SESSION_STATS)) {
+ SatelliteSessionStats stats =
+ resultData.getParcelable(KEY_SESSION_STATS,
+ SatelliteSessionStats.class);
+ executor.execute(() -> Binder.withCleanCallingIdentity(() ->
+ callback.onResult(stats)));
+ } else {
+ loge("KEY_SESSION_STATS does not exist.");
+ executor.execute(() -> Binder.withCleanCallingIdentity(() ->
+ callback.onError(new SatelliteException(
+ SATELLITE_RESULT_REQUEST_FAILED))));
+ }
+ } else {
+ executor.execute(() -> Binder.withCleanCallingIdentity(() ->
+ callback.onError(new SatelliteException(resultCode))));
+ }
+ }
+ };
+ telephony.requestSatelliteSessionStats(mSubId, receiver);
+ } else {
+ loge("requestSessionStats() invalid telephony");
+ executor.execute(() -> Binder.withCleanCallingIdentity(() -> callback.onError(
+ new SatelliteException(SATELLITE_RESULT_ILLEGAL_STATE))));
+ }
+ } catch (RemoteException ex) {
+ loge("requestSessionStats() RemoteException: " + ex);
+ executor.execute(() -> Binder.withCleanCallingIdentity(() -> callback.onError(
+ new SatelliteException(SATELLITE_RESULT_ILLEGAL_STATE))));
+ }
+ }
+
@Nullable
private static ITelephony getITelephony() {
ITelephony binder = ITelephony.Stub.asInterface(TelephonyFrameworkInitializer
diff --git a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt b/telephony/java/android/telephony/satellite/SatelliteSessionStats.aidl
similarity index 63%
copy from packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
copy to telephony/java/android/telephony/satellite/SatelliteSessionStats.aidl
index 23dbc26..4175125 100644
--- a/packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingConfig.kt
+++ b/telephony/java/android/telephony/satellite/SatelliteSessionStats.aidl
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2024 The Android Open Source Project
+ * Copyright 2024, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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,
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-package com.android.systemui.recordissue
+ package android.telephony.satellite;
-import com.android.traceur.TraceUtils.PresetTraceType
-
-data class IssueRecordingConfig(val screenRecord: Boolean, val traceType: PresetTraceType)
+ parcelable SatelliteSessionStats;
\ No newline at end of file
diff --git a/telephony/java/android/telephony/satellite/SatelliteSessionStats.java b/telephony/java/android/telephony/satellite/SatelliteSessionStats.java
new file mode 100644
index 0000000..aabb058
--- /dev/null
+++ b/telephony/java/android/telephony/satellite/SatelliteSessionStats.java
@@ -0,0 +1,224 @@
+/*
+ * 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 android.telephony.satellite;
+
+import android.annotation.NonNull;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.Objects;
+
+/**
+ * SatelliteSessionStats is used to represent the usage stats of the satellite service.
+ * @hide
+ */
+public class SatelliteSessionStats implements Parcelable {
+ private int mCountOfSuccessfulUserMessages;
+ private int mCountOfUnsuccessfulUserMessages;
+ private int mCountOfTimedOutUserMessagesWaitingForConnection;
+ private int mCountOfTimedOutUserMessagesWaitingForAck;
+ private int mCountOfUserMessagesInQueueToBeSent;
+
+ /**
+ * SatelliteSessionStats constructor
+ * @param builder Builder to create SatelliteSessionStats object/
+ */
+ public SatelliteSessionStats(@NonNull Builder builder) {
+ mCountOfSuccessfulUserMessages = builder.mCountOfSuccessfulUserMessages;
+ mCountOfUnsuccessfulUserMessages = builder.mCountOfUnsuccessfulUserMessages;
+ mCountOfTimedOutUserMessagesWaitingForConnection =
+ builder.mCountOfTimedOutUserMessagesWaitingForConnection;
+ mCountOfTimedOutUserMessagesWaitingForAck =
+ builder.mCountOfTimedOutUserMessagesWaitingForAck;
+ mCountOfUserMessagesInQueueToBeSent = builder.mCountOfUserMessagesInQueueToBeSent;
+ }
+
+ private SatelliteSessionStats(Parcel in) {
+ readFromParcel(in);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel out, int flags) {
+ out.writeInt(mCountOfSuccessfulUserMessages);
+ out.writeInt(mCountOfUnsuccessfulUserMessages);
+ out.writeInt(mCountOfTimedOutUserMessagesWaitingForConnection);
+ out.writeInt(mCountOfTimedOutUserMessagesWaitingForAck);
+ out.writeInt(mCountOfUserMessagesInQueueToBeSent);
+ }
+
+ @NonNull
+ public static final Creator<SatelliteSessionStats> CREATOR = new Parcelable.Creator<>() {
+
+ @Override
+ public SatelliteSessionStats createFromParcel(Parcel in) {
+ return new SatelliteSessionStats(in);
+ }
+
+ @Override
+ public SatelliteSessionStats[] newArray(int size) {
+ return new SatelliteSessionStats[size];
+ }
+ };
+
+ @Override
+ @NonNull
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("countOfSuccessfulUserMessages:");
+ sb.append(mCountOfSuccessfulUserMessages);
+ sb.append(",");
+
+ sb.append("countOfUnsuccessfulUserMessages:");
+ sb.append(mCountOfUnsuccessfulUserMessages);
+ sb.append(",");
+
+ sb.append("countOfTimedOutUserMessagesWaitingForConnection:");
+ sb.append(mCountOfTimedOutUserMessagesWaitingForConnection);
+ sb.append(",");
+
+ sb.append("countOfTimedOutUserMessagesWaitingForAck:");
+ sb.append(mCountOfTimedOutUserMessagesWaitingForAck);
+ sb.append(",");
+
+ sb.append("countOfUserMessagesInQueueToBeSent:");
+ sb.append(mCountOfUserMessagesInQueueToBeSent);
+ return sb.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ SatelliteSessionStats that = (SatelliteSessionStats) o;
+ return mCountOfSuccessfulUserMessages == that.mCountOfSuccessfulUserMessages
+ && mCountOfUnsuccessfulUserMessages == that.mCountOfUnsuccessfulUserMessages
+ && mCountOfTimedOutUserMessagesWaitingForConnection
+ == that.mCountOfTimedOutUserMessagesWaitingForConnection
+ && mCountOfTimedOutUserMessagesWaitingForAck
+ == that.mCountOfTimedOutUserMessagesWaitingForAck
+ && mCountOfUserMessagesInQueueToBeSent
+ == that.mCountOfUserMessagesInQueueToBeSent;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(mCountOfSuccessfulUserMessages, mCountOfUnsuccessfulUserMessages,
+ mCountOfTimedOutUserMessagesWaitingForConnection,
+ mCountOfTimedOutUserMessagesWaitingForAck,
+ mCountOfUserMessagesInQueueToBeSent);
+ }
+
+ public int getCountOfSuccessfulUserMessages() {
+ return mCountOfSuccessfulUserMessages;
+ }
+
+ public int getCountOfUnsuccessfulUserMessages() {
+ return mCountOfUnsuccessfulUserMessages;
+ }
+
+ public int getCountOfTimedOutUserMessagesWaitingForConnection() {
+ return mCountOfTimedOutUserMessagesWaitingForConnection;
+ }
+
+ public int getCountOfTimedOutUserMessagesWaitingForAck() {
+ return mCountOfTimedOutUserMessagesWaitingForAck;
+ }
+
+ public int getCountOfUserMessagesInQueueToBeSent() {
+ return mCountOfUserMessagesInQueueToBeSent;
+ }
+
+ private void readFromParcel(Parcel in) {
+ mCountOfSuccessfulUserMessages = in.readInt();
+ mCountOfUnsuccessfulUserMessages = in.readInt();
+ mCountOfTimedOutUserMessagesWaitingForConnection = in.readInt();
+ mCountOfTimedOutUserMessagesWaitingForAck = in.readInt();
+ mCountOfUserMessagesInQueueToBeSent = in.readInt();
+ }
+
+ /**
+ * A builder class to create {@link SatelliteSessionStats} data object.
+ */
+ public static final class Builder {
+ private int mCountOfSuccessfulUserMessages;
+ private int mCountOfUnsuccessfulUserMessages;
+ private int mCountOfTimedOutUserMessagesWaitingForConnection;
+ private int mCountOfTimedOutUserMessagesWaitingForAck;
+ private int mCountOfUserMessagesInQueueToBeSent;
+
+ /**
+ * Sets countOfSuccessfulUserMessages value of {@link SatelliteSessionStats}
+ * and then returns the Builder class.
+ */
+ @NonNull
+ public Builder setCountOfSuccessfulUserMessages(int count) {
+ mCountOfSuccessfulUserMessages = count;
+ return this;
+ }
+
+ /**
+ * Sets countOfUnsuccessfulUserMessages value of {@link SatelliteSessionStats}
+ * and then returns the Builder class.
+ */
+ @NonNull
+ public Builder setCountOfUnsuccessfulUserMessages(int count) {
+ mCountOfUnsuccessfulUserMessages = count;
+ return this;
+ }
+
+ /**
+ * Sets countOfTimedOutUserMessagesWaitingForConnection value of
+ * {@link SatelliteSessionStats} and then returns the Builder class.
+ */
+ @NonNull
+ public Builder setCountOfTimedOutUserMessagesWaitingForConnection(int count) {
+ mCountOfTimedOutUserMessagesWaitingForConnection = count;
+ return this;
+ }
+
+ /**
+ * Sets countOfTimedOutUserMessagesWaitingForAck value of {@link SatelliteSessionStats}
+ * and then returns the Builder class.
+ */
+ @NonNull
+ public Builder setCountOfTimedOutUserMessagesWaitingForAck(int count) {
+ mCountOfTimedOutUserMessagesWaitingForAck = count;
+ return this;
+ }
+
+ /**
+ * Sets countOfUserMessagesInQueueToBeSent value of {@link SatelliteSessionStats}
+ * and then returns the Builder class.
+ */
+ @NonNull
+ public Builder setCountOfUserMessagesInQueueToBeSent(int count) {
+ mCountOfUserMessagesInQueueToBeSent = count;
+ return this;
+ }
+
+ /** Returns SatelliteSessionStats object. */
+ @NonNull
+ public SatelliteSessionStats build() {
+ return new SatelliteSessionStats(this);
+ }
+ }
+}
diff --git a/telephony/java/android/telephony/satellite/stub/ISatelliteListener.aidl b/telephony/java/android/telephony/satellite/stub/ISatelliteListener.aidl
index 5b9dfc6..b4eb15fd 100644
--- a/telephony/java/android/telephony/satellite/stub/ISatelliteListener.aidl
+++ b/telephony/java/android/telephony/satellite/stub/ISatelliteListener.aidl
@@ -81,4 +81,12 @@
* @param supported True means satellite service is supported and false means it is not.
*/
void onSatelliteSupportedStateChanged(in boolean supported);
+
+ /**
+ * Indicates that the satellite registration failed with following failure code
+ *
+ * @param causeCode the primary failure cause code of the procedure.
+ * For LTE (EMM), cause codes are TS 24.301 Sec 9.9.3.9
+ */
+ void onRegistrationFailure(in int causeCode);
}
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 9af73ea..9b01b71 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -3390,4 +3390,14 @@
* @return {@code true} if the setting is successful, {@code false} otherwise.
*/
boolean setIsSatelliteCommunicationAllowedForCurrentLocationCache(in String state);
+
+ /**
+ * Request to get the session stats of the satellite service.
+ *
+ * @param subId The subId of the subscription to get the session stats for.
+ * @param receiver Result receiver to get the error code of the request and the requested
+ * session stats of the satellite service.
+ * @hide
+ */
+ void requestSatelliteSessionStats(int subId, in ResultReceiver receiver);
}
diff --git a/tests/FlickerTests/Rotation/src/com/android/server/wm/flicker/rotation/RotationTransition.kt b/tests/FlickerTests/Rotation/src/com/android/server/wm/flicker/rotation/RotationTransition.kt
index c7da778..c49b509 100644
--- a/tests/FlickerTests/Rotation/src/com/android/server/wm/flicker/rotation/RotationTransition.kt
+++ b/tests/FlickerTests/Rotation/src/com/android/server/wm/flicker/rotation/RotationTransition.kt
@@ -21,6 +21,7 @@
import android.tools.flicker.legacy.FlickerBuilder
import android.tools.flicker.legacy.LegacyFlickerTest
import android.tools.flicker.subject.layers.LayerTraceEntrySubject
+import android.tools.flicker.subject.layers.LayersTraceSubject
import android.tools.traces.component.ComponentNameMatcher
import android.tools.traces.component.IComponentMatcher
import android.tools.traces.surfaceflinger.Display
@@ -46,6 +47,7 @@
flicker.assertLayers {
this.visibleLayersShownMoreThanOneConsecutiveEntry(
ignoreLayers =
+ LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS +
listOf(
ComponentNameMatcher.SPLASH_SCREEN,
ComponentNameMatcher.SNAPSHOT,
diff --git a/tests/Input/Android.bp b/tests/Input/Android.bp
index c0cbdc3..f367c38 100644
--- a/tests/Input/Android.bp
+++ b/tests/Input/Android.bp
@@ -18,26 +18,31 @@
"src/**/*.java",
"src/**/*.kt",
],
+ asset_dirs: ["assets"],
kotlincflags: [
"-Werror",
],
platform_apis: true,
certificate: "platform",
static_libs: [
+ "android.view.flags-aconfig-java",
"androidx.test.core",
"androidx.test.ext.junit",
"androidx.test.ext.truth",
"androidx.test.rules",
"androidx.test.runner",
"androidx.test.uiautomator_uiautomator",
+ "collector-device-lib",
"compatibility-device-util-axt",
"cts-input-lib",
+ "cts-wm-util",
"flag-junit",
"frameworks-base-testutils",
"hamcrest-library",
"kotlin-test",
"mockito-target-minus-junit4",
"platform-test-annotations",
+ "platform-screenshot-diff-core",
"services.core.unboosted",
"servicestests-utils",
"testables",
diff --git a/tests/Input/AndroidManifest.xml b/tests/Input/AndroidManifest.xml
index 3b723dd..a05d08c 100644
--- a/tests/Input/AndroidManifest.xml
+++ b/tests/Input/AndroidManifest.xml
@@ -22,6 +22,8 @@
<uses-permission android:name="android.permission.MONITOR_INPUT"/>
<uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
<application android:label="InputTest" android:debuggable="true">
diff --git a/tests/Input/AndroidTest.xml b/tests/Input/AndroidTest.xml
index f602c512..8db3705 100644
--- a/tests/Input/AndroidTest.xml
+++ b/tests/Input/AndroidTest.xml
@@ -28,4 +28,10 @@
<!-- Take screenshot upon test failure -->
<option name="screenshot-on-failure" value="true" />
</object>
+ <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
+ <option name="pull-pattern-keys" value="input_.*" />
+ <!-- Pull files created by tests, like the output of screenshot tests -->
+ <option name="directory-keys" value="/storage/emulated/0/InputTests" />
+ <option name="collect-on-run-ended-only" value="false" />
+ </metrics_collector>
</configuration>
diff --git a/tests/Input/assets/testPointerFillStyle.png b/tests/Input/assets/testPointerFillStyle.png
new file mode 100644
index 0000000..b2354f8
--- /dev/null
+++ b/tests/Input/assets/testPointerFillStyle.png
Binary files differ
diff --git a/tests/Input/src/com/android/test/input/AnrTest.kt b/tests/Input/src/com/android/test/input/AnrTest.kt
index 6b95f5c..8d1fc50 100644
--- a/tests/Input/src/com/android/test/input/AnrTest.kt
+++ b/tests/Input/src/com/android/test/input/AnrTest.kt
@@ -29,6 +29,7 @@
import android.os.SystemClock
import android.provider.Settings
import android.provider.Settings.Global.HIDE_ERROR_DIALOGS
+import android.server.wm.CtsWindowInfoUtils.waitForStableWindowGeometry
import android.testing.PollingCheck
import androidx.test.uiautomator.By
@@ -36,13 +37,17 @@
import androidx.test.uiautomator.UiObject2
import androidx.test.uiautomator.Until
+import com.android.cts.input.DebugInputRule
import com.android.cts.input.UinputTouchScreen
+import java.util.concurrent.TimeUnit
+
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Assert.fail
import org.junit.Before
+import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -71,6 +76,9 @@
private val DISPATCHING_TIMEOUT = (UNMULTIPLIED_DEFAULT_DISPATCHING_TIMEOUT_MILLIS *
Build.HW_TIMEOUT_MULTIPLIER)
+ @get:Rule
+ val debugInputRule = DebugInputRule()
+
@Before
fun setUp() {
val contentResolver = instrumentation.targetContext.contentResolver
@@ -86,12 +94,14 @@
}
@Test
+ @DebugInputRule.DebugInput(bug = 339924248)
fun testGestureMonitorAnr_Close() {
triggerAnr()
clickCloseAppOnAnrDialog()
}
@Test
+ @DebugInputRule.DebugInput(bug = 339924248)
fun testGestureMonitorAnr_Wait() {
triggerAnr()
clickWaitOnAnrDialog()
@@ -107,7 +117,7 @@
val closeAppButton: UiObject2? =
uiDevice.wait(Until.findObject(By.res("android:id/aerr_close")), 20000)
if (closeAppButton == null) {
- fail("Could not find anr dialog")
+ fail("Could not find anr dialog/close button")
return
}
closeAppButton.click()
@@ -183,5 +193,6 @@
val flags = " -W -n "
val startCmd = "am start $flags $PACKAGE_NAME/.UnresponsiveGestureMonitorActivity"
instrumentation.uiAutomation.executeShellCommand(startCmd)
+ waitForStableWindowGeometry(5L, TimeUnit.SECONDS)
}
}
diff --git a/tests/Input/src/com/android/test/input/PointerIconLoadingTest.kt b/tests/Input/src/com/android/test/input/PointerIconLoadingTest.kt
new file mode 100644
index 0000000..dac4253
--- /dev/null
+++ b/tests/Input/src/com/android/test/input/PointerIconLoadingTest.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.test.input
+
+import android.content.Context
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.os.Environment
+import android.view.ContextThemeWrapper
+import android.view.PointerIcon
+import android.view.flags.Flags.enableVectorCursorA11ySettings
+import android.view.flags.Flags.enableVectorCursors
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assume.assumeTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestName
+import org.junit.runner.RunWith
+import platform.test.screenshot.GoldenPathManager
+import platform.test.screenshot.PathConfig
+import platform.test.screenshot.ScreenshotTestRule
+import platform.test.screenshot.assertAgainstGolden
+import platform.test.screenshot.matchers.BitmapMatcher
+import platform.test.screenshot.matchers.PixelPerfectMatcher
+
+/**
+ * Unit tests for PointerIcon.
+ *
+ * Run with:
+ * atest InputTests:com.android.test.input.PointerIconLoadingTest
+ */
+@SmallTest
+@RunWith(AndroidJUnit4::class)
+class PointerIconLoadingTest {
+ private lateinit var context: Context
+ private lateinit var exactScreenshotMatcher: BitmapMatcher
+
+ @get:Rule
+ val testName = TestName()
+
+ @get:Rule
+ val screenshotRule = ScreenshotTestRule(GoldenPathManager(
+ InstrumentationRegistry.getInstrumentation().getContext(),
+ ASSETS_PATH,
+ TEST_OUTPUT_PATH,
+ PathConfig()
+ ), disableIconPool = false)
+
+ @Before
+ fun setUp() {
+ context = InstrumentationRegistry.getInstrumentation().targetContext
+ val config =
+ Configuration(context.resources.configuration).apply {
+ densityDpi = DENSITY_DPI
+ screenWidthDp = SCREEN_WIDTH_DP
+ screenHeightDp = SCREEN_HEIGHT_DP
+ smallestScreenWidthDp = SCREEN_WIDTH_DP
+ }
+ context = context.createConfigurationContext(config)
+
+ exactScreenshotMatcher = PixelPerfectMatcher()
+ }
+
+ @Test
+ fun testPointerFillStyle() {
+ assumeTrue(enableVectorCursors())
+ assumeTrue(enableVectorCursorA11ySettings())
+
+ val theme: Resources.Theme = context.getResources().newTheme()
+ theme.setTo(context.getTheme())
+ theme.applyStyle(
+ PointerIcon.vectorFillStyleToResource(PointerIcon.POINTER_ICON_VECTOR_STYLE_FILL_GREEN),
+ /* force= */ true)
+
+ val pointerIcon =
+ PointerIcon.getLoadedSystemIcon(
+ ContextThemeWrapper(context, theme),
+ PointerIcon.TYPE_ARROW,
+ /* useLargeIcons= */ false)
+
+ pointerIcon.getBitmap().assertAgainstGolden(
+ screenshotRule,
+ testName.methodName,
+ exactScreenshotMatcher
+ )
+ }
+
+ companion object {
+ const val DENSITY_DPI = 160
+ const val SCREEN_WIDTH_DP = 480
+ const val SCREEN_HEIGHT_DP = 800
+ const val ASSETS_PATH = "tests/input/assets"
+ val TEST_OUTPUT_PATH = Environment.getExternalStorageDirectory().absolutePath +
+ "/InputTests/" +
+ PointerIconLoadingTest::class.java.simpleName
+ }
+}
