diff options
398 files changed, 8330 insertions, 3045 deletions
diff --git a/Android.bp b/Android.bp index 9411eeca834c..d7b37288934a 100644 --- a/Android.bp +++ b/Android.bp @@ -191,12 +191,20 @@ filegroup { path: "telephony/java", } +genrule { + name: "statslog-telephony-common-java-gen", + tools: ["stats-log-api-gen"], + cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" + + " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog", + out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"], +} + filegroup { name: "framework-telephony-common-sources", srcs: [ "telephony/common/**/*.java", + ":statslog-telephony-common-java-gen", ], - path: "telephony/common", } filegroup { @@ -265,7 +273,8 @@ filegroup { // etc. ":framework-javastream-protos", - ":framework-statslog-gen", + ":framework-statslog-gen", // StatsLogInternal.java + ":statslog-framework-java-gen", // FrameworkStatsLog.java // telephony annotations ":framework-telephony-annotations", @@ -533,7 +542,7 @@ java_library { srcs: [":framework-all-sources"], installable: false, static_libs: [ - "exoplayer2-core", + "exoplayer2-extractor", "android.hardware.wifi-V1.0-java-constants", ], libs: ["icing-java-proto-lite"], @@ -553,7 +562,7 @@ java_library { "compat-changeid-annotation-processor", ], static_libs: [ - "exoplayer2-core", + "exoplayer2-extractor", "android.hardware.wifi-V1.0-java-constants", ] } @@ -604,6 +613,14 @@ genrule { out: ["android/util/StatsLogInternal.java"], } +genrule { + name: "statslog-framework-java-gen", + tools: ["stats-log-api-gen"], + cmd: "$(location stats-log-api-gen) --java $(out) --module framework" + + " --javaPackage com.android.internal.util --javaClass FrameworkStatsLog --worksource", + out: ["com/android/internal/util/FrameworkStatsLog.java"], +} + gensrcs { name: "framework-javastream-protos", depfile: true, @@ -1267,7 +1284,11 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x "--hide MissingPermission --hide BroadcastBehavior " + "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + - "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*" + "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.* " + + "--api-lint-ignore-prefix android.icu. " + + "--api-lint-ignore-prefix java. " + + "--api-lint-ignore-prefix junit. " + + "--api-lint-ignore-prefix org. " build = [ "StubLibraries.bp", diff --git a/apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java b/apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java index c62aad622f25..b6e39e14602a 100644 --- a/apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java +++ b/apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java @@ -150,7 +150,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase { mViewVisibility.getAsInt(), mFlags, mFrameNumber, mOutFrame, mOutContentInsets, mOutVisibleInsets, mOutStableInsets, mOutBackDropFrame, mOutDisplayCutout, mOutMergedConfiguration, - mOutSurfaceControl, mOutInsetsState, new Point()); + mOutSurfaceControl, mOutInsetsState, new Point(), new SurfaceControl()); } } } diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp index 18382a488428..2266d049d70a 100644 --- a/apex/media/framework/Android.bp +++ b/apex/media/framework/Android.bp @@ -50,7 +50,7 @@ java_library { ], static_libs: [ - "exoplayer2-core" + "exoplayer2-extractor" ], jarjar_rules: "jarjar_rules.txt", diff --git a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java index 1dbad456760c..90b1c4b6ff5f 100644 --- a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java +++ b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java @@ -19,6 +19,7 @@ package com.android.permission.persistence; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.ApexContext; +import android.content.pm.PackageManager; import android.os.UserHandle; import android.util.ArrayMap; import android.util.AtomicFile; @@ -242,9 +243,10 @@ public class RuntimePermissionsPersistenceImpl implements RuntimePermissionsPers serializer.startTag(null, TAG_PERMISSION); serializer.attribute(null, ATTRIBUTE_NAME, permissionState.getName()); serializer.attribute(null, ATTRIBUTE_GRANTED, Boolean.toString( - permissionState.isGranted())); + permissionState.isGranted() && (permissionState.getFlags() + & PackageManager.FLAG_PERMISSION_ONE_TIME) == 0)); serializer.attribute(null, ATTRIBUTE_FLAGS, Integer.toHexString( - permissionState.getFlags())); + permissionState.getFlags() & ~PackageManager.FLAG_PERMISSION_ONE_TIME)); serializer.endTag(null, TAG_PERMISSION); } } diff --git a/apex/sdkextensions/OWNERS b/apex/sdkextensions/OWNERS index feb274262bef..a6e55228596b 100644 --- a/apex/sdkextensions/OWNERS +++ b/apex/sdkextensions/OWNERS @@ -1 +1,2 @@ +dariofreni@google.com hansson@google.com diff --git a/apex/statsd/framework/java/android/app/StatsManager.java b/apex/statsd/framework/java/android/app/StatsManager.java index ad1ac95d667c..a1de330c300a 100644 --- a/apex/statsd/framework/java/android/app/StatsManager.java +++ b/apex/statsd/framework/java/android/app/StatsManager.java @@ -474,17 +474,6 @@ public final class StatsManager { } /** - * Temp registration for while the migration is in progress. - * - * @hide - */ - public void registerPullAtomCallback(int atomTag, @Nullable PullAtomMetadata metadata, - @NonNull StatsPullAtomCallback callback, - @NonNull @CallbackExecutor Executor executor) { - registerPullAtomCallback(atomTag, metadata, executor, callback); - } - - /** * Registers a callback for an atom when that atom is to be pulled. The stats service will * invoke pullData in the callback when the stats service determines that this atom needs to be * pulled. @@ -591,15 +580,6 @@ public final class StatsManager { } /** - * Temp for while migrations are in progress. - * - * @hide - */ - public static PullAtomMetadata.Builder newBuilder() { - return new PullAtomMetadata.Builder(); - } - - /** * Builder for PullAtomMetadata. */ public static class Builder { diff --git a/api/current.txt b/api/current.txt index e614f17cce92..06271c89ec91 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14249,9 +14249,12 @@ package android.graphics { method public int getWidth(); method public boolean isHardwareAccelerated(); method public boolean isOpaque(); - method public boolean quickReject(@NonNull android.graphics.RectF, @NonNull android.graphics.Canvas.EdgeType); - method public boolean quickReject(@NonNull android.graphics.Path, @NonNull android.graphics.Canvas.EdgeType); - method public boolean quickReject(float, float, float, float, @NonNull android.graphics.Canvas.EdgeType); + method @Deprecated public boolean quickReject(@NonNull android.graphics.RectF, @NonNull android.graphics.Canvas.EdgeType); + method public boolean quickReject(@NonNull android.graphics.RectF); + method @Deprecated public boolean quickReject(@NonNull android.graphics.Path, @NonNull android.graphics.Canvas.EdgeType); + method public boolean quickReject(@NonNull android.graphics.Path); + method @Deprecated public boolean quickReject(float, float, float, float, @NonNull android.graphics.Canvas.EdgeType); + method public boolean quickReject(float, float, float, float); method public void restore(); method public void restoreToCount(int); method public void rotate(float); @@ -14276,9 +14279,9 @@ package android.graphics { field public static final int ALL_SAVE_FLAG = 31; // 0x1f } - public enum Canvas.EdgeType { - enum_constant public static final android.graphics.Canvas.EdgeType AA; - enum_constant public static final android.graphics.Canvas.EdgeType BW; + @Deprecated public enum Canvas.EdgeType { + enum_constant @Deprecated public static final android.graphics.Canvas.EdgeType AA; + enum_constant @Deprecated public static final android.graphics.Canvas.EdgeType BW; } public enum Canvas.VertexMode { @@ -29200,6 +29203,7 @@ package android.media.tv { method public void onAppPrivateCommand(@NonNull String, android.os.Bundle); method public abstract void onRelease(); method public abstract void onStartRecording(@Nullable android.net.Uri); + method public void onStartRecording(@Nullable android.net.Uri, @NonNull android.os.Bundle); method public abstract void onStopRecording(); method public abstract void onTune(android.net.Uri); method public void onTune(android.net.Uri, android.os.Bundle); @@ -29250,6 +29254,7 @@ package android.media.tv { method public void release(); method public void sendAppPrivateCommand(@NonNull String, android.os.Bundle); method public void startRecording(@Nullable android.net.Uri); + method public void startRecording(@Nullable android.net.Uri, @NonNull android.os.Bundle); method public void stopRecording(); method public void tune(String, android.net.Uri); method public void tune(String, android.net.Uri, android.os.Bundle); @@ -36483,7 +36488,7 @@ package android.os { method public boolean isSustainedPerformanceModeSupported(); method public boolean isWakeLockLevelSupported(int); method public android.os.PowerManager.WakeLock newWakeLock(int, String); - method public void reboot(@Nullable String); + method @RequiresPermission(android.Manifest.permission.REBOOT) public void reboot(@Nullable String); method public void removeThermalStatusListener(@NonNull android.os.PowerManager.OnThermalStatusChangedListener); field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000 field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED"; @@ -36925,6 +36930,7 @@ package android.os { method public static android.os.VibrationEffect createWaveform(long[], int); method public static android.os.VibrationEffect createWaveform(long[], int[], int); method public int describeContents(); + method @NonNull public static android.os.VibrationEffect.Composition startComposition(); field @NonNull public static final android.os.Parcelable.Creator<android.os.VibrationEffect> CREATOR; field public static final int DEFAULT_AMPLITUDE = -1; // 0xffffffff field public static final int EFFECT_CLICK = 0; // 0x0 @@ -36933,7 +36939,26 @@ package android.os { field public static final int EFFECT_TICK = 2; // 0x2 } + public static class VibrationEffect.Composition { + ctor public VibrationEffect.Composition(); + method @Nullable public android.os.VibrationEffect.Composition addPrimitive(int); + method @Nullable public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float); + method @Nullable public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int); + method @NonNull public android.os.VibrationEffect compose(); + field public static final int PRIMITIVE_CLICK = 1; // 0x1 + field public static final int PRIMITIVE_LIGHT_TICK = 7; // 0x7 + field public static final int PRIMITIVE_QUICK_FALL = 6; // 0x6 + field public static final int PRIMITIVE_QUICK_RISE = 4; // 0x4 + field public static final int PRIMITIVE_SLOW_RISE = 5; // 0x5 + field public static final int PRIMITIVE_SPIN = 3; // 0x3 + field public static final int PRIMITIVE_THUD = 2; // 0x2 + } + public abstract class Vibrator { + method @Nullable public Boolean areAllEffectsSupported(@NonNull int...); + method public boolean areAllPrimitivesSupported(@NonNull int...); + method @Nullable public boolean[] areEffectsSupported(@NonNull int...); + method @NonNull public boolean[] arePrimitivesSupported(@NonNull int...); method @RequiresPermission(android.Manifest.permission.VIBRATE) public abstract void cancel(); method public abstract boolean hasAmplitudeControl(); method public abstract boolean hasVibrator(); @@ -39874,6 +39899,7 @@ package android.provider { field public static final int MATCH_ONLY = 3; // 0x3 field public static final String MEDIA_IGNORE_FILENAME = ".nomedia"; field public static final String MEDIA_SCANNER_VOLUME = "volume"; + field public static final String META_DATA_REVIEW_GALLERY_PREWARM_SERVICE = "android.media.review_gallery_prewarm_service"; field public static final String META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE = "android.media.still_image_camera_preview_service"; field public static final String QUERY_ARG_MATCH_FAVORITE = "android:query-arg-match-favorite"; field public static final String QUERY_ARG_MATCH_PENDING = "android:query-arg-match-pending"; @@ -43867,11 +43893,13 @@ package android.service.quicksettings { method public android.graphics.drawable.Icon getIcon(); method public CharSequence getLabel(); method public int getState(); + method @Nullable public CharSequence getStateDescription(); method @Nullable public CharSequence getSubtitle(); method public void setContentDescription(CharSequence); method public void setIcon(android.graphics.drawable.Icon); method public void setLabel(CharSequence); method public void setState(int); + method public void setStateDescription(@Nullable CharSequence); method public void setSubtitle(@Nullable CharSequence); method public void updateTile(); method public void writeToParcel(android.os.Parcel, int); diff --git a/api/system-current.txt b/api/system-current.txt index 095f343c3c14..1a039dc3ce09 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7608,7 +7608,7 @@ package android.net.wifi { method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void forget(int, @Nullable android.net.wifi.WifiManager.ActionListener); method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>); method @Nullable @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public String getCountryCode(); - method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.Network getCurrentNetwork(); + method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.Network getCurrentNetwork(); method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String[] getFactoryMacAddresses(); method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(@Nullable java.util.List<android.net.wifi.ScanResult>); method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,android.net.wifi.hotspot2.PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(@NonNull java.util.Set<android.net.wifi.hotspot2.OsuProvider>); @@ -7633,7 +7633,7 @@ package android.net.wifi { method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void removeOnWifiUsabilityStatsListener(@NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener); method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void restoreBackupData(@NonNull byte[]); method @Nullable @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public android.net.wifi.SoftApConfiguration restoreSoftApBackupData(@NonNull byte[]); - method @Deprecated @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void restoreSupplicantBackupData(@NonNull byte[], @NonNull byte[]); + method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void restoreSupplicantBackupData(@NonNull byte[], @NonNull byte[]); method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public byte[] retrieveBackupData(); method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public byte[] retrieveSoftApBackupData(); method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void save(@NonNull android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiManager.ActionListener); @@ -8856,7 +8856,7 @@ package android.os { ctor public TelephonyServiceManager.ServiceNotFoundException(@NonNull String); } - public final class TelephonyServiceManager.ServiceRegisterer { + public static final class TelephonyServiceManager.ServiceRegisterer { method @Nullable public android.os.IBinder get(); method @NonNull public android.os.IBinder getOrThrow() throws android.os.TelephonyServiceManager.ServiceNotFoundException; method public void register(@NonNull android.os.IBinder); @@ -10046,6 +10046,13 @@ package android.service.autofill { method @NonNull public android.service.autofill.Dataset.Builder setInlinePresentation(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.service.autofill.InlinePresentation); } + public abstract class InlineSuggestionRenderService extends android.app.Service { + ctor public InlineSuggestionRenderService(); + method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent); + method @Nullable public android.view.View onRenderSuggestion(@NonNull android.service.autofill.InlinePresentation, int, int); + field public static final String SERVICE_INTERFACE = "android.service.autofill.InlineSuggestionRenderService"; + } + } package android.service.autofill.augmented { diff --git a/api/test-current.txt b/api/test-current.txt index d0ac7232e20f..fec5f3df9669 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2990,6 +2990,13 @@ package android.service.autofill { method public void apply(@NonNull android.service.autofill.ValueFinder, @NonNull android.widget.RemoteViews, int) throws java.lang.Exception; } + public abstract class InlineSuggestionRenderService extends android.app.Service { + ctor public InlineSuggestionRenderService(); + method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent); + method @Nullable public android.view.View onRenderSuggestion(@NonNull android.service.autofill.InlinePresentation, int, int); + field public static final String SERVICE_INTERFACE = "android.service.autofill.InlineSuggestionRenderService"; + } + public abstract class InternalOnClickAction implements android.service.autofill.OnClickAction android.os.Parcelable { ctor public InternalOnClickAction(); method public abstract void onClick(@NonNull android.view.ViewGroup); diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 7011724ef7d4..5ac00d05f022 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -255,7 +255,8 @@ message Atom { PermissionGrantRequestResultReported permission_grant_request_result_reported = 170 [(module) = "permissioncontroller"]; BluetoothSocketConnectionStateChanged bluetooth_socket_connection_state_changed = 171; - DeviceIdentifierAccessDenied device_identifier_access_denied = 172; + DeviceIdentifierAccessDenied device_identifier_access_denied = + 172 [(module) = "telephony_common"]; BubbleDeveloperErrorReported bubble_developer_error_reported = 173; AssistGestureStageReported assist_gesture_stage_reported = 174; AssistGestureFeedbackReported assist_gesture_feedback_reported = 175; diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp index 7708e300929e..85d1e38d6052 100644 --- a/cmds/statsd/src/external/StatsPullerManager.cpp +++ b/cmds/statsd/src/external/StatsPullerManager.cpp @@ -119,9 +119,9 @@ bool StatsPullerManager::PullLocked(int tagId, vector<shared_ptr<LogEvent>>* dat } bool StatsPullerManager::PullerForMatcherExists(int tagId) const { - // Vendor pulled atoms might be registered after we parse the config. - return isVendorPulledAtom(tagId) || - kAllPullAtomInfo.find({.atomTag = tagId}) != kAllPullAtomInfo.end(); + // Pulled atoms might be registered after we parse the config, so just make sure the id is in + // an appropriate range. + return isVendorPulledAtom(tagId) || isPulledAtom(tagId); } void StatsPullerManager::updateAlarmLocked() { diff --git a/cmds/statsd/src/guardrail/StatsdStats.h b/cmds/statsd/src/guardrail/StatsdStats.h index 32827852ecad..df810aa03958 100644 --- a/cmds/statsd/src/guardrail/StatsdStats.h +++ b/cmds/statsd/src/guardrail/StatsdStats.h @@ -164,6 +164,12 @@ public: // Maximum number of pushed atoms statsd stats will track above kMaxPushedAtomId. static const int kMaxNonPlatformPushedAtoms = 100; + // Atom id that is the start of the pulled atoms. + static const int kPullAtomStartTag = 10000; + + // Atom id that is the start of vendor atoms. + static const int kVendorAtomStartTag = 100000; + // Vendor pulled atom start id. static const int32_t kVendorPulledAtomStartTag = 150000; diff --git a/cmds/statsd/src/metrics/metrics_manager_util.cpp b/cmds/statsd/src/metrics/metrics_manager_util.cpp index 73c121242523..17f62b056426 100644 --- a/cmds/statsd/src/metrics/metrics_manager_util.cpp +++ b/cmds/statsd/src/metrics/metrics_manager_util.cpp @@ -426,7 +426,6 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t config.event_metric_size() + config.gauge_metric_size() + config.value_metric_size(); allMetricProducers.reserve(allMetricsCount); - StatsPullerManager statsPullerManager; // Construct map from metric id to metric activation index. The map will be used to determine // the metric activation corresponding to a metric. @@ -661,7 +660,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t return false; } int atomTagId = *(atomMatcher->getAtomIds().begin()); - int pullTagId = statsPullerManager.PullerForMatcherExists(atomTagId) ? atomTagId : -1; + int pullTagId = pullerManager->PullerForMatcherExists(atomTagId) ? atomTagId : -1; int conditionIndex = -1; if (metric.has_condition()) { @@ -753,7 +752,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t return false; } int atomTagId = *(atomMatcher->getAtomIds().begin()); - int pullTagId = statsPullerManager.PullerForMatcherExists(atomTagId) ? atomTagId : -1; + int pullTagId = pullerManager->PullerForMatcherExists(atomTagId) ? atomTagId : -1; int triggerTrackerIndex; int triggerAtomId = -1; diff --git a/cmds/statsd/src/stats_log_util.h b/cmds/statsd/src/stats_log_util.h index f3e94331a23e..5fdf6e260247 100644 --- a/cmds/statsd/src/stats_log_util.h +++ b/cmds/statsd/src/stats_log_util.h @@ -99,6 +99,10 @@ inline bool isVendorPulledAtom(int atomId) { return atomId >= StatsdStats::kVendorPulledAtomStartTag && atomId < StatsdStats::kMaxAtomTag; } +inline bool isPulledAtom(int atomId) { + return atomId >= StatsdStats::kPullAtomStartTag && atomId < StatsdStats::kVendorAtomStartTag; +} + } // namespace statsd } // namespace os } // namespace android diff --git a/core/java/android/annotation/SystemApi.java b/core/java/android/annotation/SystemApi.java index 1a8b78ff08cf..ecbfed96cefd 100644 --- a/core/java/android/annotation/SystemApi.java +++ b/core/java/android/annotation/SystemApi.java @@ -23,6 +23,7 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; +import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -40,6 +41,7 @@ import java.lang.annotation.Target; */ @Target({TYPE, FIELD, METHOD, CONSTRUCTOR, ANNOTATION_TYPE, PACKAGE}) @Retention(RetentionPolicy.RUNTIME) +@Repeatable(SystemApi.Container.class) // TODO(b/146727827): make this non-repeatable public @interface SystemApi { enum Client { /** @@ -95,4 +97,14 @@ public @interface SystemApi { */ @Deprecated Process process() default android.annotation.SystemApi.Process.ALL; + + + /** + * Container for {@link SystemApi} that allows it to be applied repeatedly to types. + */ + @Retention(RetentionPolicy.RUNTIME) + @Target(TYPE) + @interface Container { + SystemApi[] value(); + } } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 1af275fedd74..cdb49f0a03ab 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -17,6 +17,8 @@ package android.app; import static android.annotation.Dimension.DP; +import static android.graphics.drawable.Icon.TYPE_URI; +import static android.graphics.drawable.Icon.TYPE_URI_ADAPTIVE_BITMAP; import static com.android.internal.util.ContrastColorUtil.satisfiesTextContrast; @@ -2504,6 +2506,14 @@ public class Notification implements Parcelable } } } + + if (mBubbleMetadata != null && mBubbleMetadata.getBubbleIcon() != null) { + final Icon icon = mBubbleMetadata.getBubbleIcon(); + final int iconType = icon.getType(); + if (iconType == TYPE_URI_ADAPTIVE_BITMAP || iconType == TYPE_URI) { + visitor.accept(icon.getUri()); + } + } } /** @@ -8634,17 +8644,23 @@ public class Notification implements Parcelable public static final int FLAG_AUTO_EXPAND_BUBBLE = 0x00000001; /** - * If set and the app posting the bubble is in the foreground, the bubble will - * be posted <b>without</b> the associated notification in the notification shade. + * Indicates whether the notification associated with the bubble is being visually + * suppressed from the notification shade. When <code>true</code> the notification is + * hidden, when <code>false</code> the notification shows as normal. * - * <p>This flag has no effect if the app posting the bubble is not in the foreground. - * The app is considered foreground if it is visible and on the screen, note that - * a foreground service does not qualify. - * </p> + * <p>Apps sending bubbles may set this flag so that the bubble is posted <b>without</b> + * the associated notification in the notification shade.</p> * - * <p>Generally this flag should only be set if the user has performed an action to request - * or create a bubble, or if the user has seen the content in the notification and the - * notification is no longer relevant.</p> + * <p>Apps sending bubbles can only apply this flag when the app is in the foreground, + * otherwise the flag is not respected. The app is considered foreground if it is visible + * and on the screen, note that a foreground service does not qualify.</p> + * + * <p>Generally this flag should only be set by the app if the user has performed an + * action to request or create a bubble, or if the user has seen the content in the + * notification and the notification is no longer relevant. </p> + * + * <p>The system will also update this flag with <code>true</code> to hide the notification + * from the user once the bubble has been expanded. </p> * * @hide */ @@ -8762,6 +8778,24 @@ public class Notification implements Parcelable } /** + * Indicates whether the notification associated with the bubble is being visually + * suppressed from the notification shade. When <code>true</code> the notification is + * hidden, when <code>false</code> the notification shows as normal. + * + * <p>Apps sending bubbles may set this flag so that the bubble is posted <b>without</b> + * the associated notification in the notification shade.</p> + * + * <p>Apps sending bubbles can only apply this flag when the app is in the foreground, + * otherwise the flag is not respected. The app is considered foreground if it is visible + * and on the screen, note that a foreground service does not qualify.</p> + * + * <p>Generally the app should only set this flag if the user has performed an + * action to request or create a bubble, or if the user has seen the content in the + * notification and the notification is no longer relevant. </p> + * + * <p>The system will update this flag with <code>true</code> to hide the notification + * from the user once the bubble has been expanded.</p> + * * @return whether this bubble should suppress the notification when it is posted. * * @see BubbleMetadata.Builder#setSuppressNotification(boolean) @@ -8900,6 +8934,12 @@ public class Notification implements Parcelable if (icon == null) { throw new IllegalArgumentException("Bubbles require non-null icon"); } + if (icon.getType() != TYPE_URI_ADAPTIVE_BITMAP + && icon.getType() != TYPE_URI) { + Log.w(TAG, "Bubbles work best with icons of TYPE_URI or " + + "TYPE_URI_ADAPTIVE_BITMAP. " + + "In the future, using an icon of this type will be required."); + } mShortcutId = null; mPendingIntent = intent; mIcon = icon; diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 1aed9772700b..b998539dee9c 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -133,6 +133,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public int fullBackupContent = 0; /** + * <code>true</code> if the package is capable of presenting a unified interface representing + * multiple profiles. + * @hide + */ + public boolean crossProfile; + + /** * The default extra UI options for activities in this application. * Set from the {@link android.R.attr#uiOptions} attribute in the * activity's manifest. @@ -1382,6 +1389,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { pw.println(prefix + "fullBackupContent=" + (fullBackupContent < 0 ? "false" : "true")); } + pw.println("crossProfile=" + (crossProfile ? "true" : "false")); if (networkSecurityConfigRes != 0) { pw.println(prefix + "networkSecurityConfigRes=0x" + Integer.toHexString(networkSecurityConfigRes)); @@ -1586,6 +1594,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { uiOptions = orig.uiOptions; backupAgentName = orig.backupAgentName; fullBackupContent = orig.fullBackupContent; + crossProfile = orig.crossProfile; networkSecurityConfigRes = orig.networkSecurityConfigRes; category = orig.category; targetSandboxVersion = orig.targetSandboxVersion; @@ -1665,6 +1674,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { dest.writeInt(descriptionRes); dest.writeInt(uiOptions); dest.writeInt(fullBackupContent); + dest.writeBoolean(crossProfile); dest.writeInt(networkSecurityConfigRes); dest.writeInt(category); dest.writeInt(targetSandboxVersion); @@ -1741,6 +1751,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { descriptionRes = source.readInt(); uiOptions = source.readInt(); fullBackupContent = source.readInt(); + crossProfile = source.readBoolean(); networkSecurityConfigRes = source.readInt(); category = source.readInt(); targetSandboxVersion = source.readInt(); diff --git a/core/java/android/content/pm/parsing/PackageImpl.java b/core/java/android/content/pm/parsing/PackageImpl.java index 9baf3258a230..fe8307c7c8cd 100644 --- a/core/java/android/content/pm/parsing/PackageImpl.java +++ b/core/java/android/content/pm/parsing/PackageImpl.java @@ -2382,6 +2382,7 @@ public final class PackageImpl implements ParsingPackage, ParsedPackage, Android appInfo.uiOptions = uiOptions; appInfo.volumeUuid = volumeUuid; appInfo.zygotePreloadName = zygotePreloadName; + appInfo.crossProfile = isCrossProfile(); appInfo.setBaseCodePath(baseCodePath); appInfo.setBaseResourcePath(baseCodePath); diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java index 1001f800df3c..db16d24e0af1 100644 --- a/core/java/android/hardware/location/ContextHubManager.java +++ b/core/java/android/hardware/location/ContextHubManager.java @@ -19,6 +19,7 @@ import android.annotation.CallbackExecutor; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresFeature; import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; @@ -26,6 +27,7 @@ import android.annotation.SystemService; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.Handler; import android.os.HandlerExecutor; import android.os.Looper; @@ -52,6 +54,7 @@ import java.util.concurrent.Executor; */ @SystemApi @SystemService(Context.CONTEXTHUB_SERVICE) +@RequiresFeature(PackageManager.FEATURE_CONTEXTHUB) public final class ContextHubManager { private static final String TAG = "ContextHubManager"; diff --git a/core/java/android/os/IVibratorService.aidl b/core/java/android/os/IVibratorService.aidl index 416d69229536..e201e43b5586 100644 --- a/core/java/android/os/IVibratorService.aidl +++ b/core/java/android/os/IVibratorService.aidl @@ -24,6 +24,8 @@ interface IVibratorService { boolean hasVibrator(); boolean hasAmplitudeControl(); + boolean[] areEffectsSupported(in int[] effectIds); + boolean[] arePrimitivesSupported(in int[] primitiveIds); boolean setAlwaysOnEffect(int uid, String opPkg, int alwaysOnId, in VibrationEffect effect, in VibrationAttributes attributes); void vibrate(int uid, String opPkg, in VibrationEffect effect, diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 6a80788c81cc..f3d3837bbed1 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -1371,6 +1371,7 @@ public final class PowerManager { * @throws UnsupportedOperationException if userspace reboot was requested on a device that * doesn't support it. */ + @RequiresPermission(permission.REBOOT) public void reboot(@Nullable String reason) { if (REBOOT_USERSPACE.equals(reason) && !isRebootingUserspaceSupported()) { throw new UnsupportedOperationException( @@ -1390,6 +1391,7 @@ public final class PowerManager { * </p> * @hide */ + @RequiresPermission(permission.REBOOT) public void rebootSafeMode() { try { mService.rebootSafeMode(false, true); diff --git a/core/java/android/os/SystemVibrator.java b/core/java/android/os/SystemVibrator.java index 8050454a8ac3..faf4a36ff577 100644 --- a/core/java/android/os/SystemVibrator.java +++ b/core/java/android/os/SystemVibrator.java @@ -16,6 +16,7 @@ package android.os; +import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.media.AudioAttributes; @@ -104,6 +105,28 @@ public class SystemVibrator extends Vibrator { } @Override + public boolean[] areEffectsSupported(@VibrationEffect.EffectType int... effectIds) { + try { + return mService.areEffectsSupported(effectIds); + } catch (RemoteException e) { + Log.w(TAG, "Failed to query effect support"); + } + return new boolean[effectIds.length]; + } + + @Override + public boolean[] arePrimitivesSupported( + @NonNull @VibrationEffect.Composition.Primitive int... primitiveIds) { + try { + return mService.arePrimitivesSupported(primitiveIds); + } catch (RemoteException e) { + Log.w(TAG, "Failed to query effect support"); + } + return new boolean[primitiveIds.length]; + } + + + @Override public void cancel() { if (mService == null) { return; diff --git a/core/java/android/os/TelephonyServiceManager.java b/core/java/android/os/TelephonyServiceManager.java index c67dedb4ac17..1128f4cb538c 100644 --- a/core/java/android/os/TelephonyServiceManager.java +++ b/core/java/android/os/TelephonyServiceManager.java @@ -39,7 +39,7 @@ public class TelephonyServiceManager { /** * A class that exposes the methods to register and obtain each system service. */ - public final class ServiceRegisterer { + public static final class ServiceRegisterer { private final String mServiceName; /** diff --git a/core/java/android/os/VibrationEffect.aidl b/core/java/android/os/VibrationEffect.aidl index dcc79d798c3d..89478fac2f1a 100644 --- a/core/java/android/os/VibrationEffect.aidl +++ b/core/java/android/os/VibrationEffect.aidl @@ -17,6 +17,4 @@ package android.os; parcelable VibrationEffect; -parcelable VibrationEffect.OneShotVibration; -parcelable VibrationEffect.WaveformVibration; -parcelable VibrationEffect.EffectVibration; +parcelable VibrationEffect.Composition.PrimitiveEffect;
\ No newline at end of file diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java index 75b4724c7d26..2d218f4f2541 100644 --- a/core/java/android/os/VibrationEffect.java +++ b/core/java/android/os/VibrationEffect.java @@ -16,7 +16,9 @@ package android.os; +import android.annotation.FloatRange; import android.annotation.IntDef; +import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; @@ -28,9 +30,14 @@ import android.hardware.vibrator.V1_3.Effect; import android.net.Uri; import android.util.MathUtils; +import com.android.internal.util.Preconditions; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; +import java.util.Objects; /** * A VibrationEffect describes a haptic effect to be performed by a {@link Vibrator}. @@ -41,6 +48,8 @@ public abstract class VibrationEffect implements Parcelable { private static final int PARCEL_TOKEN_ONE_SHOT = 1; private static final int PARCEL_TOKEN_WAVEFORM = 2; private static final int PARCEL_TOKEN_EFFECT = 3; + private static final int PARCEL_TOKEN_COMPOSITION = 4; + /** * The default vibration strength of the device. @@ -359,6 +368,16 @@ public abstract class VibrationEffect implements Parcelable { return null; } + /** + * Start composing a haptic effect. + * + * @see VibrationEffect.Composition + */ + @NonNull + public static VibrationEffect.Composition startComposition() { + return new VibrationEffect.Composition(); + } + @Override public int describeContents() { return 0; @@ -839,6 +858,331 @@ public abstract class VibrationEffect implements Parcelable { }; } + /** @hide */ + public static final class Composed extends VibrationEffect implements Parcelable { + private final ArrayList<Composition.PrimitiveEffect> mPrimitiveEffects; + + /** + * @hide + */ + @SuppressWarnings("unchecked") + public Composed(@NonNull Parcel in) { + this(in.readArrayList(Composed.class.getClassLoader())); + } + + /** + * @hide + */ + public Composed(List<Composition.PrimitiveEffect> effects) { + mPrimitiveEffects = new ArrayList<>(Objects.requireNonNull(effects)); + } + + /** + * @hide + */ + @NonNull + public List<Composition.PrimitiveEffect> getPrimitiveEffects() { + return mPrimitiveEffects; + } + + @Override + public long getDuration() { + return -1; + } + + + /** + * @hide + */ + @Override + public void validate() { + for (Composition.PrimitiveEffect effect : mPrimitiveEffects) { + Composition.checkPrimitive(effect.id); + Preconditions.checkArgumentInRange( + effect.scale, 0.0f, 1.0f, "scale"); + } + } + + @Override + public void writeToParcel(@NonNull Parcel out, int flags) { + out.writeInt(PARCEL_TOKEN_COMPOSITION); + out.writeList(mPrimitiveEffects); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Composed composed = (Composed) o; + return mPrimitiveEffects.equals(composed.mPrimitiveEffects); + } + + @Override + public int hashCode() { + return Objects.hash(mPrimitiveEffects); + } + + @Override + public String toString() { + return "Composed{mPrimitiveEffects=" + mPrimitiveEffects + '}'; + } + + public static final @NonNull Parcelable.Creator<Composed> CREATOR = + new Parcelable.Creator<Composed>() { + @Override + public Composed createFromParcel(@NonNull Parcel in) { + // Skip the type token + in.readInt(); + return new Composed(in); + } + + @Override + @NonNull + public Composed[] newArray(int size) { + return new Composed[size]; + } + }; + } + + /** + * A composition of haptic primitives that, when combined, create a single haptic effect. + * + * @see VibrationEffect#startComposition() + */ + public static class Composition { + /** @hide */ + @IntDef(prefix = { "PRIMITIVE_" }, value = { + PRIMITIVE_CLICK, + PRIMITIVE_THUD, + PRIMITIVE_SPIN, + PRIMITIVE_QUICK_RISE, + PRIMITIVE_SLOW_RISE, + PRIMITIVE_QUICK_FALL, + PRIMITIVE_LIGHT_TICK, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface Primitive {} + + /** + * No haptic effect. Used to generate extended delays between primitives. + * @hide + */ + public static final int PRIMITIVE_NOOP = 0; + /** + * This effect should produce a sharp, crisp click sensation. + */ + public static final int PRIMITIVE_CLICK = 1; + /** + * A haptic effect that simulates downwards movement with gravity. Often + * followed by extra energy of hitting and reverberation to augment + * physicality. + */ + public static final int PRIMITIVE_THUD = 2; + /** + * A haptic effect that simulates spinning momentum. + */ + public static final int PRIMITIVE_SPIN = 3; + /** + * A haptic effect that simulates quick upward movement against gravity. + */ + public static final int PRIMITIVE_QUICK_RISE = 4; + /** + * A haptic effect that simulates slow upward movement against gravity. + */ + public static final int PRIMITIVE_SLOW_RISE = 5; + /** + * A haptic effect that simulates quick downwards movement with gravity. + */ + public static final int PRIMITIVE_QUICK_FALL = 6; + /** + * This very short effect should produce a light crisp sensation intended + * to be used repetitively for dynamic feedback. + */ + public static final int PRIMITIVE_LIGHT_TICK = 7; + + + private ArrayList<PrimitiveEffect> mEffects = new ArrayList<>(); + + /** + * Add a haptic primitive to the end of the current composition. + * + * Similar to {@link #addPrimitive(int, float, int)}, but with no delay and a + * default scale applied. + * + * @param primitiveId The primitive to add + * + * @return The {@link Composition} object to enable adding multiple primitives in one chain. + */ + @Nullable + public Composition addPrimitive(@Primitive int primitiveId) { + addPrimitive(primitiveId, /*scale*/ 1.0f, /*delay*/ 0); + return this; + } + + /** + * Add a haptic primitive to the end of the current composition. + * + * Similar to {@link #addPrimitive(int, float, int)}, but with no delay. + * + * @param primitiveId The primitive to add + * @param scale The scale to apply to the intensity of the primitive. + * + * @return The {@link Composition} object to enable adding multiple primitives in one chain. + */ + @Nullable + public Composition addPrimitive(@Primitive int primitiveId, + @FloatRange(from = 0f, to = 1f) float scale) { + addPrimitive(primitiveId, scale, /*delay*/ 0); + return this; + } + + /** + * Add a haptic primitive to the end of the current composition. + * + * @param primitiveId The primitive to add + * @param scale The scale to apply to the intensity of the primitive. + * @param delay The amount of time, in milliseconds, to wait before playing the prior + * primitive and this one + * @return The {@link Composition} object to enable adding multiple primitives in one chain. + */ + @Nullable + public Composition addPrimitive(@Primitive int primitiveId, + @FloatRange(from = 0f, to = 1f) float scale, @IntRange(from = 0) int delay) { + mEffects.add(new PrimitiveEffect(checkPrimitive(primitiveId), scale, delay)); + return this; + } + + /** + * Compose all of the added primitives together into a single {@link VibrationEffect}. + * + * The {@link Composition} object is still valid after this call, so you can continue adding + * more primitives to it and generating more {@link VibrationEffect}s by calling this method + * again. + * + * @return The {@link VibrationEffect} resulting from the composition of the primitives. + */ + @NonNull + public VibrationEffect compose() { + if (mEffects.isEmpty()) { + throw new IllegalStateException( + "Composition must have at least one element to compose."); + } + return new VibrationEffect.Composed(mEffects); + } + + /** + * @throws IllegalArgumentException throws if the primitive ID is not within the valid range + * @hide + * + */ + static int checkPrimitive(int primitiveId) { + Preconditions.checkArgumentInRange(primitiveId, PRIMITIVE_NOOP, PRIMITIVE_LIGHT_TICK, + "primitiveId"); + return primitiveId; + } + + /** + * Convert the primitive ID to a human readable string for debugging + * @param id The ID to convert + * @return The ID in a human readable format. + * @hide + */ + public static String primitiveToString(@Primitive int id) { + switch (id) { + case PRIMITIVE_NOOP: + return "PRIMITIVE_NOOP"; + case PRIMITIVE_CLICK: + return "PRIMITIVE_CLICK"; + case PRIMITIVE_THUD: + return "PRIMITIVE_THUD"; + case PRIMITIVE_SPIN: + return "PRIMITIVE_SPIN"; + case PRIMITIVE_QUICK_RISE: + return "PRIMITIVE_QUICK_RISE"; + case PRIMITIVE_SLOW_RISE: + return "PRIMITIVE_SLOW_RISE"; + case PRIMITIVE_QUICK_FALL: + return "PRIMITIVE_QUICK_FALL"; + case PRIMITIVE_LIGHT_TICK: + return "PRIMITIVE_LIGHT_TICK"; + + default: + return Integer.toString(id); + + } + } + + + /** + * @hide + */ + public static class PrimitiveEffect implements Parcelable { + public int id; + public float scale; + public int delay; + + PrimitiveEffect(int id, float scale, int delay) { + this.id = id; + this.scale = scale; + this.delay = delay; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(id); + dest.writeFloat(scale); + dest.writeInt(delay); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public String toString() { + return "PrimitiveEffect{" + + "id=" + primitiveToString(id) + + ", scale=" + scale + + ", delay=" + delay + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + PrimitiveEffect that = (PrimitiveEffect) o; + return id == that.id + && Float.compare(that.scale, scale) == 0 + && delay == that.delay; + } + + @Override + public int hashCode() { + return Objects.hash(id, scale, delay); + } + + + public static final @NonNull Parcelable.Creator<PrimitiveEffect> CREATOR = + new Parcelable.Creator<PrimitiveEffect>() { + @Override + public PrimitiveEffect createFromParcel(Parcel in) { + return new PrimitiveEffect(in.readInt(), in.readFloat(), in.readInt()); + } + @Override + public PrimitiveEffect[] newArray(int size) { + return new PrimitiveEffect[size]; + } + }; + } + } + public static final @NonNull Parcelable.Creator<VibrationEffect> CREATOR = new Parcelable.Creator<VibrationEffect>() { @Override @@ -850,6 +1194,8 @@ public abstract class VibrationEffect implements Parcelable { return new Waveform(in); } else if (token == PARCEL_TOKEN_EFFECT) { return new Prebaked(in); + } else if (token == PARCEL_TOKEN_COMPOSITION) { + return new Composed(in); } else { throw new IllegalStateException( "Unexpected vibration event type token in parcel."); diff --git a/core/java/android/os/Vibrator.java b/core/java/android/os/Vibrator.java index ae75f3d0d7e6..f055c60e6a41 100644 --- a/core/java/android/os/Vibrator.java +++ b/core/java/android/os/Vibrator.java @@ -17,6 +17,7 @@ package android.os; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemService; @@ -41,37 +42,42 @@ public abstract class Vibrator { /** * Vibration intensity: no vibrations. + * * @hide */ public static final int VIBRATION_INTENSITY_OFF = 0; /** * Vibration intensity: low. + * * @hide */ public static final int VIBRATION_INTENSITY_LOW = 1; /** * Vibration intensity: medium. + * * @hide */ public static final int VIBRATION_INTENSITY_MEDIUM = 2; /** * Vibration intensity: high. + * * @hide */ public static final int VIBRATION_INTENSITY_HIGH = 3; /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(prefix = { "VIBRATION_INTENSITY_" }, value = { - VIBRATION_INTENSITY_OFF, - VIBRATION_INTENSITY_LOW, - VIBRATION_INTENSITY_MEDIUM, - VIBRATION_INTENSITY_HIGH + @IntDef(prefix = {"VIBRATION_INTENSITY_"}, value = { + VIBRATION_INTENSITY_OFF, + VIBRATION_INTENSITY_LOW, + VIBRATION_INTENSITY_MEDIUM, + VIBRATION_INTENSITY_HIGH }) - public @interface VibrationIntensity{} + public @interface VibrationIntensity { + } private final String mPackageName; // The default vibration intensity level for haptic feedback. @@ -117,6 +123,7 @@ public abstract class Vibrator { /** * Get the default vibration intensity for haptic feedback. + * * @hide */ public int getDefaultHapticFeedbackIntensity() { @@ -125,13 +132,16 @@ public abstract class Vibrator { /** * Get the default vibration intensity for notifications. + * * @hide */ public int getDefaultNotificationVibrationIntensity() { return mDefaultNotificationVibrationIntensity; } - /** Get the default vibration intensity for ringtones. + /** + * Get the default vibration intensity for ringtones. + * * @hide */ public int getDefaultRingVibrationIntensity() { @@ -156,11 +166,12 @@ public abstract class Vibrator { * Configure an always-on haptics effect. * * @param alwaysOnId The board-specific always-on ID to configure. - * @param effect Vibration effect to assign to always-on id. Passing null will disable it. + * @param effect Vibration effect to assign to always-on id. Passing null will disable it. * @param attributes {@link AudioAttributes} corresponding to the vibration. For example, - * specify {@link AudioAttributes#USAGE_ALARM} for alarm vibrations or - * {@link AudioAttributes#USAGE_NOTIFICATION_RINGTONE} for - * vibrations associated with incoming calls. May only be null when effect is null. + * specify {@link AudioAttributes#USAGE_ALARM} for alarm vibrations or + * {@link AudioAttributes#USAGE_NOTIFICATION_RINGTONE} for + * vibrations associated with incoming calls. May only be null when effect is + * null. * @hide */ @RequiresPermission(android.Manifest.permission.VIBRATE_ALWAYS_ON) @@ -183,7 +194,6 @@ public abstract class Vibrator { * Vibrate constantly for the specified period of time. * * @param milliseconds The number of milliseconds to vibrate. - * * @deprecated Use {@link #vibrate(VibrationEffect)} instead. */ @Deprecated @@ -196,11 +206,10 @@ public abstract class Vibrator { * Vibrate constantly for the specified period of time. * * @param milliseconds The number of milliseconds to vibrate. - * @param attributes {@link AudioAttributes} corresponding to the vibration. For example, - * specify {@link AudioAttributes#USAGE_ALARM} for alarm vibrations or - * {@link AudioAttributes#USAGE_NOTIFICATION_RINGTONE} for - * vibrations associated with incoming calls. - * + * @param attributes {@link AudioAttributes} corresponding to the vibration. For example, + * specify {@link AudioAttributes#USAGE_ALARM} for alarm vibrations or + * {@link AudioAttributes#USAGE_NOTIFICATION_RINGTONE} for + * vibrations associated with incoming calls. * @deprecated Use {@link #vibrate(VibrationEffect, AudioAttributes)} instead. */ @Deprecated @@ -231,9 +240,8 @@ public abstract class Vibrator { * </p> * * @param pattern an array of longs of times for which to turn the vibrator on or off. - * @param repeat the index into pattern at which to repeat, or -1 if - * you don't want to repeat. - * + * @param repeat the index into pattern at which to repeat, or -1 if + * you don't want to repeat. * @deprecated Use {@link #vibrate(VibrationEffect)} instead. */ @Deprecated @@ -256,14 +264,13 @@ public abstract class Vibrator { * to start the repeat, or -1 to disable repeating. * </p> * - * @param pattern an array of longs of times for which to turn the vibrator on or off. - * @param repeat the index into pattern at which to repeat, or -1 if - * you don't want to repeat. + * @param pattern an array of longs of times for which to turn the vibrator on or off. + * @param repeat the index into pattern at which to repeat, or -1 if + * you don't want to repeat. * @param attributes {@link AudioAttributes} corresponding to the vibration. For example, - * specify {@link AudioAttributes#USAGE_ALARM} for alarm vibrations or - * {@link AudioAttributes#USAGE_NOTIFICATION_RINGTONE} for - * vibrations associated with incoming calls. - * + * specify {@link AudioAttributes#USAGE_ALARM} for alarm vibrations or + * {@link AudioAttributes#USAGE_NOTIFICATION_RINGTONE} for + * vibrations associated with incoming calls. * @deprecated Use {@link #vibrate(VibrationEffect, AudioAttributes)} instead. */ @Deprecated @@ -295,8 +302,9 @@ public abstract class Vibrator { } /** - * Like {@link #vibrate(int, String, VibrationEffect, AudioAttributes)}, but allows the + * Like {@link #vibrate(VibrationEffect, AudioAttributes)}, but allows the * caller to specify the vibration is owned by someone else and set reason for vibration. + * * @hide */ @RequiresPermission(android.Manifest.permission.VIBRATE) @@ -304,6 +312,85 @@ public abstract class Vibrator { String reason, AudioAttributes attributes); /** + * Query whether the vibrator supports the given effects. + * + * If the returned array is {@code null}, the hardware doesn't support querying its supported + * effects. It may support any or all effects, but there's no way to programmatically know + * whether a {@link #vibrate} call will be successful. + * + * If the returned array is non-null, then it will be the same length as the query array and + * the value at a given index will contain whether the effect at that same index in the + * querying array is supported or not. + * + * @param effectIds Which effects to query for. + * @return Whether the effects are supported. Null when the hardware doesn't tell us what it + * supports. + */ + @Nullable + public boolean[] areEffectsSupported( + @NonNull @VibrationEffect.EffectType int... effectIds) { + return new boolean[effectIds.length]; + } + + /** + * Query whether the vibrator supports all of the given effects. + * + * If the result is {@code null}, the hardware doesn't support querying its supported + * effects. It may support any or all effects, but there's no way to programmatically know + * whether a {@link #vibrate} call will be successful. + * + * If the returned array is non-null, then it will return whether all of the effects are + * supported by the hardware. + * + * @param effectIds Which effects to query for. + * @return Whether the effects are supported. {@code null} when the hardware doesn't tell us + * what it supports. + */ + @Nullable + public Boolean areAllEffectsSupported( + @NonNull @VibrationEffect.EffectType int... effectIds) { + for (boolean supported : areEffectsSupported(effectIds)) { + if (!supported) { + return false; + } + } + return true; + } + + + /** + * Query whether the vibrator supports the given primitives. + * + * The returned array will be the same length as the query array and the value at a given index + * will contain whether the effect at that same index in the querying array is supported or + * not. + * + * @param primitiveIds Which primitives to query for. + * @return Whether the primitives are supported. + */ + @NonNull + public boolean[] arePrimitivesSupported( + @NonNull @VibrationEffect.Composition.Primitive int... primitiveIds) { + return new boolean[primitiveIds.length]; + } + + /** + * Query whether the vibrator supports all of the given primitives. + * + * @param primitiveIds Which primitives to query for. + * @return Whether primitives effects are supported. + */ + public boolean areAllPrimitivesSupported( + @NonNull @VibrationEffect.Composition.Primitive int... primitiveIds) { + for (boolean supported : arePrimitivesSupported(primitiveIds)) { + if (!supported) { + return false; + } + } + return true; + } + + /** * Turn the vibrator off. */ @RequiresPermission(android.Manifest.permission.VIBRATE) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index a62412068fda..3e0b46b6d8e8 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2721,6 +2721,7 @@ public final class Settings { } } }); + currentGeneration = generation; } } if (mGenerationTracker != null && currentGeneration == @@ -2801,14 +2802,7 @@ public final class Settings { } mValues.clear(); } else { - boolean prefixCached = false; - int size = mValues.size(); - for (int i = 0; i < size; ++i) { - if (mValues.keyAt(i).startsWith(prefix)) { - prefixCached = true; - break; - } - } + boolean prefixCached = mValues.containsKey(prefix); if (prefixCached) { if (!names.isEmpty()) { for (String name : names) { @@ -2817,9 +2811,11 @@ public final class Settings { } } } else { - for (int i = 0; i < size; ++i) { + for (int i = 0; i < mValues.size(); ++i) { String key = mValues.keyAt(i); - if (key.startsWith(prefix)) { + // Explicitly exclude the prefix as it is only there to + // signal that the prefix has been cached. + if (key.startsWith(prefix) && !key.equals(prefix)) { keyValues.put(key, mValues.get(key)); } } @@ -2907,12 +2903,15 @@ public final class Settings { } } }); + currentGeneration = generation; } } if (mGenerationTracker != null && currentGeneration == mGenerationTracker.getCurrentGeneration()) { // cache the complete list of flags for the namespace mValues.putAll(flagsToValues); + // Adding the prefix as a signal that the prefix is cached. + mValues.put(prefix, null); } } return keyValues; @@ -14104,7 +14103,7 @@ public final class Settings { * @hide */ @RequiresPermission(Manifest.permission.READ_DEVICE_CONFIG) - static Map<String, String> getStrings(@NonNull ContentResolver resolver, + public static Map<String, String> getStrings(@NonNull ContentResolver resolver, @NonNull String namespace, @NonNull List<String> names) { List<String> compositeNames = new ArrayList<>(names.size()); for (String name : names) { @@ -14163,8 +14162,9 @@ public final class Settings { * @hide */ @RequiresPermission(Manifest.permission.WRITE_DEVICE_CONFIG) - static boolean setStrings(@NonNull ContentResolver resolver, @NonNull String namespace, - @NonNull Map<String, String> keyValues) throws DeviceConfig.BadConfigException { + public static boolean setStrings(@NonNull ContentResolver resolver, + @NonNull String namespace, @NonNull Map<String, String> keyValues) + throws DeviceConfig.BadConfigException { HashMap<String, String> compositeKeyValueMap = new HashMap<>(keyValues.keySet().size()); for (Map.Entry<String, String> entry : keyValues.entrySet()) { compositeKeyValueMap.put( @@ -14241,6 +14241,12 @@ public final class Settings { } } + /** @hide */ + public static void clearProviderForTest() { + sProviderHolder.clearProviderForTest(); + sNameValueCache.clearGenerationTrackerForTest(); + } + private static String createCompositeName(@NonNull String namespace, @NonNull String name) { Preconditions.checkNotNull(namespace); Preconditions.checkNotNull(name); diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 9da584ea1487..c969c6e49634 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -1296,17 +1296,6 @@ public final class Telephony { "android.provider.action.EXTERNAL_PROVIDER_CHANGE"; /** - * Same as {@link #ACTION_DEFAULT_SMS_PACKAGE_CHANGED} but it's implicit (e.g. sent to - * all apps) and requires - * {@link android.Manifest.permission#MONITOR_DEFAULT_SMS_PACKAGE} to receive. - * - * @hide - */ - @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - public static final String ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL = - "android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL"; - - /** * Broadcast action: When SMS-MMS db is being created. If file-based encryption is * supported, this broadcast indicates creation of the db in credential-encrypted * storage. A boolean is specified in {@link #EXTRA_IS_INITIAL_CREATE} to indicate if @@ -4038,15 +4027,6 @@ public final class Telephony { @Retention(RetentionPolicy.SOURCE) public @interface EditStatus {} - /** @hide */ - @IntDef({ - SKIP_464XLAT_DEFAULT, - SKIP_464XLAT_DISABLE, - SKIP_464XLAT_ENABLE, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface Skip464XlatStatus {} - /** * Compat framework change ID for the APN db read permission change. * diff --git a/core/java/android/security/net/config/WfaCertificateSource.java b/core/java/android/security/net/config/WfaCertificateSource.java index f212ef8bf447..545e4b0926b1 100644 --- a/core/java/android/security/net/config/WfaCertificateSource.java +++ b/core/java/android/security/net/config/WfaCertificateSource.java @@ -23,12 +23,15 @@ import java.io.File; * @hide */ public final class WfaCertificateSource extends DirectoryCertificateSource { + private static final String CACERTS_WFA_PATH = + "/apex/com.android.wifi/etc/security/cacerts_wfa"; + private static class NoPreloadHolder { private static final WfaCertificateSource INSTANCE = new WfaCertificateSource(); } private WfaCertificateSource() { - super(new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts_wfa")); + super(new File(CACERTS_WFA_PATH)); } public static WfaCertificateSource getInstance() { diff --git a/core/java/android/service/autofill/FillResponse.java b/core/java/android/service/autofill/FillResponse.java index 9333dbd1e1d5..36f3a7899700 100644 --- a/core/java/android/service/autofill/FillResponse.java +++ b/core/java/android/service/autofill/FillResponse.java @@ -748,8 +748,8 @@ public final class FillResponse implements Parcelable { parcel.writeParcelableArray(mFieldClassificationIds, flags); parcel.writeInt(mFlags); parcel.writeIntArray(mCancelIds); - parcel.writeInt(mRequestId); parcel.writeParcelable(mInlineActions, flags); + parcel.writeInt(mRequestId); } public static final @android.annotation.NonNull Parcelable.Creator<FillResponse> CREATOR = diff --git a/core/java/android/service/autofill/IInlineSuggestionRenderService.aidl b/core/java/android/service/autofill/IInlineSuggestionRenderService.aidl new file mode 100644 index 000000000000..decdcf586ee1 --- /dev/null +++ b/core/java/android/service/autofill/IInlineSuggestionRenderService.aidl @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.service.autofill; + +import android.service.autofill.IInlineSuggestionUiCallback; +import android.service.autofill.InlinePresentation; + +/** + * Interface from system to the inline suggestion render service. + * + * @hide + */ +oneway interface IInlineSuggestionRenderService { + void renderSuggestion(in IInlineSuggestionUiCallback callback, in InlinePresentation presentation, + int width, int height); +} diff --git a/core/java/android/service/autofill/IInlineSuggestionUiCallback.aidl b/core/java/android/service/autofill/IInlineSuggestionUiCallback.aidl new file mode 100644 index 000000000000..a55a2ced0b89 --- /dev/null +++ b/core/java/android/service/autofill/IInlineSuggestionUiCallback.aidl @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.service.autofill; + +import android.view.SurfaceControl; + +/** + * Interface to receive events from inline suggestions. + * + * @hide + */ +oneway interface IInlineSuggestionUiCallback { + void autofill(); + void onContent(in SurfaceControl surface); +} diff --git a/core/java/android/service/autofill/InlineSuggestionRenderService.java b/core/java/android/service/autofill/InlineSuggestionRenderService.java new file mode 100644 index 000000000000..2593aab1eb63 --- /dev/null +++ b/core/java/android/service/autofill/InlineSuggestionRenderService.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.service.autofill; + +import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SystemApi; +import android.annotation.TestApi; +import android.app.Service; +import android.app.slice.Slice; +import android.content.Intent; +import android.os.Handler; +import android.os.IBinder; +import android.os.Looper; +import android.util.Log; +import android.view.View; + +/** + * A service that renders an inline presentation given the {@link InlinePresentation} containing + * a {@link Slice} built using the {@link androidx.autofill.AutofillSliceBuilder}. + * + * {@hide} + */ +@SystemApi +@TestApi +public abstract class InlineSuggestionRenderService extends Service { + + private static final String TAG = "InlineSuggestionRenderService"; + + /** + * The {@link Intent} that must be declared as handled by the service. + * + * <p>To be supported, the service must also require the + * {@link android.Manifest.permission#BIND_INLINE_SUGGESTION_RENDER_SERVICE} permission so + * that other applications can not abuse it. + */ + public static final String SERVICE_INTERFACE = + "android.service.autofill.InlineSuggestionRenderService"; + + private final Handler mHandler = new Handler(Looper.getMainLooper(), null, true); + + private void handleRenderSuggestion(IInlineSuggestionUiCallback callback, + InlinePresentation presentation, int width, int height) { + //TODO(b/146453086): implementation in ExtService + } + + @Override + @Nullable + public final IBinder onBind(@NonNull Intent intent) { + if (SERVICE_INTERFACE.equals(intent.getAction())) { + return new IInlineSuggestionRenderService.Stub() { + @Override + public void renderSuggestion(@NonNull IInlineSuggestionUiCallback callback, + @NonNull InlinePresentation presentation, int width, int height) { + mHandler.sendMessage(obtainMessage( + InlineSuggestionRenderService::handleRenderSuggestion, + InlineSuggestionRenderService.this, callback, presentation, + width, height)); + } + }.asBinder(); + } + + Log.w(TAG, "Tried to bind to wrong intent (should be " + SERVICE_INTERFACE + ": " + intent); + return null; + } + + /** + * Renders the slice into a view. + */ + @Nullable + public View onRenderSuggestion(@NonNull InlinePresentation presentation, + int width, int height) { + Log.e(TAG, "service implementation (" + getClass() + " does not implement " + + "onRenderSuggestion()"); + return null; + } +} diff --git a/core/java/android/service/quicksettings/Tile.java b/core/java/android/service/quicksettings/Tile.java index 79c21521fe2d..40c0ac00a5a9 100644 --- a/core/java/android/service/quicksettings/Tile.java +++ b/core/java/android/service/quicksettings/Tile.java @@ -65,6 +65,7 @@ public final class Tile implements Parcelable { private CharSequence mLabel; private CharSequence mSubtitle; private CharSequence mContentDescription; + private CharSequence mStateDescription; // Default to inactive until clients of the new API can update. private int mState = STATE_INACTIVE; @@ -177,6 +178,14 @@ public final class Tile implements Parcelable { } /** + * Gets the current state description for the tile. + */ + @Nullable + public CharSequence getStateDescription() { + return mStateDescription; + } + + /** * Sets the current content description for the tile. * * Does not take effect until {@link #updateTile()} is called. @@ -187,6 +196,17 @@ public final class Tile implements Parcelable { this.mContentDescription = contentDescription; } + /** + * Sets the current state description for the tile. + * + * Does not take effect until {@link #updateTile()} is called. + * + * @param stateDescription New state description to use. + */ + public void setStateDescription(@Nullable CharSequence stateDescription) { + this.mStateDescription = stateDescription; + } + @Override public int describeContents() { return 0; @@ -215,6 +235,7 @@ public final class Tile implements Parcelable { TextUtils.writeToParcel(mLabel, dest, flags); TextUtils.writeToParcel(mSubtitle, dest, flags); TextUtils.writeToParcel(mContentDescription, dest, flags); + TextUtils.writeToParcel(mStateDescription, dest, flags); } private void readFromParcel(Parcel source) { @@ -227,6 +248,7 @@ public final class Tile implements Parcelable { mLabel = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source); mSubtitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source); mContentDescription = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source); + mStateDescription = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source); } public static final @android.annotation.NonNull Creator<Tile> CREATOR = new Creator<Tile>() { diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index dd78c78654c3..e9285cc7931d 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -223,6 +223,9 @@ public abstract class WallpaperService extends Service { SurfaceControl mSurfaceControl = new SurfaceControl(); + // Unused relayout out-param + SurfaceControl mTmpSurfaceControl = new SurfaceControl(); + final BaseSurfaceHolder mSurfaceHolder = new BaseSurfaceHolder() { { mRequestedFormat = PixelFormat.RGBX_8888; @@ -902,7 +905,7 @@ public abstract class WallpaperService extends Service { View.VISIBLE, 0, -1, mWinFrame, mContentInsets, mVisibleInsets, mStableInsets, mBackdropFrame, mDisplayCutout, mMergedConfiguration, mSurfaceControl, - mInsetsState, mSurfaceSize); + mInsetsState, mSurfaceSize, mTmpSurfaceControl); if (mSurfaceControl.isValid()) { mSurfaceHolder.mSurface.copyFrom(mSurfaceControl); mSurfaceControl.release(); diff --git a/core/java/android/telephony/TelephonyRegistryManager.java b/core/java/android/telephony/TelephonyRegistryManager.java index 6787c46c046e..4024db1e16c4 100644 --- a/core/java/android/telephony/TelephonyRegistryManager.java +++ b/core/java/android/telephony/TelephonyRegistryManager.java @@ -20,8 +20,12 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.TestApi; +import android.compat.Compatibility; +import android.compat.annotation.ChangeId; +import android.compat.annotation.EnabledAfter; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.RemoteException; import android.os.ServiceManager; import android.telephony.Annotation.ApnType; @@ -199,6 +203,13 @@ public class TelephonyRegistryManager { } /** + * To check the SDK version for {@link #listenForSubscriber}. + */ + @ChangeId + @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.P) + private static final long LISTEN_CODE_CHANGE = 147600208L; + + /** * Listen for incoming subscriptions * @param subId Subscription ID * @param pkg Package name @@ -210,6 +221,16 @@ public class TelephonyRegistryManager { public void listenForSubscriber(int subId, @NonNull String pkg, @NonNull String featureId, @NonNull PhoneStateListener listener, int events, boolean notifyNow) { try { + // subId from PhoneStateListener is deprecated Q on forward, use the subId from + // TelephonyManager instance. Keep using subId from PhoneStateListener for pre-Q. + if (Compatibility.isChangeEnabled(LISTEN_CODE_CHANGE)) { + // Since mSubId in PhoneStateListener is deprecated from Q on forward, this is + // the only place to set mSubId and its for "informational" only. + listener.mSubId = (events == PhoneStateListener.LISTEN_NONE) + ? SubscriptionManager.INVALID_SUBSCRIPTION_ID : subId; + } else if (listener.mSubId != null) { + subId = listener.mSubId; + } sRegistry.listenForSubscriber( subId, pkg, featureId, listener.callback, events, notifyNow); } catch (RemoteException e) { diff --git a/core/java/android/view/IPinnedStackController.aidl b/core/java/android/view/IPinnedStackController.aidl index 00edb3a29e87..cb82f168d991 100644 --- a/core/java/android/view/IPinnedStackController.aidl +++ b/core/java/android/view/IPinnedStackController.aidl @@ -53,9 +53,4 @@ interface IPinnedStackController { * {@param bounds} here is the final destination bounds. */ void resetBoundsAnimation(in Rect bounds); - - /** - * Reports the current default and movement bounds to controller. - */ - void reportBounds(in Rect defaultBounds, in Rect movementBounds); } diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index e3446e1f7b57..1677357dedbe 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -92,6 +92,9 @@ interface IWindowSession { * @param outSurface Object in which is placed the new display surface. * @param insetsState The current insets state in the system. * @param outSurfaceSize The width and height of the surface control + * @param outBlastSurfaceControl A BLAST SurfaceControl allocated by the WindowManager + * the SurfaceControl willl be managed by the client side, but the WindowManager + * may use it as a deferTransaction barrier. * * @return int Result flags: {@link WindowManagerGlobal#RELAYOUT_SHOW_FOCUS}, * {@link WindowManagerGlobal#RELAYOUT_FIRST_TIME}. @@ -103,7 +106,8 @@ interface IWindowSession { out Rect outBackdropFrame, out DisplayCutout.ParcelableWrapper displayCutout, out MergedConfiguration outMergedConfiguration, out SurfaceControl outSurfaceControl, - out InsetsState insetsState, out Point outSurfaceSize); + out InsetsState insetsState, out Point outSurfaceSize, + out SurfaceControl outBlastSurfaceControl); /* * Notify the window manager that an application is relaunching and diff --git a/core/java/android/view/ImeInsetsSourceConsumer.java b/core/java/android/view/ImeInsetsSourceConsumer.java index d0694375df53..2e377518f6e0 100644 --- a/core/java/android/view/ImeInsetsSourceConsumer.java +++ b/core/java/android/view/ImeInsetsSourceConsumer.java @@ -87,7 +87,7 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { * @return @see {@link android.view.InsetsSourceConsumer.ShowResult}. */ @Override - @ShowResult int requestShow(boolean fromIme) { + public @ShowResult int requestShow(boolean fromIme) { // TODO: ResultReceiver for IME. // TODO: Set mShowOnNextImeRender to automatically show IME and guard it with a flag. if (fromIme) { @@ -95,7 +95,7 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { } return getImm().requestImeShow(null /* resultReceiver */) - ? ShowResult.SHOW_DELAYED : ShowResult.SHOW_FAILED; + ? ShowResult.IME_SHOW_DELAYED : ShowResult.IME_SHOW_FAILED; } /** diff --git a/core/java/android/view/InsetsAnimationControlCallbacks.java b/core/java/android/view/InsetsAnimationControlCallbacks.java index 27edb0b69bdd..0645c98e994a 100644 --- a/core/java/android/view/InsetsAnimationControlCallbacks.java +++ b/core/java/android/view/InsetsAnimationControlCallbacks.java @@ -52,12 +52,6 @@ public interface InsetsAnimationControlCallbacks { void notifyFinished(InsetsAnimationControlImpl controller, boolean shown); /** - * Get the description of the insets state. - * @return {@link InsetsState} for adjusting corresponding {@link InsetsSource}. - */ - InsetsState getState(); - - /** * Apply the new params to the surface. * @param params The {@link android.view.SyncRtSurfaceTransactionApplier.SurfaceParams} to * apply. diff --git a/core/java/android/view/InsetsAnimationControlImpl.java b/core/java/android/view/InsetsAnimationControlImpl.java index 405eccd56e3c..e863aa06ed26 100644 --- a/core/java/android/view/InsetsAnimationControlImpl.java +++ b/core/java/android/view/InsetsAnimationControlImpl.java @@ -191,13 +191,7 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll if (mCancelled) { return; } - InsetsState state = new InsetsState(mController.getState()); - for (int i = mControls.size() - 1; i >= 0; i--) { - InsetsSourceControl control = mControls.valueAt(i); - state.getSource(control.getType()).setVisible(shown); - } - Insets insets = getInsetsFromState(state, mFrame, null /* typeSideMap */); - setInsetsAndAlpha(insets, 1f /* alpha */, 1f /* fraction */); + setInsetsAndAlpha(shown ? mShownInsets : mHiddenInsets, 1f /* alpha */, 1f /* fraction */); mFinished = true; mShownOnFinish = shown; } diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java index c6e383539a82..6f76497572d7 100644 --- a/core/java/android/view/InsetsController.java +++ b/core/java/android/view/InsetsController.java @@ -19,6 +19,7 @@ package android.view; import static android.view.InsetsState.ITYPE_IME; import static android.view.InsetsState.toPublicType; import static android.view.WindowInsets.Type.all; +import static android.view.WindowInsets.Type.ime; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_APPEARANCE_CONTROLLED; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_BEHAVIOR_CONTROLLED; @@ -31,6 +32,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.graphics.Insets; import android.graphics.Rect; +import android.os.Handler; import android.os.RemoteException; import android.util.ArraySet; import android.util.Log; @@ -55,6 +57,7 @@ import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; +import java.util.function.BiFunction; /** * Implements {@link WindowInsetsController} on the client. @@ -64,6 +67,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation private static final int ANIMATION_DURATION_SHOW_MS = 275; private static final int ANIMATION_DURATION_HIDE_MS = 340; + private static final int PENDING_CONTROL_TIMEOUT_MS = 2000; static final Interpolator INTERPOLATOR = new PathInterpolator(0.4f, 0f, 0.2f, 1f); @@ -235,12 +239,36 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation DefaultAnimationControlListener(boolean show) { super(show); } - + @Override protected void setStartingAnimation(boolean startingAnimation) { mStartingAnimation = startingAnimation; } } + /** + * Represents a control request that we had to defer because we are waiting for the IME to + * process our show request. + */ + private static class PendingControlRequest { + + PendingControlRequest(@InsetsType int types, WindowInsetsAnimationControlListener listener, + long durationMs, Interpolator interpolator, @AnimationType int animationType, + @LayoutInsetsDuringAnimation int layoutInsetsDuringAnimation) { + this.types = types; + this.listener = listener; + this.durationMs = durationMs; + this.interpolator = interpolator; + this.animationType = animationType; + this.layoutInsetsDuringAnimation = layoutInsetsDuringAnimation; + } + + final @InsetsType int types; + final WindowInsetsAnimationControlListener listener; + final long durationMs; + final Interpolator interpolator; + final @AnimationType int animationType; + final @LayoutInsetsDuringAnimation int layoutInsetsDuringAnimation; + } private final String TAG = "InsetsControllerImpl"; @@ -248,8 +276,10 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation private final InsetsState mTmpState = new InsetsState(); private final Rect mFrame = new Rect(); + private final BiFunction<InsetsController, Integer, InsetsSourceConsumer> mConsumerCreator; private final SparseArray<InsetsSourceConsumer> mSourceConsumers = new SparseArray<>(); private final ViewRootImpl mViewRoot; + private final Handler mHandler; private final SparseArray<InsetsSourceControl> mTmpControlArray = new SparseArray<>(); private final ArrayList<RunningAnimation> mRunningAnimations = new ArrayList<>(); @@ -263,7 +293,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation private final Rect mLastLegacyContentInsets = new Rect(); private final Rect mLastLegacyStableInsets = new Rect(); - private int mPendingTypesToShow; + /** Pending control request that is waiting on IME to be ready to be shown */ + private PendingControlRequest mPendingImeControlRequest; private int mLastLegacySoftInputMode; private int mLastLegacySystemUiFlags; @@ -271,8 +302,26 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation private SyncRtSurfaceTransactionApplier mApplier; + private Runnable mPendingControlTimeout = this::abortPendingImeControlRequest; + public InsetsController(ViewRootImpl viewRoot) { + this(viewRoot, (controller, type) -> { + if (type == ITYPE_IME) { + return new ImeInsetsSourceConsumer(controller.mState, Transaction::new, controller); + } else { + return new InsetsSourceConsumer(type, controller.mState, Transaction::new, + controller); + } + }, viewRoot.mHandler); + } + + @VisibleForTesting + public InsetsController(ViewRootImpl viewRoot, + BiFunction<InsetsController, Integer, InsetsSourceConsumer> consumerCreator, + Handler handler) { mViewRoot = viewRoot; + mConsumerCreator = consumerCreator; + mHandler = handler; mAnimCallback = () -> { mAnimCallbackScheduled = false; if (mRunningAnimations.isEmpty()) { @@ -393,7 +442,21 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation show(types, false /* fromIme */); } - void show(@InsetsType int types, boolean fromIme) { + @VisibleForTesting + public void show(@InsetsType int types, boolean fromIme) { + + // Handle pending request ready in case there was one set. + if (fromIme && mPendingImeControlRequest != null) { + PendingControlRequest pendingRequest = mPendingImeControlRequest; + mPendingImeControlRequest = null; + mHandler.removeCallbacks(mPendingControlTimeout); + controlAnimationUnchecked(pendingRequest.types, pendingRequest.listener, mFrame, + true /* fromIme */, pendingRequest.durationMs, pendingRequest.interpolator, + false /* fade */, pendingRequest.animationType, + pendingRequest.layoutInsetsDuringAnimation); + return; + } + // TODO: Support a ResultReceiver for IME. // TODO(b/123718661): Make show() work for multi-session IME. int typesReady = 0; @@ -463,6 +526,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation @LayoutInsetsDuringAnimation int layoutInsetsDuringAnimation) { if (types == 0) { // nothing to animate. + listener.onCancelled(); return; } cancelExistingControllers(types); @@ -471,19 +535,18 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation final SparseArray<InsetsSourceControl> controls = new SparseArray<>(); Pair<Integer, Boolean> typesReadyPair = collectSourceControls( - fromIme, internalTypes, controls, listener); + fromIme, internalTypes, controls); int typesReady = typesReadyPair.first; - boolean isReady = typesReadyPair.second; - if (!isReady) { - // IME isn't ready, all requested types would be shown once IME is ready. - mPendingTypesToShow = typesReady; - // TODO: listener for pending types. + boolean imeReady = typesReadyPair.second; + if (!imeReady) { + // IME isn't ready, all requested types will be animated once IME is ready + abortPendingImeControlRequest(); + mPendingImeControlRequest = new PendingControlRequest(types, listener, durationMs, + interpolator, animationType, layoutInsetsDuringAnimation); + mHandler.postDelayed(mPendingControlTimeout, PENDING_CONTROL_TIMEOUT_MS); return; } - // pending types from previous request. - typesReady = collectPendingTypes(typesReady); - if (typesReady == 0) { listener.onCancelled(); return; @@ -496,13 +559,12 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation } /** - * @return Pair of (types ready to animate, is ready to animate). + * @return Pair of (types ready to animate, IME ready to animate). */ private Pair<Integer, Boolean> collectSourceControls(boolean fromIme, - ArraySet<Integer> internalTypes, SparseArray<InsetsSourceControl> controls, - WindowInsetsAnimationControlListener listener) { + ArraySet<Integer> internalTypes, SparseArray<InsetsSourceControl> controls) { int typesReady = 0; - boolean isReady = true; + boolean imeReady = true; for (int i = internalTypes.size() - 1; i >= 0; i--) { InsetsSourceConsumer consumer = getSourceConsumer(internalTypes.valueAt(i)); boolean setVisible = !consumer.isRequestedVisible(); @@ -512,16 +574,12 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation case ShowResult.SHOW_IMMEDIATELY: typesReady |= InsetsState.toPublicType(consumer.getType()); break; - case ShowResult.SHOW_DELAYED: - isReady = false; + case ShowResult.IME_SHOW_DELAYED: + imeReady = false; break; - case ShowResult.SHOW_FAILED: + case ShowResult.IME_SHOW_FAILED: // IME cannot be shown (since it didn't have focus), proceed // with animation of other types. - if (mPendingTypesToShow != 0) { - // remove IME from pending because view no longer has focus. - mPendingTypesToShow &= ~InsetsState.toPublicType(ITYPE_IME); - } break; } } else { @@ -538,13 +596,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation controls.put(consumer.getType(), control); } } - return new Pair<>(typesReady, isReady); - } - - private int collectPendingTypes(@InsetsType int typesReady) { - typesReady |= mPendingTypesToShow; - mPendingTypesToShow = 0; - return typesReady; + return new Pair<>(typesReady, imeReady); } private @LayoutInsetsDuringAnimation int getLayoutInsetsDuringAnimationMode( @@ -577,6 +629,17 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation cancelAnimation(control, true /* invokeCallback */); } } + if ((types & ime()) != 0) { + abortPendingImeControlRequest(); + } + } + + private void abortPendingImeControlRequest() { + if (mPendingImeControlRequest != null) { + mPendingImeControlRequest.listener.onCancelled(); + mPendingImeControlRequest = null; + mHandler.removeCallbacks(mPendingControlTimeout); + } } @VisibleForTesting @@ -608,6 +671,9 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation cancelAnimation(control, true /* invokeCallback */); } } + if (consumer.getType() == ITYPE_IME) { + abortPendingImeControlRequest(); + } } private void cancelAnimation(InsetsAnimationControlImpl control, boolean invokeCallback) { @@ -635,7 +701,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation if (controller != null) { return controller; } - controller = createConsumerOfType(type); + controller = mConsumerCreator.apply(this, type); mSourceConsumers.put(type, controller); return controller; } @@ -696,14 +762,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation return ANIMATION_TYPE_NONE; } - private InsetsSourceConsumer createConsumerOfType(int type) { - if (type == ITYPE_IME) { - return new ImeInsetsSourceConsumer(mState, Transaction::new, this); - } else { - return new InsetsSourceConsumer(type, mState, Transaction::new, this); - } - } - /** * Sends the local visibility state back to window manager. */ diff --git a/core/java/android/view/InsetsSourceConsumer.java b/core/java/android/view/InsetsSourceConsumer.java index 35a82b8bfd54..ddfd38c0320b 100644 --- a/core/java/android/view/InsetsSourceConsumer.java +++ b/core/java/android/view/InsetsSourceConsumer.java @@ -36,7 +36,7 @@ import java.util.function.Supplier; public class InsetsSourceConsumer { @Retention(RetentionPolicy.SOURCE) - @IntDef(value = {ShowResult.SHOW_IMMEDIATELY, ShowResult.SHOW_DELAYED, ShowResult.SHOW_FAILED}) + @IntDef(value = {ShowResult.SHOW_IMMEDIATELY, ShowResult.IME_SHOW_DELAYED, ShowResult.IME_SHOW_FAILED}) @interface ShowResult { /** * Window type is ready to be shown, will be shown immidiately. @@ -46,12 +46,12 @@ public class InsetsSourceConsumer { * Result will be delayed. Window needs to be prepared or request is not from controller. * Request will be delegated to controller and may or may not be shown. */ - int SHOW_DELAYED = 1; + int IME_SHOW_DELAYED = 1; /** * Window will not be shown because one of the conditions couldn't be met. * (e.g. in IME's case, when no editor is focused.) */ - int SHOW_FAILED = 2; + int IME_SHOW_FAILED = 2; } protected final InsetsController mController; @@ -155,7 +155,8 @@ public class InsetsSourceConsumer { * {@link android.inputmethodservice.InputMethodService}). * @return @see {@link ShowResult}. */ - @ShowResult int requestShow(boolean fromController) { + @VisibleForTesting + public @ShowResult int requestShow(boolean fromController) { return ShowResult.SHOW_IMMEDIATELY; } diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index c638717b13c0..c91096e5aa25 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -19,6 +19,7 @@ package android.view; import static android.view.Display.INVALID_DISPLAY; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Build; @@ -1269,6 +1270,7 @@ public class KeyEvent extends InputEvent implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSource; private int mDisplayId; + private @Nullable byte[] mHmac; @UnsupportedAppUsage private int mMetaState; @UnsupportedAppUsage @@ -1546,6 +1548,7 @@ public class KeyEvent extends InputEvent implements Parcelable { mDeviceId = origEvent.mDeviceId; mSource = origEvent.mSource; mDisplayId = origEvent.mDisplayId; + mHmac = origEvent.mHmac == null ? null : origEvent.mHmac.clone(); mScanCode = origEvent.mScanCode; mFlags = origEvent.mFlags; mCharacters = origEvent.mCharacters; @@ -1573,6 +1576,7 @@ public class KeyEvent extends InputEvent implements Parcelable { mDeviceId = origEvent.mDeviceId; mSource = origEvent.mSource; mDisplayId = origEvent.mDisplayId; + mHmac = null; // Don't copy HMAC, it will be invalid because eventTime is changing mScanCode = origEvent.mScanCode; mFlags = origEvent.mFlags; mCharacters = origEvent.mCharacters; @@ -1600,7 +1604,8 @@ public class KeyEvent extends InputEvent implements Parcelable { */ public static KeyEvent obtain(long downTime, long eventTime, int action, int code, int repeat, int metaState, - int deviceId, int scancode, int flags, int source, int displayId, String characters) { + int deviceId, int scancode, int flags, int source, int displayId, @Nullable byte[] hmac, + String characters) { KeyEvent ev = obtain(); ev.mDownTime = downTime; ev.mEventTime = eventTime; @@ -1613,6 +1618,7 @@ public class KeyEvent extends InputEvent implements Parcelable { ev.mFlags = flags; ev.mSource = source; ev.mDisplayId = displayId; + ev.mHmac = hmac; ev.mCharacters = characters; return ev; } @@ -1627,7 +1633,7 @@ public class KeyEvent extends InputEvent implements Parcelable { int code, int repeat, int metaState, int deviceId, int scancode, int flags, int source, String characters) { return obtain(downTime, eventTime, action, code, repeat, metaState, deviceId, scancode, - flags, source, INVALID_DISPLAY, characters); + flags, source, INVALID_DISPLAY, null /* hmac */, characters); } /** @@ -1650,6 +1656,7 @@ public class KeyEvent extends InputEvent implements Parcelable { ev.mFlags = other.mFlags; ev.mSource = other.mSource; ev.mDisplayId = other.mDisplayId; + ev.mHmac = other.mHmac == null ? null : other.mHmac.clone(); ev.mCharacters = other.mCharacters; return ev; } @@ -1738,6 +1745,7 @@ public class KeyEvent extends InputEvent implements Parcelable { mDeviceId = origEvent.mDeviceId; mSource = origEvent.mSource; mDisplayId = origEvent.mDisplayId; + mHmac = null; // Don't copy the hmac, it will be invalid since action is changing mScanCode = origEvent.mScanCode; mFlags = origEvent.mFlags; // Don't copy mCharacters, since one way or the other we'll lose it @@ -3091,6 +3099,7 @@ public class KeyEvent extends InputEvent implements Parcelable { mDeviceId = in.readInt(); mSource = in.readInt(); mDisplayId = in.readInt(); + mHmac = in.createByteArray(); mAction = in.readInt(); mKeyCode = in.readInt(); mRepeatCount = in.readInt(); @@ -3109,6 +3118,7 @@ public class KeyEvent extends InputEvent implements Parcelable { out.writeInt(mDeviceId); out.writeInt(mSource); out.writeInt(mDisplayId); + out.writeByteArray(mHmac); out.writeInt(mAction); out.writeInt(mKeyCode); out.writeInt(mRepeatCount); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index c5f4faf2f462..5e59143b3866 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -22,10 +22,6 @@ import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LO import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP; import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION; import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL; -import static android.view.WindowInsets.Type.ime; -import static android.view.WindowInsets.Type.systemBars; -import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; -import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST; import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED; import static java.lang.Math.max; @@ -146,7 +142,6 @@ import android.widget.FrameLayout; import android.widget.ScrollBarDrawable; import com.android.internal.R; -import com.android.internal.policy.DecorView; import com.android.internal.view.TooltipPopup; import com.android.internal.view.menu.MenuBuilder; import com.android.internal.widget.ScrollBarUtils; @@ -21856,7 +21851,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (!concatMatrix && (parentFlags & (ViewGroup.FLAG_SUPPORT_STATIC_TRANSFORMATIONS | ViewGroup.FLAG_CLIP_CHILDREN)) == ViewGroup.FLAG_CLIP_CHILDREN && - canvas.quickReject(mLeft, mTop, mRight, mBottom, Canvas.EdgeType.BW) && + canvas.quickReject(mLeft, mTop, mRight, mBottom) && (mPrivateFlags & PFLAG_DRAW_ANIMATION) == 0) { mPrivateFlags2 |= PFLAG2_VIEW_QUICK_REJECTED; return more; @@ -22140,6 +22135,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * 4. Draw children * 5. If necessary, draw the fading edges and restore layers * 6. Draw decorations (scrollbars for instance) + * 7. If necessary, draw the default focus highlight */ // Step 1, draw the background, if needed @@ -22346,6 +22342,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, // Step 6, draw decorations (foreground, scrollbars) onDrawForeground(canvas); + // Step 7, draw the default focus highlight + drawDefaultFocusHighlight(canvas); + if (isShowingLayoutBounds()) { debugDrawFocus(canvas); } @@ -23241,11 +23240,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** - * Draw the default focus highlight onto the canvas. + * Draw the default focus highlight onto the canvas if there is one and this view is focused. * @param canvas the canvas where we're drawing the highlight. */ private void drawDefaultFocusHighlight(Canvas canvas) { - if (mDefaultFocusHighlight != null) { + if (mDefaultFocusHighlight != null && isFocused()) { if (mDefaultFocusHighlightSizeChanged) { mDefaultFocusHighlightSizeChanged = false; final int l = mScrollX; diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 7a93dcc9e4ec..841c43fb1392 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -507,7 +507,7 @@ public final class ViewRootImpl implements ViewParent, @UnsupportedAppUsage public final Surface mSurface = new Surface(); private final SurfaceControl mSurfaceControl = new SurfaceControl(); - private SurfaceControl mBlastSurfaceControl; + private SurfaceControl mBlastSurfaceControl = new SurfaceControl(); private BLASTBufferQueue mBlastBufferQueue; @@ -636,6 +636,7 @@ public final class ViewRootImpl implements ViewParent, InputEventConsistencyVerifier.isInstrumentationEnabled() ? new InputEventConsistencyVerifier(this, 0) : null; + private final InsetsController mInsetsController; private final ImeFocusController mImeFocusController; /** @@ -646,7 +647,6 @@ public final class ViewRootImpl implements ViewParent, return mImeFocusController; } - private final InsetsController mInsetsController = new InsetsController(this); private final GestureExclusionTracker mGestureExclusionTracker = new GestureExclusionTracker(); @@ -705,6 +705,7 @@ public final class ViewRootImpl implements ViewParent, mFallbackEventHandler = new PhoneFallbackEventHandler(context); mChoreographer = Choreographer.getInstance(); mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE); + mInsetsController = new InsetsController(this); String processorOverrideName = context.getResources().getString( R.string.config_inputEventCompatProcessorOverrideClassName); @@ -1690,23 +1691,17 @@ public final class ViewRootImpl implements ViewParent, .build(); setBoundsLayerCrop(); mTransaction.show(mBoundsLayer).apply(); - } - return mBoundsLayer; + } + return mBoundsLayer; } Surface getOrCreateBLASTSurface(int width, int height) { if (mSurfaceControl == null || !mSurfaceControl.isValid()) { return null; } - if (mBlastSurfaceControl == null) { - mBlastSurfaceControl = new SurfaceControl.Builder(mSurfaceSession) - .setParent(mSurfaceControl) - .setName("BLAST") - .setBLASTLayer() - .build(); + if ((mBlastBufferQueue != null) && mBlastSurfaceControl.isValid()) { mBlastBufferQueue = new BLASTBufferQueue( mBlastSurfaceControl, width, height); - } mBlastBufferQueue.update(mBlastSurfaceControl, width, height); @@ -3683,32 +3678,29 @@ public final class ViewRootImpl implements ViewParent, Trace.traceBegin(Trace.TRACE_TAG_VIEW, "draw"); boolean usingAsyncReport = false; + boolean reportNextDraw = mReportNextDraw; // Capture the original value if (mAttachInfo.mThreadedRenderer != null && mAttachInfo.mThreadedRenderer.isEnabled()) { ArrayList<Runnable> commitCallbacks = mAttachInfo.mTreeObserver .captureFrameCommitCallbacks(); - if (mReportNextDraw) { - usingAsyncReport = true; + final boolean needFrameCompleteCallback = mNextDrawUseBLASTSyncTransaction || + (commitCallbacks != null && commitCallbacks.size() > 0) || + mReportNextDraw; + usingAsyncReport = mReportNextDraw; + if (needFrameCompleteCallback) { final Handler handler = mAttachInfo.mHandler; mAttachInfo.mThreadedRenderer.setFrameCompleteCallback((long frameNr) -> handler.postAtFrontOfQueue(() -> { finishBLASTSync(); - // TODO: Use the frame number - pendingDrawFinished(); + if (reportNextDraw) { + // TODO: Use the frame number + pendingDrawFinished(); + } if (commitCallbacks != null) { for (int i = 0; i < commitCallbacks.size(); i++) { commitCallbacks.get(i).run(); } } })); - } else if (commitCallbacks != null && commitCallbacks.size() > 0) { - final Handler handler = mAttachInfo.mHandler; - mAttachInfo.mThreadedRenderer.setFrameCompleteCallback((long frameNr) -> - handler.postAtFrontOfQueue(() -> { - finishBLASTSync(); - for (int i = 0; i < commitCallbacks.size(); i++) { - commitCallbacks.get(i).run(); - } - })); } } @@ -7344,7 +7336,8 @@ public final class ViewRootImpl implements ViewParent, insetsPending ? WindowManagerGlobal.RELAYOUT_INSETS_PENDING : 0, frameNumber, mTmpFrame, mPendingContentInsets, mPendingVisibleInsets, mPendingStableInsets, mPendingBackDropFrame, mPendingDisplayCutout, - mPendingMergedConfiguration, mSurfaceControl, mTempInsets, mSurfaceSize); + mPendingMergedConfiguration, mSurfaceControl, mTempInsets, mSurfaceSize, + mBlastSurfaceControl); if (mSurfaceControl.isValid()) { if (!WindowManagerGlobal.USE_BLAST_ADAPTER) { mSurface.copyFrom(mSurfaceControl); diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java index d39c3c0a5cc6..f03c4e731283 100644 --- a/core/java/android/view/WindowManagerGlobal.java +++ b/core/java/android/view/WindowManagerGlobal.java @@ -29,7 +29,6 @@ import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; -import android.provider.DeviceConfig; import android.util.AndroidRuntimeException; import android.util.ArraySet; import android.util.Log; @@ -63,10 +62,7 @@ public final class WindowManagerGlobal { * This flag controls whether ViewRootImpl will utilize the Blast Adapter * to send buffer updates to SurfaceFlinger */ - public static final boolean USE_BLAST_ADAPTER = - SystemProperties.getBoolean(String.join(".", "persist.device_config", - DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT, - WM_USE_BLAST_ADAPTER_FLAG), false); + public static final boolean USE_BLAST_ADAPTER = false; /** * The user is navigating with keys (not the touch screen), so diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java index 9f2784889cab..91778aaf51fd 100644 --- a/core/java/android/view/WindowlessWindowManager.java +++ b/core/java/android/view/WindowlessWindowManager.java @@ -161,7 +161,7 @@ public class WindowlessWindowManager implements IWindowSession { Rect outStableInsets, Rect outBackdropFrame, DisplayCutout.ParcelableWrapper cutout, MergedConfiguration mergedConfiguration, SurfaceControl outSurfaceControl, InsetsState outInsetsState, - Point outSurfaceSize) { + Point outSurfaceSize, SurfaceControl outBLASTSurfaceControl) { State state = null; synchronized (this) { state = mStateForWindow.get(window.asBinder()); diff --git a/core/java/android/widget/ScrollBarDrawable.java b/core/java/android/widget/ScrollBarDrawable.java index 80e17b5e8217..c2d4596e17dc 100644 --- a/core/java/android/widget/ScrollBarDrawable.java +++ b/core/java/android/widget/ScrollBarDrawable.java @@ -138,7 +138,7 @@ public class ScrollBarDrawable extends Drawable implements Drawable.Callback { } final Rect r = getBounds(); - if (canvas.quickReject(r.left, r.top, r.right, r.bottom, Canvas.EdgeType.AA)) { + if (canvas.quickReject(r.left, r.top, r.right, r.bottom)) { return; } diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl index a9f7b8455807..7622883326a0 100644 --- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl @@ -78,6 +78,7 @@ interface IStatusBarService in int notificationLocation, boolean modifiedBeforeSending); void onNotificationSettingsViewed(String key); void onNotificationBubbleChanged(String key, boolean isBubble); + void onBubbleNotificationSuppressionChanged(String key, boolean isSuppressed); void grantInlineReplyUriPermission(String key, in Uri uri, in UserHandle user, String packageName); void clearInlineReplyUriPermissions(String key); diff --git a/core/jni/android_content_res_ApkAssets.cpp b/core/jni/android_content_res_ApkAssets.cpp index 5d13cf82141b..b55dc68af558 100644 --- a/core/jni/android_content_res_ApkAssets.cpp +++ b/core/jni/android_content_res_ApkAssets.cpp @@ -221,7 +221,7 @@ static jobject NativeGetOverlayableInfo(JNIEnv* env, jclass /*clazz*/, jlong ptr return nullptr; } - jstring actor_string = env->NewStringUTF(actor->first.c_str()); + jstring actor_string = env->NewStringUTF(actor->second.c_str()); if (env->ExceptionCheck() || actor_string == nullptr) { jniThrowException(env, "java/io/IOException", "Error reading overlayable from APK"); return 0; diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index fb8e633fec12..e77c25efb1d4 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -537,9 +537,10 @@ public: LOGDEATH("Receiving binderDied() on JavaDeathRecipient %p\n", this); if (mObject != NULL) { JNIEnv* env = javavm_to_jnienv(mVM); - jobject jBinderProxy = javaObjectForIBinder(env, who.promote()); + ScopedLocalRef<jobject> jBinderProxy(env, javaObjectForIBinder(env, who.promote())); env->CallStaticVoidMethod(gBinderProxyOffsets.mClass, - gBinderProxyOffsets.mSendDeathNotice, mObject, jBinderProxy); + gBinderProxyOffsets.mSendDeathNotice, mObject, + jBinderProxy.get()); if (env->ExceptionCheck()) { jthrowable excep = env->ExceptionOccurred(); report_exception(env, excep, diff --git a/core/jni/android_view_InputEventSender.cpp b/core/jni/android_view_InputEventSender.cpp index f90d1cf27d7c..84acf9ac6989 100644 --- a/core/jni/android_view_InputEventSender.cpp +++ b/core/jni/android_view_InputEventSender.cpp @@ -113,10 +113,13 @@ status_t NativeInputEventSender::sendKeyEvent(uint32_t seq, const KeyEvent* even } uint32_t publishedSeq = mNextPublishedSeq++; - status_t status = mInputPublisher.publishKeyEvent(publishedSeq, - event->getDeviceId(), event->getSource(), event->getDisplayId(), event->getAction(), - event->getFlags(), event->getKeyCode(), event->getScanCode(), event->getMetaState(), - event->getRepeatCount(), event->getDownTime(), event->getEventTime()); + status_t status = + mInputPublisher.publishKeyEvent(publishedSeq, event->getDeviceId(), event->getSource(), + event->getDisplayId(), event->getHmac(), + event->getAction(), event->getFlags(), + event->getKeyCode(), event->getScanCode(), + event->getMetaState(), event->getRepeatCount(), + event->getDownTime(), event->getEventTime()); if (status) { ALOGW("Failed to send key event on channel '%s'. status=%d", getInputChannelName().c_str(), status); @@ -134,17 +137,24 @@ status_t NativeInputEventSender::sendMotionEvent(uint32_t seq, const MotionEvent uint32_t publishedSeq; for (size_t i = 0; i <= event->getHistorySize(); i++) { publishedSeq = mNextPublishedSeq++; - status_t status = mInputPublisher.publishMotionEvent(publishedSeq, - event->getDeviceId(), event->getSource(), event->getDisplayId(), - event->getAction(), event->getActionButton(), event->getFlags(), - event->getEdgeFlags(), event->getMetaState(), event->getButtonState(), - event->getClassification(), - event->getXOffset(), event->getYOffset(), - event->getXPrecision(), event->getYPrecision(), - event->getRawXCursorPosition(), event->getRawYCursorPosition(), - event->getDownTime(), event->getHistoricalEventTime(i), - event->getPointerCount(), event->getPointerProperties(), - event->getHistoricalRawPointerCoords(0, i)); + status_t status = + mInputPublisher.publishMotionEvent(publishedSeq, event->getDeviceId(), + event->getSource(), event->getDisplayId(), + event->getHmac(), event->getAction(), + event->getActionButton(), event->getFlags(), + event->getEdgeFlags(), event->getMetaState(), + event->getButtonState(), + event->getClassification(), event->getXScale(), + event->getYScale(), event->getXOffset(), + event->getYOffset(), event->getXPrecision(), + event->getYPrecision(), + event->getRawXCursorPosition(), + event->getRawYCursorPosition(), + event->getDownTime(), + event->getHistoricalEventTime(i), + event->getPointerCount(), + event->getPointerProperties(), + event->getHistoricalRawPointerCoords(0, i)); if (status) { ALOGW("Failed to send motion event sample on channel '%s'. status=%d", getInputChannelName().c_str(), status); diff --git a/core/jni/android_view_KeyEvent.cpp b/core/jni/android_view_KeyEvent.cpp index f0107723a43e..57979bd9b546 100644 --- a/core/jni/android_view_KeyEvent.cpp +++ b/core/jni/android_view_KeyEvent.cpp @@ -20,15 +20,53 @@ #include <android_runtime/AndroidRuntime.h> #include <android_runtime/Log.h> -#include <utils/Log.h> #include <input/Input.h> +#include <nativehelper/ScopedPrimitiveArray.h> #include <nativehelper/ScopedUtfChars.h> +#include <utils/Log.h> +#include <optional> #include "android_view_KeyEvent.h" #include "core_jni_helpers.h" namespace android { +/** + * Convert an std::array of bytes into a Java object. + */ +template <size_t N> +static ScopedLocalRef<jbyteArray> toJbyteArray(JNIEnv* env, const std::array<uint8_t, N>& data) { + ScopedLocalRef<jbyteArray> array(env, env->NewByteArray(N)); + if (array.get() == nullptr) { + jniThrowException(env, "java/lang/OutOfMemoryError", nullptr); + return array; + } + static_assert(sizeof(char) == sizeof(uint8_t)); + env->SetByteArrayRegion(array.get(), 0, N, reinterpret_cast<const signed char*>(data.data())); + return array; +} + +/** + * Convert a Java object into an std::array of bytes of size N. + * If the object is null, or the length is unexpected, return std::nullopt. + */ +template <size_t N> +static std::optional<std::array<uint8_t, N>> fromJobject(JNIEnv* env, jobject object) { + if (object == nullptr) { + return std::nullopt; + } + jbyteArray javaArray = reinterpret_cast<jbyteArray>(object); + ScopedByteArrayRO bytes(env, javaArray); + if (bytes.size() != N) { + ALOGE("Could not initialize array from java object, expected length %zu but got %zu", N, + bytes.size()); + return std::nullopt; + } + std::array<uint8_t, N> array; + std::move(bytes.get(), bytes.get() + N, array.begin()); + return array; +} + // ---------------------------------------------------------------------------- static struct { @@ -40,6 +78,7 @@ static struct { jfieldID mDeviceId; jfieldID mSource; jfieldID mDisplayId; + jfieldID mHmac; jfieldID mMetaState; jfieldID mAction; jfieldID mKeyCode; @@ -54,20 +93,16 @@ static struct { // ---------------------------------------------------------------------------- jobject android_view_KeyEvent_fromNative(JNIEnv* env, const KeyEvent* event) { - jobject eventObj = env->CallStaticObjectMethod(gKeyEventClassInfo.clazz, - gKeyEventClassInfo.obtain, - nanoseconds_to_milliseconds(event->getDownTime()), - nanoseconds_to_milliseconds(event->getEventTime()), - event->getAction(), - event->getKeyCode(), - event->getRepeatCount(), - event->getMetaState(), - event->getDeviceId(), - event->getScanCode(), - event->getFlags(), - event->getSource(), - event->getDisplayId(), - NULL); + ScopedLocalRef<jbyteArray> hmac = toJbyteArray(env, event->getHmac()); + jobject eventObj = + env->CallStaticObjectMethod(gKeyEventClassInfo.clazz, gKeyEventClassInfo.obtain, + nanoseconds_to_milliseconds(event->getDownTime()), + nanoseconds_to_milliseconds(event->getEventTime()), + event->getAction(), event->getKeyCode(), + event->getRepeatCount(), event->getMetaState(), + event->getDeviceId(), event->getScanCode(), + event->getFlags(), event->getSource(), + event->getDisplayId(), hmac.get(), NULL); if (env->ExceptionCheck()) { ALOGE("An exception occurred while obtaining a key event."); LOGE_EX(env); @@ -82,6 +117,11 @@ status_t android_view_KeyEvent_toNative(JNIEnv* env, jobject eventObj, jint deviceId = env->GetIntField(eventObj, gKeyEventClassInfo.mDeviceId); jint source = env->GetIntField(eventObj, gKeyEventClassInfo.mSource); jint displayId = env->GetIntField(eventObj, gKeyEventClassInfo.mDisplayId); + jobject hmacObj = env->GetObjectField(eventObj, gKeyEventClassInfo.mHmac); + std::optional<std::array<uint8_t, 32>> hmac = fromJobject<32>(env, hmacObj); + if (!hmac) { + hmac = INVALID_HMAC; + } jint metaState = env->GetIntField(eventObj, gKeyEventClassInfo.mMetaState); jint action = env->GetIntField(eventObj, gKeyEventClassInfo.mAction); jint keyCode = env->GetIntField(eventObj, gKeyEventClassInfo.mKeyCode); @@ -91,10 +131,9 @@ status_t android_view_KeyEvent_toNative(JNIEnv* env, jobject eventObj, jlong downTime = env->GetLongField(eventObj, gKeyEventClassInfo.mDownTime); jlong eventTime = env->GetLongField(eventObj, gKeyEventClassInfo.mEventTime); - event->initialize(deviceId, source, displayId, action, flags, keyCode, scanCode, metaState, - repeatCount, - milliseconds_to_nanoseconds(downTime), - milliseconds_to_nanoseconds(eventTime)); + event->initialize(deviceId, source, displayId, *hmac, action, flags, keyCode, scanCode, + metaState, repeatCount, milliseconds_to_nanoseconds(downTime), + milliseconds_to_nanoseconds(eventTime)); return OK; } @@ -134,8 +173,9 @@ int register_android_view_KeyEvent(JNIEnv* env) { jclass clazz = FindClassOrDie(env, "android/view/KeyEvent"); gKeyEventClassInfo.clazz = MakeGlobalRefOrDie(env, clazz); - gKeyEventClassInfo.obtain = GetStaticMethodIDOrDie(env, gKeyEventClassInfo.clazz, - "obtain", "(JJIIIIIIIIILjava/lang/String;)Landroid/view/KeyEvent;"); + gKeyEventClassInfo.obtain = + GetStaticMethodIDOrDie(env, gKeyEventClassInfo.clazz, "obtain", + "(JJIIIIIIIII[BLjava/lang/String;)Landroid/view/KeyEvent;"); gKeyEventClassInfo.recycle = GetMethodIDOrDie(env, gKeyEventClassInfo.clazz, "recycle", "()V"); @@ -143,6 +183,7 @@ int register_android_view_KeyEvent(JNIEnv* env) { gKeyEventClassInfo.mSource = GetFieldIDOrDie(env, gKeyEventClassInfo.clazz, "mSource", "I"); gKeyEventClassInfo.mDisplayId = GetFieldIDOrDie(env, gKeyEventClassInfo.clazz, "mDisplayId", "I"); + gKeyEventClassInfo.mHmac = GetFieldIDOrDie(env, gKeyEventClassInfo.clazz, "mHmac", "[B"); gKeyEventClassInfo.mMetaState = GetFieldIDOrDie(env, gKeyEventClassInfo.clazz, "mMetaState", "I"); gKeyEventClassInfo.mAction = GetFieldIDOrDie(env, gKeyEventClassInfo.clazz, "mAction", "I"); diff --git a/core/jni/android_view_KeyEvent.h b/core/jni/android_view_KeyEvent.h index 586eb2f2a139..dab6bb75c91e 100644 --- a/core/jni/android_view_KeyEvent.h +++ b/core/jni/android_view_KeyEvent.h @@ -42,4 +42,4 @@ extern status_t android_view_KeyEvent_recycle(JNIEnv* env, jobject eventObj); } // namespace android -#endif // _ANDROID_OS_KEYEVENT_H +#endif // _ANDROID_VIEW_KEYEVENT_H diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp index feb9fe39e0a8..3335fb23cfb7 100644 --- a/core/jni/android_view_MotionEvent.cpp +++ b/core/jni/android_view_MotionEvent.cpp @@ -330,14 +330,12 @@ static void pointerPropertiesFromNative(JNIEnv* env, const PointerProperties* po // ---------------------------------------------------------------------------- -static jlong android_view_MotionEvent_nativeInitialize(JNIEnv* env, jclass clazz, - jlong nativePtr, - jint deviceId, jint source, jint displayId, jint action, jint flags, jint edgeFlags, - jint metaState, jint buttonState, jint classification, - jfloat xOffset, jfloat yOffset, jfloat xPrecision, jfloat yPrecision, - jlong downTimeNanos, jlong eventTimeNanos, - jint pointerCount, jobjectArray pointerPropertiesObjArray, - jobjectArray pointerCoordsObjArray) { +static jlong android_view_MotionEvent_nativeInitialize( + JNIEnv* env, jclass clazz, jlong nativePtr, jint deviceId, jint source, jint displayId, + jint action, jint flags, jint edgeFlags, jint metaState, jint buttonState, + jint classification, jfloat xOffset, jfloat yOffset, jfloat xPrecision, jfloat yPrecision, + jlong downTimeNanos, jlong eventTimeNanos, jint pointerCount, + jobjectArray pointerPropertiesObjArray, jobjectArray pointerCoordsObjArray) { if (!validatePointerCount(env, pointerCount) || !validatePointerPropertiesArray(env, pointerPropertiesObjArray, pointerCount) || !validatePointerCoordsObjArray(env, pointerCoordsObjArray, pointerCount)) { @@ -371,11 +369,12 @@ static jlong android_view_MotionEvent_nativeInitialize(JNIEnv* env, jclass clazz env->DeleteLocalRef(pointerCoordsObj); } - event->initialize(deviceId, source, displayId, action, 0, flags, edgeFlags, metaState, - buttonState, static_cast<MotionClassification>(classification), - xOffset, yOffset, xPrecision, yPrecision, - AMOTION_EVENT_INVALID_CURSOR_POSITION, AMOTION_EVENT_INVALID_CURSOR_POSITION, - downTimeNanos, eventTimeNanos, pointerCount, pointerProperties, rawPointerCoords); + event->initialize(deviceId, source, displayId, INVALID_HMAC, action, 0, flags, edgeFlags, + metaState, buttonState, static_cast<MotionClassification>(classification), + 1 /*xScale*/, 1 /*yScale*/, xOffset, yOffset, xPrecision, yPrecision, + AMOTION_EVENT_INVALID_CURSOR_POSITION, AMOTION_EVENT_INVALID_CURSOR_POSITION, + downTimeNanos, eventTimeNanos, pointerCount, pointerProperties, + rawPointerCoords); return reinterpret_cast<jlong>(event); @@ -757,155 +756,76 @@ static void android_view_MotionEvent_nativeScale(jlong nativePtr, jfloat scale) // ---------------------------------------------------------------------------- static const JNINativeMethod gMotionEventMethods[] = { - /* name, signature, funcPtr */ - { "nativeInitialize", - "(JIIIIIIIIIFFFFJJI[Landroid/view/MotionEvent$PointerProperties;" - "[Landroid/view/MotionEvent$PointerCoords;)J", - (void*)android_view_MotionEvent_nativeInitialize }, - { "nativeDispose", - "(J)V", - (void*)android_view_MotionEvent_nativeDispose }, - { "nativeAddBatch", - "(JJ[Landroid/view/MotionEvent$PointerCoords;I)V", - (void*)android_view_MotionEvent_nativeAddBatch }, - { "nativeReadFromParcel", - "(JLandroid/os/Parcel;)J", - (void*)android_view_MotionEvent_nativeReadFromParcel }, - { "nativeWriteToParcel", - "(JLandroid/os/Parcel;)V", - (void*)android_view_MotionEvent_nativeWriteToParcel }, - { "nativeAxisToString", "(I)Ljava/lang/String;", - (void*)android_view_MotionEvent_nativeAxisToString }, - { "nativeAxisFromString", "(Ljava/lang/String;)I", - (void*)android_view_MotionEvent_nativeAxisFromString }, - { "nativeGetPointerProperties", - "(JILandroid/view/MotionEvent$PointerProperties;)V", - (void*)android_view_MotionEvent_nativeGetPointerProperties }, - { "nativeGetPointerCoords", - "(JIILandroid/view/MotionEvent$PointerCoords;)V", - (void*)android_view_MotionEvent_nativeGetPointerCoords }, - - // --------------- @FastNative ---------------------- - { "nativeGetPointerId", - "(JI)I", - (void*)android_view_MotionEvent_nativeGetPointerId }, - { "nativeGetToolType", - "(JI)I", - (void*)android_view_MotionEvent_nativeGetToolType }, - { "nativeGetEventTimeNanos", - "(JI)J", - (void*)android_view_MotionEvent_nativeGetEventTimeNanos }, - { "nativeGetRawAxisValue", - "(JIII)F", - (void*)android_view_MotionEvent_nativeGetRawAxisValue }, - { "nativeGetAxisValue", - "(JIII)F", - (void*)android_view_MotionEvent_nativeGetAxisValue }, - { "nativeTransform", - "(JLandroid/graphics/Matrix;)V", - (void*)android_view_MotionEvent_nativeTransform }, - - // --------------- @CriticalNative ------------------ - - { "nativeCopy", - "(JJZ)J", - (void*)android_view_MotionEvent_nativeCopy }, - { "nativeGetDeviceId", - "(J)I", - (void*)android_view_MotionEvent_nativeGetDeviceId }, - { "nativeGetSource", - "(J)I", - (void*)android_view_MotionEvent_nativeGetSource }, - { "nativeSetSource", - "(JI)V", - (void*)android_view_MotionEvent_nativeSetSource }, - { "nativeGetDisplayId", - "(J)I", - (void*)android_view_MotionEvent_nativeGetDisplayId }, - { "nativeSetDisplayId", - "(JI)V", - (void*)android_view_MotionEvent_nativeSetDisplayId }, - { "nativeGetAction", - "(J)I", - (void*)android_view_MotionEvent_nativeGetAction }, - { "nativeSetAction", - "(JI)V", - (void*)android_view_MotionEvent_nativeSetAction }, - { "nativeGetActionButton", - "(J)I", - (void*)android_view_MotionEvent_nativeGetActionButton}, - { "nativeSetActionButton", - "(JI)V", - (void*)android_view_MotionEvent_nativeSetActionButton}, - { "nativeIsTouchEvent", - "(J)Z", - (void*)android_view_MotionEvent_nativeIsTouchEvent }, - { "nativeGetFlags", - "(J)I", - (void*)android_view_MotionEvent_nativeGetFlags }, - { "nativeSetFlags", - "(JI)V", - (void*)android_view_MotionEvent_nativeSetFlags }, - { "nativeGetEdgeFlags", - "(J)I", - (void*)android_view_MotionEvent_nativeGetEdgeFlags }, - { "nativeSetEdgeFlags", - "(JI)V", - (void*)android_view_MotionEvent_nativeSetEdgeFlags }, - { "nativeGetMetaState", - "(J)I", - (void*)android_view_MotionEvent_nativeGetMetaState }, - { "nativeGetButtonState", - "(J)I", - (void*)android_view_MotionEvent_nativeGetButtonState }, - { "nativeSetButtonState", - "(JI)V", - (void*)android_view_MotionEvent_nativeSetButtonState }, - { "nativeGetClassification", - "(J)I", - (void*)android_view_MotionEvent_nativeGetClassification }, - { "nativeOffsetLocation", - "(JFF)V", - (void*)android_view_MotionEvent_nativeOffsetLocation }, - { "nativeGetXOffset", - "(J)F", - (void*)android_view_MotionEvent_nativeGetXOffset }, - { "nativeGetYOffset", - "(J)F", - (void*)android_view_MotionEvent_nativeGetYOffset }, - { "nativeGetXPrecision", - "(J)F", - (void*)android_view_MotionEvent_nativeGetXPrecision }, - { "nativeGetYPrecision", - "(J)F", - (void*)android_view_MotionEvent_nativeGetYPrecision }, - { "nativeGetXCursorPosition", - "(J)F", - (void*)android_view_MotionEvent_nativeGetXCursorPosition }, - { "nativeGetYCursorPosition", - "(J)F", - (void*)android_view_MotionEvent_nativeGetYCursorPosition }, - { "nativeSetCursorPosition", - "(JFF)V", - (void*)android_view_MotionEvent_nativeSetCursorPosition }, - { "nativeGetDownTimeNanos", - "(J)J", - (void*)android_view_MotionEvent_nativeGetDownTimeNanos }, - { "nativeSetDownTimeNanos", - "(JJ)V", - (void*)android_view_MotionEvent_nativeSetDownTimeNanos }, - { "nativeGetPointerCount", - "(J)I", - (void*)android_view_MotionEvent_nativeGetPointerCount }, - { "nativeFindPointerIndex", - "(JI)I", - (void*)android_view_MotionEvent_nativeFindPointerIndex }, - { "nativeGetHistorySize", - "(J)I", - (void*)android_view_MotionEvent_nativeGetHistorySize }, - { "nativeScale", - "(JF)V", - (void*)android_view_MotionEvent_nativeScale }, + /* name, signature, funcPtr */ + {"nativeInitialize", + "(JIIIIIIIIIFFFFJJI[Landroid/view/MotionEvent$PointerProperties;" + "[Landroid/view/MotionEvent$PointerCoords;)J", + (void*)android_view_MotionEvent_nativeInitialize}, + {"nativeDispose", "(J)V", (void*)android_view_MotionEvent_nativeDispose}, + {"nativeAddBatch", "(JJ[Landroid/view/MotionEvent$PointerCoords;I)V", + (void*)android_view_MotionEvent_nativeAddBatch}, + {"nativeReadFromParcel", "(JLandroid/os/Parcel;)J", + (void*)android_view_MotionEvent_nativeReadFromParcel}, + {"nativeWriteToParcel", "(JLandroid/os/Parcel;)V", + (void*)android_view_MotionEvent_nativeWriteToParcel}, + {"nativeAxisToString", "(I)Ljava/lang/String;", + (void*)android_view_MotionEvent_nativeAxisToString}, + {"nativeAxisFromString", "(Ljava/lang/String;)I", + (void*)android_view_MotionEvent_nativeAxisFromString}, + {"nativeGetPointerProperties", "(JILandroid/view/MotionEvent$PointerProperties;)V", + (void*)android_view_MotionEvent_nativeGetPointerProperties}, + {"nativeGetPointerCoords", "(JIILandroid/view/MotionEvent$PointerCoords;)V", + (void*)android_view_MotionEvent_nativeGetPointerCoords}, + + // --------------- @FastNative ---------------------- + {"nativeGetPointerId", "(JI)I", (void*)android_view_MotionEvent_nativeGetPointerId}, + {"nativeGetToolType", "(JI)I", (void*)android_view_MotionEvent_nativeGetToolType}, + {"nativeGetEventTimeNanos", "(JI)J", + (void*)android_view_MotionEvent_nativeGetEventTimeNanos}, + {"nativeGetRawAxisValue", "(JIII)F", (void*)android_view_MotionEvent_nativeGetRawAxisValue}, + {"nativeGetAxisValue", "(JIII)F", (void*)android_view_MotionEvent_nativeGetAxisValue}, + {"nativeTransform", "(JLandroid/graphics/Matrix;)V", + (void*)android_view_MotionEvent_nativeTransform}, + + // --------------- @CriticalNative ------------------ + + {"nativeCopy", "(JJZ)J", (void*)android_view_MotionEvent_nativeCopy}, + {"nativeGetDeviceId", "(J)I", (void*)android_view_MotionEvent_nativeGetDeviceId}, + {"nativeGetSource", "(J)I", (void*)android_view_MotionEvent_nativeGetSource}, + {"nativeSetSource", "(JI)V", (void*)android_view_MotionEvent_nativeSetSource}, + {"nativeGetDisplayId", "(J)I", (void*)android_view_MotionEvent_nativeGetDisplayId}, + {"nativeSetDisplayId", "(JI)V", (void*)android_view_MotionEvent_nativeSetDisplayId}, + {"nativeGetAction", "(J)I", (void*)android_view_MotionEvent_nativeGetAction}, + {"nativeSetAction", "(JI)V", (void*)android_view_MotionEvent_nativeSetAction}, + {"nativeGetActionButton", "(J)I", (void*)android_view_MotionEvent_nativeGetActionButton}, + {"nativeSetActionButton", "(JI)V", (void*)android_view_MotionEvent_nativeSetActionButton}, + {"nativeIsTouchEvent", "(J)Z", (void*)android_view_MotionEvent_nativeIsTouchEvent}, + {"nativeGetFlags", "(J)I", (void*)android_view_MotionEvent_nativeGetFlags}, + {"nativeSetFlags", "(JI)V", (void*)android_view_MotionEvent_nativeSetFlags}, + {"nativeGetEdgeFlags", "(J)I", (void*)android_view_MotionEvent_nativeGetEdgeFlags}, + {"nativeSetEdgeFlags", "(JI)V", (void*)android_view_MotionEvent_nativeSetEdgeFlags}, + {"nativeGetMetaState", "(J)I", (void*)android_view_MotionEvent_nativeGetMetaState}, + {"nativeGetButtonState", "(J)I", (void*)android_view_MotionEvent_nativeGetButtonState}, + {"nativeSetButtonState", "(JI)V", (void*)android_view_MotionEvent_nativeSetButtonState}, + {"nativeGetClassification", "(J)I", + (void*)android_view_MotionEvent_nativeGetClassification}, + {"nativeOffsetLocation", "(JFF)V", (void*)android_view_MotionEvent_nativeOffsetLocation}, + {"nativeGetXOffset", "(J)F", (void*)android_view_MotionEvent_nativeGetXOffset}, + {"nativeGetYOffset", "(J)F", (void*)android_view_MotionEvent_nativeGetYOffset}, + {"nativeGetXPrecision", "(J)F", (void*)android_view_MotionEvent_nativeGetXPrecision}, + {"nativeGetYPrecision", "(J)F", (void*)android_view_MotionEvent_nativeGetYPrecision}, + {"nativeGetXCursorPosition", "(J)F", + (void*)android_view_MotionEvent_nativeGetXCursorPosition}, + {"nativeGetYCursorPosition", "(J)F", + (void*)android_view_MotionEvent_nativeGetYCursorPosition}, + {"nativeSetCursorPosition", "(JFF)V", + (void*)android_view_MotionEvent_nativeSetCursorPosition}, + {"nativeGetDownTimeNanos", "(J)J", (void*)android_view_MotionEvent_nativeGetDownTimeNanos}, + {"nativeSetDownTimeNanos", "(JJ)V", (void*)android_view_MotionEvent_nativeSetDownTimeNanos}, + {"nativeGetPointerCount", "(J)I", (void*)android_view_MotionEvent_nativeGetPointerCount}, + {"nativeFindPointerIndex", "(JI)I", (void*)android_view_MotionEvent_nativeFindPointerIndex}, + {"nativeGetHistorySize", "(J)I", (void*)android_view_MotionEvent_nativeGetHistorySize}, + {"nativeScale", "(JF)V", (void*)android_view_MotionEvent_nativeScale}, }; int register_android_view_MotionEvent(JNIEnv* env) { diff --git a/core/jni/android_view_MotionEvent.h b/core/jni/android_view_MotionEvent.h index 0cf1fb2f2203..9ce4bf367688 100644 --- a/core/jni/android_view_MotionEvent.h +++ b/core/jni/android_view_MotionEvent.h @@ -38,4 +38,4 @@ extern status_t android_view_MotionEvent_recycle(JNIEnv* env, jobject eventObj); } // namespace android -#endif // _ANDROID_OS_KEYEVENT_H +#endif // _ANDROID_VIEW_MOTIONEVENT_H diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index 0c7484216367..927be503c23b 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -147,7 +147,8 @@ message DisplayContentProto { optional int32 id = 2; repeated StackProto stacks = 3; optional DockedStackDividerControllerProto docked_stack_divider_controller = 4; - optional PinnedStackControllerProto pinned_stack_controller = 5; + // Will be removed soon. + optional PinnedStackControllerProto pinned_stack_controller = 5 [deprecated=true]; /* non app windows */ repeated WindowTokenProto above_app_windows = 6; repeated WindowTokenProto below_app_windows = 7; @@ -184,8 +185,8 @@ message DockedStackDividerControllerProto { message PinnedStackControllerProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; - optional .android.graphics.RectProto default_bounds = 1; - optional .android.graphics.RectProto movement_bounds = 2; + optional .android.graphics.RectProto default_bounds = 1 [deprecated=true]; + optional .android.graphics.RectProto movement_bounds = 2 [deprecated=true]; } /* represents TaskStack */ diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 020a8352ad07..4d319dfbe525 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3339,6 +3339,13 @@ <permission android:name="android.permission.BIND_AUTOFILL_FIELD_CLASSIFICATION_SERVICE" android:protectionLevel="signature" /> + <!-- Must be required by an {@link android.service.autofill.InlineSuggestionRenderService} + to ensure that only the system can bind to it. + @hide This is not a third-party API (intended for OEMs and system apps). + --> + <permission android:name="android.permission.BIND_INLINE_SUGGESTION_RENDER_SERVICE" + android:protectionLevel="signature" /> + <!-- Must be required by a android.service.textclassifier.TextClassifierService, to ensure that only the system can bind to it. @SystemApi @hide This is not a third-party API (intended for OEMs and system apps). @@ -4849,6 +4856,19 @@ <permission android:name="android.permission.ACCESS_SHARED_LIBRARIES" android:protectionLevel="signature|installer" /> + <!-- Allows an app to log compat change usage. + @hide <p>Not for use by third-party applications.</p> --> + <permission android:name="android.permission.LOG_COMPAT_CHANGE" + android:protectionLevel="signature" /> + <!-- Allows an app to read compat change config. + @hide <p>Not for use by third-party applications.</p> --> + <permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG" + android:protectionLevel="signature" /> + <!-- Allows an app to override compat change config. + @hide <p>Not for use by third-party applications.</p> --> + <permission android:name="android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG" + android:protectionLevel="signature" /> + <!-- Allows input events to be monitored. Very dangerous! @hide --> <permission android:name="android.permission.MONITOR_INPUT" android:protectionLevel="signature" /> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index de8f55bb8036..c34a485bc7a9 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Jy het jou ontsluitpatroon <xliff:g id="NUMBER_0">%1$d</xliff:g> keer verkeerdelik geteken. Na nog <xliff:g id="NUMBER_1">%2$d</xliff:g> onsuksesvolle pogings, sal jy gevra word om jou foon te ontsluit deur middel van \'n e-posrekening.\n\n Probeer weer oor <xliff:g id="NUMBER_2">%3$d</xliff:g> sekondes."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Verwyder"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Verhoog volume bo aanbevole vlak?\n\nOm lang tydperke teen hoë volume te luister, kan jou gehoor beskadig."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Gebruik toeganklikheidkortpad?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Wanneer die kortpad aan is, sal \'n toeganklikheidkenmerk begin word as albei volumeknoppies 3 sekondes lank gedruk word.\n\n Bestaande toeganklikheidkenmerk:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Jy kan die kenmerk in Instellings > Toeganklikheid verander."</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index ec9abfe3e67f..23e6ccdbd87f 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"የመክፈቻ ስርዓተ ጥለቱን <xliff:g id="NUMBER_0">%1$d</xliff:g> ጊዜ በትክክል አልሳሉትም። ከ<xliff:g id="NUMBER_1">%2$d</xliff:g> ተጨማሪ ያልተሳኩ ሙከራዎች በኋላ የኢሜይል መለያ ተጠቅመው ስልክዎን እንዲከፍቱ ይጠየቃሉ።\n\nእባክዎ ከ<xliff:g id="NUMBER_2">%3$d</xliff:g> ሰከንዶች በኋላ እንደገና ይሞክሩ።"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"አስወግድ"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"ድምጹ ከሚመከረው መጠን በላይ ከፍ ይበል?\n\nበከፍተኛ ድምጽ ለረጅም ጊዜ ማዳመጥ ጆሮዎን ሊጎዳው ይችላል።"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"የተደራሽነት አቋራጭ ጥቅም ላይ ይዋል?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"አቋራጩ ሲበራ ሁለቱንም የድምፅ አዝራሮች ለ3 ሰከንዶች ተጭኖ መቆየት የተደራሽነት ባህሪን ያስጀምረዋል።\n\n አሁን ያለ የተደራሽነት ባህሪ፦\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ባህሪውን በቅንብሮች > ተደራሽነት ውስጥ ሊለውጡት ይችላሉ።"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 0d70a11f2eeb..80c04ebee695 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -222,7 +222,7 @@ <string name="reboot_to_update_prepare" msgid="6978842143587422365">"جارٍ الإعداد للتحديث…"</string> <string name="reboot_to_update_package" msgid="4644104795527534811">"جارٍ معالجة حزمة التحديث…"</string> <string name="reboot_to_update_reboot" msgid="4474726009984452312">"جارٍ إعادة التشغيل…"</string> - <string name="reboot_to_reset_title" msgid="2226229680017882787">"إعادة الضبط بحسب بيانات المصنع"</string> + <string name="reboot_to_reset_title" msgid="2226229680017882787">"إعادة الضبط على الإعدادات الأصلية"</string> <string name="reboot_to_reset_message" msgid="3347690497972074356">"جارٍ إعادة التشغيل…"</string> <string name="shutdown_progress" msgid="5017145516412657345">"جارٍ إيقاف التشغيل..."</string> <string name="shutdown_confirm" product="tablet" msgid="2872769463279602432">"سيتم إيقاف تشغيل الجهاز اللوحي."</string> @@ -320,7 +320,7 @@ <string name="capability_title_canRetrieveWindowContent" msgid="7554282892101587296">"استرداد محتوى النافذة"</string> <string name="capability_desc_canRetrieveWindowContent" msgid="6195610527625237661">"فحص محتوى نافذة يتم التفاعل معها"</string> <string name="capability_title_canRequestTouchExploration" msgid="327598364696316213">"تشغيل الاستكشاف باللمس"</string> - <string name="capability_desc_canRequestTouchExploration" msgid="4394677060796752976">"سيتم نطق العناصر التي تم النقر عليها بصوت عال ويمكن استكشاف الشاشة باستخدام الإيماءات."</string> + <string name="capability_desc_canRequestTouchExploration" msgid="4394677060796752976">"سيتم قول العناصر التي تم النقر عليها بصوت عال ويمكن استكشاف الشاشة باستخدام الإيماءات."</string> <string name="capability_title_canRequestFilterKeyEvents" msgid="2772371671541753254">"ملاحظة النص الذي تكتبه"</string> <string name="capability_desc_canRequestFilterKeyEvents" msgid="2381315802405773092">"يتضمن بيانات شخصية مثل أرقام بطاقات الائتمان وكلمات المرور."</string> <string name="capability_title_canControlMagnification" msgid="7701572187333415795">"التحكم في تكبير الشاشة"</string> @@ -676,8 +676,8 @@ <string name="policylab_forceLock" msgid="7360335502968476434">"قفل الشاشة"</string> <string name="policydesc_forceLock" msgid="1008844760853899693">"التحكّم في طريقة ووقت قفل الشاشة"</string> <string name="policylab_wipeData" msgid="1359485247727537311">"محو جميع البيانات"</string> - <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"يمكنك محو بيانات الجهاز اللوحي بدون تحذير، وذلك عبر إجراء إعادة الضبط بحسب بيانات المصنع."</string> - <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"يمكنك محو بيانات جهاز Android TV بدون تحذير عن طريق تنفيذ إعادة الضبط بحسب بيانات المصنع."</string> + <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"يمكنك محو بيانات الجهاز اللوحي بدون تحذير، وذلك عبر إجراء إعادة الضبط على الإعدادات الأصلية."</string> + <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"يمكنك محو بيانات جهاز Android TV بدون تحذير عن طريق تنفيذ إعادة الضبط على الإعدادات الأصلية."</string> <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"محو بيانات الهاتف بدون تحذير، وذلك من خلال إعادة ضبط البيانات على الإعدادات الأصلية"</string> <string name="policylab_wipeData_secondaryUser" msgid="413813645323433166">"محو بيانات المستخدم"</string> <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="2336676480090926470">"لمحو بيانات هذا المستخدم على هذا الجهاز اللوحي بدون تحذير."</string> @@ -1701,6 +1701,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"لقد رسمت نقش فتح القفل بشكل غير صحيح <xliff:g id="NUMBER_0">%1$d</xliff:g> مرة. بعد إجراء <xliff:g id="NUMBER_1">%2$d</xliff:g> من المحاولات غير الناجحة الأخرى، ستُطالب بإلغاء تأمين الهاتف باستخدام حساب بريد إلكتروني لإلغاء تأمين الهاتف.\n\n أعد المحاولة خلال <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانية."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"إزالة"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"هل تريد رفع مستوى الصوت فوق المستوى الموصى به؟\n\nقد يضر سماع صوت عالٍ لفترات طويلة بسمعك."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"هل تريد استخدام اختصار \"سهولة الاستخدام\"؟"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"عند تشغيل الاختصار، يؤدي الضغط على زرّي مستوى الصوت لمدة 3 ثوانٍ إلى تفعيل ميزة \"سهولة الاستخدام\".\n\n ميزة \"سهولة الاستخدام\" الحالية:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n يمكنك تغيير الميزة من \"الإعدادات\" > \"سهولة الاستخدام\"."</string> @@ -1932,7 +1934,7 @@ <string name="zen_mode_default_events_name" msgid="2280682960128512257">"حدث"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"النوم"</string> <string name="muted_by" msgid="91464083490094950">"يعمل <xliff:g id="THIRD_PARTY">%1$s</xliff:g> على كتم بعض الأصوات."</string> - <string name="system_error_wipe_data" msgid="5910572292172208493">"حدثت مشكلة داخلية في جهازك، وقد لا يستقر وضعه حتى إجراء إعادة الضبط بحسب بيانات المصنع."</string> + <string name="system_error_wipe_data" msgid="5910572292172208493">"حدثت مشكلة داخلية في جهازك، وقد لا يستقر وضعه حتى إجراء إعادة الضبط على الإعدادات الأصلية."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"حدثت مشكلة داخلية في جهازك. يمكنك الاتصال بالمصنِّع للحصول على تفاصيل."</string> <string name="stk_cc_ussd_to_dial" msgid="3139884150741157610">"تم تغيير طلب USSD إلى مكالمة عادية."</string> <string name="stk_cc_ussd_to_ss" msgid="4826846653052609738">"تم تغيير طلب USSD إلى طلب SS."</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index ad11a37524a0..73e32b85c224 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"আপুনি আপোনাৰ ল\'ক খোলাৰ আৰ্হিটো <xliff:g id="NUMBER_0">%1$d</xliff:g>বাৰ ভুলকৈ আঁকিছে। <xliff:g id="NUMBER_1">%2$d</xliff:g>তকৈ বেছি বাৰ ভুল আৰ্হি আঁকিলে আপোনাৰ ফ\'নটো কোনো একাউণ্টৰ জৰিয়তে আনলক কৰিবলৈ কোৱা হ\'ব।\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> ছেকেণ্ডৰ পিছত আকৌ চেষ্টা কৰক।"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"আঁতৰাওক"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"অনুমোদিত স্তৰতকৈ ওপৰলৈ ভলিউম বঢ়াব নেকি?\n\nদীৰ্ঘ সময়ৰ বাবে উচ্চ ভলিউমত শুনাৰ ফলত শ্ৰৱণ ক্ষমতাৰ ক্ষতি হ\'ব পাৰে।"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"দিব্যাংগসকলৰ সুবিধাৰ শ্বৰ্টকাট ব্যৱহাৰ কৰেনে?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"শ্বৰ্টকাট অন হৈ থকাৰ সময়ত দুয়োটা ভলিউম বুটামত ৩ ছেকেণ্ডৰ বাবে ছাপ দি থাকিলে দিব্যাংগসকলৰ বাবে থকা সুবিধা এটা আৰম্ভ হ\'ব। \n\n চলিত দিব্যাংগসকলৰ সুবিধা:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n আপুনি এই সুবিধাটো ছেটিংসমূহ > দিব্যাংগসকলৰ বাবে সুবিধা-লৈ গৈ সলনি কৰিব পাৰে।"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index a535f1f0e2ba..c894c29956dc 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Siz artıq modeli <xliff:g id="NUMBER_0">%1$d</xliff:g> dəfə yanlış daxil etmisiniz.<xliff:g id="NUMBER_1">%2$d</xliff:g> dəfə də yanlış daxil etsəniz, telefonun kilidinin açılması üçün elektron poçt ünvanınız tələb olunacaq.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> saniyə ərzində yenidən cəhd edin."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" - "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Yığışdır"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Səsin həcmi tövsiyə olunan səviyyədən artıq olsun?\n\nYüksək səsi uzun zaman dinləmək eşitmə qabiliyyətinizə zərər vura bilər."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Əlçatımlılıq Qısayolu istifadə edilsin?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Qısayol aktiv olduqda hər iki səs düyməsinə 3 saniyə basıb saxlamaqla əlçatımlılıq funksiyası işə başlayacaq.\n\n Cari əlçatımlılıq funksiyası:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funksiyanı Ayarlar və Əçatımlılıq bölməsində dəyişə bilərsiniz."</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 249e5af2d585..909c31558e18 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -1635,6 +1635,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Nacrtali ste šablon za otključavanje netačno <xliff:g id="NUMBER_0">%1$d</xliff:g> puta. Posle još <xliff:g id="NUMBER_1">%2$d</xliff:g> neuspešna(ih) pokušaja, od vas će biti zatraženo da otključate telefon pomoću naloga e-pošte.\n\nProbajte ponovo za <xliff:g id="NUMBER_2">%3$d</xliff:g> sekunde/i."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Ukloni"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Želite da pojačate zvuk iznad preporučenog nivoa?\n\nSlušanje glasne muzike duže vreme može da vam ošteti sluh."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Želite li da koristite prečicu za pristupačnost?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Kada je prečica uključena, pritisnite oba dugmeta za jačinu zvuka da biste pokrenuli funkciju pristupačnosti.\n\n Aktuelna funkcija pristupačnosti:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Možete da promenite funkciju u odeljku Podešavanja > Pristupačnost."</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index dc4c56e684ee..19dcf927b74d 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -1657,6 +1657,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) вам будзе прапанавана разблакiраваць тэлефон, увайшоўшы ў Google.\n\n Паўтарыце спробу праз <xliff:g id="NUMBER_2">%3$d</xliff:g> с."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Выдалiць"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Павялiчыць гук вышэй рэкамендаванага ўзроўню?\n\nДоўгае праслухоўванне музыкi на вялiкай гучнасцi можа пашкодзiць ваш слых."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Выкарыстоўваць камбінацыю хуткага доступу для спецыяльных магчымасцей?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Калі камбінацыя хуткага доступу ўключана, вы можаце націснуць абедзве кнопкі гучнасці і ўтрымліваць іх 3 секунды, каб уключыць функцыю спецыяльных магчымасцей.\n\n Бягучая функцыя спецыяльных магчымасцей:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Вы можаце змяніць гэту функцыю ў меню \"Налады > Спецыяльныя магчымасці\"."</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 30b7d302a273..8a687666ac9b 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Начертахте неправилно фигурата си за отключване <xliff:g id="NUMBER_0">%1$d</xliff:g> пъти. След още <xliff:g id="NUMBER_1">%2$d</xliff:g> неуспешни опита ще бъдете помолени да отключите телефона посредством имейл адрес.\n\n Опитайте отново след <xliff:g id="NUMBER_2">%3$d</xliff:g> секунди."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Премахване"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Да се увеличи ли силата на звука над препоръчителното ниво?\n\nПродължителното слушане при висока сила на звука може да увреди слуха ви."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Искате ли да използвате пряк път към функцията за достъпност?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Когато прекият път е включен, можете да стартирате дадена функция за достъпност, като натиснете двата бутона за промяна на силата на звука и ги задържите 3 секунди.\n\n Текущата функция за достъпност е:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Можете да промените функцията от „Настройки“ > „Достъпност“."</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index d85b5d6ee716..9ca383d30b04 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"আপনি আপনার আনলকের প্যাটার্ন আঁকার ক্ষেত্রে <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করেছেন৷ আর <xliff:g id="NUMBER_1">%2$d</xliff:g> বার অসফল প্রচেষ্টা করা হলে আপনাকে একটি ইমেল অ্যাকাউন্ট মারফত আপনার ফোন আনলক করতে বলা হবে৷\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> সেকেন্ডের মধ্যে আবার চেষ্টা করুন৷"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"সরান"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"প্রস্তাবিত স্তরের চেয়ে বেশি উঁচুতে ভলিউম বাড়াবেন?\n\nউঁচু ভলিউমে বেশি সময় ধরে কিছু শুনলে আপনার শ্রবনশক্তির ক্ষতি হতে পারে।"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"অ্যাক্সেসযোগ্যতা শর্টকাট ব্যবহার করবেন?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"শর্টকাটটি চালু থাকলে দুটি ভলিউম বোতাম একসাথে ৩ সেকেন্ড টিপে ধরে রাখলে একটি অ্যাকসেসিবিলিটি বৈশিষ্ট্য চালু হবে।\n\n বর্তমান অ্যাকসেসিবিলিটি বৈশিষ্ট্য:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n আপনি এই বৈশিষ্ট্যটি সেটিংস > অ্যাকসেসিবিলিটিতে গিয়ে পরিবর্তন করতে পারবেন।"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index c8c65bb15eb0..5f83aa427eef 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -1637,6 +1637,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Pogrešno ste nacrtali uzorak za otključavanje <xliff:g id="NUMBER_0">%1$d</xliff:g> puta. Ako napravite još <xliff:g id="NUMBER_1">%2$d</xliff:g> pokušaja bez uspjeha, od vas će se tražiti da otključate telefon pomoću e-pošte. \n\n Pokušajte ponovo za <xliff:g id="NUMBER_2">%3$d</xliff:g> s."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Ukloni"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Želite li pojačati zvuk iznad preporučenog nivoa?\n\nDužim slušanjem glasnog zvuka možete oštetiti sluh."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Želite li koristiti Prečicu za pristupačnost?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Kada je prečica uključena, pritiskom na oba dugmeta za podešavanje jačine zvuka u trajanju od 3 sekunde pokrenut će se funkcija za pristupačnost.\n\n Trenutna funkcija za pristupačnost je:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funkciju možete promijeniti ako odete u Postavke > Pristupačnost."</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 42bebe16a004..930065b02883 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Has dibuixat el patró de desbloqueig <xliff:g id="NUMBER_0">%1$d</xliff:g> vegades de manera incorrecta. Si falles <xliff:g id="NUMBER_1">%2$d</xliff:g> vegades més, se\'t demanarà que desbloquegis el telèfon amb un compte de correu electrònic.\n\n Torna-ho a provar d\'aquí a <xliff:g id="NUMBER_2">%3$d</xliff:g> segons."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Elimina"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Vols apujar el volum per sobre del nivell recomanat?\n\nSi escoltes música a un volum alt durant períodes llargs, pots danyar-te l\'oïda."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Vols fer servir la drecera d\'accessibilitat?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Si la drecera està activada, prem els dos botons de volum durant 3 segons, per iniciar una funció d\'accessibilitat.\n\n Funció d\'accessibilitat actual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Pots canviar la funció a Configuració > Accessibilitat."</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 2c162914274b..2c017dd52ee1 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1657,6 +1657,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Již <xliff:g id="NUMBER_0">%1$d</xliff:g>krát jste nesprávně nakreslili své heslo odemknutí. Po <xliff:g id="NUMBER_1">%2$d</xliff:g> dalších neúspěšných pokusech budete požádáni o odemčení telefonu pomocí e-mailového účtu.\n\n Zkuste to znovu za <xliff:g id="NUMBER_2">%3$d</xliff:g> s."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Odebrat"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Zvýšit hlasitost nad doporučenou úroveň?\n\nDlouhodobý poslech hlasitého zvuku může poškodit sluch."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Použít zkratku přístupnosti?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Když je tato zkratka zapnutá, můžete funkci přístupnosti spustit tím, že na tři sekundy podržíte obě tlačítka hlasitosti.\n\n Aktuální funkce přístupnosti:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funkci můžete změnit v Nastavení > Přístupnost."</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index f86db77184e6..4ebea8947666 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Du har tegnet dit oplåsningsmønster forkert <xliff:g id="NUMBER_0">%1$d</xliff:g> gange. Efter <xliff:g id="NUMBER_1">%2$d</xliff:g> yderligere mislykkede forsøg til vil du blive bedt om at låse din telefon op ved hjælp af en mailkonto.\n\n Prøv igen om <xliff:g id="NUMBER_2">%3$d</xliff:g> sekunder."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Fjern"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Vil du skrue højere op end det anbefalede lydstyrkeniveau?\n\nDu kan skade hørelsen ved at lytte til meget høj musik over længere tid."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Vil du bruge genvejen til Hjælpefunktioner?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Når genvejen er slået til, kan du starte en hjælpefunktion ved at trykke på begge lydstyrkeknapper i tre sekunder.\n\n Nuværende hjælpefunktion:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Du kan skifte funktion i Indstillinger > Hjælpefunktioner."</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index d6a9a010d9da..6fa0ac1791fa 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Du hast dein Entsperrungsmuster <xliff:g id="NUMBER_0">%1$d</xliff:g>-mal falsch gezeichnet. Nach <xliff:g id="NUMBER_1">%2$d</xliff:g> weiteren erfolglosen Versuchen wirst du aufgefordert, dein Telefon mithilfe eines E-Mail-Kontos zu entsperren.\n\n Versuche es in <xliff:g id="NUMBER_2">%3$d</xliff:g> Sekunden erneut."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Entfernen"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Lautstärke über den Schwellenwert anheben?\n\nWenn du über einen längeren Zeitraum Musik in hoher Lautstärke hörst, kann dies dein Gehör schädigen."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Verknüpfung für Bedienungshilfen verwenden?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Wenn die Verknüpfung aktiviert ist, kannst du die beiden Lautstärketasten drei Sekunden lang gedrückt halten, um eine Bedienungshilfe zu starten.\n\n Aktuelle Bedienungshilfe:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Du kannst die Bedienungshilfe unter \"Einstellungen\" > \"Bedienungshilfen\" ändern."</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 67285e9b0bf3..81a16f28651c 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Σχεδιάσατε το μοτίβο ξεκλειδώματος εσφαλμένα <xliff:g id="NUMBER_0">%1$d</xliff:g> φορές. Μετά από <xliff:g id="NUMBER_1">%2$d</xliff:g> ανεπιτυχείς προσπάθειες ακόμη, θα σας ζητηθεί να ξεκλειδώσετε το τηλέφωνό σας με τη χρήση ενός λογαριασμού ηλεκτρονικού ταχυδρομείου.\n\n Δοκιμάστε ξανά σε <xliff:g id="NUMBER_2">%3$d</xliff:g> δευτερόλεπτα."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Κατάργηση"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Αυξάνετε την ένταση ήχου πάνω από το επίπεδο ασφαλείας;\n\nΑν ακούτε μουσική σε υψηλή ένταση για μεγάλο χρονικό διάστημα ενδέχεται να προκληθεί βλάβη στην ακοή σας."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Να χρησιμοποιείται η συντόμευση προσβασιμότητας;"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Όταν η συντόμευση είναι ενεργοποιημένη, το πάτημα και των δύο κουμπιών έντασης ήχου για 3 δευτερόλεπτα θα ξεκινήσει μια λειτουργία προσβασιμότητας.\n\n Τρέχουσα λειτουργία προσβασιμότητας:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Μπορείτε να αλλάξετε τη λειτουργία από τις Ρυθμίσεις > Προσβασιμότητα."</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index ed31c2274696..87e0c902df8c 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Remove"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Raise volume above recommended level?\n\nListening at high volume for long periods may damage your hearing."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Use Accessibility Shortcut?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"When the shortcut is on, pressing both volume buttons for 3 seconds will start an accessibility feature.\n\n Current accessibility feature:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n You can change the feature in Settings > Accessibility."</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 6ae46b4c646e..008ad8aec7fc 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Remove"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Raise volume above recommended level?\n\nListening at high volume for long periods may damage your hearing."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Use Accessibility Shortcut?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"When the shortcut is on, pressing both volume buttons for 3 seconds will start an accessibility feature.\n\n Current accessibility feature:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n You can change the feature in Settings > Accessibility."</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index ed31c2274696..87e0c902df8c 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Remove"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Raise volume above recommended level?\n\nListening at high volume for long periods may damage your hearing."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Use Accessibility Shortcut?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"When the shortcut is on, pressing both volume buttons for 3 seconds will start an accessibility feature.\n\n Current accessibility feature:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n You can change the feature in Settings > Accessibility."</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index ed31c2274696..87e0c902df8c 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Remove"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Raise volume above recommended level?\n\nListening at high volume for long periods may damage your hearing."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Use Accessibility Shortcut?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"When the shortcut is on, pressing both volume buttons for 3 seconds will start an accessibility feature.\n\n Current accessibility feature:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n You can change the feature in Settings > Accessibility."</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index 07cb6c7f1c7c..777107a60820 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Remove"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Raise volume above recommended level?\n\nListening at high volume for long periods may damage your hearing."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Use Accessibility Shortcut?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"When the shortcut is on, pressing both volume buttons for 3 seconds will start an accessibility feature.\n\n Current accessibility feature:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n You can change the feature in Settings > Accessibility."</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 6f83551eca5a..4335c2bf9f27 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Dibujaste incorrectamente tu patrón de desbloqueo <xliff:g id="NUMBER_0">%1$d</xliff:g> veces. Luego de <xliff:g id="NUMBER_1">%2$d</xliff:g> intentos incorrectos más, se te solicitará que desbloquees tu dispositivo mediante el uso de una cuenta de correo.\n\n Vuelve a intentarlo en <xliff:g id="NUMBER_2">%3$d</xliff:g> segundos."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Eliminar"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"¿Quieres subir el volumen por encima del nivel recomendado?\n\nEscuchar a un alto volumen durante largos períodos puede dañar tu audición."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"¿Usar acceso directo de accesibilidad?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Cuando el acceso directo está activado, puedes presionar los botones de volumen durante 3 segundos para iniciar una función de accesibilidad.\n\n Función de accesibilidad actual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Puedes cambiar la función en Configuración > Accesibilidad."</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 737a83b4dbfe..8d750caa6dba 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Has fallado <xliff:g id="NUMBER_0">%1$d</xliff:g> veces al dibujar el patrón de desbloqueo. Si fallas otras <xliff:g id="NUMBER_1">%2$d</xliff:g> veces, deberás usar una cuenta de correo electrónico para desbloquear el teléfono.\n\n Inténtalo de nuevo en <xliff:g id="NUMBER_2">%3$d</xliff:g> segundos."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Quitar"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"¿Quieres subir el volumen por encima del nivel recomendado?\n\nEscuchar sonidos fuertes durante mucho tiempo puede dañar los oídos."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"¿Utilizar acceso directo de accesibilidad?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Si el acceso directo está activado, pulsa los dos botones de volumen durante tres segundos para iniciar una función de accesibilidad.\n\n Función de accesibilidad actual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Puedes cambiar la función en Ajustes > Accesibilidad."</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 021985f50e59..7f423e935b47 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Joonistasite oma avamismustri <xliff:g id="NUMBER_0">%1$d</xliff:g> korda valesti. Pärast veel <xliff:g id="NUMBER_1">%2$d</xliff:g> ebaõnnestunud katset palutakse teil telefon avada meilikontoga.\n\n Proovige uuesti <xliff:g id="NUMBER_2">%3$d</xliff:g> sekundi pärast."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Eemalda"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Kas suurendada helitugevuse taset üle soovitatud taseme?\n\nPikaajaline valju helitugevusega kuulamine võib kuulmist kahjustada."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Kas kasutada juurdepääsetavuse otseteed?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Kui otsetee on sisse lülitatud, käivitab mõlema helitugevuse nupu kolm sekundit all hoidmine juurdepääsetavuse funktsiooni.\n\n Praegune juurdepääsetavuse funktsioon:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Saate seda funktsiooni muuta valikutega Seaded > Juurdepääsetavus."</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 8ecdd0765a67..9d014a3b875a 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Desblokeatzeko eredua oker marraztu duzu <xliff:g id="NUMBER_0">%1$d</xliff:g> aldiz. Beste <xliff:g id="NUMBER_1">%2$d</xliff:g> aldiz oker marrazten baduzu, telefonoa posta-kontu baten bidez desblokeatzeko eskatuko dizugu.\n\n Saiatu berriro <xliff:g id="NUMBER_2">%3$d</xliff:g> segundo barru."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Kendu"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Bolumena gomendatutako mailatik gora igo nahi duzu?\n\nMusika bolumen handian eta denbora luzez entzuteak entzumena kalte diezazuke."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Erabilerraztasun-lasterbidea erabili nahi duzu?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Lasterbidea aktibatuta dagoenean, bi bolumen-botoiak hiru segundoz sakatuta abiaraziko da erabilerraztasun-eginbidea.\n\n Uneko erabilerraztasun-eginbidea:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Eginbidea aldatzeko, joan Ezarpenak > Erabilerraztasuna atalera."</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 9c3403b57eac..58ce7a7e547c 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. پس از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب ایمیل قفل تلفن خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"حذف"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"میزان صدا را به بالاتر از حد توصیه شده افزایش میدهید؟\n\nگوش دادن به صداهای بلند برای مدت طولانی میتواند به شنواییتان آسیب وارد کند."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"از میانبر دسترسپذیری استفاده شود؟"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"وقتی میانبر روشن است، اگر هر دو دکمه صدا را ۳ ثانیه فشار دهید یکی از قابلیتهای دسترسپذیری شروع میشود.\n\n قابلیت دسترسپذیری کنونی:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n میتوانید در «تنظیمات > دسترسپذیری»، قابلیت را تغییر دهید."</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index a42b87d5d7f2..e0f4ed49b6a3 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Piirsit lukituksenpoistokuvion väärin <xliff:g id="NUMBER_0">%1$d</xliff:g> kertaa. Jos piirrät kuvion väärin vielä <xliff:g id="NUMBER_1">%2$d</xliff:g> kertaa, sinua pyydetään poistamaan puhelimesi lukitus sähköpostitilin avulla.\n\n Yritä uudelleen <xliff:g id="NUMBER_2">%3$d</xliff:g> sekunnin kuluttua."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Poista"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Nostetaanko äänenvoimakkuus suositellun tason yläpuolelle?\n\nPitkäkestoinen kova äänenvoimakkuus saattaa heikentää kuuloa."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Käytetäänkö esteettömyyden pikanäppäintä?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Kun pikanäppäin on käytössä, voit käynnistää esteettömyystoiminnon pitämällä molempia äänenvoimakkuuspainikkeita painettuna kolmen sekunnin ajan.\n\n Tällä hetkellä valittu esteettömyystoiminto:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Voit vaihtaa toimintoa valitsemalla Asetukset > Esteettömyys."</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 47f41841f747..5d99db170087 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Vous avez dessiné un schéma de déverrouillage incorrect à <xliff:g id="NUMBER_0">%1$d</xliff:g> reprises. Si vous échouez encore <xliff:g id="NUMBER_1">%2$d</xliff:g> fois, vous devrez déverrouiller votre téléphone à l\'aide d\'un compte de messagerie électronique.\n\n Veuillez réessayer dans <xliff:g id="NUMBER_2">%3$d</xliff:g> secondes."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Supprimer"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Augmenter le volume au-dessus du niveau recommandé?\n\nL\'écoute prolongée à un volume élevé peut endommager vos facultés auditives."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Utiliser le raccourci d\'accessibilité?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Quand le raccourci est activé, appuyez sur les deux boutons de volume pendant trois secondes pour lancer une fonctionnalité d\'accessibilité.\n\n Fonctionnalité d\'accessibilité utilisée actuellement :\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Vous pouvez changer de fonctionnalité sous Paramètres > Accessibilité."</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 7898e797c8e3..3f4f3e6549e4 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Vous avez dessiné un schéma de déverrouillage incorrect à <xliff:g id="NUMBER_0">%1$d</xliff:g> reprises. Si vous échouez encore <xliff:g id="NUMBER_1">%2$d</xliff:g> fois, vous devrez déverrouiller votre téléphone à l\'aide d\'un compte de messagerie électronique.\n\n Veuillez réessayer dans <xliff:g id="NUMBER_2">%3$d</xliff:g> secondes."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Supprimer"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Augmenter le volume au dessus du niveau recommandé ?\n\nL\'écoute prolongée à un volume élevé peut endommager vos facultés auditives."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Utiliser le raccourci d\'accessibilité ?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Quand le raccourci est activé, appuyez sur les deux boutons de volume pendant trois secondes pour lancer une fonctionnalité d\'accessibilité.\n\n Fonctionnalité d\'accessibilité utilisée actuellement :\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Vous pouvez changer de fonctionnalité dans Paramètres > Accessibilité."</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index e7498b954194..2e5052c134b1 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Debuxaches o padrón de desbloqueo incorrectamente <xliff:g id="NUMBER_0">%1$d</xliff:g> veces. Se realizas <xliff:g id="NUMBER_1">%2$d</xliff:g> intentos incorrectos máis, terás que desbloquear o teléfono a través dunha conta de correo electrónico.\n\n Téntao de novo dentro de <xliff:g id="NUMBER_2">%3$d</xliff:g> segundos."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Eliminar"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Queres subir o volume máis do nivel recomendado?\n\nA reprodución de son a un volume elevado durante moito tempo pode provocar danos nos oídos."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Queres utilizar o atallo de accesibilidade?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Cando o atallo está activado, podes premer os dous botóns de volume durante 3 segundos para iniciar unha función de accesibilidade.\n\n Función de accesibilidade actual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Podes cambiar a función en Configuración > Accesibilidade."</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index b52d99ef7b8a..8081ef2709ba 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"તમે તમારી અનલૉક પૅટર્ન <xliff:g id="NUMBER_0">%1$d</xliff:g> વખત ખોટી રીતે દોરી. હજી <xliff:g id="NUMBER_1">%2$d</xliff:g> અસફળ પ્રયાસ પછી, તમને ઇમેઇલ એકાઉન્ટનો ઉપયોગ કરીને ફોનને અનલૉક કરવાનું કહેવામાં આવશે.\n\n<xliff:g id="NUMBER_2">%3$d</xliff:g> સેકન્ડમાં ફરીથી પ્રયાસ કરો."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"દૂર કરો"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"ભલામણ કરેલ સ્તરની ઉપર વૉલ્યૂમ વધાર્યો?\n\nલાંબા સમય સુધી ઊંચા અવાજે સાંભળવું તમારી શ્રવણક્ષમતાને નુકસાન પહોંચાડી શકે છે."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ઍક્સેસિબિલિટી શૉર્ટકટનો ઉપયોગ કરીએ?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"જ્યારે શૉર્ટકટ ચાલુ હોય, ત્યારે બન્ને વૉલ્યૂમ બટનને 3 સેકન્ડ સુધી દબાવી રાખવાથી ઍક્સેસિબિલિટી સુવિધા શરૂ થઈ જશે.\n\n વર્તમાન ઍક્સેસિબિલિટી સુવિધા:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n તમે સેટિંગ્સ > ઍક્સેસિબિલિટીમાં જઈને આ સુવિધા બદલી શકો છો."</string> @@ -1987,8 +1989,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"<xliff:g id="EXTENSION">%1$s</xliff:g> સ્પ્રેડશીટ"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"પ્રસ્તુતિ"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"<xliff:g id="EXTENSION">%1$s</xliff:g> પ્રસ્તુતિ"</string> - <!-- no translation found for bluetooth_airplane_mode_toast (2066399056595768554) --> - <skip /> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"એરપ્લેન મોડ દરમિયાન બ્લૂટૂથ ચાલુ રહેશે"</string> <string name="car_loading_profile" msgid="8219978381196748070">"લોડિંગ"</string> <plurals name="file_count" formatted="false" msgid="7063513834724389247"> <item quantity="one"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> ફાઇલ</item> @@ -2009,8 +2010,7 @@ <!-- no translation found for accessibility_system_action_accessibility_menu_label (8436484650391125184) --> <skip /> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"<xliff:g id="APP_NAME">%1$s</xliff:g>નું કૅપ્શન બાર."</string> - <!-- no translation found for as_app_forced_to_restricted_bucket (8233871289353898964) --> - <skip /> + <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>ને પ્રતિબંધિત સમૂહમાં મૂકવામાં આવ્યું છે"</string> <!-- no translation found for resolver_personal_tab (2051260504014442073) --> <skip /> <!-- no translation found for resolver_work_tab (2690019516263167035) --> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 3140c76ac43c..05efcd8942cb 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"आपने अपने अनलॉक आकार को <xliff:g id="NUMBER_0">%1$d</xliff:g> बार गलत तरीके से आरेखित किया है. <xliff:g id="NUMBER_1">%2$d</xliff:g> और असफल प्रयासों के बाद, आपसे अपने फ़ोन को किसी ईमेल खाते का उपयोग करके अनलॉक करने के लिए कहा जाएगा.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> सेकंड में फिर से प्रयास करें."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"निकालें"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"वॉल्यूम को सुझाए गए स्तर से ऊपर बढ़ाएं?\n\nअत्यधिक वॉल्यूम पर ज़्यादा समय तक सुनने से आपकी सुनने की क्षमता को नुकसान हो सकता है."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"सुलभता शॉर्टकट का इस्तेमाल करना चाहते हैं?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"इस शॉर्टकट के चालू होने पर, दोनों वॉल्यूम बटनों को 3 सेकंड तक दबाने से सुलभता सुविधा शुरू हो जाएगी.\n\n मौजूदा सुलभता सुविधा:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n आप इस सुविधा को सेटिंग > सुलभता पर जाकर बदल सकते हैं."</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index feb29e22b7ab..e4cefe8149d7 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1635,6 +1635,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Netočno ste iscrtali obrazac za otključavanje <xliff:g id="NUMBER_0">%1$d</xliff:g> puta. Nakon još ovoliko neuspješnih pokušaja: <xliff:g id="NUMBER_1">%2$d</xliff:g> morat ćete otključati telefon pomoću računa e-pošte.\n\n Pokušajte ponovo za <xliff:g id="NUMBER_2">%3$d</xliff:g> s."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Ukloni"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Želite li pojačati zvuk iznad preporučene razine?\n\nDugotrajno slušanje glasne glazbe može vam oštetiti sluh."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Želite li upotrebljavati prečac za pristupačnost?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Kada je taj prečac uključen, pritiskom na obje tipke za glasnoću na 3 sekunde pokrenut će se značajka pristupačnosti.\n\n Trenutačna značajka pristupačnosti:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Značajku možete promijeniti u Postavkama > Pristupačnost."</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 20d38ae44291..08cb1c774b33 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"<xliff:g id="NUMBER_0">%1$d</xliff:g> alkalommal helytelenül rajzolta le a feloldási mintát. További <xliff:g id="NUMBER_1">%2$d</xliff:g> sikertelen kísérlet után egy e-mail fiók használatával kell feloldania a telefonját.\n\n Kérjük, próbálja újra <xliff:g id="NUMBER_2">%3$d</xliff:g> másodperc múlva."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Eltávolítás"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Az ajánlott szint fölé szeretné emelni a hangerőt?\n\nHa hosszú időn át teszi ki magát nagy hangerőnek, azzal károsíthatja a hallását."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Szeretné használni a Kisegítő lehetőségek billentyűparancsot?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Ha be van kapcsolva a billentyűparancs, a két hangerőgomb 3 másodpercig tartó lenyomásával elindíthatja a kisegítő lehetőségek egyik funkcióját.\n\n A kisegítő lehetőségek jelenleg beállított funkciója:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n A funkciót a Beállítások > Kisegítő lehetőségek menüpontban módosíthatja."</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index d13b9ea0770a..9d33f6b8e4fd 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Դուք <xliff:g id="NUMBER_0">%1$d</xliff:g> անգամ սխալ եք հավաքել ձեր ապակողպման նմուշը: <xliff:g id="NUMBER_1">%2$d</xliff:g> անգամից ավել անհաջող փորձերից հետո ձեզ կառաջարկվի ապակողպել ձեր հեռախոսը` օգտագործելով էլփոստի հաշիվ:\n\n Փորձեք կրկին <xliff:g id="NUMBER_2">%3$d</xliff:g> վայրկյանից:"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Հեռացնել"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Ձայնը բարձրացնե՞լ խորհուրդ տրվող մակարդակից ավել:\n\nԵրկարատև բարձրաձայն լսելը կարող է վնասել ձեր լսողությունը:"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Օգտագործե՞լ Մատչելիության դյուրանցումը։"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Հատուկ գործառույթն օգտագործելու համար սեղմեք և 3 վայրկյան սեղմած պահեք ձայնի ուժգնության երկու կոճակները, երբ գործառույթը միացված է։\n\n Մատչելիության ակտիվ գործառույթը՝\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Գործառույթը կարող եք փոփոխել՝ անցնելով Կարգավորումներ > Հատուկ գործառույթներ։"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index c2a081757300..48136108d7c1 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Anda telah <xliff:g id="NUMBER_0">%1$d</xliff:g> kali salah menggambar pola pembuka kunci. Setelah <xliff:g id="NUMBER_1">%2$d</xliff:g> lagi upaya gagal, Anda akan diminta membuka kunci ponsel menggunakan akun email.\n\nCoba lagi dalam <xliff:g id="NUMBER_2">%3$d</xliff:g> detik."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Hapus"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Mengeraskan volume di atas tingkat yang disarankan?\n\nMendengarkan dengan volume keras dalam waktu yang lama dapat merusak pendengaran Anda."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Gunakan Pintasan Aksesibilitas?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Saat pintasan aktif, menekan kedua tombol volume selama 3 detik akan memulai fitur aksesibilitas.\n\n Fitur aksesibilitas saat ini:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Anda dapat mengubah fitur di Setelan > Aksesibilitas."</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index c596c12205e0..bf3fe87f7931 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Þú hefur teiknað rangt opnunarmynstur <xliff:g id="NUMBER_0">%1$d</xliff:g> sinnum. Eftir <xliff:g id="NUMBER_1">%2$d</xliff:g> árangurslausar tilraunir í viðbót verður þú beðin(n) um að opna símann með tölvupóstreikningi.\n\n Reyndu aftur eftir <xliff:g id="NUMBER_2">%3$d</xliff:g> sekúndur."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Fjarlægja"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Hækka hljóðstyrk umfram ráðlagðan styrk?\n\nEf hlustað er á háum hljóðstyrk í langan tíma kann það að skaða heyrnina."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Viltu nota aðgengisflýtileið?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Þegar flýtileiðin er virk er kveikt á aðgengiseiginleikanum með því að halda báðum hljóðstyrkshnöppunum inni í þrjár sekúndur.\n\n Virkur aðgengiseiginleiki:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Hægt er að skipta um eiginleika í Stillingar > Aðgengi."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 1144995c069e..72ca138f9ed3 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"<xliff:g id="NUMBER_0">%1$d</xliff:g> tentativi errati di inserimento della sequenza di sblocco. Dopo altri <xliff:g id="NUMBER_1">%2$d</xliff:g> tentativi falliti, ti verrà chiesto di sbloccare il telefono con un account email.\n\n Riprova tra <xliff:g id="NUMBER_2">%3$d</xliff:g> secondi."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Rimuovi"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Vuoi aumentare il volume oltre il livello consigliato?\n\nL\'ascolto ad alto volume per lunghi periodi di tempo potrebbe danneggiare l\'udito."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Usare la scorciatoia Accessibilità?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Quando la scorciatoia è attiva, puoi premere entrambi i pulsanti del volume per tre secondi per avviare una funzione di accessibilità.\n\n Funzione di accessibilità corrente:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Puoi cambiare la funzione in Impostazioni > Accessibilità."</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index bce62ab631da..9c8d0a3a64ec 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1657,6 +1657,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"שרטטת את קו ביטול הנעילה באופן שגוי <xliff:g id="NUMBER_0">%1$d</xliff:g> פעמים. לאחר <xliff:g id="NUMBER_1">%2$d</xliff:g> ניסיונות כושלים נוספים, תתבקש לבטל את נעילת הטלפון באמצעות חשבון אימייל.\n\nנסה שוב בעוד <xliff:g id="NUMBER_2">%3$d</xliff:g> שניות."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"הסר"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"האם להעלות את עוצמת הקול מעל לרמה המומלצת?\n\nהאזנה בעוצמת קול גבוהה למשכי זמן ממושכים עלולה לפגוע בשמיעה."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"להשתמש בקיצור הדרך לתכונת הנגישות?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"כשקיצור הדרך מופעל, לחיצה על שני לחצני עוצמת השמע למשך שלוש שניות מפעילה את תכונת הנגישות.\n\n תכונת הנגישות המוגדרת כרגע:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n אפשר לשנות את התכונה בקטע \'הגדרות ונגישות\'."</string> @@ -2053,8 +2055,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"גיליון אלקטרוני <xliff:g id="EXTENSION">%1$s</xliff:g>"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"מצגת"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"מצגת <xliff:g id="EXTENSION">%1$s</xliff:g>"</string> - <!-- no translation found for bluetooth_airplane_mode_toast (2066399056595768554) --> - <skip /> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"Bluetooth יישאר מופעל במהלך מצב טיסה"</string> <string name="car_loading_profile" msgid="8219978381196748070">"בטעינה"</string> <plurals name="file_count" formatted="false" msgid="7063513834724389247"> <item quantity="two"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> קבצים</item> @@ -2077,8 +2078,7 @@ <!-- no translation found for accessibility_system_action_accessibility_menu_label (8436484650391125184) --> <skip /> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"סרגל כיתוב של <xliff:g id="APP_NAME">%1$s</xliff:g>."</string> - <!-- no translation found for as_app_forced_to_restricted_bucket (8233871289353898964) --> - <skip /> + <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> התווספה לקטגוריה \'מוגבל\'"</string> <!-- no translation found for resolver_personal_tab (2051260504014442073) --> <skip /> <!-- no translation found for resolver_work_tab (2690019516263167035) --> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 1ef4a1391860..529d0119f0be 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"ロック解除パターンの入力を<xliff:g id="NUMBER_0">%1$d</xliff:g>回間違えました。あと<xliff:g id="NUMBER_1">%2$d</xliff:g>回間違えると、モバイルデバイスのロック解除にメールアカウントが必要になります。\n\n<xliff:g id="NUMBER_2">%3$d</xliff:g>秒後にもう一度お試しください。"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" - "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"削除"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"推奨レベルを超えるまで音量を上げますか？\n\n大音量で長時間聞き続けると、聴力を損なう恐れがあります。"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ユーザー補助機能のショートカットの使用"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"ショートカットが ON の場合、両方の音量ボタンを 3 秒間押し続けるとユーザー補助機能が起動します。\n\n現在のユーザー補助機能:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\nユーザー補助機能は [設定] > [ユーザー補助] で変更できます。"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 41b23887e827..3f97338ade76 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"თქვენ არასწორად დახატეთ თქვენი განბლოკვის ნიმუში <xliff:g id="NUMBER_0">%1$d</xliff:g>-ჯერ. კიდევ <xliff:g id="NUMBER_1">%2$d</xliff:g> წარუმატებელი ცდის შემდეგ, დაგჭირდებათ თქვენი ტელეფონის განბლოკვა ელფოსტის ანგარიშის გამოყენებით.\n\n ხელახლა სცადეთ <xliff:g id="NUMBER_2">%3$d</xliff:g> წამში."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"ამოშლა"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"გსურთ ხმის რეკომენდებულ დონეზე მაღლა აწევა?\n\nხანგრძლივად ხმამაღლა მოსმენით შესაძლოა სმენადობა დაიზიანოთ."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"გსურთ მარტივი წვდომის მალსახმობის გამოყენება?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"მალსახმობის ჩართვის შემთხვევაში, ხმის ორივე ღილაკზე 3 წამის განმავლობაში დაჭერით მარტივი წვდომის ფუნქცია ჩაირთვება.\n\n მარტივი წვდომის ამჟამინდელი ფუნქციაა:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ამ ფუნქციის შეცვლა შეგიძლიათ აქ: პარამეტრები > მარტივი წვდომა."</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 3ea4d351edd9..bccd3f4b6a77 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Бекітпені ашу кескінін <xliff:g id="NUMBER_0">%1$d</xliff:g> рет қате сыздыңыз. <xliff:g id="NUMBER_1">%2$d</xliff:g> сәтсіз әрекеттен кейін телефоныңызды есептік жазба арқылы ашу өтінішін аласыз. \n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секундтан кейін қайта әрекеттеніңіз."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Алып тастау"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Дыбыс деңгейін ұсынылған деңгейден көтеру керек пе?\n\nЖоғары дыбыс деңгейінде ұзақ кезеңдер бойы тыңдау есту қабілетіңізге зиян тигізуі мүмкін."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Арнайы мүмкіндік төте жолын пайдалану керек пе?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Бұл төте жол қосулы кезде дыбыс деңгейі түймелерінің екеуін де 3 секунд бойы басқанда арнайы мүмкіндік іске қосылады.\n\n Ағымдағы арнайы мүмкіндік:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Бұл мүмкіндікті \"Параметрлер\" > \"Арнайы мүмкіндіктер\" тармағында өзгертуге болады."</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 4f7c0febb6ce..ee451e936020 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -1615,6 +1615,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"អ្នកបានគូរលំនាំដោះសោរបស់អ្នកមិនត្រឹមត្រូវចំនួន <xliff:g id="NUMBER_0">%1$d</xliff:g> ដង។ បន្ទាប់ពីការព្យាយាមមិនជោគជ័យច្រើនជាង <xliff:g id="NUMBER_1">%2$d</xliff:g> ដង អ្នកនឹងត្រូវបានស្នើឲ្យដោះសោទូរស័ព្ទរបស់អ្នកដោយប្រើគណនីអ៊ីមែល។\n\n ព្យាយាមម្ដងទៀតក្នុងរយៈពេល <xliff:g id="NUMBER_2">%3$d</xliff:g> វិនាទី។"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"លុបចេញ"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"បង្កើនកម្រិតសំឡេងលើសពីកម្រិតបានផ្ដល់យោបល់?\n\nការស្ដាប់នៅកម្រិតសំឡេងខ្លាំងយូរអាចធ្វើឲ្យខូចត្រចៀក។"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ប្រើប្រាស់ផ្លូវកាត់ភាពងាយស្រួល?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"នៅពេលផ្លូវកាត់នេះបើក ការចុចប៊ូតុងកម្រិតសំឡេងទាំងពីរឲ្យជាប់រយៈពេល 3 វិនាទីនឹងចាប់ផ្តើមមុខងារភាពងាយស្រួល។\n\n មុខងារភាពងាយស្រួលបច្ចុប្បន្ន៖\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n អ្នកអាចផ្លាស់ប្តូរមុខងារនេះបាននៅក្នុងការ កំណត់ > ភាពងាយស្រួល។"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 9efa85774bab..75282842175c 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"ನಿಮ್ಮ ಅನ್ಲಾಕ್ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಡ್ರಾ ಮಾಡಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ಬಳಿಕ, ನಿಮ್ಮ ಇಮೇಲ್ ಖಾತೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡುವಂತೆ ನಿಮ್ಮಲ್ಲಿ ಕೇಳಿಕೊಳ್ಳಲಾಗುತ್ತದೆ.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"ತೆಗೆದುಹಾಕು"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"ವಾಲ್ಯೂಮ್ ಅನ್ನು ಶಿಫಾರಸು ಮಾಡಲಾದ ಮಟ್ಟಕ್ಕಿಂತಲೂ ಹೆಚ್ಚು ಮಾಡುವುದೇ?\n\nದೀರ್ಘ ಅವಧಿಯವರೆಗೆ ಹೆಚ್ಚಿನ ವಾಲ್ಯೂಮ್ನಲ್ಲಿ ಆಲಿಸುವುದರಿಂದ ನಿಮ್ಮ ಆಲಿಸುವಿಕೆ ಸಾಮರ್ಥ್ಯಕ್ಕೆ ಹಾನಿಯುಂಟು ಮಾಡಬಹುದು."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ಪ್ರವೇಶಿಸುವಿಕೆ ಶಾರ್ಟ್ಕಟ್ ಬಳಸುವುದೇ?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"ಶಾರ್ಟ್ಕಟ್ ಆನ್ ಆಗಿರುವಾಗ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯ ಆನ್ ಮಾಡಲು, ಎರಡೂ ವಾಲ್ಯೂಮ್ ಬಟನ್ಗಳನ್ನು ನೀವು 3 ಸೆಕೆಂಡುಗಳ ಕಾಲ ಒತ್ತಬೇಕು.\n\nಪ್ರಸ್ತುತ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯ: \n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ಸೆಟ್ಟಿಂಗ್ಗಳು ಮತ್ತು ಪ್ರವೇಶಿಸುವಿಕೆಯಲ್ಲಿ ನೀವು ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬದಲಾಯಿಸಬಹುದು."</string> @@ -1987,8 +1989,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"<xliff:g id="EXTENSION">%1$s</xliff:g> ಸ್ಪ್ರೆಡ್ಶೀಟ್"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"ಪ್ರಸ್ತುತಿ"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"<xliff:g id="EXTENSION">%1$s</xliff:g> ಪ್ರಸ್ತುತಿ"</string> - <!-- no translation found for bluetooth_airplane_mode_toast (2066399056595768554) --> - <skip /> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"ಏರ್ಪ್ಲೇನ್ ಮೋಡ್ನಲ್ಲಿರುವಾಗಲೂ ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರುತ್ತದೆ"</string> <string name="car_loading_profile" msgid="8219978381196748070">"ಲೋಡ್ ಆಗುತ್ತಿದೆ"</string> <plurals name="file_count" formatted="false" msgid="7063513834724389247"> <item quantity="one"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> ಫೈಲ್ಗಳು</item> @@ -2009,8 +2010,7 @@ <!-- no translation found for accessibility_system_action_accessibility_menu_label (8436484650391125184) --> <skip /> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಆ್ಯಪ್ನ ಶೀರ್ಷಿಕೆಯ ಪಟ್ಟಿ."</string> - <!-- no translation found for as_app_forced_to_restricted_bucket (8233871289353898964) --> - <skip /> + <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> ಅನ್ನು ನಿರ್ಬಂಧಿತ ಬಕೆಟ್ಗೆ ಹಾಕಲಾಗಿದೆ"</string> <!-- no translation found for resolver_personal_tab (2051260504014442073) --> <skip /> <!-- no translation found for resolver_work_tab (2690019516263167035) --> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 90fa0fa65f1d..d5b450757bf9 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"잠금해제 패턴을 <xliff:g id="NUMBER_0">%1$d</xliff:g>회 잘못 그렸습니다. <xliff:g id="NUMBER_1">%2$d</xliff:g>회 더 실패하면 이메일 계정을 사용하여 휴대전화를 잠금해제해야 합니다.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g>초 후에 다시 시도해 주세요."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"삭제"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"권장 수준 이상으로 볼륨을 높이시겠습니까?\n\n높은 볼륨으로 장시간 청취하면 청력에 손상이 올 수 있습니다."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"접근성 단축키를 사용하시겠습니까?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"단축키가 사용 설정된 경우 두 개의 볼륨 버튼을 3초간 누르면 접근성 기능이 시작됩니다.\n\n 현재 접근성 기능:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n \'설정 > 접근성\'에서 기능을 변경할 수 있습니다."</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 07a6e3f75222..533e0b816142 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -540,7 +540,7 @@ <string name="fingerprint_error_timeout" msgid="2946635815726054226">"Манжа изин күтүү мөөнөтү бүттү. Кайра аракет кылыңыз."</string> <string name="fingerprint_error_canceled" msgid="540026881380070750">"Манжа изи иш-аракети жокко чыгарылды."</string> <string name="fingerprint_error_user_canceled" msgid="7685676229281231614">"Манжа изи операциясын колдонуучу жокко чыгарды."</string> - <string name="fingerprint_error_lockout" msgid="7853461265604738671">"Аракеттер өтө көп болду. Кийинчерээк кайра аракет кылыңыз."</string> + <string name="fingerprint_error_lockout" msgid="7853461265604738671">"Аракеттер өтө көп болду. Бир аздан кийин кайталап көрүңүз."</string> <string name="fingerprint_error_lockout_permanent" msgid="3895478283943513746">"Өтө көп жолу аракет жасадыңыз. Манжа изинин сенсору өчүрүлдү."</string> <string name="fingerprint_error_unable_to_process" msgid="1148553603490048742">"Кайра бир аракеттениңиз."</string> <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Бир да манжа изи катталган эмес."</string> @@ -583,7 +583,7 @@ <string name="face_error_no_space" msgid="5649264057026021723">"Жаңы жүздү сактоо мүмкүн эмес. Адегенде эскисин өчүрүңүз."</string> <string name="face_error_canceled" msgid="2164434737103802131">"Жүздүн аныктыгын текшерүү жокко чыгарылды."</string> <string name="face_error_user_canceled" msgid="8553045452825849843">"Жүзүнөн таануу функциясын колдонуучу өчүрүп салды."</string> - <string name="face_error_lockout" msgid="7864408714994529437">"Өтө көп жолу аракет жасадыңыз. Кийинчерээк кайра аракет кылыңыз."</string> + <string name="face_error_lockout" msgid="7864408714994529437">"Өтө көп жолу аракет жасадыңыз. Бир аздан кийин кайталап көрүңүз."</string> <string name="face_error_lockout_permanent" msgid="8277853602168960343">"Өтө көп жолу аракет кылдыңыз. Жүзүнөн таануу функциясы өчүрүлдү."</string> <string name="face_error_unable_to_process" msgid="5723292697366130070">"Жүз ырасталбай жатат. Кайра аракет кылыңыз."</string> <string name="face_error_not_enrolled" msgid="7369928733504691611">"Жүзүнөн таануу функциясын жөндөй элексиз."</string> @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Графикалык ачкычты <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес көрсөттүңүз. <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу туура эмес көрсөтүлгөндөн кийин, телефондун кулпусун ачуу үчүн Google аккаунтуңузга кирүүгө туура келет.\n\n<xliff:g id="NUMBER_2">%3$d</xliff:g> секундадан кийин кайталап көрсөңүз болот."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Алып салуу"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Сунушталган деңгээлден да катуулатып уккуңуз келеби?\n\nМузыканы узакка чейин катуу уксаңыз, угууңуз начарлап кетиши мүмкүн."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Ыкчам иштетесизби?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Атайын мүмкүнчүлүктөр функциясын пайдалануу үчүн, ал күйгүзүлгөндө, үндү катуулатып/акырындаткан эки баскычты тең үч секунддай кое бербей басып туруңуз.\n\n Учурдагы атайын мүмкүнчүлүктөрдүн жөндөөлөрү:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\nЖөндөөлөр > Атайын мүмкүнчүлүктөр бөлүмүнөн өзгөртө аласыз."</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 05f9698cd48d..7a3e85e7f5b2 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"ທ່ານແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານຜິດ <xliff:g id="NUMBER_0">%1$d</xliff:g> ເທື່ອແລ້ວ. ຫຼັງຈາກຄວາມພະຍາຍາມອີກ <xliff:g id="NUMBER_1">%2$d</xliff:g> ເທື່ອ ທ່ານຈະຖືກຖາມໃຫ້ປົດລັອກໂທລະສັບຂອງທ່ານດ້ວຍບັນຊີອີເມວ.\n\n ລອງໃໝ່ອີກຄັ້ງໃນ <xliff:g id="NUMBER_2">%3$d</xliff:g> ວິນາທີ."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"ລຶບອອກ"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"ເພີ່ມລະດັບສຽງໃຫ້ເກີນກວ່າລະດັບທີ່ແນະນຳບໍ?\n\nການຮັບຟັງສຽງໃນລະດັບທີ່ສູງເປັນໄລຍະເວລາດົນອາດເຮັດໃຫ້ການຟັງຂອງທ່ານມີບັນຫາໄດ້."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ໃຊ້ປຸ່ມລັດການຊ່ວຍເຂົ້າເຖິງບໍ?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"ເມື່ອເປີດໃຊ້ປຸ່ມລັດແລ້ວ, ໃຫ້ກົດປຸ່ມສຽງທັງສອງຄ້າງໄວ້ 3 ວິນາທີເພື່ອເລີ່ມຄຸນສົມບັດການຊ່ວຍເຂົ້າເຖິງ.\n\n ຄຸນສົມບັດການຊ່ວຍເຂົ້າເຖິງປັດຈຸບັນ:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ທ່ານສາມາດປ່ຽນຄຸນສົມບັດໄດ້ໃນການຕັ້ງຄ່າ > ການຊ່ວຍເຂົ້າເຖິງ."</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 4f48685f2a3b..265c97e4b228 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1657,6 +1657,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Netinkamai nupiešėte atrakinimo piešinį <xliff:g id="NUMBER_0">%1$d</xliff:g> k. Po dar <xliff:g id="NUMBER_1">%2$d</xliff:g> nesėkm. band. būsite paprašyti atrakinti telefoną naudodami „Google“ prisijungimo duomenis.\n\n Bandykite dar kartą po <xliff:g id="NUMBER_2">%3$d</xliff:g> sek."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Pašalinti"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Padidinti garsą daugiau nei rekomenduojamas lygis?\n\nIlgai klausydami dideliu garsu galite pažeisti klausą."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Naudoti spartųjį pritaikymo neįgaliesiems klavišą?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Kai spartusis klavišas įjungtas, spaudžiant abu garsumo mygtukus 3 sekundes bus paleista pritaikymo neįgaliesiems funkcija.\n\n Dabartinė pritaikymo neįgaliesiems funkcija:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>„\n“\n Funkciją galite pakeisti skiltyje „Nustatymai“ > „Pritaikymas neįgaliesiems“."</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index ae9abc6331a3..a535f6dd9feb 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -1635,6 +1635,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Jūs nepareizi norādījāt atbloķēšanas kombināciju <xliff:g id="NUMBER_0">%1$d</xliff:g> reizes. Pēc vēl <xliff:g id="NUMBER_1">%2$d</xliff:g> neveiksmīgiem mēģinājumiem tālrunis būs jāatbloķē, izmantojot e-pasta kontu.\n\nMēģiniet vēlreiz pēc <xliff:g id="NUMBER_2">%3$d</xliff:g> sekundēm."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Noņemt"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Vai palielināt skaļumu virs ieteicamā līmeņa?\n\nIlgstoši klausoties skaņu lielā skaļumā, var tikt bojāta dzirde."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Vai izmantot pieejamības saīsni?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Ja saīsne ir iespējota, vienlaikus nospiežot abas skaļuma regulēšanas pogas un trīs sekundes turot tās, tiks palaista pieejamības funkcija.\n\n Pašreiz iestatītā pieejamības funkcija:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Šo funkciju var mainīt sadaļā Iestatījumi > Pieejamība."</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index f1e54064036f..2f75269cf421 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -1615,6 +1615,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Погрешно сте ја употребиле вашата шема на отклучување <xliff:g id="NUMBER_0">%1$d</xliff:g> пати. По <xliff:g id="NUMBER_1">%2$d</xliff:g> неуспешни обиди, ќе побараат од вас да го отклучите телефонот со користење сметка на е-пошта.\n\n Обидете се повторно за <xliff:g id="NUMBER_2">%3$d</xliff:g> секунди."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Отстрани"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Да го зголемиме звукот над препорачаното ниво?\n\nСлушањето звуци со голема јачина подолги периоди може да ви го оштети сетилото за слух."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Да се користи кратенка за „Пристапност“?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Кога е вклучена кратенката, ако ги притиснете двете копчиња за јачина на звук во времетраење од 3 секунди, ќе се стартува функција на пристапност.\n\n Тековна функција на пристапност:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Функцијата може да ја промените во „Поставки“ > „Пристапност“."</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index f0cc48cf9bd9..25d72126418f 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"നിങ്ങളുടെ അൺലോക്ക് പാറ്റേൺ <xliff:g id="NUMBER_0">%1$d</xliff:g> തവണ തെറ്റായി വരച്ചു. <xliff:g id="NUMBER_1">%2$d</xliff:g> ശ്രമങ്ങൾ കൂടി വിജയിച്ചില്ലെങ്കിൽ, ഒരു ഇമെയിൽ അക്കൗണ്ട് ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാൻ നിങ്ങളോട് ആവശ്യപ്പെടും.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> സെക്കൻഡിനുള്ള വീണ്ടും ശ്രമിക്കുക."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"നീക്കംചെയ്യുക"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"മുകളിൽക്കൊടുത്തിരിക്കുന്ന ശുപാർശചെയ്ത ലെവലിലേക്ക് വോളിയം വർദ്ധിപ്പിക്കണോ?\n\nഉയർന്ന വോളിയത്തിൽ ദീർഘനേരം കേൾക്കുന്നത് നിങ്ങളുടെ ശ്രവണ ശേഷിയെ ദോഷകരമായി ബാധിക്കാം."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ഉപയോഗസഹായി കുറുക്കുവഴി ഉപയോഗിക്കണോ?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"കുറുക്കുവഴി ഓണാണെങ്കിൽ, രണ്ട് വോളിയം ബട്ടണുകളും 3 സെക്കൻഡ് നേരത്തേക്ക് അമർത്തുന്നത് ഉപയോഗസഹായി ഫീച്ചർ ആരംഭിക്കും.\n\n നിലവിലെ ഉപയോഗസഹായി ഫീച്ചർ:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ക്രമീകരണം > ഉപയോഗസഹായി എന്നതിൽ ഏത് സമയത്തും നിങ്ങൾക്ക് ഫീച്ചർ മാറ്റാവുന്നതാണ്."</string> @@ -1987,8 +1989,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"<xliff:g id="EXTENSION">%1$s</xliff:g> സ്പ്രെഡ്ഷീറ്റ്"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"അവതരണം"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"<xliff:g id="EXTENSION">%1$s</xliff:g> അവതരണം"</string> - <!-- no translation found for bluetooth_airplane_mode_toast (2066399056595768554) --> - <skip /> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"ഫ്ലൈറ്റ് മോഡ് ഓണാക്കിയിരിക്കുമ്പോഴും Bluetooth ലഭ്യമാകും"</string> <string name="car_loading_profile" msgid="8219978381196748070">"ലോഡ് ചെയ്യുന്നു"</string> <plurals name="file_count" formatted="false" msgid="7063513834724389247"> <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> ഫയലുകൾ</item> @@ -2009,8 +2010,7 @@ <!-- no translation found for accessibility_system_action_accessibility_menu_label (8436484650391125184) --> <skip /> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിന്റെ അടിക്കുറിപ്പ് ബാർ."</string> - <!-- no translation found for as_app_forced_to_restricted_bucket (8233871289353898964) --> - <skip /> + <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> നിയന്ത്രിത ബക്കറ്റിലേക്ക് നീക്കി"</string> <!-- no translation found for resolver_personal_tab (2051260504014442073) --> <skip /> <!-- no translation found for resolver_work_tab (2690019516263167035) --> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 3be3a0442401..3acdb7245b7c 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Та тайлах хээг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу зурлаа. <xliff:g id="NUMBER_1">%2$d</xliff:g> удаа дахин буруу оруулбал, та утсаа тайлахын тулд имэйл бүртгэлээ ашиглах шаардлагатай болно.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секундын дараа дахин оролдоно уу."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Устгах"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Дууг санал болгосноос чанга болгож өсгөх үү?\n\nУрт хугацаанд чанга хөгжим сонсох нь таны сонсголыг муутгаж болно."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Хүртээмжийн товчлолыг ашиглах уу?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Товчлолыг асаасан үед дуун товчлуурыг 3 секунд дарснаар хүртээмжийн онцлогийг эхлүүлнэ.\n\n Одоогийн хүртээмжийн онцлог:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Онцлогийг Тохиргоо > Хүртээмж хэсэгт өөрчлөх боломжтой."</string> @@ -1987,8 +1989,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"<xliff:g id="EXTENSION">%1$s</xliff:g>-н хүснэгт"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"Үзүүлэн"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"<xliff:g id="EXTENSION">%1$s</xliff:g>-н үзүүлэн"</string> - <!-- no translation found for bluetooth_airplane_mode_toast (2066399056595768554) --> - <skip /> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"Нислэгийн горимын үеэр Bluetooth асаалттай байх болно"</string> <string name="car_loading_profile" msgid="8219978381196748070">"Ачаалж байна"</string> <plurals name="file_count" formatted="false" msgid="7063513834724389247"> <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> файл</item> @@ -2009,8 +2010,7 @@ <!-- no translation found for accessibility_system_action_accessibility_menu_label (8436484650391125184) --> <skip /> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"<xliff:g id="APP_NAME">%1$s</xliff:g>-н гарчгийн талбар."</string> - <!-- no translation found for as_app_forced_to_restricted_bucket (8233871289353898964) --> - <skip /> + <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g>-г ХЯЗГААРЛАСАН сагс руу орууллаа"</string> <!-- no translation found for resolver_personal_tab (2051260504014442073) --> <skip /> <!-- no translation found for resolver_work_tab (2690019516263167035) --> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index a2bf4796eaec..ff9f3e741c85 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"तुम्ही तुमचा अनलॉक पॅटर्न <xliff:g id="NUMBER_0">%1$d</xliff:g> वेळा अयोग्यपणे काढला आहे. आणखी <xliff:g id="NUMBER_1">%2$d</xliff:g> अयशस्वी प्रयत्नांनंतर, तुम्हाला ईमेल खाते वापरून तुमचा फोन अनलॉक करण्यास सांगितले जाईल.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> सेकंदांमध्ये पुन्हा प्रयत्न करा."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"काढा"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"शिफारस केलेल्या पातळीच्या वर आवाज वाढवायचा?\n\nउच्च आवाजात दीर्घ काळ ऐकण्याने आपल्या श्रवणशक्तीची हानी होऊ शकते."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"प्रवेशयोग्यता शॉर्टकट वापरायचा?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"शॉर्टकट चालू असताना, दोन्ही आवाज बटणे 3 सेकंद दाबल्याने प्रवेशयोग्यता वैशिष्ट्य सुरू होईल.\n\n वर्तमान प्रवेशयोग्यता वैशिष्ट्य:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n तुम्ही सेटिंग्ज > प्रवेशयोग्यता मध्ये वैशिष्ट्य बदलू शकता."</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index f7626dbe1935..e4364083751d 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Anda telah tersilap lukis corak buka kunci sebanyak <xliff:g id="NUMBER_0">%1$d</xliff:g> kali. Selepas <xliff:g id="NUMBER_1">%2$d</xliff:g> lagi percubaan yang tidak berjaya, anda akan diminta membuka kunci telefon anda menggunakan log masuk Google anda.\n\n Cuba lagi dalam <xliff:g id="NUMBER_2">%3$d</xliff:g> saat."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Alih keluar"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Naikkan kelantangan melebihi paras yang disyokorkan?\n\nMendengar pada kelantangan yang tinggi untuk tempoh yang lama boleh merosakkan pendengaran anda."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Gunakan Pintasan Kebolehaksesan?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Apabila pintasan dihidupkan, tindakan menekan kedua-dua butang kelantangan selama 3 saat akan memulakan ciri kebolehaksesan.\n\n Ciri kebolehaksesan semasa:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Anda boleh menukar ciri itu dalam Tetapan > Kebolehaksesan."</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 556837efa8a3..56f49c28b26d 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"သင် ပုံဖော်၍သော့ဖွင့်ခြင်းကို <xliff:g id="NUMBER_0">%1$d</xliff:g> အကြိမ် မှန်ကန်စွာ မပြုလုပ်နိုင်ပါ။ နောက်ထပ် <xliff:g id="NUMBER_1">%2$d</xliff:g> အကြိမ် မမှန်ကန်ပါက သင့်ဖုန်းအား အီးမေးလ်အသုံးပြု၍ သော့ဖွင့်ရန် တောင်းဆိုပါလိမ့်မည်။ \n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> စက္ကန့်အကြာတွင် ပြန်လည် ကြိုးစားပါ"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"ဖယ်ရှားရန်"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"အသံကို အကြံပြုထားသည့် ပမာဏထက် မြှင့်ပေးရမလား?\n\nအသံကို မြင့်သည့် အဆင့်မှာ ကြာရှည်စွာ နားထောင်ခြင်းက သင်၏ နားကို ထိခိုက်စေနိုင်သည်။"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"အများသုံးစွဲနိုင်မှု ဖြတ်လမ်းလင့်ခ်ကို အသုံးပြုလိုပါသလား။"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"ဖြတ်လမ်းလင့်ခ်ကို ဖွင့်ထားစဉ် အသံအတိုးအလျှော့ခလုတ် နှစ်ခုစလုံးကို ၃ စက္ကန့်ခန့် ဖိထားခြင်းဖြင့် အများသုံးစွဲနိုင်မှုဆိုင်ရာ ဝန်ဆောင်မှုကို ဖွင့်နိုင်သည်။\n\n လက်ရှိ အများသုံးစွဲနိုင်မှုဆိုင်ရာ ဝန်ဆောင်မှု−\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ဝန်ဆောင်မှုကို ဆက်တင်များ > အများသုံးစွဲနိုင်မှုတွင် ပြောင်းလဲနိုင်ပါသည်။"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 6f3b6c213cad..bb3d52f7b854 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Du har tegnet opplåsningsmønsteret feil <xliff:g id="NUMBER_0">%1$d</xliff:g> ganger. Etter ytterligere <xliff:g id="NUMBER_1">%2$d</xliff:g> gale forsøk, blir du bedt om å låse opp telefonen via en e-postkonto.\n\n Prøv på nytt om <xliff:g id="NUMBER_2">%3$d</xliff:g> sekunder."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Fjern"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Vil du øke volumet til over anbefalt nivå?\n\nHvis du hører på et høyt volum over lengre perioder, kan det skade hørselen din."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Vil du bruke tilgjengelighetssnarveien?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Når snarveien er på, starter en tilgjengelighetsfunksjon når du trykker inn begge volumknappene i tre sekunder.\n\n Nåværende tilgjengelighetsfunksjon:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Du kan endre funksjonen i Innstillinger > Tilgjengelighet."</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index ebbf50bf41e4..b3d6cdecf8ed 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -1619,6 +1619,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"तपाईँले आफ्नो अनलक ढाँचा गलत रूपमा <xliff:g id="NUMBER_0">%1$d</xliff:g> पटक तान्नु भएको छ। <xliff:g id="NUMBER_1">%2$d</xliff:g> धेरै असफल प्रयासहरूपछि, तपाईँलाई एउटा इमेल खाताको प्रयोग गरेर तपाईँको फोन अनलक गर्न सोधिने छ।\n\n फेरि <xliff:g id="NUMBER_2">%3$d</xliff:g> सेकेन्डमा प्रयास गर्नुहोस्।"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"हटाउनुहोस्"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"सिफारिस तहभन्दा आवाज ठुलो गर्नुहुन्छ?\n\nलामो समय सम्म उच्च आवाजमा सुन्दा तपाईँको सुन्ने शक्तिलाई हानी गर्न सक्छ।"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"पहुँच सम्बन्धी सर्टकट प्रयोग गर्ने हो?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"सर्टकट सक्रिय हुँदा, भोल्युमका दुवै बटनहरूलाई ३ सेकेन्डसम्म थिची राख्नाले पहुँच सम्बन्धी कुनै सुविधा सुरु हुनेछ।\n\n हाल व्यवहारमा रहेको पहुँच सम्बन्धी सुविधा:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n तपाईं सेटिङहरू अन्तर्गतको पहुँच सम्बन्धी विकल्पमा गई उक्त सुविधालाई बदल्न सक्नुहुन्छ।"</string> @@ -1993,8 +1995,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"<xliff:g id="EXTENSION">%1$s</xliff:g> स्प्रेडसिट"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"प्रस्तुति"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"<xliff:g id="EXTENSION">%1$s</xliff:g> प्रस्तुति"</string> - <!-- no translation found for bluetooth_airplane_mode_toast (2066399056595768554) --> - <skip /> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"हवाइजहाज मोडमा ब्लुटुथ सक्रिय रहने छ"</string> <string name="car_loading_profile" msgid="8219978381196748070">"लोड गर्दै"</string> <plurals name="file_count" formatted="false" msgid="7063513834724389247"> <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> फाइलहरू</item> @@ -2015,8 +2016,7 @@ <!-- no translation found for accessibility_system_action_accessibility_menu_label (8436484650391125184) --> <skip /> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"<xliff:g id="APP_NAME">%1$s</xliff:g> को क्याप्सन बार।"</string> - <!-- no translation found for as_app_forced_to_restricted_bucket (8233871289353898964) --> - <skip /> + <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> लाई प्रतिबन्धित बाल्टीमा राखियो"</string> <!-- no translation found for resolver_personal_tab (2051260504014442073) --> <skip /> <!-- no translation found for resolver_work_tab (2690019516263167035) --> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 0635c214a4c1..47de950c5c7d 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Je hebt je ontgrendelingspatroon <xliff:g id="NUMBER_0">%1$d</xliff:g> keer onjuist getekend. Na nog eens <xliff:g id="NUMBER_1">%2$d</xliff:g> mislukte pogingen wordt u gevraagd je telefoon te ontgrendelen via een e-mailaccount.\n\n Probeer het over <xliff:g id="NUMBER_2">%3$d</xliff:g> seconden opnieuw."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Verwijderen"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Volume verhogen tot boven het aanbevolen niveau?\n\nAls je langere tijd op hoog volume naar muziek luistert, raakt je gehoor mogelijk beschadigd."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Snelkoppeling toegankelijkheid gebruiken?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Wanneer de snelkoppeling is ingeschakeld, kun je drie seconden op beide volumeknoppen drukken om een toegankelijkheidsfunctie te starten.\n\n Huidige toegankelijkheidsfunctie:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Je kunt de functie wijzigen in Instellingen > Toegankelijkheid."</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index 03a7ea3be704..1242188f791a 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"ଆପଣଙ୍କ ଅନଲକ୍ ପାଟର୍ନକୁ ଆପଣ <xliff:g id="NUMBER_0">%1$d</xliff:g> ଥର ଭୁଲ ଭାବେ ଅଙ୍କନ କରିଛନ୍ତି। ଆଉ <xliff:g id="NUMBER_1">%2$d</xliff:g>ଟି ଭୁଲ ପ୍ରୟାସ ପରେ ଏକ ଇମେଲ୍ ଆକାଉଣ୍ଟ ବ୍ୟବହାର କରି ନିଜ ଫୋନ୍କୁ ଅନଲକ୍ କରିବା ପାଇଁ କୁହାଯିବ।\n\n<xliff:g id="NUMBER_2">%3$d</xliff:g> ସେକେଣ୍ଡ ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"ବାହାର କରନ୍ତୁ"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"ମାତ୍ରା ବଢ଼ାଇ ସୁପାରିଶ ସ୍ତର ବଢ଼ାଉଛନ୍ତି? \n\n ଲମ୍ବା ସମୟ ପର୍ଯ୍ୟନ୍ତ ଉଚ୍ଚ ଶବ୍ଦରେ ଶୁଣିଲେ ଆପଣଙ୍କ ଶ୍ରବଣ ଶକ୍ତି ଖରାପ ହୋଇପାରେ।"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ଆକ୍ସେସବିଲିଟି ଶର୍ଟକଟ୍ ବ୍ୟବହାର କରିବେ?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"ସର୍ଟକଟ୍ ଅନ୍ ଥିବା ବେଳେ, ଉଭୟ ଭଲ୍ୟୁମ୍ ବଟନ୍ 3 ସେକେଣ୍ଡ ପାଇଁ ଦବାଇବା ଦ୍ୱାରା ଆକ୍ସେସବିଲିଟି ବୈଶିଷ୍ଟ ଆରମ୍ଭ ହେବ।\n\n ସମ୍ପ୍ରତି ଆକ୍ସେସବିଲିଟି ବୈଶିଷ୍ଟ୍ୟ:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ସେଟିଙ୍ଗ ଓ ଆକ୍ସେସବିଲିଟିରେ ଆପଣ ବୈଶିଷ୍ଟ୍ୟ ବଦଳାଇ ପାରିବେ।"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index b2cca4db6615..b6513c399559 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"ਤੁਸੀਂ <xliff:g id="NUMBER_0">%1$d</xliff:g> ਵਾਰ ਆਪਣਾ ਅਣਲਾਕ ਪੈਟਰਨ ਗਲਤ ਢੰਗ ਨਾਲ ਡ੍ਰਾ ਕੀਤਾ ਹੈ। <xliff:g id="NUMBER_1">%2$d</xliff:g> ਹੋਰ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਤੋਂ ਬਾਅਦ, ਤੁਹਾਨੂੰ ਇੱਕ ਈਮੇਲ ਖਾਤਾ ਵਰਤਦੇ ਹੋਏ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ ਲਈ ਕਿਹਾ ਜਾਏਗਾ।\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"ਹਟਾਓ"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"ਕੀ ਵੌਲਿਊਮ ਸਿਫ਼ਾਰਸ਼ ਕੀਤੇ ਪੱਧਰ ਤੋਂ ਵਧਾਉਣੀ ਹੈ?\n\nਲੰਮੇ ਸਮੇਂ ਤੱਕ ਉੱਚ ਵੌਲਿਊਮ ਤੇ ਸੁਣਨ ਨਾਲ ਤੁਹਾਡੀ ਸੁਣਨ ਸ਼ਕਤੀ ਨੂੰ ਨੁਕਸਾਨ ਪਹੁੰਚ ਸਕਦਾ ਹੈ।"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ਕੀ ਪਹੁੰਚਯੋਗਤਾ ਸ਼ਾਰਟਕੱਟ ਵਰਤਣਾ ਹੈ?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੋਣ \'ਤੇ, ਕਿਸੇ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਵਾਜ਼ ਬਟਨਾਂ ਨੂੰ 3 ਸਕਿੰਟ ਲਈ ਦਬਾ ਕੇ ਰੱਖੋ।\n\n ਵਰਤਮਾਨ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ > ਪਹੁੰਚਯੋਗਤਾ ਵਿੱਚ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਬਦਲ ਸਕਦੇ ਹੋ।"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 94fd851f7c66..964c973e491f 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1657,6 +1657,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Po raz <xliff:g id="NUMBER_0">%1$d</xliff:g> nieprawidłowo narysowałeś wzór odblokowania. Po kolejnych <xliff:g id="NUMBER_1">%2$d</xliff:g> nieudanych próbach konieczne będzie odblokowanie telefonu przy użyciu danych logowania na konto Google.\n\n Spróbuj ponownie za <xliff:g id="NUMBER_2">%3$d</xliff:g> s."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Usuń"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Zwiększyć głośność ponad zalecany poziom?\n\nSłuchanie głośno przez długi czas może uszkodzić Twój słuch."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Użyć skrótu do ułatwień dostępu?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Gdy skrót jest włączony, jednoczesne naciśnięcie przez trzy sekundy obu klawiszy sterowania głośnością uruchomi funkcję ułatwień dostępu.\n\nBieżąca funkcja ułatwień dostępu:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\nFunkcję możesz zmienić, wybierając Ustawienia > Ułatwienia dostępu."</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 72a3ce904a8c..a6fd0fe230ec 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Você desenhou sua sequência de desbloqueio incorretamente <xliff:g id="NUMBER_0">%1$d</xliff:g> vezes. Se fizer mais <xliff:g id="NUMBER_1">%2$d</xliff:g> tentativas incorretas, será solicitado que você use o login do Google para desbloquear.\n\n Tente novamente em <xliff:g id="NUMBER_2">%3$d</xliff:g> segundos."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Remover"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Aumentar o volume acima do nível recomendado?\n\nOuvir em volume alto por longos períodos pode danificar sua audição."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Usar atalho de Acessibilidade?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Quando o atalho está ativado, pressione os dois botões de volume por três segundos para iniciar um recurso de acessibilidade.\n\n Recurso de acessibilidade atual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n É possível alterar o recurso em Configurações > Acessibilidade."</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 4f45517c0bb9..81f5ced0a044 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Desenhou o padrão de desbloqueio incorretamente <xliff:g id="NUMBER_0">%1$d</xliff:g> vezes. Depois de mais <xliff:g id="NUMBER_1">%2$d</xliff:g> tentativas sem sucesso, ser-lhe-á pedido para desbloquear o telemóvel através de uma conta de email.\n\n Tente novamente dentro de <xliff:g id="NUMBER_2">%3$d</xliff:g> segundos."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" - "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Remover"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Aumentar o volume acima do nível recomendado?\n\nOuvir com um volume elevado durante longos períodos poderá ser prejudicial para a sua audição."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Pretende utilizar o atalho de acessibilidade?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Quando o atalho está ativado, premir ambos os botões de volume durante 3 segundos inicia uma funcionalidade de acessibilidade.\n\n Funcionalidade de acessibilidade atual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Pode alterar a funcionalidade em Definições > Acessibilidade."</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 72a3ce904a8c..a6fd0fe230ec 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Você desenhou sua sequência de desbloqueio incorretamente <xliff:g id="NUMBER_0">%1$d</xliff:g> vezes. Se fizer mais <xliff:g id="NUMBER_1">%2$d</xliff:g> tentativas incorretas, será solicitado que você use o login do Google para desbloquear.\n\n Tente novamente em <xliff:g id="NUMBER_2">%3$d</xliff:g> segundos."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Remover"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Aumentar o volume acima do nível recomendado?\n\nOuvir em volume alto por longos períodos pode danificar sua audição."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Usar atalho de Acessibilidade?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Quando o atalho está ativado, pressione os dois botões de volume por três segundos para iniciar um recurso de acessibilidade.\n\n Recurso de acessibilidade atual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n É possível alterar o recurso em Configurações > Acessibilidade."</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index d7cdade6c674..cb8d3fee32ca 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1635,6 +1635,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> secunde."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Eliminați"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Ridicați volumul mai sus de nivelul recomandat?\n\nAscultarea la volum ridicat pe perioade lungi de timp vă poate afecta auzul."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Utilizați comanda rapidă pentru accesibilitate?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Când comanda rapidă este activată, dacă apăsați ambele butoane de volum timp de 3 secunde, veți lansa o funcție de accesibilitate.\n\n Funcția actuală de accesibilitate:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Puteți schimba funcția în Setări > Accesibilitate."</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 91b7ca6ab62c..4821c7f9d175 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1657,6 +1657,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Вы <xliff:g id="NUMBER_0">%1$d</xliff:g> раз неверно указали графический ключ. После <xliff:g id="NUMBER_1">%2$d</xliff:g> неверных попыток для разблокировки телефона потребуется войти в аккаунт Google.\n\nПовтор через <xliff:g id="NUMBER_2">%3$d</xliff:g> сек."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Удалить"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Установить громкость выше рекомендуемого уровня?\n\nВоздействие громкого звука в течение долгого времени может привести к повреждению слуха."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Использовать быстрое включение?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Чтобы использовать функцию специальных возможностей, когда она включена, нажмите и удерживайте три секунды обе кнопки регулировки громкости.\n\nТекущая функция специальных возможностей:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\nВы можете изменить ее в разделе \"Настройки > Специальные возможности\"."</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 601f9b9ee6c6..df14036c1a07 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -1615,6 +1615,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"ඔබ වැරදියට <xliff:g id="NUMBER_0">%1$d</xliff:g> වතාවක් ඔබගේ අගුළු හැරීමේ රටාව ඇඳ ඇත. අසාර්ථක උත්සහ කිරීම් <xliff:g id="NUMBER_1">%2$d</xliff:g> න් පසුව, ඔබගේ ඊ-තැපැල් ලිපිනය භාවිතයෙන් ඔබගේ දුරකථනය අගුළු හැරීමට ඔබගෙන් අසයි.\n\n තත්පර <xliff:g id="NUMBER_2">%3$d</xliff:g> න් පසුව නැවත උත්සහ කරන්න."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"ඉවත් කරන්න"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"නිර්දේශිතයි මට්ටමට වඩා ශබ්දය වැඩිද?\n\nදිගු කාලයක් සඳහා ඉහළ ශබ්දයක් ඇසීමෙන් ඇතැම් විට ඔබගේ ඇසීමට හානි විය හැක."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ප්රවේශ්යතා කෙටිමඟ භාවිතා කරන්නද?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"කෙටිමඟ සක්රිය විට, හඬ බොත්තම් දෙකම තත්පර 3ක් අල්ලාගෙන සිටීමෙන් ප්රවේශ්යත අංගයක් ඇරඹේ.\n\n වත්මන් ප්රවේශ්යතා අංගය:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n සැකසීම් > ප්රවේශ්යතාව තුළ ඔබට අංගය වෙනස් කළ හැක."</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index fb81855b4590..b0dc5f3cd342 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1657,6 +1657,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"<xliff:g id="NUMBER_0">%1$d</xliff:g>-krát ste nesprávne nakreslili svoj bezpečnostný vzor. Po <xliff:g id="NUMBER_1">%2$d</xliff:g> ďalších neúspešných pokusoch sa zobrazí výzva na odomknutie telefónu pomocou e-mailového účtu.\n\n Skúste to znova o <xliff:g id="NUMBER_2">%3$d</xliff:g> s."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Odstrániť"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Zvýšiť hlasitosť nad odporúčanú úroveň?\n\nDlhodobé počúvanie pri vysokej hlasitosti môže poškodiť váš sluch."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Použiť skratku dostupnosti?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Keď je skratka zapnutá, stlačením obidvoch tlačidiel hlasitosti na tri sekundy spustíte funkciu dostupnosti.\n\n Aktuálna funkcia dostupnosti:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funkciu môžete zmeniť v časti Nastavenia > Dostupnosť."</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 9405fb2a4e13..bdd5925d8a3e 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1657,6 +1657,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Vzorec za odklepanje ste <xliff:g id="NUMBER_0">%1$d</xliff:g>-krat napačno vnesli. Po nadaljnjih <xliff:g id="NUMBER_1">%2$d</xliff:g> neuspešnih poskusih boste pozvani, da odklenete telefon z Googlovimi podatki za prijavo.\n\nPoskusite znova čez <xliff:g id="NUMBER_2">%3$d</xliff:g> s."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Odstrani"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Ali želite povečati glasnost nad priporočeno raven?\n\nDolgotrajno poslušanje pri veliki glasnosti lahko poškoduje sluh."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Želite uporabljati bližnjico funkcij za ljudi s posebnimi potrebami?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Ko je bližnjica vklopljena, pritisnite gumba za glasnost in ju pridržite tri sekunde, če želite zagnati funkcijo za ljudi s posebnimi potrebami.\n\n Trenutna funkcija za ljudi s posebnimi potrebami:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funkcijo lahko spremenite v »Nastavitve > Funkcije za ljudi s posebnimi potrebami«."</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index fe167da393fa..fd8dda060448 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Ke vizatuar <xliff:g id="NUMBER_0">%1$d</xliff:g> herë pa sukses motivin tënd. Pas <xliff:g id="NUMBER_1">%2$d</xliff:g> tentativave të tjera të pasuksesshme, do të të duhet ta shkyçësh telefonin duke përdorur një llogari mail-i.\n\n Provo sërish për <xliff:g id="NUMBER_2">%3$d</xliff:g> sekonda."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" - "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Hiq"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Të ngrihet volumi mbi nivelin e rekomanduar?\n\nDëgjimi me volum të lartë për periudha të gjata mund të dëmtojë dëgjimin."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Të përdoret shkurtorja e qasshmërisë?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Kur shkurtorja është e aktivizuar, shtypja e të dy butonave për 3 sekonda do të nisë një funksion qasshmërie.\n\n Funksioni aktual i qasshmërisë:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Mund ta ndryshosh funksionin te Cilësimet > Qasshmëria."</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 564612c454ce..d82faa66ed12 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1635,6 +1635,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Нацртали сте шаблон за откључавање нетачно <xliff:g id="NUMBER_0">%1$d</xliff:g> пута. После још <xliff:g id="NUMBER_1">%2$d</xliff:g> неуспешна(их) покушаја, од вас ће бити затражено да откључате телефон помоћу налога е-поште.\n\nПробајте поново за <xliff:g id="NUMBER_2">%3$d</xliff:g> секунде/и."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Уклони"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Желите да појачате звук изнад препорученог нивоа?\n\nСлушање гласне музике дуже време може да вам оштети слух."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Желите ли да користите пречицу за приступачност?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Када је пречица укључена, притисните оба дугмета за јачину звука да бисте покренули функцију приступачности.\n\n Актуелна функција приступачности:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Можете да промените функцију у одељку Подешавања > Приступачност."</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 4332352909f6..9c7e1e5ecc4b 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Du har ritat ditt grafiska lösenord fel <xliff:g id="NUMBER_0">%1$d</xliff:g> gånger. Efter ytterligare <xliff:g id="NUMBER_1">%2$d</xliff:g> försök ombeds du låsa upp mobilen med hjälp av ett e-postkonto.\n\n Försök igen om <xliff:g id="NUMBER_2">%3$d</xliff:g> sekunder."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Ta bort"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Vill du höja volymen över den rekommenderade nivån?\n\nAtt lyssna med stark volym långa stunder åt gången kan skada hörseln."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Vill du använda Aktivera tillgänglighet snabbt?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"När kortkommandot har aktiverats startar du en tillgänglighetsfunktion genom att trycka ned båda volymknapparna i tre sekunder.\n\n Aktuell tillgänglighetsfunktion:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Du kan ändra funktionen i Inställningar > Tillgänglighet."</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index d1bff3f55906..f53efe068aec 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Umekosea kuchora mchoro wako wa kufungua mara <xliff:g id="NUMBER_0">%1$d</xliff:g>. Baada ya majaribio <xliff:g id="NUMBER_1">%2$d</xliff:g> yasiyofaulu, utaombwa kufungua simu yako kwa kutumia akaunti ya barua pepe.\n\n Jaribu tena baada ya sekunde <xliff:g id="NUMBER_2">%3$d</xliff:g>."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Ondoa"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Ungependa kupandisha sauti zaidi ya kiwango kinachopendekezwa?\n\nKusikiliza kwa sauti ya juu kwa muda mrefu kunaweza kuharibu uwezo wako wa kusikia."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Ungependa kutumia njia ya mkato ya ufikivu?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Unapowasha kipengele cha njia ya mkato, hatua ya kubonyeza vitufe vyote viwili vya sauti kwa dakika 3 itafungua kipengele cha ufikivu.\n\n Kipengele cha ufikivu kilichopo kwa sasa:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Unaweza kubadilisha kipengele hiki katika Mipangilio > Zana za ufikivu."</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 5444f36081f3..c7c4ea3c6a5b 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"திறப்பதற்கான வடிவத்தை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக வரைந்துள்ளீர்கள். மேலும் <xliff:g id="NUMBER_1">%2$d</xliff:g> தோல்வி முயற்சிகளுக்குப் பிறகு, மின்னஞ்சல் கணக்கைப் பயன்படுத்தி உங்கள் மொபைலைத் திறக்கக் கேட்கப்படுவீர்கள்.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> வினாடிகள் கழித்து முயற்சிக்கவும்."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"அகற்று"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"பரிந்துரைத்த அளவை விட ஒலியை அதிகரிக்கவா?\n\nநீண்ட நேரத்திற்கு அதிகளவில் ஒலி கேட்பது கேட்கும் திறனைப் பாதிக்கலாம்."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"அணுகல்தன்மை ஷார்ட்கட்டைப் பயன்படுத்தவா?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"ஷார்ட்கட் இயக்கத்தில் இருந்தால், இரண்டு ஒலியளவு பொத்தான்களையும் 3 வினாடிகள் அழுத்தி, அணுகல்தன்மை அம்சத்தை இயக்கலாம்.\n\n தற்போதைய அணுகல்தன்மை அம்சம்:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n அமைப்புகள் > அணுகல்தன்மை என்பதற்குச் சென்று, அம்சத்தை மாற்றலாம்."</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index f9f6479eece2..9c77ccd01b92 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"మీరు మీ అన్లాక్ నమూనాను <xliff:g id="NUMBER_0">%1$d</xliff:g> సార్లు తప్పుగా గీసారు. మరో <xliff:g id="NUMBER_1">%2$d</xliff:g> విఫల ప్రయత్నాల తర్వాత, ఇమెయిల్ ఖాతాను ఉపయోగించి మీ ఫోన్ను అన్లాక్ చేయాల్సిందిగా మిమ్మల్ని అడుగుతారు.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> సెకన్లలో మళ్లీ ప్రయత్నించండి."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"తీసివేయి"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"వాల్యూమ్ను సిఫార్సు చేయబడిన స్థాయి కంటే ఎక్కువగా పెంచాలా?\n\nసుదీర్ఘ వ్యవధుల పాటు అధిక వాల్యూమ్లో వినడం వలన మీ వినికిడి శక్తి దెబ్బ తినవచ్చు."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"యాక్సెస్ సామర్థ్యం షార్ట్కట్ను ఉపయోగించాలా?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"షార్ట్కట్ ఆన్లో ఉన్నప్పుడు, రెండు వాల్యూమ్ బటన్లను 3 సెకన్ల పాటు నొక్కితే యాక్సెస్ సామర్థ్య ఫీచర్ ప్రారంభం అవుతుంది.\n\n ప్రస్తుత యాక్సెస్ సామర్థ్య ఫీచర్:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n సెట్టింగ్లు > యాక్సెస్ సామర్థ్యంలో మీరు ఫీచర్ను మార్చవచ్చు."</string> @@ -1987,8 +1989,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"<xliff:g id="EXTENSION">%1$s</xliff:g> స్ప్రెడ్షీట్"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"ప్రదర్శన"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"<xliff:g id="EXTENSION">%1$s</xliff:g> ప్రదర్శన"</string> - <!-- no translation found for bluetooth_airplane_mode_toast (2066399056595768554) --> - <skip /> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"విమానం మోడ్లో బ్లూటూత్ ఆన్లో ఉంటుంది"</string> <string name="car_loading_profile" msgid="8219978381196748070">"లోడవుతోంది"</string> <plurals name="file_count" formatted="false" msgid="7063513834724389247"> <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> ఫైల్లు</item> @@ -2009,8 +2010,7 @@ <!-- no translation found for accessibility_system_action_accessibility_menu_label (8436484650391125184) --> <skip /> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"<xliff:g id="APP_NAME">%1$s</xliff:g> క్యాప్షన్ బార్."</string> - <!-- no translation found for as_app_forced_to_restricted_bucket (8233871289353898964) --> - <skip /> + <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> పరిమితం చేయబడిన బకెట్లో ఉంచబడింది"</string> <!-- no translation found for resolver_personal_tab (2051260504014442073) --> <skip /> <!-- no translation found for resolver_work_tab (2690019516263167035) --> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 7796b03b1ae0..efff25bf74c8 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"คุณวาดรูปแบบการปลดล็อกไม่ถูกต้อง <xliff:g id="NUMBER_0">%1$d</xliff:g> ครั้งแล้ว หากทำไม่สำเร็จอีก <xliff:g id="NUMBER_1">%2$d</xliff:g> ครั้ง ระบบจะขอให้คุณปลดล็อกโทรศัพท์โดยใช้ับัญชีอีเมล\n\n โปรดลองอีกครั้งในอีก <xliff:g id="NUMBER_2">%3$d</xliff:g> วินาที"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"ลบ"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"นี่เป็นการเพิ่มระดับเสียงเกินระดับที่แนะนำ\n\nการฟังเสียงดังเป็นเวลานานอาจทำให้การได้ยินของคุณบกพร่องได้"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ใช้ทางลัดการช่วยเหลือพิเศษไหม"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"เมื่อทางลัดเปิดอยู่ การกดปุ่มปรับระดับเสียงทั้ง 2 ปุ่มเป็นเวลา 3 วินาทีจะเริ่มฟีเจอร์การช่วยเหลือพิเศษ\n\n ฟีเจอร์การช่วยเหลือพิเศษปัจจุบัน:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n คุณสามารถเปลี่ยนฟีเจอร์ในการตั้งค่า > การช่วยเหลือพิเศษ"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index d15bcd7f48d7..7cfa7b02ebaa 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Naguhit mo nang hindi tama ang iyong pattern sa pag-unlock nang <xliff:g id="NUMBER_0">%1$d</xliff:g> (na) beses. Pagkatapos ng <xliff:g id="NUMBER_1">%2$d</xliff:g> pang hindi matagumpay na pagtatangka, hihilingin sa iyong i-unlock ang telepono mo gamit ang isang email account.\n\n Subukang muli sa loob ng <xliff:g id="NUMBER_2">%3$d</xliff:g> (na) segundo."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Alisin"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Lakasan ang volume nang lagpas sa inirerekomendang antas?\n\nMaaaring mapinsala ng pakikinig sa malakas na volume sa loob ng mahahabang panahon ang iyong pandinig."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Gagamitin ang Shortcut sa Pagiging Accessible?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Kapag naka-on ang shortcut, magsisimula ang isang feature ng pagiging naa-access kapag pinindot ang parehong button ng volume sa loob ng 3 segundo.\n\n Kasalukuyang feature ng pagiging naa-access:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Maaari mong baguhin ang feature sa Mga Setting > Pagiging Accessible."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index e5559c507c30..b47eb4bb025c 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Kilit açma deseninizi <xliff:g id="NUMBER_0">%1$d</xliff:g> kez yanlış çizdiniz. <xliff:g id="NUMBER_1">%2$d</xliff:g> başarısız denemeden sonra telefonunuzu bir e-posta hesabı kullanarak açmanız istenir.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> saniye içinde tekrar deneyin."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Kaldır"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Ses seviyesi önerilen düzeyin üzerine yükseltilsin mi?\n\nUzun süre yüksek ses seviyesinde dinlemek işitme duyunuza zarar verebilir."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Erişilebilirlik Kısayolu Kullanılsın mı?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Kısayol açık olduğunda, ses düğmelerinin ikisini birden 3 saniyeliğine basılı tutmanız bir erişilebilirlik özelliğini başlatır.\n\n Geçerli erişilebilirlik özelliği:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Özelliği, Ayarlar > Erişilebilirlik seçeneğinden değiştirebilirsiniz."</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 7c06892e070c..22aa199d9964 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1657,6 +1657,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Ключ розблокування неправильно намальовано стільки разів: <xliff:g id="NUMBER_0">%1$d</xliff:g>. У вас є ще стільки спроб: <xliff:g id="NUMBER_1">%2$d</xliff:g>. У разі невдачі з’явиться запит розблокувати телефон за допомогою облікового запису електронної пошти.\n\n Повторіть спробу через <xliff:g id="NUMBER_2">%3$d</xliff:g> сек."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" – "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Вилучити"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Збільшити гучність понад рекомендований рівень?\n\nЯкщо слухати надто гучну музику тривалий час, можна пошкодити слух."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Використовувати швидке ввімкнення?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Коли ярлик увімкнено, після натискання обох клавіш гучності й утримування їх протягом 3 секунд увімкнеться функція спеціальних можливостей.\n\n Поточна функція спеціальних можливостей:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Цю функцію можна змінити в меню \"Налаштування\" > \"Спеціальні можливості\"."</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 1b007200def6..a88d6c504964 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"آپ نے اپنا غیر مقفل کرنے کا پیٹرن <xliff:g id="NUMBER_0">%1$d</xliff:g> بار غلط طریقے سے ڈرا کیا ہے۔ <xliff:g id="NUMBER_1">%2$d</xliff:g> مزید ناکام کوششوں کے بعد، آپ سے ایک ای میل اکاؤنٹ استعمال کرکے اپنا فون غیر مقفل کرنے کو کہا جائے گا۔\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> سیکنڈ میں دوبارہ کوشش کریں۔"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"ہٹائیں"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"والیوم کو تجویز کردہ سطح سے زیادہ کریں؟\n\nزیادہ وقت تک اونچی آواز میں سننے سے آپ کی سماعت کو نقصان پہنچ سکتا ہے۔"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"ایکسیسبیلٹی شارٹ کٹ استعمال کریں؟"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"شارٹ کٹ آن ہونے پر، 3 سیکنڈ تک دونوں والیوم بٹنز کو دبانے سے ایک ایکسیسبیلٹی خصوصیت شروع ہو جائے گی۔\n\n موجودہ ایکسیسبیلٹی خصوصیت:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n آپ خصوصیت کو ترتیبات > ایکسیسبیلٹی میں جا کر تبدیل کر سکتے ہیں۔"</string> @@ -1987,8 +1989,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"<xliff:g id="EXTENSION">%1$s</xliff:g> اسپریڈشیٹ"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"پیشکش"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"<xliff:g id="EXTENSION">%1$s</xliff:g> پیشکش"</string> - <!-- no translation found for bluetooth_airplane_mode_toast (2066399056595768554) --> - <skip /> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"ہوائی جہاز وضع کے دوران بلوٹوتھ آن رہے گا"</string> <string name="car_loading_profile" msgid="8219978381196748070">"لوڈ ہو رہا ہے"</string> <plurals name="file_count" formatted="false" msgid="7063513834724389247"> <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> فائلز</item> @@ -2009,8 +2010,7 @@ <!-- no translation found for accessibility_system_action_accessibility_menu_label (8436484650391125184) --> <skip /> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"<xliff:g id="APP_NAME">%1$s</xliff:g> کی کیپشن بار۔"</string> - <!-- no translation found for as_app_forced_to_restricted_bucket (8233871289353898964) --> - <skip /> + <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> کو پابند کردہ بکٹ میں رکھ دیا گیا ہے"</string> <!-- no translation found for resolver_personal_tab (2051260504014442073) --> <skip /> <!-- no translation found for resolver_work_tab (2690019516263167035) --> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 1193d278774d..a08b1788c5d6 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Siz grafik kalitni <xliff:g id="NUMBER_0">%1$d</xliff:g> marta noto‘g‘ri chizdingiz. <xliff:g id="NUMBER_1">%2$d</xliff:g> marta muvaffaqiyatsiz urinishdan so‘ng, sizdan e-pochtangizdan foydalanib, telefon qulfini ochishingiz so‘raladi.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> soniyadan so‘ng yana urinib ko‘ring."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Olib tashlash"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Tovush balandligi tavsiya etilgan darajadan ham yuqori qilinsinmi?\n\nUzoq vaqt davomida baland ovozda tinglash eshitish qobiliyatingizga salbiy ta’sir ko‘rsatishi mumkin."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Tezkor ishga tushirishdan foydalanilsinmi?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Maxsus imkoniyatlar funksiyasidan foydalanish uchun u yoniqligida ikkala ovoz balandligini boshqarish tugmasini 3 soniya bosib turing.\n\n Joriy maxsus imkoniyatlar funksiyasi:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Bu funksiyani Sozlamalar > Maxsus imkoniyatlar orqali o‘zgartirish mumkin."</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 7cfd87051a2b..db55613dce7e 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Bạn đã <xliff:g id="NUMBER_0">%1$d</xliff:g> lần vẽ không chính xác hình mở khóa của mình. Sau <xliff:g id="NUMBER_1">%2$d</xliff:g> lần thử không thành công nữa, bạn sẽ được yêu cầu mở khóa điện thoại bằng tài khoản email.\n\n Vui lòng thử lại sau <xliff:g id="NUMBER_2">%3$d</xliff:g> giây."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Xóa"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Bạn tăng âm lượng lên quá mức khuyên dùng?\n\nViệc nghe ở mức âm lượng cao trong thời gian dài có thể gây tổn thương thính giác của bạn."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Sử dụng phím tắt Hỗ trợ tiếp cận?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Khi phím tắt được bật, nhấn cả hai nút âm lượng trong 3 giây sẽ bắt đầu một tính năng trợ năng.\n\n Tính năng trợ năng hiện tại:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Bạn có thể thay đổi tính năng trong Cài đặt > Trợ năng."</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 5d7ad5ad0361..08d232683c57 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"您已连续 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次画错解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次后仍不成功，系统就会要求您使用自己的电子邮件帐号解锁手机。\n\n请在 <xliff:g id="NUMBER_2">%3$d</xliff:g> 秒后重试。"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"删除"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"要将音量调高到建议的音量以上吗？\n\n长时间保持高音量可能会损伤听力。"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"要使用无障碍快捷方式吗？"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"开启快捷方式后，同时按下两个音量按钮 3 秒钟即可启动所设定的无障碍功能。\n\n当前设定的无障碍功能：\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n如需更改设定的功能，请依次转到“设置”>“无障碍”。"</string> @@ -1987,8 +1989,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"<xliff:g id="EXTENSION">%1$s</xliff:g> 电子表格"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"演示文稿"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"<xliff:g id="EXTENSION">%1$s</xliff:g> 演示文稿"</string> - <!-- no translation found for bluetooth_airplane_mode_toast (2066399056595768554) --> - <skip /> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"在飞行模式下，蓝牙将保持开启状态"</string> <string name="car_loading_profile" msgid="8219978381196748070">"正在加载"</string> <plurals name="file_count" formatted="false" msgid="7063513834724389247"> <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> 个文件</item> @@ -2009,8 +2010,7 @@ <!-- no translation found for accessibility_system_action_accessibility_menu_label (8436484650391125184) --> <skip /> <string name="accessibility_freeform_caption" msgid="8377519323496290122">"<xliff:g id="APP_NAME">%1$s</xliff:g>的标题栏。"</string> - <!-- no translation found for as_app_forced_to_restricted_bucket (8233871289353898964) --> - <skip /> + <string name="as_app_forced_to_restricted_bucket" msgid="8233871289353898964">"<xliff:g id="PACKAGE_NAME">%1$s</xliff:g> 已被放入受限存储分区"</string> <!-- no translation found for resolver_personal_tab (2051260504014442073) --> <skip /> <!-- no translation found for resolver_work_tab (2690019516263167035) --> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 361eb4c66029..ea106c6c2a78 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"您已畫錯解鎖圖案 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次，如果再嘗試 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次仍未成功，系統會要求您透過電郵帳戶解開上鎖的手機。\n\n請在 <xliff:g id="NUMBER_2">%3$d</xliff:g> 秒後再試一次。"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"移除"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"要調高音量 (比建議的音量更大聲) 嗎？\n\n長時間聆聽高分貝音量可能會導致您的聽力受損。"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"要使用無障礙功能快速鍵嗎？"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"快速鍵開啟後，同時按住音量按鈕 3 秒，無障礙功能便會啟用。\n\n目前的無障礙功能：\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n如要變更功能，請前往「設定」>「無障礙功能」。"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 2bcae59eb4cf..70651816bfbd 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"你的解鎖圖案已畫錯 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次，如果再嘗試 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次仍未成功，系統就會要求你透過電子郵件帳戶解除手機的鎖定狀態。\n\n請在 <xliff:g id="NUMBER_2">%3$d</xliff:g> 秒後再試一次。"</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"移除"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"要調高音量，比建議的音量更大聲嗎？\n\n長時間聆聽高分貝音量可能會使你的聽力受損。"</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"要使用無障礙捷徑嗎？"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"啟用捷徑功能後，只要同時按下兩個音量鍵 3 秒，就能啟動無障礙功能。\n\n 目前設定的無障礙功能為：\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n 如要變更設定的功能，請依序輕觸 [設定] > [無障礙設定]。"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index e96696ea0f4a..1cb67e162da7 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1613,6 +1613,8 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"Ukulayisha ungenisa iphathini yakho yokuvula ngendlela engalungile izikhathi ezi-<xliff:g id="NUMBER_0">%1$d</xliff:g> Emva kweminye imizamo engu-<xliff:g id="NUMBER_1">%2$d</xliff:g>, uzocelwa ukuvula ifoni yakho usebenzisa ukungena ngemvume ku-Google\n\n Zame futhi emumva kwengu- <xliff:g id="NUMBER_2">%3$d</xliff:g> amasekhondi."</string> <string name="kg_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"Susa"</string> + <!-- no translation found for allow_while_in_use_permission_in_fgs (4101339676785053656) --> + <skip /> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"Khuphukisa ivolumu ngaphezu kweleveli enconyiwe?\n\nUkulalela ngevolumu ephezulu izikhathi ezide kungahle kulimaze ukuzwa kwakho."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="4017995837692622933">"Sebenzisa isinqamuleli sokufinyelela?"</string> <string name="accessibility_shortcut_toogle_warning" msgid="8306239551412868396">"Uma kuvulwe isinqamuleli, ukucindezela zombili izinkinobho zevolumu amasekhondi angu-3 kuzoqala isici sokufinyelela.\n\n Isici samanje sokufinyelela:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Ungashintsha isici kuzilungiselelo > Ukufinyelela."</string> diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index 3836d6f4115d..38454ecb6111 100644 --- a/core/tests/coretests/Android.bp +++ b/core/tests/coretests/Android.bp @@ -41,6 +41,7 @@ android_test { "truth-prebuilt", "print-test-util-lib", "testng", + "servicestests-utils" ], libs: [ diff --git a/core/tests/coretests/src/android/app/PullAtomMetadataTest.java b/core/tests/coretests/src/android/app/PullAtomMetadataTest.java index 2e3f8928d9c2..0ae613400b18 100644 --- a/core/tests/coretests/src/android/app/PullAtomMetadataTest.java +++ b/core/tests/coretests/src/android/app/PullAtomMetadataTest.java @@ -32,7 +32,7 @@ public final class PullAtomMetadataTest { @Test public void testEmpty() { - PullAtomMetadata metadata = PullAtomMetadata.newBuilder().build(); + PullAtomMetadata metadata = new PullAtomMetadata.Builder().build(); assertThat(metadata.getTimeoutNs()).isEqualTo(StatsManager.DEFAULT_TIMEOUT_NS); assertThat(metadata.getCoolDownNs()).isEqualTo(StatsManager.DEFAULT_COOL_DOWN_NS); assertThat(metadata.getAdditiveFields()).isNull(); @@ -42,7 +42,7 @@ public final class PullAtomMetadataTest { public void testSetTimeoutNs() { long timeoutNs = 500_000_000L; PullAtomMetadata metadata = - PullAtomMetadata.newBuilder().setTimeoutNs(timeoutNs).build(); + new PullAtomMetadata.Builder().setTimeoutNs(timeoutNs).build(); assertThat(metadata.getTimeoutNs()).isEqualTo(timeoutNs); assertThat(metadata.getCoolDownNs()).isEqualTo(StatsManager.DEFAULT_COOL_DOWN_NS); assertThat(metadata.getAdditiveFields()).isNull(); @@ -52,7 +52,7 @@ public final class PullAtomMetadataTest { public void testSetCoolDownNs() { long coolDownNs = 10_000_000_000L; PullAtomMetadata metadata = - PullAtomMetadata.newBuilder().setCoolDownNs(coolDownNs).build(); + new PullAtomMetadata.Builder().setCoolDownNs(coolDownNs).build(); assertThat(metadata.getTimeoutNs()).isEqualTo(StatsManager.DEFAULT_TIMEOUT_NS); assertThat(metadata.getCoolDownNs()).isEqualTo(coolDownNs); assertThat(metadata.getAdditiveFields()).isNull(); @@ -62,7 +62,7 @@ public final class PullAtomMetadataTest { public void testSetAdditiveFields() { int[] fields = {2, 4, 6}; PullAtomMetadata metadata = - PullAtomMetadata.newBuilder().setAdditiveFields(fields).build(); + new PullAtomMetadata.Builder().setAdditiveFields(fields).build(); assertThat(metadata.getTimeoutNs()).isEqualTo(StatsManager.DEFAULT_TIMEOUT_NS); assertThat(metadata.getCoolDownNs()).isEqualTo(StatsManager.DEFAULT_COOL_DOWN_NS); assertThat(metadata.getAdditiveFields()).isEqualTo(fields); @@ -73,7 +73,7 @@ public final class PullAtomMetadataTest { long timeoutNs = 300L; long coolDownNs = 9572L; int[] fields = {3, 2}; - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setTimeoutNs(timeoutNs) .setCoolDownNs(coolDownNs) .setAdditiveFields(fields) diff --git a/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java b/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java index c0d9be5dde59..7328f35790da 100644 --- a/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java +++ b/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java @@ -16,10 +16,10 @@ package android.content.integrity; -import static android.content.integrity.TestUtils.assertExpectException; - import static com.google.common.truth.Truth.assertThat; +import static org.testng.Assert.expectThrows; + import android.content.integrity.AtomicFormula.BooleanAtomicFormula; import android.content.integrity.AtomicFormula.StringAtomicFormula; import android.os.Parcel; @@ -133,35 +133,38 @@ public class AtomicFormulaTest { @Test public void testInvalidAtomicFormula_stringValue() { - assertExpectException( - IllegalArgumentException.class, - /* expectedExceptionMessageRegex */ - String.format("Key VERSION_CODE cannot be used with StringAtomicFormula"), - () -> - new StringAtomicFormula( - AtomicFormula.VERSION_CODE, - "test-value", - /* isHashedValue= */ false)); + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> + new StringAtomicFormula( + AtomicFormula.VERSION_CODE, + "test-value", + /* isHashedValue= */ false)); + assertThat(e.getMessage()).matches( + "Key VERSION_CODE cannot be used with StringAtomicFormula"); } @Test public void testInvalidAtomicFormula_longValue() { - assertExpectException( - IllegalArgumentException.class, - /* expectedExceptionMessageRegex */ - String.format("Key PACKAGE_NAME cannot be used with LongAtomicFormula"), - () -> - new AtomicFormula.LongAtomicFormula( - AtomicFormula.PACKAGE_NAME, AtomicFormula.EQ, 1)); + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> + new AtomicFormula.LongAtomicFormula( + AtomicFormula.PACKAGE_NAME, AtomicFormula.EQ, 1)); + assertThat(e.getMessage()).matches( + "Key PACKAGE_NAME cannot be used with LongAtomicFormula"); } @Test public void testInvalidAtomicFormula_boolValue() { - assertExpectException( - IllegalArgumentException.class, - /* expectedExceptionMessageRegex */ - String.format("Key PACKAGE_NAME cannot be used with BooleanAtomicFormula"), - () -> new BooleanAtomicFormula(AtomicFormula.PACKAGE_NAME, true)); + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> new BooleanAtomicFormula(AtomicFormula.PACKAGE_NAME, true)); + assertThat(e.getMessage()).matches( + "Key PACKAGE_NAME cannot be used with BooleanAtomicFormula"); } @Test @@ -205,20 +208,24 @@ public class AtomicFormulaTest { @Test public void testInvalidAtomicFormula_invalidKey() { - assertExpectException( - IllegalArgumentException.class, - /* expectedExceptionMessageRegex */ "Unknown key: -1", - () -> new AtomicFormula.LongAtomicFormula(/* key= */ -1, AtomicFormula.EQ, 0)); + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> new AtomicFormula.LongAtomicFormula(/* key= */ -1, + AtomicFormula.EQ, /* value= */0)); + assertThat(e.getMessage()).matches("Unknown key: -1"); } @Test public void testInvalidAtomicFormula_invalidOperator() { - assertExpectException( - IllegalArgumentException.class, - /* expectedExceptionMessageRegex */ "Unknown operator: -1", - () -> - new AtomicFormula.LongAtomicFormula( - AtomicFormula.VERSION_CODE, /* operator= */ -1, 0)); + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> + new AtomicFormula.LongAtomicFormula( + AtomicFormula.VERSION_CODE, /* operator= */ -1, /* value= */ + 0)); + assertThat(e.getMessage()).matches("Unknown operator: -1"); } @Test diff --git a/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java b/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java index fa3d671c09e5..4054c4916089 100644 --- a/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java +++ b/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java @@ -16,11 +16,9 @@ package android.content.integrity; -import static android.content.integrity.TestUtils.assertExpectException; - import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; +import static org.testng.Assert.expectThrows; import android.os.Parcel; @@ -46,32 +44,32 @@ public class CompoundFormulaTest { new CompoundFormula( CompoundFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); - assertEquals(CompoundFormula.AND, compoundFormula.getConnector()); - assertEquals( - Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2), compoundFormula.getFormulas()); + assertThat(compoundFormula.getConnector()).isEqualTo(CompoundFormula.AND); + assertThat(compoundFormula.getFormulas()).containsAllOf(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2); } @Test public void testValidateAuxiliaryFormula_binaryConnectors() { - assertExpectException( - IllegalArgumentException.class, - /* expectedExceptionMessageRegex */ - "Connector AND must have at least 2 formulas", - () -> - new CompoundFormula( - CompoundFormula.AND, Collections.singletonList(ATOMIC_FORMULA_1))); + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> + new CompoundFormula( + CompoundFormula.AND, + Collections.singletonList(ATOMIC_FORMULA_1))); + assertThat(e.getMessage()).matches("Connector AND must have at least 2 formulas"); } @Test public void testValidateAuxiliaryFormula_unaryConnectors() { - assertExpectException( - IllegalArgumentException.class, - /* expectedExceptionMessageRegex */ - "Connector NOT must have 1 formula only", - () -> - new CompoundFormula( - CompoundFormula.NOT, - Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2))); + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> + new CompoundFormula( + CompoundFormula.NOT, + Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2))); + assertThat(e.getMessage()).matches("Connector NOT must have 1 formula only"); } @Test @@ -82,20 +80,20 @@ public class CompoundFormulaTest { Parcel p = Parcel.obtain(); formula.writeToParcel(p, 0); p.setDataPosition(0); - CompoundFormula newFormula = CompoundFormula.CREATOR.createFromParcel(p); - assertEquals(formula, newFormula); + assertThat(CompoundFormula.CREATOR.createFromParcel(p)).isEqualTo(formula); } @Test public void testInvalidCompoundFormula_invalidConnector() { - assertExpectException( - IllegalArgumentException.class, - /* expectedExceptionMessageRegex */ "Unknown connector: -1", - () -> - new CompoundFormula( - /* connector= */ -1, - Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2))); + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> + new CompoundFormula( + /* connector= */ -1, + Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2))); + assertThat(e.getMessage()).matches("Unknown connector: -1"); } @Test diff --git a/core/tests/coretests/src/android/content/integrity/IntegrityUtilsTest.java b/core/tests/coretests/src/android/content/integrity/IntegrityUtilsTest.java index 639adf6a05d7..e6f6686dcb6f 100644 --- a/core/tests/coretests/src/android/content/integrity/IntegrityUtilsTest.java +++ b/core/tests/coretests/src/android/content/integrity/IntegrityUtilsTest.java @@ -18,6 +18,7 @@ package android.content.integrity; import static com.google.common.truth.Truth.assertThat; +import static org.testng.Assert.expectThrows; import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals; import org.junit.Test; @@ -43,15 +44,20 @@ public class IntegrityUtilsTest { } @Test - public void testInvalidHexDigest() { - TestUtils.assertExpectException( - IllegalArgumentException.class, - "must have even length", - () -> IntegrityUtils.getBytesFromHexDigest("ABC")); - - TestUtils.assertExpectException( - IllegalArgumentException.class, - "Invalid hex char", - () -> IntegrityUtils.getBytesFromHexDigest("GH")); + public void testInvalidHexDigest_mustHaveEvenLength() { + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> IntegrityUtils.getBytesFromHexDigest("ABC")); + assertThat(e.getMessage()).containsMatch("must have even length"); + } + + @Test + public void testInvalidHexDigest_invalidHexChar() { + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> IntegrityUtils.getBytesFromHexDigest("GH")); + assertThat(e.getMessage()).containsMatch("Invalid hex char"); } } diff --git a/core/tests/coretests/src/android/content/integrity/RuleTest.java b/core/tests/coretests/src/android/content/integrity/RuleTest.java index 8c4cfca39e90..8faf8ba2f52a 100644 --- a/core/tests/coretests/src/android/content/integrity/RuleTest.java +++ b/core/tests/coretests/src/android/content/integrity/RuleTest.java @@ -16,10 +16,9 @@ package android.content.integrity; -import static android.content.integrity.TestUtils.assertExpectException; +import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.testng.Assert.expectThrows; import android.os.Parcel; @@ -50,16 +49,16 @@ public class RuleTest { public void testValidRule() { Rule validRule = new Rule(PACKAGE_NAME_ATOMIC_FORMULA, DENY_EFFECT); - assertEquals(PACKAGE_NAME_ATOMIC_FORMULA, validRule.getFormula()); - assertEquals(DENY_EFFECT, validRule.getEffect()); + assertThat(validRule.getFormula()).isEqualTo(PACKAGE_NAME_ATOMIC_FORMULA); + assertThat(validRule.getEffect()).isEqualTo(DENY_EFFECT); } @Test public void testInvalidRule_invalidFormula() { - assertExpectException( - NullPointerException.class, - /* expectedExceptionMessageRegex */ null, - () -> new Rule(null, DENY_EFFECT)); + Exception e = + expectThrows( + NullPointerException.class, + () -> new Rule(null, DENY_EFFECT)); } @Test @@ -70,27 +69,23 @@ public class RuleTest { Arrays.asList(PACKAGE_NAME_ATOMIC_FORMULA, APP_CERTIFICATE_ATOMIC_FORMULA)); Rule rule = new Rule(compoundFormula, Rule.DENY); - assertEquals( - String.format( - "Rule: (PACKAGE_NAME EQ %s) AND (APP_CERTIFICATE EQ %s), DENY", - PACKAGE_NAME, APP_CERTIFICATE), - rule.toString()); + assertThat(rule.toString()) + .isEqualTo( + String.format( + "Rule: (PACKAGE_NAME EQ %s) AND (APP_CERTIFICATE EQ %s), DENY", + PACKAGE_NAME, APP_CERTIFICATE)); } @Test public void testEquals_trueCase() { - Rule rule1 = new Rule(PACKAGE_NAME_ATOMIC_FORMULA, DENY_EFFECT); - Rule rule2 = new Rule(PACKAGE_NAME_ATOMIC_FORMULA, DENY_EFFECT); - - assertEquals(rule1, rule2); + assertThat(new Rule(PACKAGE_NAME_ATOMIC_FORMULA, DENY_EFFECT)) + .isEqualTo(new Rule(PACKAGE_NAME_ATOMIC_FORMULA, DENY_EFFECT)); } @Test public void testEquals_falseCase() { - Rule rule1 = new Rule(PACKAGE_NAME_ATOMIC_FORMULA, DENY_EFFECT); - Rule rule2 = new Rule(APP_CERTIFICATE_ATOMIC_FORMULA, DENY_EFFECT); - - assertNotEquals(rule1, rule2); + assertThat(new Rule(PACKAGE_NAME_ATOMIC_FORMULA, DENY_EFFECT)) + .isNotEqualTo(new Rule(APP_CERTIFICATE_ATOMIC_FORMULA, DENY_EFFECT)); } @Test @@ -108,16 +103,16 @@ public class RuleTest { Parcel p = Parcel.obtain(); rule.writeToParcel(p, 0); p.setDataPosition(0); - Rule newRule = Rule.CREATOR.createFromParcel(p); - assertEquals(newRule, rule); + assertThat(Rule.CREATOR.createFromParcel(p)).isEqualTo(rule); } @Test public void testInvalidRule_invalidEffect() { - assertExpectException( - IllegalArgumentException.class, - /* expectedExceptionMessageRegex */ "Unknown effect: -1", - () -> new Rule(PACKAGE_NAME_ATOMIC_FORMULA, /* effect= */ -1)); + Exception e = + expectThrows( + IllegalArgumentException.class, + () -> new Rule(PACKAGE_NAME_ATOMIC_FORMULA, /* effect= */ -1)); + assertThat(e.getMessage()).isEqualTo("Unknown effect: -1"); } } diff --git a/core/tests/coretests/src/android/content/integrity/TestUtils.java b/core/tests/coretests/src/android/content/integrity/TestUtils.java deleted file mode 100644 index af984cf318f5..000000000000 --- a/core/tests/coretests/src/android/content/integrity/TestUtils.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.content.integrity; - -import android.test.MoreAsserts; - -import junit.framework.Assert; - -/** Helper methods used in tests. */ -class TestUtils { - private TestUtils() {} - - public interface ExceptionRunnable { - void run() throws Exception; - } - - public static void assertExpectException( - Class<? extends Throwable> expectedExceptionType, - String expectedExceptionMessageRegex, - ExceptionRunnable r) { - try { - r.run(); - } catch (Throwable e) { - Assert.assertTrue( - "Expected exception type was " - + expectedExceptionType.getName() - + " but caught " - + e.getClass().getName(), - expectedExceptionType.isAssignableFrom(e.getClass())); - if (expectedExceptionMessageRegex != null) { - MoreAsserts.assertContainsRegex(expectedExceptionMessageRegex, e.getMessage()); - } - return; // Pass. - } - Assert.fail( - "Expected exception type " + expectedExceptionType.getName() + " was not thrown"); - } -} diff --git a/core/tests/coretests/src/android/provider/NameValueCacheTest.java b/core/tests/coretests/src/android/provider/NameValueCacheTest.java new file mode 100644 index 000000000000..4212ef21e0af --- /dev/null +++ b/core/tests/coretests/src/android/provider/NameValueCacheTest.java @@ -0,0 +1,232 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.provider; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +import android.content.ContentProvider; +import android.content.IContentProvider; +import android.os.Bundle; +import android.platform.test.annotations.Presubmit; +import android.test.mock.MockContentResolver; +import android.util.MemoryIntArray; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * These tests are verifying that Settings#NameValueCache is working as expected with DeviceConfig. + * Due to how the classes are structured, we have to test it in a somewhat roundabout way. We're + * mocking out the contentProvider and are handcrafting very specific Bundles to answer the queries. + */ +@Presubmit +@RunWith(AndroidJUnit4.class) +@SmallTest +public class NameValueCacheTest { + + private static final String NAMESPACE = "namespace"; + private static final String NAMESPACE2 = "namespace2"; + + @Mock + private IContentProvider mMockIContentProvider; + @Mock + private ContentProvider mMockContentProvider; + private MockContentResolver mMockContentResolver; + private MemoryIntArray mCacheGenerationStore; + private int mCurrentGeneration = 123; + + private HashMap<String, HashMap<String, String>> mStorage; + + @Before + public void setUp() throws Exception { + Settings.Config.clearProviderForTest(); + MockitoAnnotations.initMocks(this); + when(mMockContentProvider.getIContentProvider()).thenReturn(mMockIContentProvider); + mMockContentResolver = new MockContentResolver(); + mMockContentResolver.addProvider(DeviceConfig.CONTENT_URI.getAuthority(), + mMockContentProvider); + mCacheGenerationStore = new MemoryIntArray(1); + mStorage = new HashMap<>(); + + // Stores keyValues for a given prefix and increments the generation. (Note that this + // increments the generation no matter what, it doesn't pay attention to if anything + // actually changed). + when(mMockIContentProvider.call(any(), any(), eq(DeviceConfig.CONTENT_URI.getAuthority()), + eq(Settings.CALL_METHOD_SET_ALL_CONFIG), + any(), any(Bundle.class))).thenAnswer(invocationOnMock -> { + Bundle incomingBundle = invocationOnMock.getArgument(5); + HashMap<String, String> keyValues = + (HashMap<String, String>) incomingBundle.getSerializable( + Settings.CALL_METHOD_FLAGS_KEY); + String prefix = incomingBundle.getString(Settings.CALL_METHOD_PREFIX_KEY); + mStorage.put(prefix, keyValues); + mCacheGenerationStore.set(0, ++mCurrentGeneration); + + Bundle result = new Bundle(); + result.putBoolean(Settings.KEY_CONFIG_SET_RETURN, true); + return result; + }); + + // Returns the keyValues corresponding to a namespace, or an empty map if the namespace + // doesn't have anything stored for it. Returns the generation key if the caller asked + // for one. + when(mMockIContentProvider.call(any(), any(), eq(DeviceConfig.CONTENT_URI.getAuthority()), + eq(Settings.CALL_METHOD_LIST_CONFIG), + any(), any(Bundle.class))).thenAnswer(invocationOnMock -> { + Bundle incomingBundle = invocationOnMock.getArgument(5); + + String prefix = incomingBundle.getString(Settings.CALL_METHOD_PREFIX_KEY); + + if (!mStorage.containsKey(prefix)) { + mStorage.put(prefix, new HashMap<>()); + } + HashMap<String, String> keyValues = mStorage.get(prefix); + + Bundle bundle = new Bundle(); + bundle.putSerializable(Settings.NameValueTable.VALUE, keyValues); + + if (incomingBundle.containsKey(Settings.CALL_METHOD_TRACK_GENERATION_KEY)) { + bundle.putParcelable(Settings.CALL_METHOD_TRACK_GENERATION_KEY, + mCacheGenerationStore); + bundle.putInt(Settings.CALL_METHOD_GENERATION_INDEX_KEY, 0); + bundle.putInt(Settings.CALL_METHOD_GENERATION_KEY, + mCacheGenerationStore.get(0)); + } + return bundle; + }); + } + + @Test + public void testCaching_singleNamespace() throws Exception { + HashMap<String, String> keyValues = new HashMap<>(); + keyValues.put("a", "b"); + Settings.Config.setStrings(mMockContentResolver, NAMESPACE, keyValues); + verify(mMockIContentProvider).call(any(), any(), any(), + eq(Settings.CALL_METHOD_SET_ALL_CONFIG), + any(), any(Bundle.class)); + + Map<String, String> returnedValues = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE, + Collections.emptyList()); + verify(mMockIContentProvider).call(any(), any(), any(), + eq(Settings.CALL_METHOD_LIST_CONFIG), + any(), any(Bundle.class)); + assertThat(returnedValues).containsExactlyEntriesIn(keyValues); + + Map<String, String> cachedKeyValues = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE, Collections.emptyList()); + verifyNoMoreInteractions(mMockIContentProvider); + assertThat(cachedKeyValues).containsExactlyEntriesIn(keyValues); + + // Modify the value to invalidate the cache. + keyValues.put("a", "c"); + Settings.Config.setStrings(mMockContentResolver, NAMESPACE, keyValues); + verify(mMockIContentProvider, times(2)).call(any(), any(), any(), + eq(Settings.CALL_METHOD_SET_ALL_CONFIG), + any(), any(Bundle.class)); + + Map<String, String> returnedValues2 = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE, Collections.emptyList()); + verify(mMockIContentProvider, times(2)).call(any(), any(), any(), + eq(Settings.CALL_METHOD_LIST_CONFIG), + any(), any(Bundle.class)); + assertThat(returnedValues2).containsExactlyEntriesIn(keyValues); + + Map<String, String> cachedKeyValues2 = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE, Collections.emptyList()); + verifyNoMoreInteractions(mMockIContentProvider); + assertThat(cachedKeyValues2).containsExactlyEntriesIn(keyValues); + } + + @Test + public void testCaching_multipleNamespaces() throws Exception { + HashMap<String, String> keyValues = new HashMap<>(); + keyValues.put("a", "b"); + Settings.Config.setStrings(mMockContentResolver, NAMESPACE, keyValues); + verify(mMockIContentProvider).call(any(), any(), any(), + eq(Settings.CALL_METHOD_SET_ALL_CONFIG), + any(), any(Bundle.class)); + + HashMap<String, String> keyValues2 = new HashMap<>(); + keyValues2.put("c", "d"); + keyValues2.put("e", "f"); + Settings.Config.setStrings(mMockContentResolver, NAMESPACE2, keyValues2); + verify(mMockIContentProvider, times(2)).call(any(), any(), any(), + eq(Settings.CALL_METHOD_SET_ALL_CONFIG), + any(), any(Bundle.class)); + + Map<String, String> returnedValues = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE, + Collections.emptyList()); + verify(mMockIContentProvider).call(any(), any(), any(), + eq(Settings.CALL_METHOD_LIST_CONFIG), + any(), any(Bundle.class)); + assertThat(returnedValues).containsExactlyEntriesIn(keyValues); + + Map<String, String> returnedValues2 = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE2, + Collections.emptyList()); + verify(mMockIContentProvider, times(2)).call(any(), any(), any(), + eq(Settings.CALL_METHOD_LIST_CONFIG), + any(), any(Bundle.class)); + assertThat(returnedValues2).containsExactlyEntriesIn(keyValues2); + + Map<String, String> cachedKeyValues = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE, Collections.emptyList()); + verifyNoMoreInteractions(mMockIContentProvider); + assertThat(cachedKeyValues).containsExactlyEntriesIn(keyValues); + + Map<String, String> cachedKeyValues2 = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE2, Collections.emptyList()); + verifyNoMoreInteractions(mMockIContentProvider); + assertThat(cachedKeyValues2).containsExactlyEntriesIn(keyValues2); + } + + @Test + public void testCaching_emptyNamespace() throws Exception { + Map<String, String> returnedValues = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE, + Collections.emptyList()); + verify(mMockIContentProvider).call(any(), any(), any(), + eq(Settings.CALL_METHOD_LIST_CONFIG), + any(), any(Bundle.class)); + assertThat(returnedValues).isEmpty(); + + Map<String, String> cachedKeyValues = Settings.Config.getStrings(mMockContentResolver, + NAMESPACE, Collections.emptyList()); + verifyNoMoreInteractions(mMockIContentProvider); + assertThat(cachedKeyValues).isEmpty(); + } + +} diff --git a/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java b/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java index bcf0b8ce4439..169716f99dea 100644 --- a/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java +++ b/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java @@ -176,8 +176,6 @@ public class InsetsAnimationControlImplTest { when(mMockController.getState()).thenReturn(mInsetsState); mController.finish(true /* shown */); mController.applyChangeInsets(mInsetsState); - assertTrue(mInsetsState.getSource(ITYPE_STATUS_BAR).isVisible()); - assertTrue(mInsetsState.getSource(ITYPE_NAVIGATION_BAR).isVisible()); assertEquals(Insets.of(0, 100, 100, 0), mController.getCurrentInsets()); verify(mMockController).notifyFinished(eq(mController), eq(true /* shown */)); } diff --git a/core/tests/coretests/src/android/view/InsetsControllerTest.java b/core/tests/coretests/src/android/view/InsetsControllerTest.java index f720c987a525..e68c4b8d2ab3 100644 --- a/core/tests/coretests/src/android/view/InsetsControllerTest.java +++ b/core/tests/coretests/src/android/view/InsetsControllerTest.java @@ -19,10 +19,13 @@ package android.view; import static android.view.InsetsController.ANIMATION_TYPE_HIDE; import static android.view.InsetsController.ANIMATION_TYPE_NONE; import static android.view.InsetsController.ANIMATION_TYPE_SHOW; +import static android.view.InsetsSourceConsumer.ShowResult.IME_SHOW_DELAYED; +import static android.view.InsetsSourceConsumer.ShowResult.SHOW_IMMEDIATELY; import static android.view.InsetsState.ITYPE_IME; import static android.view.InsetsState.ITYPE_NAVIGATION_BAR; import static android.view.InsetsState.ITYPE_STATUS_BAR; import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL; +import static android.view.WindowInsets.Type.ime; import static android.view.WindowInsets.Type.statusBars; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; @@ -32,6 +35,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.notNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -41,6 +46,7 @@ import android.graphics.Insets; import android.graphics.Point; import android.graphics.Rect; import android.platform.test.annotations.Presubmit; +import android.view.SurfaceControl.Transaction; import android.view.WindowInsets.Type; import android.view.WindowManager.BadTokenException; import android.view.WindowManager.LayoutParams; @@ -48,6 +54,9 @@ import android.view.animation.LinearInterpolator; import android.view.test.InsetsModeSession; import android.widget.TextView; +import com.android.server.testutils.OffsettableClock; +import com.android.server.testutils.TestHandler; + import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; @@ -59,6 +68,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import java.util.concurrent.CountDownLatch; +import java.util.function.Supplier; /** * Tests for {@link InsetsController}. @@ -77,6 +87,8 @@ public class InsetsControllerTest { private SurfaceSession mSession = new SurfaceSession(); private SurfaceControl mLeash; private ViewRootImpl mViewRoot; + private TestHandler mTestHandler; + private OffsettableClock mTestClock; private static InsetsModeSession sInsetsModeSession; @BeforeClass @@ -103,7 +115,26 @@ public class InsetsControllerTest { } catch (BadTokenException e) { // activity isn't running, we will ignore BadTokenException. } - mController = new InsetsController(mViewRoot); + mTestClock = new OffsettableClock(); + mTestHandler = new TestHandler(null, mTestClock); + mController = new InsetsController(mViewRoot, (controller, type) -> { + if (type == ITYPE_IME) { + return new InsetsSourceConsumer(type, controller.getState(), + Transaction::new, controller) { + @Override + public int requestShow(boolean fromController) { + if (fromController) { + return SHOW_IMMEDIATELY; + } else { + return IME_SHOW_DELAYED; + } + } + }; + } else { + return new InsetsSourceConsumer(type, controller.getState(), Transaction::new, + controller); + } + }, mTestHandler); final Rect rect = new Rect(5, 5, 5, 5); mController.getState().getSource(ITYPE_STATUS_BAR).setFrame(new Rect(0, 0, 100, 10)); mController.getState().getSource(ITYPE_NAVIGATION_BAR).setFrame( @@ -395,6 +426,71 @@ public class InsetsControllerTest { InstrumentationRegistry.getInstrumentation().waitForIdleSync(); } + @Test + public void testControlImeNotReady() { + prepareControls(); + InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { + WindowInsetsAnimationControlListener listener = + mock(WindowInsetsAnimationControlListener.class); + mController.controlInputMethodAnimation(0, new LinearInterpolator(), listener); + + // Ready gets deferred until next predraw + mViewRoot.getView().getViewTreeObserver().dispatchOnPreDraw(); + + verify(listener, never()).onReady(any(), anyInt()); + + // Pretend that IME is calling. + mController.show(ime(), true); + + // Ready gets deferred until next predraw + mViewRoot.getView().getViewTreeObserver().dispatchOnPreDraw(); + + verify(listener).onReady(notNull(), eq(ime())); + + }); + } + + @Test + public void testControlImeNotReady_controlRevoked() { + prepareControls(); + InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { + WindowInsetsAnimationControlListener listener = + mock(WindowInsetsAnimationControlListener.class); + mController.controlInputMethodAnimation(0, new LinearInterpolator(), listener); + + // Ready gets deferred until next predraw + mViewRoot.getView().getViewTreeObserver().dispatchOnPreDraw(); + + verify(listener, never()).onReady(any(), anyInt()); + + // Pretend that we are losing control + mController.onControlsChanged(new InsetsSourceControl[0]); + + verify(listener).onCancelled(); + }); + } + + @Test + public void testControlImeNotReady_timeout() { + prepareControls(); + InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { + WindowInsetsAnimationControlListener listener = + mock(WindowInsetsAnimationControlListener.class); + mController.controlInputMethodAnimation(0, new LinearInterpolator(), listener); + + // Ready gets deferred until next predraw + mViewRoot.getView().getViewTreeObserver().dispatchOnPreDraw(); + + verify(listener, never()).onReady(any(), anyInt()); + + // Pretend that timeout is happening + mTestClock.fastForward(2500); + mTestHandler.timeAdvance(); + + verify(listener).onCancelled(); + }); + } + private void waitUntilNextFrame() throws Exception { final CountDownLatch latch = new CountDownLatch(1); Choreographer.getMainThreadInstance().postCallback(Choreographer.CALLBACK_COMMIT, diff --git a/core/tests/coretests/src/android/view/KeyEventTest.java b/core/tests/coretests/src/android/view/KeyEventTest.java index 88d3bdbe3c92..14999c7f5642 100644 --- a/core/tests/coretests/src/android/view/KeyEventTest.java +++ b/core/tests/coretests/src/android/view/KeyEventTest.java @@ -20,8 +20,10 @@ import static android.view.Display.INVALID_DISPLAY; import static org.junit.Assert.assertEquals; +import android.os.Parcel; + +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,6 +42,7 @@ public class KeyEventTest { private static final int SCAN_CODE = 0; private static final int FLAGS = 0; private static final int SOURCE = InputDevice.SOURCE_KEYBOARD; + private static final byte[] HMAC = null; private static final String CHARACTERS = null; @Test @@ -65,25 +68,15 @@ public class KeyEventTest { KeyEvent keyEvent = KeyEvent.obtain(DOWN_TIME, EVENT_TIME, ACTION, KEYCODE, REPEAT, METASTATE, DEVICE_ID, SCAN_CODE, FLAGS, SOURCE, CHARACTERS); KeyEvent keyEvent2 = KeyEvent.obtain(keyEvent); - assertEquals(keyEvent.getDownTime(), keyEvent2.getDownTime()); - assertEquals(keyEvent.getEventTime(), keyEvent2.getEventTime()); - assertEquals(keyEvent.getAction(), keyEvent2.getAction()); - assertEquals(keyEvent.getKeyCode(), keyEvent2.getKeyCode()); - assertEquals(keyEvent.getRepeatCount(), keyEvent2.getRepeatCount()); - assertEquals(keyEvent.getMetaState(), keyEvent2.getMetaState()); - assertEquals(keyEvent.getDeviceId(), keyEvent2.getDeviceId()); - assertEquals(keyEvent.getScanCode(), keyEvent2.getScanCode()); - assertEquals(keyEvent.getFlags(), keyEvent2.getFlags()); - assertEquals(keyEvent.getSource(), keyEvent2.getSource()); - assertEquals(keyEvent.getDisplayId(), keyEvent2.getDisplayId()); - assertEquals(keyEvent.getCharacters(), keyEvent2.getCharacters()); + compareKeys(keyEvent, keyEvent2); } @Test public void testObtainWithDisplayId() { final int displayId = 5; KeyEvent keyEvent = KeyEvent.obtain(DOWN_TIME, EVENT_TIME, ACTION, KEYCODE, REPEAT, - METASTATE, DEVICE_ID, SCAN_CODE, FLAGS, SOURCE, displayId, CHARACTERS); + METASTATE, DEVICE_ID, SCAN_CODE, FLAGS, SOURCE, displayId, null /* hmac*/, + CHARACTERS); assertEquals(DOWN_TIME, keyEvent.getDownTime()); assertEquals(EVENT_TIME, keyEvent.getEventTime()); assertEquals(ACTION, keyEvent.getAction()); @@ -97,4 +90,44 @@ public class KeyEventTest { assertEquals(displayId, keyEvent.getDisplayId()); assertEquals(CHARACTERS, keyEvent.getCharacters()); } + + @Test + public void testParcelUnparcel() { + KeyEvent key1 = createKey(); + Parcel parcel = Parcel.obtain(); + key1.writeToParcel(parcel, 0 /*flags*/); + parcel.setDataPosition(0); + + KeyEvent key2 = KeyEvent.CREATOR.createFromParcel(parcel); + parcel.recycle(); + + compareKeys(key1, key2); + } + + @Test + public void testConstructor() { + KeyEvent key1 = createKey(); + KeyEvent key2 = new KeyEvent(key1); + compareKeys(key1, key2); + } + + private static KeyEvent createKey() { + return KeyEvent.obtain(DOWN_TIME, EVENT_TIME, ACTION, KEYCODE, REPEAT, + METASTATE, DEVICE_ID, SCAN_CODE, FLAGS, SOURCE, INVALID_DISPLAY, HMAC, CHARACTERS); + } + + private static void compareKeys(KeyEvent key1, KeyEvent key2) { + assertEquals(key1.getDownTime(), key2.getDownTime()); + assertEquals(key1.getEventTime(), key2.getEventTime()); + assertEquals(key1.getAction(), key2.getAction()); + assertEquals(key1.getKeyCode(), key2.getKeyCode()); + assertEquals(key1.getRepeatCount(), key2.getRepeatCount()); + assertEquals(key1.getMetaState(), key2.getMetaState()); + assertEquals(key1.getDeviceId(), key2.getDeviceId()); + assertEquals(key1.getScanCode(), key2.getScanCode()); + assertEquals(key1.getFlags(), key2.getFlags()); + assertEquals(key1.getSource(), key2.getSource()); + assertEquals(key1.getDisplayId(), key2.getDisplayId()); + assertEquals(key1.getCharacters(), key2.getCharacters()); + } } diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 0541db121ae6..da505505628e 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -60,6 +60,10 @@ <group gid="log" /> </permission> + <permission name="android.permission.MANAGE_EXTERNAL_STORAGE" > + <group gid="external_storage" /> + </permission> + <permission name="android.permission.ACCESS_MTP" > <group gid="mtp" /> </permission> diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 9a0ca3e4ad9b..d949444d44d6 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -1162,6 +1162,7 @@ public class Canvas extends BaseCanvas { * @see #quickReject(float, float, float, float, EdgeType) * @see #quickReject(Path, EdgeType) * @see #quickReject(RectF, EdgeType) + * @deprecated quickReject no longer uses this. */ public enum EdgeType { @@ -1197,13 +1198,30 @@ public class Canvas extends BaseCanvas { * non-antialiased ({@link Canvas.EdgeType#BW}). * @return true if the rect (transformed by the canvas' matrix) * does not intersect with the canvas' clip + * @deprecated The EdgeType is ignored. Use {@link #quickReject(RectF)} instead. */ + @Deprecated public boolean quickReject(@NonNull RectF rect, @NonNull EdgeType type) { return nQuickReject(mNativeCanvasWrapper, rect.left, rect.top, rect.right, rect.bottom); } /** + * Return true if the specified rectangle, after being transformed by the + * current matrix, would lie completely outside of the current clip. Call + * this to check if an area you intend to draw into is clipped out (and + * therefore you can skip making the draw calls). + * + * @param rect the rect to compare with the current clip + * @return true if the rect (transformed by the canvas' matrix) + * does not intersect with the canvas' clip + */ + public boolean quickReject(@NonNull RectF rect) { + return nQuickReject(mNativeCanvasWrapper, + rect.left, rect.top, rect.right, rect.bottom); + } + + /** * Return true if the specified path, after being transformed by the * current matrix, would lie completely outside of the current clip. Call * this to check if an area you intend to draw into is clipped out (and @@ -1217,12 +1235,30 @@ public class Canvas extends BaseCanvas { * non-antialiased ({@link Canvas.EdgeType#BW}). * @return true if the path (transformed by the canvas' matrix) * does not intersect with the canvas' clip + * @deprecated The EdgeType is ignored. Use {@link #quickReject(Path)} instead. */ + @Deprecated public boolean quickReject(@NonNull Path path, @NonNull EdgeType type) { return nQuickReject(mNativeCanvasWrapper, path.readOnlyNI()); } /** + * Return true if the specified path, after being transformed by the + * current matrix, would lie completely outside of the current clip. Call + * this to check if an area you intend to draw into is clipped out (and + * therefore you can skip making the draw calls). Note: for speed it may + * return false even if the path itself might not intersect the clip + * (i.e. the bounds of the path intersects, but the path does not). + * + * @param path The path to compare with the current clip + * @return true if the path (transformed by the canvas' matrix) + * does not intersect with the canvas' clip + */ + public boolean quickReject(@NonNull Path path) { + return nQuickReject(mNativeCanvasWrapper, path.readOnlyNI()); + } + + /** * Return true if the specified rectangle, after being transformed by the * current matrix, would lie completely outside of the current clip. Call * this to check if an area you intend to draw into is clipped out (and @@ -1241,13 +1277,37 @@ public class Canvas extends BaseCanvas { * non-antialiased ({@link Canvas.EdgeType#BW}). * @return true if the rect (transformed by the canvas' matrix) * does not intersect with the canvas' clip + * @deprecated The EdgeType is ignored. Use {@link #quickReject(float, float, float, float)} + * instead. */ + @Deprecated public boolean quickReject(float left, float top, float right, float bottom, @NonNull EdgeType type) { return nQuickReject(mNativeCanvasWrapper, left, top, right, bottom); } /** + * Return true if the specified rectangle, after being transformed by the + * current matrix, would lie completely outside of the current clip. Call + * this to check if an area you intend to draw into is clipped out (and + * therefore you can skip making the draw calls). + * + * @param left The left side of the rectangle to compare with the + * current clip + * @param top The top of the rectangle to compare with the current + * clip + * @param right The right side of the rectangle to compare with the + * current clip + * @param bottom The bottom of the rectangle to compare with the + * current clip + * @return true if the rect (transformed by the canvas' matrix) + * does not intersect with the canvas' clip + */ + public boolean quickReject(float left, float top, float right, float bottom) { + return nQuickReject(mNativeCanvasWrapper, left, top, right, bottom); + } + + /** * Return the bounds of the current clip (in local coordinates) in the * bounds parameter, and return true if it is non-empty. This can be useful * in a way similar to quickReject, in that it tells you that drawing diff --git a/media/java/android/media/audiopolicy/AudioProductStrategy.java b/media/java/android/media/audiopolicy/AudioProductStrategy.java index 612f83a14e12..60b3fc642ee4 100644 --- a/media/java/android/media/audiopolicy/AudioProductStrategy.java +++ b/media/java/android/media/audiopolicy/AudioProductStrategy.java @@ -134,7 +134,9 @@ public final class AudioProductStrategy implements Parcelable { + "DO NOT USE STREAM TO CONTROL THE VOLUME"); return AudioSystem.STREAM_MUSIC; } - return streamType; + if (streamType < AudioSystem.getNumStreamTypes()) { + return streamType; + } } } return AudioSystem.STREAM_MUSIC; diff --git a/media/java/android/media/tv/ITvInputManager.aidl b/media/java/android/media/tv/ITvInputManager.aidl index c199c6f8b761..508a46f492dd 100644 --- a/media/java/android/media/tv/ITvInputManager.aidl +++ b/media/java/android/media/tv/ITvInputManager.aidl @@ -89,7 +89,7 @@ interface ITvInputManager { void timeShiftEnablePositionTracking(in IBinder sessionToken, boolean enable, int userId); // For the recording session - void startRecording(in IBinder sessionToken, in Uri programUri, int userId); + void startRecording(in IBinder sessionToken, in Uri programUri, in Bundle params, int userId); void stopRecording(in IBinder sessionToken, int userId); // For TV input hardware binding diff --git a/media/java/android/media/tv/ITvInputSession.aidl b/media/java/android/media/tv/ITvInputSession.aidl index 356ec3cd1f11..24b87d50b33e 100644 --- a/media/java/android/media/tv/ITvInputSession.aidl +++ b/media/java/android/media/tv/ITvInputSession.aidl @@ -56,6 +56,6 @@ oneway interface ITvInputSession { void timeShiftEnablePositionTracking(boolean enable); // For the recording session - void startRecording(in Uri programUri); + void startRecording(in Uri programUri, in Bundle params); void stopRecording(); } diff --git a/media/java/android/media/tv/ITvInputSessionWrapper.java b/media/java/android/media/tv/ITvInputSessionWrapper.java index 07cfbda7ac2b..e89d33d70d5c 100644 --- a/media/java/android/media/tv/ITvInputSessionWrapper.java +++ b/media/java/android/media/tv/ITvInputSessionWrapper.java @@ -216,7 +216,8 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand break; } case DO_START_RECORDING: { - mTvInputRecordingSessionImpl.startRecording((Uri) msg.obj); + SomeArgs args = (SomeArgs) msg.obj; + mTvInputRecordingSessionImpl.startRecording((Uri) args.arg1, (Bundle) args.arg2); break; } case DO_STOP_RECORDING: { @@ -352,8 +353,9 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand } @Override - public void startRecording(@Nullable Uri programUri) { - mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_START_RECORDING, programUri)); + public void startRecording(@Nullable Uri programUri, @Nullable Bundle params) { + mCaller.executeOrSendMessage(mCaller.obtainMessageOO(DO_START_RECORDING, programUri, + params)); } @Override diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index bb867630ca01..2589521ca370 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java @@ -2381,12 +2381,23 @@ public final class TvInputManager { * {@link TvContract#buildProgramUri(long)}. Can be {@code null}. */ void startRecording(@Nullable Uri programUri) { + startRecording(programUri, null); + } + + /** + * Starts TV program recording in the current recording session. + * + * @param programUri The URI for the TV program to record as a hint, built by + * {@link TvContract#buildProgramUri(long)}. Can be {@code null}. + * @param params A set of extra parameters which might be handled with this event. + */ + void startRecording(@Nullable Uri programUri, @Nullable Bundle params) { if (mToken == null) { Log.w(TAG, "The session has been already released"); return; } try { - mService.startRecording(mToken, programUri, mUserId); + mService.startRecording(mToken, programUri, params, mUserId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index 7e1f44cb0899..62c7e51f3edf 100755 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -1818,6 +1818,30 @@ public abstract class TvInputService extends Service { public abstract void onStartRecording(@Nullable Uri programUri); /** + * Called when the application requests to start TV program recording. Recording must start + * immediately when this method is called. + * + * <p>The application may supply the URI for a TV program for filling in program specific + * data fields in the {@link android.media.tv.TvContract.RecordedPrograms} table. + * A non-null {@code programUri} implies the started recording should be of that specific + * program, whereas null {@code programUri} does not impose such a requirement and the + * recording can span across multiple TV programs. In either case, the application must call + * {@link TvRecordingClient#stopRecording()} to stop the recording. + * + * <p>The session must call {@link #notifyError(int)} if the start request cannot be + * fulfilled. + * + * @param programUri The URI for the TV program to record, built by + * {@link TvContract#buildProgramUri(long)}. Can be {@code null}. + * @param params Domain-specific data for this tune request. Keys <em>must</em> be a scoped + * name, i.e. prefixed with a package name you own, so that different developers + * will not create conflicting keys. + */ + public void onStartRecording(@Nullable Uri programUri, @NonNull Bundle params) { + onStartRecording(programUri); + } + + /** * Called when the application requests to stop TV program recording. Recording must stop * immediately when this method is called. * @@ -1867,11 +1891,11 @@ public abstract class TvInputService extends Service { } /** - * Calls {@link #onStartRecording(Uri)}. + * Calls {@link #onStartRecording(Uri, Bundle)}. * */ - void startRecording(@Nullable Uri programUri) { - onStartRecording(programUri); + void startRecording(@Nullable Uri programUri, @NonNull Bundle params) { + onStartRecording(programUri, params); } /** diff --git a/media/java/android/media/tv/TvRecordingClient.java b/media/java/android/media/tv/TvRecordingClient.java index 5aadeb6ecfa9..8ae98ae5e937 100644 --- a/media/java/android/media/tv/TvRecordingClient.java +++ b/media/java/android/media/tv/TvRecordingClient.java @@ -170,11 +170,37 @@ public class TvRecordingClient { * @throws IllegalStateException If {@link #tune} request hasn't been handled yet. */ public void startRecording(@Nullable Uri programUri) { + startRecording(programUri, Bundle.EMPTY); + } + + /** + * Starts TV program recording in the current recording session. Recording is expected to start + * immediately when this method is called. If the current recording session has not yet tuned to + * any channel, this method throws an exception. + * + * <p>The application may supply the URI for a TV program for filling in program specific data + * fields in the {@link android.media.tv.TvContract.RecordedPrograms} table. + * A non-null {@code programUri} implies the started recording should be of that specific + * program, whereas null {@code programUri} does not impose such a requirement and the + * recording can span across multiple TV programs. In either case, the application must call + * {@link TvRecordingClient#stopRecording()} to stop the recording. + * + * <p>The recording session will respond by calling {@link RecordingCallback#onError(int)} if + * the start request cannot be fulfilled. + * + * @param programUri The URI for the TV program to record, built by + * {@link TvContract#buildProgramUri(long)}. Can be {@code null}. + * @param params Domain-specific data for this request. Keys <em>must</em> be a scoped + * name, i.e. prefixed with a package name you own, so that different developers will + * not create conflicting keys. + * @throws IllegalStateException If {@link #tune} request hasn't been handled yet. + */ + public void startRecording(@Nullable Uri programUri, @NonNull Bundle params) { if (!mIsTuned) { throw new IllegalStateException("startRecording failed - not yet tuned"); } if (mSession != null) { - mSession.startRecording(programUri); + mSession.startRecording(programUri, params); mIsRecordingStarted = true; } } diff --git a/packages/CarSystemUI/src/com/android/systemui/TEST_MAPPING b/packages/CarSystemUI/TEST_MAPPING index 6056ddfc0bc7..6056ddfc0bc7 100644 --- a/packages/CarSystemUI/src/com/android/systemui/TEST_MAPPING +++ b/packages/CarSystemUI/TEST_MAPPING diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index d40e7d4addab..0f3585303ed8 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -110,6 +110,7 @@ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" /> + <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.CREATE_USERS" /> diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING index 9f13a7b861a0..cff958faa7e1 100644 --- a/packages/SystemUI/TEST_MAPPING +++ b/packages/SystemUI/TEST_MAPPING @@ -16,5 +16,24 @@ } ] } + ], + "platinum-postsubmit": [ + { + "name": "PlatformScenarioTests", + "options": [ + { + "include-filter": "android.platform.test.scenario.sysui" + }, + { + "include-annotation": "android.platform.test.scenario.annotation.Scenario" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "android.platform.helpers.Staging" + } + ] + } ] } diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java index 6518924ca0c2..17f2f476c9f2 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java @@ -133,6 +133,7 @@ public interface QSTile { public CharSequence label; public CharSequence secondaryLabel; public CharSequence contentDescription; + public CharSequence stateDescription; public CharSequence dualLabelContentDescription; public boolean disabledByPolicy; public boolean dualTarget = false; @@ -151,6 +152,7 @@ public interface QSTile { || !Objects.equals(other.label, label) || !Objects.equals(other.secondaryLabel, secondaryLabel) || !Objects.equals(other.contentDescription, contentDescription) + || !Objects.equals(other.stateDescription, stateDescription) || !Objects.equals(other.dualLabelContentDescription, dualLabelContentDescription) || !Objects.equals(other.expandedAccessibilityClassName, @@ -168,6 +170,7 @@ public interface QSTile { other.label = label; other.secondaryLabel = secondaryLabel; other.contentDescription = contentDescription; + other.stateDescription = stateDescription; other.dualLabelContentDescription = dualLabelContentDescription; other.expandedAccessibilityClassName = expandedAccessibilityClassName; other.disabledByPolicy = disabledByPolicy; @@ -195,6 +198,7 @@ public interface QSTile { sb.append(",label=").append(label); sb.append(",secondaryLabel=").append(secondaryLabel); sb.append(",contentDescription=").append(contentDescription); + sb.append(",stateDescription=").append(stateDescription); sb.append(",dualLabelContentDescription=").append(dualLabelContentDescription); sb.append(",expandedAccessibilityClassName=").append(expandedAccessibilityClassName); sb.append(",disabledByPolicy=").append(disabledByPolicy); diff --git a/packages/SystemUI/res-product/values-ky/strings.xml b/packages/SystemUI/res-product/values-ky/strings.xml index 8d96cb26bf30..043faeeaf89a 100644 --- a/packages/SystemUI/res-product/values-ky/strings.xml +++ b/packages/SystemUI/res-product/values-ky/strings.xml @@ -26,18 +26,18 @@ <string name="keyguard_missing_sim_message" product="tablet" msgid="5018086454277963787">"Планшетте SIM-карта жок."</string> <string name="keyguard_missing_sim_message" product="default" msgid="7053347843877341391">"Телефондо SIM-карта жок."</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="6278551068943958651">"PIN-коддор дал келген жок"</string> - <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="302165994845009232">"Планшеттин кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, бул планшет баштапкы абалга келтирилип, андагы бардык маалымат жок кылынат."</string> - <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="2594813176164266847">"Телефондун кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, бул телефон баштапкы абалга келтирилип, андагы бардык маалымат жок кылынат."</string> - <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="8710104080409538587">"Планшеттин кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Бул планшет баштапкы абалга келтирилип, андагы бардык маалымат жок кылынат."</string> - <string name="kg_failed_attempts_now_wiping" product="default" msgid="6381835450014881813">"Телефондун кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес аракет жасадыңыз. Бул телефон баштапкы абалга келтирилип, андагы бардык маалымат жок кылынат."</string> - <string name="kg_failed_attempts_almost_at_erase_user" product="tablet" msgid="7325071812832605911">"Планшеттин кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, бул колдонуучу өчүрүлүп, колдонуучунун бардык маалыматы жок кылынат."</string> - <string name="kg_failed_attempts_almost_at_erase_user" product="default" msgid="8110939900089863103">"Телефондун кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, бул колдонуучу өчүрүлүп, колдонуучунун бардык маалыматы жок кылынат."</string> - <string name="kg_failed_attempts_now_erasing_user" product="tablet" msgid="8509811676952707883">"Планшеттин кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Бул колдонуучу өчүрүлүп, колдонуучунун бардык маалыматы жок кылынат."</string> - <string name="kg_failed_attempts_now_erasing_user" product="default" msgid="3051962486994265014">"Телефондун кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Бул колдонуучу өчүрүлүп, колдонуучунун бардык маалыматы жок кылынат."</string> - <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="1049523640263353830">"Планшетиңиздин кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, жумуш профилиңиз өчүрүлүп, профилдеги бардык маалымат жок кылынат."</string> - <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="3280816298678433681">"Телефондун кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, жумуш профилиңиз өчүрүлүп, профилдеги бардык маалымат жок кылынат."</string> - <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4417100487251371559">"Планшеттин кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Жумуш профили өчүрүлүп, андагы бардык маалымат жок кылынат."</string> - <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4682221342671290678">"Телефондун кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Жумуш профили өчүрүлүп, андагы бардык маалымат жок кылынат."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="302165994845009232">"Планшеттин кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, бул планшет баштапкы абалга келтирилип, андагы бардык маалымат өчүрүлөт."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="2594813176164266847">"Телефондун кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, бул телефон баштапкы абалга келтирилип, андагы бардык маалымат өчүрүлөт."</string> + <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="8710104080409538587">"Планшеттин кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Бул планшет баштапкы абалга келтирилип, андагы бардык маалымат өчүрүлөт."</string> + <string name="kg_failed_attempts_now_wiping" product="default" msgid="6381835450014881813">"Телефондун кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес аракет жасадыңыз. Бул телефон баштапкы абалга келтирилип, андагы бардык маалымат өчүрүлөт."</string> + <string name="kg_failed_attempts_almost_at_erase_user" product="tablet" msgid="7325071812832605911">"Планшеттин кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, бул колдонуучу өчүрүлүп, колдонуучунун бардык маалыматы өчүрүлөт."</string> + <string name="kg_failed_attempts_almost_at_erase_user" product="default" msgid="8110939900089863103">"Телефондун кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, бул колдонуучу өчүрүлүп, колдонуучунун бардык маалыматы өчүрүлөт."</string> + <string name="kg_failed_attempts_now_erasing_user" product="tablet" msgid="8509811676952707883">"Планшеттин кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Бул колдонуучу өчүрүлүп, колдонуучунун бардык маалыматы өчүрүлөт."</string> + <string name="kg_failed_attempts_now_erasing_user" product="default" msgid="3051962486994265014">"Телефондун кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Бул колдонуучу өчүрүлүп, колдонуучунун бардык маалыматы өчүрүлөт."</string> + <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="1049523640263353830">"Планшетиңиздин кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, жумуш профилиңиз өчүрүлүп, профилдеги бардык маалымат өчүрүлөт."</string> + <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="3280816298678433681">"Телефондун кулпусун <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> жолу ийгиликсиз аракет кылсаңыз, жумуш профилиңиз өчүрүлүп, профилдеги бардык маалымат өчүрүлөт."</string> + <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4417100487251371559">"Планшеттин кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Жумуш профили өчүрүлүп, андагы бардык маалымат өчүрүлөт."</string> + <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4682221342671290678">"Телефондун кулпусун <xliff:g id="NUMBER">%d</xliff:g> жолу туура эмес ачууга аракет жасадыңыз. Жумуш профили өчүрүлүп, андагы бардык маалымат өчүрүлөт."</string> <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="1860049973474855672">"Графикалык ачкычты <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес тарттыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> ийгиликсиз аракеттен кийин планшетиңизди бөгөттөн электрондук почтаңыз аркылуу чыгаруу талап кылынат.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секунддан кийин кайра аракеттениңиз."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="44112553371516141">"Графикалык ачкычты <xliff:g id="NUMBER_0">%1$d</xliff:g> жолу туура эмес тарттыңыз. Дагы <xliff:g id="NUMBER_1">%2$d</xliff:g> ийгиликсиз аракеттен кийин телефонуңузду бөгөттөн электрондук почтаңыз аркылуу чыгаруу талап кылынат.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секунддан кийин кайра аракеттениңиз."</string> </resources> diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 4de854314b1a..823685e15807 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoem om skerm te vul"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Strek om skerm te vul"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Skermkiekie"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Prent is ingevoeg"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Stoor tans skermkiekie..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Stoor tans skermkiekie..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Skermkiekie is gestoor"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Begin opname"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Neem stemopname op"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Wys tikke"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tik om te stop"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stop"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Laat wag"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Hervat"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Batterybespaarder"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Aan met sonsondergang"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Tot sonsopkoms"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Aan om <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Tot <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC is gedeaktiveer"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC is geaktiveer"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Skermopname"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Begin"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stop"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Swiep op om programme te wissel"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Sleep regs om programme vinnig te wissel"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Wissel oorsig"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Pasmaak"</string> <string name="notification_done" msgid="6215117625922713976">"Klaar"</string> <string name="inline_undo" msgid="9026953267645116526">"Ontdoen"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Merk hierdie kennisgewing as \"nie \'n gesprek nie\""</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Gunsteling"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Ontmerk as gunsteling"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Demp"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Ontdemp"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Wys as borrel"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Skakel borrels af"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Voeg by tuisskerm"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"kennisgewingkontroles"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"kennisgewing-sluimeropsies"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 87603ac2051a..c3248249ebb6 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"ማያ እንዲሞላ አጉላ"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ማያ ለመሙለት ሳብ"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"ቅጽበታዊ ገጽ እይታ"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"ምስል ገብቷል"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"ቅጽበታዊ ገጽ እይታ በማስቀመጥ ላይ..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"ቅጽበታዊ ገጽ እይታ በማስቀመጥ ላይ..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"ቅጽበታዊ ገጽ እይታ ተቀምጧል"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"መቅረጽ ጀምር"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"ድምጽን ቅረጽ"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"መታ ማድረጎችን አሳይ"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"ለማቆም መታ ያድርጉ"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"አቁም"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"ባለበት አቁም"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ከቆመበት ቀጥል"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ባትሪ ቆጣቢ"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"ጸሐይ ስትጠልቅ ይበራል"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"ጸሐይ እስክትወጣ ድረስ"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> ላይ ይበራል"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"እስከ <xliff:g id="TIME">%s</xliff:g> ድረስ"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"ኤንኤፍሲ"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"ኤንኤፍሲ ተሰናክሏል"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"ኤንኤፍሲ ነቅቷል"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index c764004fddfe..113d705d7f31 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"تكبير/تصغير لملء الشاشة"</string> <string name="compat_mode_off" msgid="7682459748279487945">"توسيع بملء الشاشة"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"لقطة شاشة"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"تم إدراج الصورة"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"جارٍ حفظ لقطة الشاشة..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"جارٍ حفظ لقطة الشاشة..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"تم حفظ لقطة الشاشة."</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"بدء التسجيل"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"تسجيل التعليق الصوتي"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"عرض النقرات"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"انقر لإيقاف التسجيل"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"إيقاف"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"إيقاف مؤقت"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"استئناف"</string> @@ -396,15 +398,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"توفير شحن البطارية"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"تفعيل عند غروب الشمس"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"حتى شروق الشمس"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"تفعيل الوضع في <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"حتى <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"الاتصالات قصيرة المدى (NFC)"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"تم إيقاف الاتصال القريب المدى"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"تم تفعيل الاتصال القريب المدى"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"تسجيل الشاشة"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"بدء"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"إيقاف"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"مرّر سريعًا لأعلى لتبديل التطبيقات"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"اسحب لليسار للتبديل السريع بين التطبيقات"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"تبديل \"النظرة العامة\""</string> @@ -708,22 +709,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"تخصيص"</string> <string name="notification_done" msgid="6215117625922713976">"تم"</string> <string name="inline_undo" msgid="9026953267645116526">"تراجع"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"تحويل الإشعار من محادثة إلى إشعار عادي"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"المفضّلة"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"إزالة المحادثة من المفضّلة"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"كتم الصوت"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"إعادة الصوت"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"إظهار الإشعار كفقاعة تفسيرية"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"إيقاف الفقاعات التفسيرية"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"إضافة إلى الشاشة الرئيسية"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"عناصر التحكم في الإشعارات"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"خيارات تأجيل الإشعارات"</string> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index 2fc393c6ec68..975d639c2ea4 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"স্ক্ৰীণ পূর্ণ কৰিবলৈ জুম কৰক"</string> <string name="compat_mode_off" msgid="7682459748279487945">"স্ক্ৰীণ পূর্ণ কৰিবলৈ প্ৰসাৰিত কৰক"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"স্ক্ৰীনশ্বট"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"প্ৰতিচ্ছবি ভৰোৱা হ’ল"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"স্ক্ৰীণশ্বট ছেভ কৰি থকা হৈছে…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"স্ক্ৰীণশ্বট ছেভ কৰি থকা হৈছে…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"স্ক্ৰীণশ্বট ছেভ কৰা হ’ল"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"ৰেকৰ্ডিং কৰা আৰম্ভ কৰক"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"পাৰ্শ্ব-ধ্বনি ৰেকৰ্ড কৰক"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"টিপা ঠাইসমূহ দেখুৱাওক"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"বন্ধ কৰিবলৈ টিপক"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"বন্ধ কৰক"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"প\'জ কৰক"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ৰখোৱাৰ পৰা পুনৰ আৰম্ভ কৰক"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"বেটাৰী সঞ্চয়কাৰী"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"সূৰ্যাস্তত অন হয়"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"সূৰ্যোদয়লৈকে"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>ত অন কৰক"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> পৰ্যন্ত"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC নিষ্ক্ৰিয় হৈ আছে"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC সক্ষম হৈ আছে"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"স্ক্ৰীন ৰেকর্ড"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"আৰম্ভ কৰক"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"বন্ধ কৰক"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"আনটো এপ্ ব্য়ৱহাৰ কৰিবলৈ ওপৰলৈ ছোৱাইপ কৰক"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"খৰতকীয়াকৈ আনটো এপ্ ব্য়ৱহাৰ কৰিবলৈ সোঁফালে টানক"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"অৱলোকন ট’গল কৰক"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"নিজৰ উপযোগিতা অনুসৰি"</string> <string name="notification_done" msgid="6215117625922713976">"সম্পন্ন হ’ল"</string> <string name="inline_undo" msgid="9026953267645116526">"আনডু কৰক"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"এই জাননীখন এটা বার্তালাপ নহয় বুলি চিহ্নিত কৰক"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"অপ্ৰিয় হিচাপে চিহ্নিত কৰক"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"অপ্ৰিয় হিচাপে চিহ্নিত কৰক"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"মিউট কৰক"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"আনমিউট কৰক"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"বাবল হিচাপে দেখুৱাওক"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"বাবলসমূহ অফ কৰক"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"গৃহ স্ক্ৰীনত যোগ কৰক"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"জাননীৰ নিয়ন্ত্ৰণসমূহ"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"জাননীক স্নুজ কৰাৰ বিকল্পসমূহ"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index de9c60520d84..d98d939da47a 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Ekranı doldurmaq üçün yaxınlaşdır"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Ekranı doldurmaq üçün uzat"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Ekran şəkli"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Şəkil daxil edildi"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Skrinşot yadda saxlanılır..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Skrinşot yadda saxlanır..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Skrinşot yadda saxlandı"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Ekranın Video Çəkimini Başladın"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Ekranın səsli video çəkimi"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Klikləmələri göstərin"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Dayandırmaq üçün toxunun"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Dayandırın"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Dayandırın"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Davam edin"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Enerjiyə qənaət"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Qürubda aktiv olacaq"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Şəfəq vaxtına qədər"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Bu vaxt aktiv olur: <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Bu vaxtadək: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC deaktiv edilib"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC aktiv edilib"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekran yazması"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Başlayın"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Dayandırın"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Tətbiqi dəyişmək üçün yuxarı sürüşdürün"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Tətbiqləri cəld dəyişmək üçün sağa çəkin"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"İcmala Keçin"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Fərdiləşdirin"</string> <string name="notification_done" msgid="6215117625922713976">"Hazırdır"</string> <string name="inline_undo" msgid="9026953267645116526">"Ləğv edin"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Bu bildirişi \"söhbət deyil\" kimi qeyd edin."</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Sevimli"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Sevimlilərdən silin"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Səssiz"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Susdurmayın"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Qabarcıq kimi göstərin"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Qabarcıqları deaktiv edin"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Əsas ekrana əlavə edin"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"bildiriş nəzarəti"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"bildiriş təxirə salma seçimləri"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index a895f35cca72..ff03bb9726ae 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zumiraj na celom ekranu"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Razvuci na ceo ekran"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Snimak ekrana"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Slika je umetnuta"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Čuvanje snimka ekrana..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Čuvanje snimka ekrana..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Snimak ekrana je sačuvan"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Započni snimanje"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Snimi prenos glasa"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Prikazuj dodire"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Dodirnite da biste zaustavili"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Zaustavi"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pauziraj"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Nastavi"</string> @@ -390,6 +392,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Ušteda baterije"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Uključuje se po zalasku sunca"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Do izlaska sunca"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Uključuje se u <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Do <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC je onemogućen"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC je omogućen"</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 67aa8996c4ff..1ebbb5ea100c 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Павял. на ўвесь экран"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Расцягн. на ўвесь экран"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Здымак экрана"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Відарыс устаўлены"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Захаванне скрыншота..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Захаванне скрыншота..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Здымак экрана захаваны"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Пачаць запіс"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Закадравае агучванне запісу"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Паказваць дотыкі"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Націсніце, каб спыніць"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Спыніць"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Прыпыніць"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Узнавіць"</string> @@ -394,15 +396,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Эканомія зараду"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Уключана ўвечары"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Да ўсходу сонца"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Уключана ў <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Да <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC адключаны"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC уключаны"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Запіс экрана"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Пачаць"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Спыніць"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Правядзіце ўверх, каб пераключыць праграмы"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Каб хутка пераключыцца паміж праграмамі, перацягніце ўправа"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Уключыць/выключыць агляд"</string> @@ -704,22 +705,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Наладзіць"</string> <string name="notification_done" msgid="6215117625922713976">"Гатова"</string> <string name="inline_undo" msgid="9026953267645116526">"Адрабіць"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Не пазначаць гэта апавяшчэнне як размову"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"У абранае"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Выдаліць з абранага"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Ігнараваць"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Уключыць паказ"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Паказваць як усплывальнае апавяшчэнне"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Выключыць усплывальныя апавяшчэнні"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Дадаць на галоўны экран"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"кіраванне апавяшчэннямі"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"параметры адкладвання апавяшчэнняў"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index f83bf96e2b0d..5cfea60f901f 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Мащаб – запълва екрана"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Разпъване – запълва екрана"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Екранна снимка"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Изображението бе вмъкнато"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Екранната снимка се запазва..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Екранната снимка се запазва..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Екранната снимка е запазена"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Стартиране на записа"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Записване на озвучаване"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Показване на докосванията"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Докоснете за спиране"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Спиране"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Поставяне на пауза"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Възобновяване"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Запазв. на батерията"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Ще се вкл. по залез"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"До изгрев"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Ще се включи в <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"До <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"КБП"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"КБП е деактивирана"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"КБП е активирана"</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 10479b134c89..f1e49ce57ce8 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"স্ক্রীণ পূরণ করতে জুম করুন"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ফুল স্ক্রিন করুন"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"স্ক্রিনশট"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"ছবি যোগ করা হয়েছে"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"স্ক্রিনশট সেভ করা হচ্ছে..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"স্ক্রিনশট সেভ করা হচ্ছে..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"স্ক্রিনশট সেভ করা হয়েছে"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"রেকর্ডিং শুরু করুন"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"ভয়েসওভার রেকর্ড করুন"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"ট্যাপগুলি দেখুন"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"বন্ধ করতে ট্যাপ করুন"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"বন্ধ করুন"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"পজ করুন"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"আবার চালু করুন"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ব্যাটারি সেভার"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"সূর্যাস্তে চালু হবে"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"সূর্যোদয় পর্যন্ত"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>-এ চালু হবে"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> পর্যন্ত"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC অক্ষম করা আছে"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC সক্ষম করা আছে"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"স্ক্রিন রেকর্ড"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"শুরু করুন"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"বন্ধ করুন"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"অন্য অ্যাপে যেতে উপরের দিকে সোয়াইপ করুন"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"একটি অ্যাপ ছেড়ে দ্রুত অন্য অ্যাপে যেতে ডান দিকে টেনে আনুন"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"\'এক নজরে\' বৈশিষ্ট্যটি চালু বা বন্ধ করুন"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"কাস্টমাইজ করুন"</string> <string name="notification_done" msgid="6215117625922713976">"সম্পন্ন"</string> <string name="inline_undo" msgid="9026953267645116526">"আগের অবস্থায় ফিরে যান"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"কথোপকথন হিসেবে এই বিজ্ঞপ্তি চিহ্নিত করবেন না"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"পছন্দসই"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"পছন্দসই থেকে সরান"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"মিউট করুন"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"আনমিউট করুন"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"পপ-আপ হিসেবে দেখুন"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"পপ-আপ বন্ধ করুন"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"হোম স্ক্রিনে যোগ করুন"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"বিজ্ঞপ্তির নিয়ন্ত্রণগুলি"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"বিজ্ঞপ্তি মনে করিয়ে দেওয়ার বিকল্পগুলি"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 6c89d976731a..cabe87f4a0b0 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Uvećaj prikaz na ekran"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Razvuci prikaz na ekran"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Snimak ekrana"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Slika je umetnuta"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Spašavanje snimka ekrana..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Spašavanje snimka ekrana..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Snimak ekrana je sačuvan"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Započni snimanje"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Govor snimka"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Prikaži dodire"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Dodirnite za zaustavljanje"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Zaustavi"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pauza"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Nastavi"</string> @@ -390,6 +392,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Ušteda baterije"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Uključuje se u sumrak"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Do svitanja"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Uključuje se u <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Do <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC je onemogućen"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC je omogućen"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index f675e20e7dfd..3e257952050a 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom per omplir pantalla"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Estira per omplir pant."</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Captura de pantalla"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Imatge inserida"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"S\'està desant captura de pantalla..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"S\'està desant la captura de pantalla..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"S\'ha desat la captura de pantalla"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Inicia la gravació"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Grava la veu en off"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Mostra els tocs"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Toca per aturar"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Atura"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Posa en pausa"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Reprèn"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Estalvi de bateria"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Al vespre"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Fins a l\'alba"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"S\'activarà a les <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Fins a les <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"L\'NFC està desactivada"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"L\'NFC està activada"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 354ccf44af39..3c85880eaaf8 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Přiblížit na celou obrazovku"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Na celou obrazovku"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Snímek obrazovky"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Vložen obrázek"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Ukládání snímku obrazovky..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Ukládání snímku obrazovky..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Snímek obrazovky byl uložen"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Spustit nahrávání"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Nahrávat komentář"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Zobrazovat klepnutí"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Klepnutím zastavíte"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Zastavit"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pozastavit"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Obnovit"</string> @@ -392,6 +394,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Spořič baterie"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Při soumraku"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Do svítání"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Zapnout v <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Do <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC je vypnuto"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC je zapnuto"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 04e83d4b62ea..f2ffdaac0e37 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom til fuld skærm"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Stræk til fuld skærm"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Billedet blev indsat"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Gemmer screenshot..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Gemmer screenshot..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshottet blev gemt"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Start optagelse"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Optag voiceover"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Vis tryk"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tryk for at stoppe"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stop"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Sæt på pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Genoptag"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Batterisparefunktion"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Til ved solnedgang"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Indtil solopgang"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Tænd kl. <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Indtil kl. <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC er deaktiveret"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC er aktiveret"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index baf3e7c0006e..58caef2b46bb 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom auf Bildschirmgröße"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Auf Bildschirmgröße anpassen"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Bild eingefügt"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Screenshot wird gespeichert..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Screenshot wird gespeichert..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshot gespeichert"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Aufzeichnung starten"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Voice-over aufnehmen"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Fingertipps anzeigen"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Zum Stoppen tippen"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Anhalten"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pausieren"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Fortsetzen"</string> @@ -392,15 +394,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Energiesparmodus"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"An bei Sonnenuntergang"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Bis Sonnenaufgang"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"An um <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Bis <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC ist deaktiviert"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC ist aktiviert"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Bildschirmaufnahme"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Starten"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Beenden"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Nach oben wischen, um Apps zu wechseln"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Zum schnellen Wechseln der Apps nach rechts ziehen"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Übersicht ein-/ausblenden"</string> @@ -700,22 +701,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Anpassen"</string> <string name="notification_done" msgid="6215117625922713976">"Fertig"</string> <string name="inline_undo" msgid="9026953267645116526">"Rückgängig machen"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Diese Benachrichtigung als keine Unterhaltung markieren"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Favorit"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Aus Favoriten entfernen"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Stummschalten"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Stummschaltung aufheben"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Als Infofeld anzeigen"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Infofelder deaktivieren"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Zum Startbildschirm hinzufügen"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> – <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"Benachrichtigungseinstellungen"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"Optionen für spätere Erinnerung bei Benachrichtigungen"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 45ad30244812..d3686c834882 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Ζουμ σε πλήρη οθόνη"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Προβoλή σε πλήρη οθ."</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Στιγμιότυπο οθόνης"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Έγινε εισαγωγή εικόνας"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Αποθήκ. στιγμιότυπου οθόνης..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Αποθήκευση στιγμιότυπου οθόνης..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Το στιγμιότυπο οθόνης αποθηκεύτηκε"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Έναρξη εγγραφής"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Εγγραφή σπικάζ"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Εμφάνιση πατημάτων"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Πατήστε για διακοπή"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Διακοπή"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Παύση"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Συνέχιση"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Εξοικονόμ. μπαταρίας"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Κατά τη δύση"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Μέχρι την ανατολή"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Ενεργοποίηση στις <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Έως <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Το NFC είναι απενεργοποιημένο"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Το NFC είναι ενεργοποιημένο"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index b6a5d1573acc..4f61daa2bf18 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom to fill screen"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Stretch to fill screen"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Image inserted"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Saving screenshot…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Saving screenshot…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshot saved"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Start Recording"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Record voiceover"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Show taps"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tap to stop"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stop"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Resume"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Battery Saver"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"On at sunset"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Until sunrise"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"On at <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Until <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC is disabled"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC is enabled"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index e194e69c9299..34a2f1975d75 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom to fill screen"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Stretch to fill screen"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Image inserted"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Saving screenshot…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Saving screenshot…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshot saved"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Start Recording"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Record voiceover"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Show taps"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tap to stop"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stop"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Resume"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Battery Saver"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"On at sunset"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Until sunrise"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"On at <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Until <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC is disabled"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC is enabled"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index b6a5d1573acc..4f61daa2bf18 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom to fill screen"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Stretch to fill screen"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Image inserted"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Saving screenshot…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Saving screenshot…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshot saved"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Start Recording"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Record voiceover"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Show taps"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tap to stop"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stop"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Resume"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Battery Saver"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"On at sunset"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Until sunrise"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"On at <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Until <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC is disabled"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC is enabled"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index b6a5d1573acc..4f61daa2bf18 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom to fill screen"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Stretch to fill screen"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Image inserted"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Saving screenshot…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Saving screenshot…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshot saved"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Start Recording"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Record voiceover"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Show taps"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tap to stop"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stop"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Resume"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Battery Saver"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"On at sunset"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Until sunrise"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"On at <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Until <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC is disabled"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC is enabled"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index e3a569a29cae..2bb51311aa0a 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom to fill screen"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Stretch to fill screen"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Image inserted"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Saving screenshot…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Saving screenshot…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshot saved"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Start Recording"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Record voiceover"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Show taps"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tap to stop"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stop"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Resume"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Battery Saver"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"On at sunset"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Until sunrise"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"On at <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Until <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC is disabled"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC is enabled"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 255db9229657..e2bf6efa538e 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom para ocupar la pantalla"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Estirar p/ ocupar la pantalla"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Captura de pantalla"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Se insertó la imagen"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Guardando captura de pantalla"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Guardando la captura de pantalla..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Se guardó la captura de pantalla"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Iniciar grabación"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Grabar voz superpuesta"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Mostrar toques"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Presiona para detener"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Detener"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pausar"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Reanudar"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Ahorro de batería"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Al atardecer"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Hasta el amanecer"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"A la(s) <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Hasta la(s) <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"La tecnología NFC está inhabilitada"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"La tecnología NFC está habilitada"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index d1d959c84099..40d7fe3bdf25 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom para ajustar"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Expandir para ajustar"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Captura de pantalla"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Se ha insertado la imagen"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Guardando captura..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Guardando captura..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Se ha guardado la captura de pantalla"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Iniciar grabación"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Grabar voz en off"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Mostrar toques"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Toca para detener"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Detener"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pausar"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Seguir"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Ahorro de batería"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Al anochecer"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Hasta el amanecer"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"A las <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Hasta las <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"El NFC está desactivado"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"El NFC está activado"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 6f69a17f35f0..d8f546ce48d4 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Suumi ekraani täitmiseks"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Venita ekraani täitmiseks"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Ekraanipilt"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Pilt on sisestatud"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Kuvatõmmise salvestamine ..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Kuvatõmmise salvestamine ..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Ekraanipilt salvestati"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Alusta salvestamist"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Salvesta hääl"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Kuva puudutused"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Puudutage peatamiseks"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Peata"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Peata"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Jätka"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Akusäästja"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Sisse päikeselooj."</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Kuni päikesetõusuni"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Sisse kell <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Kuni <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC on keelatud"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC on lubatud"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekraanikirje"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Alustage"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Peatage"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Rakenduste vahetamiseks pühkige üles"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Lohistage paremale, et rakendusi kiiresti vahetada"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Lehe Ülevaade sisse- ja väljalülitamine"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Kohandamine"</string> <string name="notification_done" msgid="6215117625922713976">"Valmis"</string> <string name="inline_undo" msgid="9026953267645116526">"Võta tagasi"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Eemalda see meeldetuletus vestlustest"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Lisa lemmikutesse"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Tühista lemmikutesse lisamine"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Vaigista"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Tühista vaigistus"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Kuva mullina"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Lülita mullid välja"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Lisa avakuvale"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"märguannete juhtnupud"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"märguannete edasilükkamise valikud"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 1b89c5aa92d2..9dceb5fe3f05 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Handiagotu pantaila betetzeko"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Luzatu pantaila betetzeko"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Pantaila-argazkia"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Irudi bat txertatu da"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Pantaila-argazkia gordetzen…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Pantaila-argazkia gordetzen…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Gorde da pantaila-argazkia"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Hasi grabatzen"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Grabatu off ahotsa"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Erakutsi sakatzeak"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Sakatu gelditzeko"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Gelditu"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pausatu"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Berrekin"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Bateria-aurrezlea"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Ilunabarrean aktibatuko da"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Egunsentira arte"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Aktibatze-ordua: <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Desaktibatze-ordua: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Desgaituta dago NFC"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Gaituta dago NFC"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Pantaila-grabaketa"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Hasi"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Gelditu"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Egin gora aplikazioa aldatzeko"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Arrastatu eskuinera aplikazioa azkar aldatzeko"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Aldatu ikuspegi orokorra"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Pertsonalizatu"</string> <string name="notification_done" msgid="6215117625922713976">"Eginda"</string> <string name="inline_undo" msgid="9026953267645116526">"Desegin"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Markatu jakinarazpen hau ez dela elkarrizketa bat"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Markatu gogoko gisa"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Kendu gogokoetatik"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Ezkutatu"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Erakutsi"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Markatu burbuila gisa"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Desaktibatu burbuilak"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Gehitu hasierako pantailan"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"jakinarazpena kontrolatzeko aukerak"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"jakinarazpena atzeratzeko aukerak"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 2b765573ac06..d27b420c0e9c 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"بزرگنمایی برای پر کردن صفحه"</string> <string name="compat_mode_off" msgid="7682459748279487945">"گسترده کردن برای پر کردن صفحه"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"عکس صفحهنمایش"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"تصویر درج شد"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"در حال ذخیره عکس صفحهنمایش..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"درحال ذخیره عکس صفحهنمایش…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"عکس صفحهنمایش ذخیره شد"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"شروع ضبط"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"ضبط صدا روی تصویر"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"نمایش ضربهها"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"ضربه برای توقف"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"توقف"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"مکث"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ازسرگیری"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"بهینهسازی باتری"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"غروب روشن میشود"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"تا طلوع آفتاب"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"ساعت <xliff:g id="TIME">%s</xliff:g> روشن میشود"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"تا<xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC غیرفعال است"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC فعال است"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ضبط کردن صفحهنمایش"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"شروع"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"توقف"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"برای تغییر برنامهها، تند به بالا بکشید"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"برای جابهجایی سریع میان برنامهها، به چپ بکشید"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"تغییر وضعیت نمای کلی"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"سفارشی کردن"</string> <string name="notification_done" msgid="6215117625922713976">"تمام"</string> <string name="inline_undo" msgid="9026953267645116526">"واگرد"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"علامتگذاری این اعلان بهعنوان غیرمکالمه"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"مورد دلخواه"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"حذف از موارد دلخواه"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"صامت کردن"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"باصدا کردن"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"نمایش بهشکل ابزارک اعلان"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"خاموش کردن ابزارکهای اعلان"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"افزودن به صفحه اصلی"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"کنترلهای اعلان"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"گزینههای تعویق اعلان"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 9b76f39175ab..cf01efd933d0 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoomaa koko näyttöön"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Venytä koko näyttöön"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Kuvakaappaus"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Kuva lisätty"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Tallennetaan kuvakaappausta..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Tallennetaan kuvakaappausta..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Kuvakaappaus tallennettu"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Aloita tallennus"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Äänitä taustaselostus"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Näytä napautukset"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Lopeta napauttamalla"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Lopeta"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Keskeytä"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Jatka"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Virransäästö"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Auringon laskiessa"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Auringonnousuun"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Päälle klo <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> asti"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC on poistettu käytöstä"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC on käytössä"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Näytön tallentaminen"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Aloita"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Lopeta"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Vaihda sovellusta pyyhkäisemällä ylös"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Vaihda sovellusta nopeasti vetämällä oikealle"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Näytä/piilota viimeisimmät"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Muokkaa"</string> <string name="notification_done" msgid="6215117625922713976">"Valmis"</string> <string name="inline_undo" msgid="9026953267645116526">"Kumoa"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Merkitse, että tämä ilmoitus ei ole keskustelu"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Suosikki"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Poista suosikeista"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Ohita"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Poista ohitus"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Näytä ohjekuplana"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Laita ohjekuplat pois päältä"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Lisää aloitusnäytölle"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"Ilmoitusten hallinta"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"Ilmoitusten torkkuasetukset"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 55eb39ee69f2..5f7a358239c7 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoomer pour remplir l\'écran"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Étirer pour remplir l\'écran"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Capture d\'écran"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Image insérée"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Enregistrement capture écran…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Enregistrement capture écran…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Capture d\'écran enregistrée"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Commencer l\'enregistrement"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Enregistrer la voix hors champ"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Afficher les éléments sélectionnés"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Toucher pour arrêter"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Arrêter"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Reprendre"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Économiseur de pile"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Activé la nuit"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Jusqu\'à l\'aube"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Actif à <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Jusqu\'à <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC désactivée"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC activée"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 5b126129311e..3c12f668d2b9 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoomer pour remplir l\'écran"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Étirer pour remplir l\'écran"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Capture d\'écran"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Image insérée"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Enregistrement capture écran…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Enregistrement de la capture d\'écran…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Capture d\'écran enregistrée"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Démarrer l\'enregistrement"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Enregistrer une voix off"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Afficher les éléments sélectionnés"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Appuyez ici pour arrêter"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Arrêter"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Reprendre"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Économiseur batterie"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Activé la nuit"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Jusqu\'à l\'aube"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"À partir de <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Jusqu\'à <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC désactivée"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"La technologie NFC est activée"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 74ee202f9926..0c444e48aee3 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Ampliar ata ocupar todo"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Estirar ata ocupar todo"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Crear captura"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Engadiuse a imaxe"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Gardando captura de pantalla…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Gardando captura de pantalla…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Gardouse a captura de pantalla"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Iniciar gravación"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Gravar voz en off"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Mostrar toques"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Toca para deter a gravación"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Deter"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pór en pausa"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Retomar"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Aforro de batería"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Activación ao solpor"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Ata o amencer"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Activarase ás: <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Utilizarase ata as: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"A opción NFC está desactivada"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"A opción NFC está activada"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 4b5dd2519055..9dde523d9a89 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"સ્ક્રીન ભરવા માટે ઝૂમ કરો"</string> <string name="compat_mode_off" msgid="7682459748279487945">"સ્ક્રીન ભરવા માટે ખેંચો"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"સ્ક્રીનશૉટ"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"છબી શામેલ કરી"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"સ્ક્રીનશોટ સાચવી રહ્યું છે…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"સ્ક્રીનશોટ સાચવી રહ્યું છે…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"સ્ક્રીનશૉટ સાચવ્યો"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"રેકોર્ડિંગ શરૂ કરો"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"વૉઇસઓવર રેકોર્ડ કરો"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"ટૅપ કર્યાની સંખ્યા બતાવો"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"રોકવા માટે ટૅપ કરો"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"રોકો"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"થોભાવો"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ફરી શરૂ કરો"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"બૅટરી સેવર"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"સૂર્યાસ્ત વખતે"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"સૂર્યોદય સુધી"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> વાગ્યે ચાલુ"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> વાગ્યા સુધી"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC અક્ષમ કરેલ છે"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC સક્ષમ કરેલ છે"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"સ્ક્રીન રેકૉર્ડ કરો"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"શરૂ કરો"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"રોકો"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ઍપ સ્વિચ કરવા માટે ઉપરની તરફ સ્વાઇપ કરો"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ઍપને ઝડપથી સ્વિચ કરવા માટે જમણે ખેંચો"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"ઝલકને ટૉગલ કરો"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"કસ્ટમાઇઝ કરો"</string> <string name="notification_done" msgid="6215117625922713976">"થઈ ગયું"</string> <string name="inline_undo" msgid="9026953267645116526">"રદ કરો"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"આ નોટિફિકેશન વાતચીત ન હોવા તરીકે માર્ક કરો"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"મનપસંદ"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"મનપસંદમાંથી કાઢી નાખો"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"મ્યૂટ કરો"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"અનમ્યૂટ કરો"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"બબલ તરીકે બતાવો"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"બબલ બંધ કરો"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"હોમ સ્ક્રીન પર ઉમેરો"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"સૂચના નિયંત્રણો"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"સૂચના સ્નૂઝ કરવાના વિકલ્પો"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index c22d234bedd9..5522605cd0f4 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"स्क्रीन भरने के लिए ज़ूम करें"</string> <string name="compat_mode_off" msgid="7682459748279487945">"स्क्रीन भरने के लिए खींचें"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"स्क्रीनशॉट"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"इमेज डाली गई"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"स्क्रीनशॉट सहेजा जा रहा है..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"स्क्रीनशॉट सहेजा जा रहा है..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"स्क्रीनशॉट सेव किया गया"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"रिकॉर्डिंग शुरू करें"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"वॉइसओवर रिकॉर्ड करें"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"टैप दिखाएं"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"रोकने के लिए टैप करें"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"रोकें"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"रोकें"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"फिर से शुरू करें"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"बैटरी सेवर"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"शाम को चालू होगा"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"सुबह तक चालू रहेगी"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> बजे चालू हाेगी"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> बजे तक चालू रहेगी"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"एनएफ़सी"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC बंद है"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC चालू है"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"स्क्रीन रिकॉर्ड"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"शुरू करें"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"रोकें"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ऐप्लिकेशन बदलने के लिए ऊपर स्वाइप करें"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ऐप्लिकेशन को झटपट स्विच करने के लिए उसे दाईं ओर खींचें और छोड़ें"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"खास जानकारी टॉगल करें"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"पसंद के मुताबिक बनाएं"</string> <string name="notification_done" msgid="6215117625922713976">"हो गया"</string> <string name="inline_undo" msgid="9026953267645116526">"पहले जैसा करें"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"इस सूचना को \'बातचीत नहीं\' के रूप में मार्क करें"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"पसंदीदा के रूप में मार्क करें"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"पसंदीदा से हटाएं"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"म्यूट करें"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"अनम्यूट करें"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"बबल के रूप में दिखाएं"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"बबल्स को बंद करें"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"होम स्क्रीन पर जोड़ें"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"सूचना नियंत्रण"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"सूचना को स्नूज़ (थोड़ी देर के लिए चुप करना) करने के विकल्प"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 128670923f1c..55a0e788581a 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zumiraj i ispuni zaslon"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Rastegni i ispuni zaslon"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Snimka zaslona"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Umetnuta je slika"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Spremanje snimke zaslona..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Spremanje snimke zaslona..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Snimka zaslona spremljena"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Započni snimanje"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Snimi glasovni zapis"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Prikaži dodire"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Dodirnite da biste zaustavili"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Zaustavi"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pauza"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Nastavi"</string> @@ -390,6 +392,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Štednja baterije"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Uključuje se u suton"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Do izlaska sunca"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Uključuje se u <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Do <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC je onemogućen"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC je omogućen"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index a3b6d3fe1480..a9b2d036ebcc 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Nagyítás a kitöltéshez"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Nyújtás kitöltéshez"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Képernyőkép"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Kép beszúrva"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Képernyőkép mentése..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Képernyőkép mentése..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"A képernyőkép mentése sikerült"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Rögzítés indítása"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Hang rögzítése"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Koppintások megjelenítése"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Koppintson a leállításhoz"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Leállítás"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Szünet"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Folytatás"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Akkumulátorkímélő"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Be: napnyugta"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Napfelkeltéig"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Be: <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Eddig: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Az NFC ki van kapcsolva"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Az NFC be van kapcsolva"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 5c73ed18d73f..78acb2ed164e 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Խոշորացնել` էկրանը լցնելու համար"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Ձգել` էկրանը լցնելու համար"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Սքրինշոթ"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Պատկերը զետեղվեց"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Սքրինշոթը պահվում է…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Սքրինշոթը պահվում է..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Սքրինշոթը պահվեց"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Սկսել տեսագրումը"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Ձայնագրել ուղեկցող ձայները"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Ցույց տալ հպումները"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Հպեք՝ դադարեցնելու համար"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Կանգնեցնել"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Դադարեցնել"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Վերսկսել"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Մարտկոցի տնտեսում"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Կմիացվի մայրամուտին"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Մինչև լուսաբաց"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Կմիանա՝ <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Մինչև <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC-ն անջատված է"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC-ն միացված է"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Էկրանի ձայնագրում"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Սկսել"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Կանգնեցնել"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Սահեցրեք վերև՝ մյուս հավելվածին անցնելու համար"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Քաշեք աջ՝ հավելվածների միջև անցնելու համար"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Միացնել/անջատել համատեսքը"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Կարգավորել"</string> <string name="notification_done" msgid="6215117625922713976">"Պատրաստ է"</string> <string name="inline_undo" msgid="9026953267645116526">"Հետարկել"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Նշել այս ծանուցումը որպես ոչ խոսակցություն"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Ավելացնել ընտրանիում"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Հեռացնել ընտրանուց"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Անջատել ծանուցումները"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Միացնել ծանուցումները"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Ցուցադրել որպես ամպիկ"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Անջատել ամպիկները"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Ավելացնել հիմնական էկրանին"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"ծանուցման կառավարներ"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"ծանուցման հետաձգման ընտրանքներ"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index bad3e677af0d..95c16c87dc1a 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Perbesar utk mengisi layar"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Rentangkn utk mngisi layar"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Gambar disisipkan"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Menyimpan screenshot..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Menyimpan screenshot..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshot disimpan"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Mulai Merekam"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Rekam voiceover"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Tampilkan sentuhan"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Ketuk untuk menghentikan"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stop"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Jeda"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Lanjutkan"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Penghemat Baterai"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Aktif saat malam"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Sampai pagi"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Aktif pada <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Sampai <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC dinonaktifkan"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC diaktifkan"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 68f04fb506fc..985f62d3e936 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Fylla skjá með aðdrætti"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Teygja yfir allan skjáinn"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Skjámynd"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Mynd sett inn"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Vistar skjámynd…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Vistar skjámynd…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Skjámynd vistuð"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Hefja upptöku"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Taka upp talsetningu"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Sýna snertingar"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Ýttu til að stöðva"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stöðva"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Hlé"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Halda áfram"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Rafhlöðusparnaður"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Kveikt við sólsetur"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Til sólarupprásar"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Virkt kl. <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Til <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Slökkt á NFC"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Kveikt á NFC"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index bdf93fa93e15..870e6b7a75e7 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom per riempire schermo"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Estendi per riemp. schermo"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Immagine inserita"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Salvataggio screenshot..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Salvataggio screenshot..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshot salvato"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Avvia registrazione"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Registra voce fuori campo"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Mostra tocchi"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tocca per interrompere"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Interrompi"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pausa"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Riprendi"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Risparmio energetico"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Attivato al tramonto"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Fino all\'alba"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Attivazione alle <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Fino alle <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC non attiva"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC attiva"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 9cfd0b3a22f6..775be02e20e9 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"הגדל תצוגה כדי למלא את המסך"</string> <string name="compat_mode_off" msgid="7682459748279487945">"מתח כדי למלא את המסך"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"צילום מסך"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"התמונה התווספה"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"שומר צילום מסך..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"שומר צילום מסך..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"צילום המסך נשמר"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"הפעלת ההקלטה"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"הקלטת voiceover"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"הצגת הקשות"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"אפשר להקיש כדי להפסיק"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"עצירה"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"השהיה"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"המשך"</string> @@ -392,15 +394,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"חיסכון בסוללה"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"מופעל בשקיעה"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"עד הזריחה"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"יתחיל בשעה <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"עד <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC מושבת"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC מופעל"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"הקלטת המסך"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"התחלה"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"עצירה"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"יש להחליק מעלה כדי להחליף אפליקציות"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"יש לגרור ימינה כדי לעבור במהירות בין אפליקציות"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"החלפת מצב של מסכים אחרונים"</string> @@ -702,22 +703,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"התאמה אישית"</string> <string name="notification_done" msgid="6215117625922713976">"סיום"</string> <string name="inline_undo" msgid="9026953267645116526">"ביטול"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"סימון ההתראה הזו כהתראה שאינה משיחה"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"סימון כמועדפת"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"הסרה מהמועדפים"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"השתקה"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"ביטול ההשתקה"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"הצגה בתור בועה"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"כיבוי הבועות"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"הוספה למסך הבית"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"בקרת התראות"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"אפשרויות של דחיית התראות לטיפול בהמשך"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 0c57372f3ba9..7af3f8631f03 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"画面サイズに合わせて拡大"</string> <string name="compat_mode_off" msgid="7682459748279487945">"画面サイズに合わせて拡大"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"スクリーンショット"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"画像を挿入しました"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"スクリーンショットを保存中..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"スクリーンショットを保存しています..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"スクリーンショットを保存しました"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"録画を開始"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"ナレーションの録音"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"タップの表示"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"タップして停止"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"停止"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"一時停止"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"再開"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"バッテリー セーバー"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"日の入りに ON"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"日の出まで"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>にオン"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g>まで"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC は無効です"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC は有効です"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"スクリーン レコード"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"開始"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"停止"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"アプリを切り替えるには上にスワイプ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"右にドラッグするとアプリを素早く切り替えることができます"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"概要を切り替え"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"カスタマイズ"</string> <string name="notification_done" msgid="6215117625922713976">"完了"</string> <string name="inline_undo" msgid="9026953267645116526">"元に戻す"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"この通知を会話ではないとマーク"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"お気に入り"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"お気に入りから削除"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"ミュート"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"ミュートを解除"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"ふきだしとして表示"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"ふきだしを OFF にする"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"ホーム画面に追加"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"通知管理"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"通知スヌーズ設定"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index a3827d2a183b..2433f9e32e8f 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"მასშტაბი შეცვალეთ ეკრანის შესავსებად."</string> <string name="compat_mode_off" msgid="7682459748279487945">"გაწიეთ ეკრანის შესავსებად."</string> <string name="global_action_screenshot" msgid="2760267567509131654">"ეკრანის ანაბეჭდი"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"სურათი ჩასმულია"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"სკრინშოტის შენახვა…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"ეკრანის სურათის შენახვა…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"ეკრანის ანაბეჭდი შენახულია"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"ჩაწერის დაწყება"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"ხმის ჩაწერა"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"შეხებების ჩვენება"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"შეეხეთ შესაწყვეტად"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"შეწყვეტა"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"პაუზა"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"გაგრძელება"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ბატარეის დამზოგი"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"ჩაირთოს მზის ჩასვლისას"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"მზის ამოსვლამდე"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"ჩაირთოს <xliff:g id="TIME">%s</xliff:g>-ზე"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g>-მდე"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC გათიშულია"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC ჩართულია"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ეკრანის ჩანაწერი"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"დაწყება"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"შეწყვეტა"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"გადაფურცლეთ ზემოთ აპების გადასართავად"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"აპების სწრაფად გადასართავად ჩავლებით გადაიტანეთ მარჯვნივ"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"მიმოხილვის გადართვა"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"მორგება"</string> <string name="notification_done" msgid="6215117625922713976">"მზადაა"</string> <string name="inline_undo" msgid="9026953267645116526">"მოქმედების გაუქმება"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ამ შეტყობინების მონიშვნა, როგორც არა მიმოწერის"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"რჩეული"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"რჩეულებიდან ამოღება"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"დადუმება"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"დადუმების მოხსნა"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"ბუშტის სახით ჩვენება"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"ბუშტების გამორთვა"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"მთავარ ეკრანზე დამატება"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"შეტყობინებების მართვის საშუალებები"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"შეტყობინებების ჩაჩუმების ვარიანტები"</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 19ae4e2a02d7..be93c18006b9 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Экранды толтыру үшін ұлғайту"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Экранды толтыру үшін созу"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Скриншот"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Сурет енгізілді"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Скриншотты сақтауда…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Скриншотты сақтауда…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Скриншот сақталды"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Жазуды бастау"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Кадр сыртындағы дыбысты жазу"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Түрту әрекеттерін көрсету"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Тоқтату үшін түртіңіз"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Тоқтату"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Тоқтата тұру"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Жалғастыру"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Battery Saver"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Күн батқанда қосу"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Күн шыққанға дейін"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Қосылу уақыты: <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> дейін"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC өшірулі"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC қосулы"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Экранды жазу"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Бастау"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Тоқтату"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Қолданбалар арасында ауысу үшін жоғары сырғытыңыз"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Қолданбаларды жылдам ауыстырып қосу үшін оңға қарай сүйреңіз"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Шолуды қосу/өшіру"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Реттеу"</string> <string name="notification_done" msgid="6215117625922713976">"Дайын"</string> <string name="inline_undo" msgid="9026953267645116526">"Қайтару"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Хабарландыруды сөйлесу емес деп белгілеу"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Таңдаулы"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Таңдаулылар тізімінен шығару"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Дыбысын өшіру"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Дыбысын қосу"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Қалқымалы анықтама ретінде көрсету"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Қалқымалы анықтамаларды өшіру"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Негізгі экранға қосу"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"хабарландыруларды басқару элементтері"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"хабарландыруды кідірту опциялары"</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index d6ec177d3909..413125cefb92 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"ពង្រីកដើម្បីឲ្យពេញអេក្រង់"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ទាញដើម្បីឲ្យពេញអេក្រង់"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"រូបថតអេក្រង់"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"បានបញ្ចូលរូបភាព"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"កំពុងរក្សាទុករូបថតអេក្រង់…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"កំពុងរក្សាទុករូបថតអេក្រង់..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"បានរក្សាទុករូបថតអេក្រង់"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"ចាប់ផ្តើមថត"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"ថតការបញ្ចូលសំឡេង"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"បង្ហាញការចុច"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"ចុច ដើម្បីបញ្ឈប់"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"ឈប់"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"ផ្អាក"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"បន្ត"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"កម្មវិធីសន្សំថ្ម"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"បើកនៅពេលថ្ងៃលិច"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"រហូតដល់ពេលថ្ងៃរះ"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"បើកនៅម៉ោង <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"រហូតដល់ម៉ោង <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"បានបិទ NFC"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"បានបើក NFC"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ការថតអេក្រង់"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ចាប់ផ្ដើម"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ឈប់"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"អូសឡើងលើដើម្បីប្តូរកម្មវិធី"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"អូសទៅស្ដាំដើម្បីប្ដូរកម្មវិធីបានរហ័ស"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"បិទ/បើកទិដ្ឋភាពរួម"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"ប្ដូរតាមបំណង"</string> <string name="notification_done" msgid="6215117625922713976">"រួចរាល់"</string> <string name="inline_undo" msgid="9026953267645116526">"ត្រឡប់វិញ"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"សម្គាល់ការជូនដំណឹងនេះថាមិនមែនជាការសន្ទនា"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"សំណព្វ"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"ដកចេញពីសំណព្វ"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"បិទសំឡេង"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"បើកសំឡេង"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"បង្ហាញជាសារលេចឡើង"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"បិទសារលេចឡើង"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"បញ្ចូលទៅក្នុងអេក្រង់ដើម"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"ការគ្រប់គ្រងការជូនដំណឹង"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"ជម្រើសផ្អាកការជូនដំណឹង"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index fc0f8e6c8093..0b98e0655a7e 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"ಪರದೆ ತುಂಬಿಸಲು ಝೂಮ್ ಮಾಡು"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ಪರದೆ ತುಂಬಿಸಲು ವಿಸ್ತಾರಗೊಳಿಸು"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"ಸ್ಕ್ರೀನ್ಶಾಟ್"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"ಚಿತ್ರವನ್ನು ಸೇರಿಸಲಾಗಿದೆ"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"ಸ್ಕ್ರೀನ್ಶಾಟ್ ಉಳಿಸಲಾಗುತ್ತಿದೆ…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"ಸ್ಕ್ರೀನ್ಶಾಟ್ ಉಳಿಸಲಾಗುತ್ತಿದೆ…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"ಸ್ಕ್ರೀನ್ಶಾಟ್ ಅನ್ನು ಉಳಿಸಲಾಗಿದೆ"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"ರೆಕಾರ್ಡಿಂಗ್ ಆರಂಭಿಸಿ"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"voiceover ಅನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಿ"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"ಟ್ಯಾಪ್ಗಳನ್ನು ತೋರಿಸಿ"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"ನಿಲ್ಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"ನಿಲ್ಲಿಸಿ"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"ವಿರಾಮಗೊಳಿಸಿ"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ಮುಂದುವರಿಸಿ"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ಬ್ಯಾಟರಿ ಸೇವರ್"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"ಸೂರ್ಯಾಸ್ತ ಸಮಯದಲ್ಲಿ"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"ಸೂರ್ಯೋದಯದವರೆಗೆ"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> ಸಮಯದಲ್ಲಿ"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> ವರೆಗೂ"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC ಸಕ್ರಿಯಗೊಂಡಿದೆ"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡ್"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ಪ್ರಾರಂಭಿಸಿ"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ನಿಲ್ಲಿಸಿ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಬದಲಿಸಲು ತ್ವರಿತವಾಗಿ ಬಲಕ್ಕೆ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"ಟಾಗಲ್ ನ ಅವಲೋಕನ"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"ಕಸ್ಟಮೈಜ್ ಮಾಡಿ"</string> <string name="notification_done" msgid="6215117625922713976">"ಮುಗಿದಿದೆ"</string> <string name="inline_undo" msgid="9026953267645116526">"ರದ್ದುಮಾಡಿ"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ಈ ಅಧಿಸೂಚನೆಯನ್ನು ಸಂಭಾಷಣೆಯಲ್ಲ ಎಂಬುದಾಗಿ ಗುರುತಿಸಿ"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"ಮೆಚ್ಚಿನದು"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"ಮೆಚ್ಚಿನದಲ್ಲದ್ದು"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"ಮ್ಯೂಟ್ ಮಾಡಿ"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"ಅನ್ಮ್ಯೂಟ್ ಮಾಡಿ"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"ಗುಳ್ಳೆಯಾಗಿ ತೋರಿಸಿ"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"ಗುಳ್ಳೆಗಳನ್ನು ಆಫ್ ಮಾಡಿ"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"ಮುಖಪುಟದ ಪರದೆಗೆ ಸೇರಿಸಿ"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"ಅಧಿಸೂಚನೆ ನಿಯಂತ್ರಣಗಳು"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"ಅಧಿಸೂಚನೆ ಸ್ನೂಜ್ ಆಯ್ಕೆಗಳು"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index eb3ebc918edb..54b055dd674b 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"전체화면 모드로 확대"</string> <string name="compat_mode_off" msgid="7682459748279487945">"전체화면 모드로 확대"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"스크린샷"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"이미지 삽입됨"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"캡쳐화면 저장 중..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"캡쳐화면 저장 중..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"스크린샷 저장됨"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"녹화 시작"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"음성 해설 녹음"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"탭한 항목 표시"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"탭하여 중지하기"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"중지"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"일시중지"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"재개"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"절전 모드"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"일몰에"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"일출까지"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>에"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g>까지"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC 사용 중지됨"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC 사용 설정됨"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"화면 녹화"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"시작"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"중지"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"위로 스와이프하여 앱 전환"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"앱을 빠르게 전환하려면 오른쪽으로 드래그"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"최근 사용 버튼 전환"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"맞춤설정"</string> <string name="notification_done" msgid="6215117625922713976">"완료"</string> <string name="inline_undo" msgid="9026953267645116526">"실행취소"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"이 알림을 대화가 아닌 일반 알림으로 표시"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"즐겨찾기"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"즐겨찾기 해제"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"숨기기"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"숨기기 취소"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"버블로 표시"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"버블 사용 중지"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"홈 화면에 추가"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"알림 관리"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"알림 일시 중지 옵션"</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 06f81614d1e2..ed6b9186cdba 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Экрнд тлтр ү. чен өлч өзг"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Экранды толтуруу ү-н чоюу"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Скриншот"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Сүрөт киргизилди"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Скриншот сакталууда…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Скриншот сакталууда..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Скриншот сакталды"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Жаздырып баштоо"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Үн коштоону жаздыруу"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Басылган жерди көрсөтүү"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Токтотуш үчүн басыңыз"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Токтотуу"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Тындыруу"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Улантуу"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Батареяны үнөмдөгүч"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Күн батканда күйөт"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Күн чыкканга чейин"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Саат <xliff:g id="TIME">%s</xliff:g> күйөт"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> чейин"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC өчүрүлгөн"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC иштетилген"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Экранды жаздыруу"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Старт"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Токтотуу"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Колдонмолорду которуштуруу үчүн өйдө сүрүңүз"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Колдонмолорду тез которуштуруу үчүн оңго сүйрөңүз"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Сереп салууну өчүрүү/күйгүзүү"</string> @@ -444,7 +445,7 @@ <string name="guest_new_guest" msgid="962155336259570156">"Конок кошуу"</string> <string name="guest_exit_guest" msgid="4030840507598850886">"Конокту алып салуу"</string> <string name="guest_exit_guest_dialog_title" msgid="5015697561580641422">"Конокту алып саласызбы?"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Бул сеанстагы бардык колдонмолор жана дайындар жок кылынат."</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Бул сеанстагы бардык колдонмолор жана дайындар өчүрүлөт."</string> <string name="guest_exit_guest_dialog_remove" msgid="7505817591242703757">"Алып салуу"</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"Кайтып келишиңиз менен, конок!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"Сеансыңызды улантасызбы?"</string> @@ -464,7 +465,7 @@ <item quantity="one">Бир колдонуучуну гана кошууга болот.</item> </plurals> <string name="user_remove_user_title" msgid="9124124694835811874">"Колдонуучу алынып салынсынбы?"</string> - <string name="user_remove_user_message" msgid="6702834122128031833">"Бул колдонуучунун бардык колдонмолору жана дайындары жок кылынат."</string> + <string name="user_remove_user_message" msgid="6702834122128031833">"Бул колдонуучунун бардык колдонмолору жана дайындары өчүрүлөт."</string> <string name="user_remove_user_remove" msgid="8387386066949061256">"Алып салуу"</string> <string name="battery_saver_notification_title" msgid="8419266546034372562">"Батареяны үнөмдөгүч режими күйүк"</string> <string name="battery_saver_notification_text" msgid="2617841636449016951">"Иштин майнаптуулугун начарлатып, фондук дайындарды чектейт"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Ыңгайлаштыруу"</string> <string name="notification_done" msgid="6215117625922713976">"Бүттү"</string> <string name="inline_undo" msgid="9026953267645116526">"Кайтаруу"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Бул билдирме \"жазышуу эмес\" катары белгиленсин"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Сүйүктүүлөргө кошуу"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Сүйүктүүлөрдөн чыгаруу"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Үнүн басуу"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Үнүн чыгаруу"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Көбүк катары көрсөтүү"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Көбүктөрдү өчүрүү"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Башкы экранга кошуу"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"эскертмелерди башкаруу каражаттары"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"эскертмени тындыруу опциялары"</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 3013e1e94c34..11c4f7c45433 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"ຊູມໃຫ້ເຕັມໜ້າຈໍ"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ປັບໃຫ້ເຕັມໜ້າຈໍ"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"ພາບໜ້າຈໍ"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"ແຊກຮູບແລ້ວ"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"ກຳລັງບັນທຶກຮູບໜ້າຈໍ"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"ກຳລັງບັນທຶກພາບໜ້າຈໍ..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"ບັນທຶກຮູບໜ້າຈໍໄວ້ແລ້ວ"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"ເລີ່ມການບັນທຶກ"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"ບັນທຶກສຽງພາກ"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"ສະແດງການແຕະ"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"ແຕະເພື່ອຢຸດ"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"ຢຸດ"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"ຢຸດຊົ່ວຄາວ"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ສືບຕໍ່"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ຕົວປະຢັດແບັດເຕີຣີ"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"ເປີດຕອນຕາເວັນຕົກ"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"ຈົນກວ່າຕາເວັນຂຶ້ນ"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"ເປີດເວລາ <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"ຈົນຮອດ <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC is disabled"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC is enabled"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ການບັນທຶກໜ້າຈໍ"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ເລີ່ມ"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ຢຸດ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ປັດຂື້ນເພື່ອສະຫຼັບແອັບ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ລາກໄປຂວາເພື່ອສະຫຼັບແອັບດ່ວນ"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"ສະຫຼັບພາບຮວມ"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"ປັບແຕ່ງ"</string> <string name="notification_done" msgid="6215117625922713976">"ສຳເລັດແລ້ວ"</string> <string name="inline_undo" msgid="9026953267645116526">"ຍົກເລີກ"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ໝາຍການແຈ້ງເຕືອນນີ້ວ່າບໍ່ແມ່ນການສົນທະນາ"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"ລາຍການທີ່ມັກ"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"ຍົກເລີກລາຍການທີ່ມັກ"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"ປິດສຽງ"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"ເຊົາປິດສຽງ"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"ສະແດງເປັນ bubble"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"ປິດການໃຊ້ bubble"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"ເພີ່ມໃສ່ໜ້າຈໍຫຼັກ"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"ການຄວບຄຸມການແຈ້ງເຕືອນ"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"ຕົວເລືອກການເລື່ອນການແຈ້ງເຕືອນ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index c6b50d92e3ed..7da1174c0878 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Keisti mast., kad atit. ekr."</string> <string name="compat_mode_off" msgid="7682459748279487945">"Ištempti, kad atit. ekr."</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Ekrano kopija"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Vaizdas įterptas"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Išsaugoma ekrano kopija..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Išsaugoma ekrano kopija..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Ekrano kopija išsaugota"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Pradėti įrašymą"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Įrašyti balsą už kadro"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Rodyti palietimus"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Sustabdykite palietę"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Sustabdyti"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pristabdyti"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Tęsti"</string> @@ -392,6 +394,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Akum. taus. priemonė"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Per saulėlydį"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Iki saulėtekio"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Iki <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"ALR"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"ALR išjungtas"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"ALR įjungtas"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index b519f053b1ce..fed86b324c78 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Tālumm., lai aizp. ekr."</string> <string name="compat_mode_off" msgid="7682459748279487945">"Stiepiet, lai aizp. ekr."</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Ekrānuzņēmums"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Attēls ir ievietots"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Saglabā ekrānuzņēmumu…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Notiek ekrānuzņēmuma saglabāšana..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Ekrānuzņēmums saglabāts"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Sākt ierakstīšanu"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Ierakstīt balsi"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Rādīt pieskārienus"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Pieskarieties, lai apturētu"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Pārtraukt"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Apturēt"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Atsākt"</string> @@ -390,15 +392,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Jaudas taupīšana"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Saulrietā"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Līdz saullēktam"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Plkst. <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Līdz plkst. <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC ir atspējoti"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC ir iespējoti"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekrāna ierakstīšana"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Sākt"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Apturēt"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Velciet augšup, lai pārslēgtu lietotnes"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Lai ātri pārslēgtu lietotnes, velciet pa labi"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Pārskata pārslēgšana"</string> @@ -699,22 +700,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Pielāgot"</string> <string name="notification_done" msgid="6215117625922713976">"Gatavs"</string> <string name="inline_undo" msgid="9026953267645116526">"Atsaukt"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Atzīmēt, ka šis paziņojums nav saruna"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Pievienot izlasei"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Noņemt no izlases"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Izslēgt skaņu"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Ieslēgt skaņu"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Rādīt kā burbuli"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Izslēgt burbuļus"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Pievienot sākuma ekrānam"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"paziņojumu vadīklas"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"paziņojumu atlikšanas opcijas"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 9080b576d4a9..a02f38ed267b 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Зумирај да се исполни екранот"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Растегни да се исполни екранот"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Слика од екранот"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Вметната е слика"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Сликата на екранот се зачувува..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Сликата на екранот се зачувува..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Сликата од екранот е зачувана"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Започни со снимање"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Снимај коментар"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Прикажувај допири"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Допрете за запирање"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Сопри"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Паузирај"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Продолжи"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Штедач на батерија"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Вклуч. на зајдисонце"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"До изгрејсонце"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Се вклучува во <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"До <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC е оневозможено"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC е овозможено"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index b761c445297f..2d3f73fc5978 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"സ്ക്രീനിൽ ഉൾക്കൊള്ളിക്കാൻ സൂം ചെയ്യുക"</string> <string name="compat_mode_off" msgid="7682459748279487945">"സ്ക്രീനിൽ ഉൾക്കൊള്ളിക്കാൻ വലിച്ചുനീട്ടുക"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"സ്ക്രീൻഷോട്ട്"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"ചിത്രം ചേർത്തു"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"സ്ക്രീൻഷോട്ട് സംരക്ഷിക്കുന്നു..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"സ്ക്രീൻഷോട്ട് സംരക്ഷിക്കുന്നു..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"സ്ക്രീൻഷോട്ട് സംരക്ഷിച്ചു"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"റെക്കോര്ഡിംഗ് ആരംഭിക്കുക"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"വോയ്സ് ഓവർ റെക്കോർഡ് ചെയ്യുക"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"ടാപ്പുകൾ കാണിക്കുക"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"നിർത്താൻ ടാപ്പ് ചെയ്യുക"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"നിർത്തുക"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"താൽക്കാലികമായി നിർത്തുക"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"പുനരാരംഭിക്കുക"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ബാറ്ററി ലാഭിക്കൽ"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"സൂര്യാസ്തമയത്തിന്"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"സൂര്യോദയം വരെ"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>-ന്"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> വരെ"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC പ്രവർത്തനരഹിതമാക്കി"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC പ്രവർത്തനക്ഷമമാക്കി"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"സ്ക്രീൻ റെക്കോർഡ്"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ആരംഭിക്കുക"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"നിര്ത്തുക"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ആപ്പുകൾ മാറാൻ മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ആപ്പുകൾ പെട്ടെന്ന് മാറാൻ വലത്തോട്ട് വലിച്ചിടുക"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"അവലോകനം മാറ്റുക"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"ഇഷ്ടാനുസൃതമാക്കുക"</string> <string name="notification_done" msgid="6215117625922713976">"പൂർത്തിയായി"</string> <string name="inline_undo" msgid="9026953267645116526">"പഴയപടിയാക്കുക"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ഈ അറിയിപ്പ് സംഭാഷണമല്ലെന്ന് അടയാളപ്പെടുത്തുക"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"പ്രിയപ്പെട്ടവ"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"പ്രിയപ്പെട്ടതല്ലാതാക്കുക"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"മ്യൂട്ട് ചെയ്യുക"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"അൺമ്യൂട്ട് ചെയ്യുക"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"ബബ്ൾ ആയി കാണിക്കുക"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"ബബിളുകൾ ഓഫാക്കുക"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"ഹോം സ്ക്രീനിലേക്ക് ചേർക്കുക"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"അറിയിപ്പ് നിയന്ത്രണങ്ങൾ"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"അറിയിപ്പ് സ്നൂസ് ഓപ്ഷനുകൾ"</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 4f9b447bcd69..85d7eadce349 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Дэлгэц дүүргэх бол өсгөнө үү"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Дэлгэц дүүргэх бол татна уу"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Дэлгэцийн зураг дарах"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Зургийг орууллаа"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Дэлгэцийн агшинг хадгалж байна…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Дэлгэцийн агшинг хадгалж байна…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Дэлгэцээс дарсан зургийг хадгалсан"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Бичлэгийг эхлүүлэх"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Дуу оруулалтыг бичих"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Товшилтыг харуулах"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Зогсоохын тулд товшино уу"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Зогсоох"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Түр зогсоох"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Үргэлжлүүлэх"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Батарей хэмнэгч"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Нар жаргах үед"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Нар мандах хүртэл"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>-д"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> хүртэл"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC-г цуцалсан"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC-г идэвхжүүлсэн"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Дэлгэцийн бичлэг хийх"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Эхлүүлэх"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Зогсоох"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Апп сэлгэхийн тулд дээш шударна уу"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Аппуудыг хурдан сэлгэхийн тулд баруун тийш чирнэ үү"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Тоймыг унтраах/асаах"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Тохируулах"</string> <string name="notification_done" msgid="6215117625922713976">"Дууссан"</string> <string name="inline_undo" msgid="9026953267645116526">"Болих"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Энэ мэдэгдлийг харилцаа биш гэж тэмдэглэх"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Дуртай"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Дургүй"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Дууг хаах"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Дууг нээх"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Хөөс маягаар харуулах"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Хөөсийг унтраах"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Үндсэн нүүрэнд нэмэх"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"мэдэгдлийн удирдлага"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"мэдэгдэл түр хойшлуулагчийн сонголт"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 99f48e6b4cb9..3406edf3f1bd 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"स्क्रीन भरण्यासाठी झूम करा"</string> <string name="compat_mode_off" msgid="7682459748279487945">"स्क्रीन भरण्यासाठी ताणा"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"स्क्रीनशॉट"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"इमेज घातली गेली"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"स्क्रीनशॉट सेव्ह करत आहे…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"स्क्रीनशॉट सेव्ह करत आहे…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"स्क्रीनशॉट सेव्ह केला"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"रेकॉर्डिंग सुरू करा"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"व्हॉइसओव्हर रेकॉर्ड करा"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"टॅप दाखवा"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"थांबवण्यासाठी टॅप करा"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"थांबवा"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"थांबवा"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"पुन्हा सुरू करा"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"बॅटरी सेव्हर"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"संध्याकाळी सुरू होते"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"सूर्योदयापर्यंत"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> वाजता सुरू होते"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> पर्यंत"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC अक्षम केले आहे"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC सक्षम केले आहे"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"स्क्रीन रेकॉर्ड"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"सुरू"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"थांबा"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"अॅप्स स्विच करण्यासाठी वर स्वाइप करा"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"अॅप्स वर झटपट स्विच करण्यासाठी उजवीकडे ड्रॅग करा"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"अवलोकन टॉगल करा."</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"कस्टमाइझ करा"</string> <string name="notification_done" msgid="6215117625922713976">"पूर्ण झाले"</string> <string name="inline_undo" msgid="9026953267645116526">"पहिल्यासारखे करा"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ही सूचना संभाषण नाही म्हणून खूण करा"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"आवडते"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"नावडते"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"म्यूट करा"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"अनम्यूट करा"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"बबल असे दाखवा"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"बुडबुडे बंद करा"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"होम स्क्रीनवर जोडा"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"सूचना नियंत्रणे"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"सूचना स्नूझ पर्याय"</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 42c51b7844a6..eeaaceae0669 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zum untuk memenuhi skrin"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Regang utk memenuhi skrin"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Tangkapan skrin"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Imej disisipkan"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Menyimpan tangkapan skrin..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Menyimpan tangkapan skrin..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Tangkapan skrin disimpan"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Mula Merakam"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Rakam suara latar"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Tunjukkan ketikan"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Ketik untuk berhenti"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Berhenti"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Jeda"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Sambung semula"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Penjimat Bateri"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Dihidupkan pd senja"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Hingga matahari trbt"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Dihidupkan pada <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Hingga <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC dilumpuhkan"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC didayakan"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Saring Rekod"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Mula"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Berhenti"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Leret ke atas untuk menukar apl"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Seret ke kanan untuk beralih apl dengan pantas"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Togol Ikhtisar"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Sesuaikan"</string> <string name="notification_done" msgid="6215117625922713976">"Selesai"</string> <string name="inline_undo" msgid="9026953267645116526">"Buat asal"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Tandai pemberitahuan ini sebagai bukan perbualan"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Kegemaran"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Nyahgemari"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Redam"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Nyahredam"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Tunjukkan sebagai gelembung"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Matikan gelembung"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Tambahkan pada skrin utama"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"kawalan pemberitahuan"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"pilihan tunda pemberitahuan"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index dd5acfab0c21..5ae82eafbcf9 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"ဇူးမ်အပြည့်ဆွဲခြင်း"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ဖန်သားပြင်အပြည့်ဆန့်ခြင်း"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"ဖန်သားပြင်ဓာတ်ပုံ"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"ပုံ ထည့်ထားသည်"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"ဖန်သားပြင်ဓါတ်ပုံသိမ်းစဉ်.."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"ဖန်သားပြင်ဓါတ်ပုံရိုက်ခြင်းအား သိမ်းဆည်းပါမည်"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"ဖန်သားပြင်ဓာတ်ပုံကို သိမ်းပြီးပါပြီ"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"စတင် ရိုက်ကူးရန်"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"နောက်ခံစကားပြော ကူးယူရန်"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"တို့ခြင်းများကို ပြရန်"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"ရပ်ရန် တို့ပါ"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"ရပ်ရန်"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"ခဏရပ်ရန်"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ဆက်လုပ်ရန်"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ဘက်ထရီ အားထိန်း"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"နေဝင်ချိန်၌ ဖွင့်ရန်"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"နေထွက်ချိန် အထိ"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> တွင် ဖွင့်မည်"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> အထိ"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC ကို ပိတ်ထားသည်"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC ကို ဖွင့်ထားသည်"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ဖန်သားပြင် မှတ်တမ်းတင်ရန်"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"စတင်ရန်"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ရပ်ရန်"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"အက်ပ်များကို ဖွင့်ရန် အပေါ်သို့ ပွတ်ဆွဲပါ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"အက်ပ်များကို ပြောင်းရန် ညာဘက်သို့ ဖိဆွဲပါ"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"ဖွင့်၊ ပိတ် အနှစ်ချုပ်"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"စိတ်ကြိုက်ပြုလုပ်ရန်"</string> <string name="notification_done" msgid="6215117625922713976">"ပြီးပါပြီ"</string> <string name="inline_undo" msgid="9026953267645116526">"တစ်ဆင့်နောက်ပြန်ရန်"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ဤအကြောင်းကြားချက်ကို စကားဝိုင်းမဟုတ်ဟု မှတ်ထားရန်"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"အကြိုက်ဆုံး"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"အကြိုက်ဆုံးမှ ဖယ်ရှားရန်"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"အသံတိတ်ရန်"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"အသံဖွင့်ရန်"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"ပူဖောင်းကွက်အဖြစ် ပြရန်"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"ပူဖောင်းကွက်များကို ပိတ်ရန်"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"ပင်မစာမျက်နှာတွင် ထည့်ရန်"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"အကြောင်းကြားချက် ထိန်းချုပ်မှုများ"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"အကြောင်းကြားချက်များကို ဆိုင်းငံ့ရန် ရွေးချယ်စရာများ"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 97d6792ee6bb..463b95c0107e 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom for å fylle skjermen"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Strekk for å fylle skjerm"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Skjermdump"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Bildet er satt inn"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Lagrer skjermdumpen …"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Lagrer skjermdumpen …"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Skjermdumpen er lagret"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Start opptak"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Ta opp et kommentarspor"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Vis trykk"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Trykk for å stoppe"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stopp"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Sett på pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Gjenoppta"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Batterisparing"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"På ved solnedgang"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Til soloppgang"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Slås på klokken <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Til <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC er slått av"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC er slått på"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Skjermopptak"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Start"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Stopp"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Sveip opp for å bytte apper"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Dra til høyre for å bytte apper raskt"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Slå oversikten av eller på"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Tilpass"</string> <string name="notification_done" msgid="6215117625922713976">"Ferdig"</string> <string name="inline_undo" msgid="9026953267645116526">"Angre"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Marker dette varselet som ikke en samtale"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Favoritt"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Fjern som favoritt"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Ignorer"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Slutt å ignorere"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Vis som boble"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Slå av bobler"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Legg til på startskjermen"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"varselinnstillinger"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"slumrealternativer for varsler"</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 1345b098f06e..21a76a3a86d0 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"स्क्रिन भर्न जुम गर्नुहोस्"</string> <string name="compat_mode_off" msgid="7682459748279487945">"स्क्रिन भर्न तन्काउनुहोस्"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"स्क्रिनसट"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"छवि सम्मिलित गरियो"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"स्क्रिनसट बचत गर्दै…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"स्क्रिनसट बचत गर्दै…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"स्क्रिनसट सुरक्षित गरियो"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"रेकर्डिङ सुरु गर्नुहोस्"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"भ्वाइसओवर रेकर्ड गर्नुहोस्"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"ट्यापहरू देखाउनुहोस्"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"रोक्न ट्याप गर्नुहोस्"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"रोक्नुहोस्"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"पज गर्नुहोस्"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"जारी राख्नुहोस्"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ब्याट्री सेभर"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"सूर्यास्तमा सक्रिय"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"सूर्योदयसम्म"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> मा सक्रिय"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> सम्म"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC लाई असक्षम पारिएको छ"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC लाई सक्षम पारिएको छ"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"स्रिनको रेकर्ड"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"सुरु गर्नुहोस्"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"रोक्नुहोस्"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"अनुप्रयोगहरू बदल्न माथितिर स्वाइप गर्नुहोस्"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"अनुप्रयोगहरू बदल्न द्रुत गतिमा दायाँतिर ड्र्याग गर्नुहोस्"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"परिदृश्य टगल गर्नुहोस्"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"आफू अनुकूल पार्नुहोस्"</string> <string name="notification_done" msgid="6215117625922713976">"सम्पन्न भयो"</string> <string name="inline_undo" msgid="9026953267645116526">"अन्डू गर्नुहोस्"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"यो सूचनालाई वार्तालाप होइन भनी चिन्ह लगाउनुहोस्"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"मन पर्ने"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"मन पर्ने कुराहरूबाट हटाउनुहोस्"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"म्युट गर्नुहोस्"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"अनम्युट गर्नुहोस्"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"बबलको रूपमा देखाउनुहोस्"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"बबलहरूलाई निष्क्रिय पार्नुहोस्"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"गृह स्क्रिनमा थप्नुहोस्"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"सूचना सम्बन्धी नियन्त्रणहरू"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"सूचना स्नुज गर्ने विकल्पहरू"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 71d2388264fb..3c040154437c 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom om scherm te vullen"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Rek uit v. schermvulling"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Afbeelding ingevoegd"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Screenshot opslaan..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Screenshot opslaan..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Screenshot opgeslagen"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Opname starten"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Voice-over opnemen"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Tikken weergeven"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tik om te stoppen"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stoppen"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pauzeren"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Hervatten"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Batterijbesparing"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Aan bij zonsondergang"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Tot zonsopgang"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Aan om <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Tot <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC is uitgeschakeld"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC is ingeschakeld"</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index 85841feeff14..42302756debd 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"ସ୍କ୍ରୀନ ଭରିବା ପାଇଁ ଜୁମ୍ କରନ୍ତୁ"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ସ୍କ୍ରୀନ୍କୁ ଭରିବା ପାଇଁ ଟାଣନ୍ତୁ"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"ସ୍କ୍ରିନ୍ସଟ୍ ନିଅନ୍ତୁ"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"ଛବି ଭର୍ତ୍ତି କରାଯାଇଛି"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"ସ୍କ୍ରୀନଶଟ୍ ସେଭ୍ କରାଯାଉଛି…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"ସ୍କ୍ରୀନଶଟ୍ ସେଭ୍ କରାଯାଉଛି…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"ସ୍କ୍ରୀନଶଟ୍ ସେଭ୍ ହୋଇଛି"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"ରେକର୍ଡିଂ ଆରମ୍ଭ କରନ୍ତୁ"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"ଭଏସ୍ଓଭର୍ ରେକର୍ଡ କରନ୍ତୁ"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"ଟାପ୍ ଦେଖାନ୍ତୁ"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"ବନ୍ଦ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"ବିରତି କରନ୍ତୁ"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ପୁଣି ଚାଲୁ କରନ୍ତୁ"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ବ୍ୟାଟେରୀ ସେଭର୍"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"ସନ୍ଧ୍ୟାରେ ଚାଲୁ ହେବ"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"ସକାଳ ପର୍ଯ୍ୟନ୍ତ"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>ରେ ଚାଲୁ ହେବ"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> ପର୍ଯ୍ୟନ୍ତ"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC ଅକ୍ଷମ କରାଯାଇଛି"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC ସକ୍ଷମ କରାଯାଇଛି"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ସ୍କ୍ରିନ୍ ରେକର୍ଡ"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ଆରମ୍ଭ କରନ୍ତୁ"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ଆପ୍କୁ ବଦଳ କରିବା ପାଇଁ ସ୍ଵାଇପ୍ କରନ୍ତୁ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ଆପ୍ଗୁଡ଼ିକ ମଧ୍ୟରେ ଶୀଘ୍ର ବଦଳ କରିବା ପାଇଁ ଡାହାଣକୁ ଡ୍ରାଗ୍ କରନ୍ତୁ"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"ସଂକ୍ଷିପ୍ତ ବିବରଣୀକୁ ଟୋଗଲ୍ କରନ୍ତୁ"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"କଷ୍ଟମାଇଜ୍ କରନ୍ତୁ"</string> <string name="notification_done" msgid="6215117625922713976">"ହୋଇଗଲା"</string> <string name="inline_undo" msgid="9026953267645116526">"ପୂର୍ବସ୍ଥାନକୁ ଫେରାଇଆଣନ୍ତୁ"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ଏହି ବିଜ୍ଞପ୍ତି କୌଣସି ବାର୍ତ୍ତାଳାପ ନୁହେଁ ବୋଲି ଚିହ୍ନଟ କରନ୍ତୁ"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"ପସନ୍ଦ ଭାବରେ ଚିହ୍ନଟ କରନ୍ତୁ"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"ନାପସନ୍ଦ କରନ୍ତୁ"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"ମ୍ୟୁଟ୍ କରନ୍ତୁ"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"ଅନମ୍ୟୁଟ୍ କରନ୍ତୁ"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"ବୁଦବୁଦ୍ ଭାବରେ ଦେଖାନ୍ତୁ"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"ବୁଦବୁଦଗୁଡ଼ିକ ବନ୍ଦ କରନ୍ତୁ"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"ମୂଳ ସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"ବିଜ୍ଞପ୍ତି ନିୟନ୍ତ୍ରଣ"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"ବିଜ୍ଞପ୍ତି ସ୍ନୁଜ୍ ବିକଳ୍ପ"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 4ea51ddbde9e..f345d6a8f7aa 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"ਸਕ੍ਰੀਨ ਭਰਨ ਲਈ ਜ਼ੂਮ ਕਰੋ"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ਸਕ੍ਰੀਨ ਭਰਨ ਲਈ ਸਟ੍ਰੈਚ ਕਰੋ"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"ਚਿੱਤਰ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਸੁਰੱਖਿਅਤ ਕਰ ਰਿਹਾ ਹੈ…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਸੁਰੱਖਿਅਤ ਕਰ ਰਿਹਾ ਹੈ…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"ਰਿਕਾਰਡਿੰਗ ਸ਼ੁਰੂ ਕਰੋ"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"ਅਵਾਜ਼ ਰਿਕਾਰਡ ਕਰੋ"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"ਟੈਪਾਂ ਦਿਖਾਓ"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"ਰੋਕਣ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"ਬੰਦ ਕਰੋ"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"ਰੋਕੋ"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ਮੁੜ-ਚਾਲੂ ਕਰੋ"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"ਬੈਟਰੀ ਸੇਵਰ"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"ਸੂਰਜ ਛਿਪਣ \'ਤੇ ਚਾਲੂ"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"ਸੂਰਜ ਚੜ੍ਹਨ ਤੱਕ"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> ਵਜੇ ਚਾਲੂ"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> ਵਜੇ ਤੱਕ"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC ਨੂੰ ਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ਸਕ੍ਰੀਨ ਰਿਕਾਰਡਰ"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ਸ਼ੁਰੂ ਕਰੋ"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ਰੋਕੋ"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ਐਪਾਂ ਵਿਚਾਲੇ ਤੇਜ਼ੀ ਨਾਲ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਸੱਜੇ ਪਾਸੇ ਵੱਲ ਘਸੀਟੋ"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"ਰੂਪ-ਰੇਖਾ ਨੂੰ ਟੌਗਲ ਕਰੋ"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"ਵਿਉਂਤਬੱਧ ਕਰੋ"</string> <string name="notification_done" msgid="6215117625922713976">"ਹੋ ਗਿਆ"</string> <string name="inline_undo" msgid="9026953267645116526">"ਅਣਕੀਤਾ ਕਰੋ"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ਇਸ ਸੂਚਨਾ ਦੀ ਗੱਲ-ਬਾਤ ਨਹੀਂ ਵਜੋਂ ਨਿਸ਼ਾਨਦੇਹੀ ਕਰੋ"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"ਮਨਪਸੰਦ"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"ਨਾਪਸੰਦ"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"ਮਿਊਟ ਕਰੋ"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"ਅਣਮਿਊਟ ਕਰੋ"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"ਬੁਲਬੁਲੇ ਵਜੋਂ ਦਿਖਾਓ"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"ਬੁਲਬੁਲੇ ਬੰਦ ਕਰੋ"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"ਸੂਚਨਾ ਕੰਟਰੋਲ"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"ਸੂਚਨਾ ਸਨੂਜ਼ ਵਿਕਲਪ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 515d659d2c5b..68cb14eb32b3 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Powiększ, aby wypełnić ekran"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Rozciągnij, aby wypełnić ekran"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Zrzut ekranu"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Wstawiono obraz"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Zapisywanie zrzutu ekranu..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Zapisywanie zrzutu ekranu..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Zrzut ekranu został zapisany"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Rozpocznij rejestrowanie"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Nagraj tekst lektora"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Pokaż dotknięcia"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Kliknij, by zatrzymać"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Zatrzymaj"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Wstrzymaj"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Wznów"</string> @@ -392,15 +394,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Oszczędzanie baterii"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Włącz o zachodzie"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Do wschodu słońca"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Włącz o <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Do <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"Komunikacja NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Komunikacja NFC jest wyłączona"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Komunikacja NFC jest włączona"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Zapis ekranu"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Rozpocznij"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Zatrzymaj"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Przesuń w górę, by przełączyć aplikacje"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Szybko przeciągnij w prawo, by przełączyć aplikacje"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Przełącz Przegląd"</string> @@ -702,22 +703,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Dostosuj"</string> <string name="notification_done" msgid="6215117625922713976">"Gotowe"</string> <string name="inline_undo" msgid="9026953267645116526">"Cofnij"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Nie oznaczaj tego powiadomienia jako wątku"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Dodaj do ulubionych"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Usuń z ulubionych"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Wycisz"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Wyłącz wyciszenie"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Pokaż jako dymek"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Wyłącz dymki"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Dodaj do ekranu głównego"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"sterowanie powiadomieniami"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"opcje odkładania powiadomień"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index d486b9b2a7ed..a9101d74706f 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom p/ preencher a tela"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Ampliar p/ preencher tela"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Capturar tela"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Imagem inserida"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Salvando captura de tela..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Salvando captura de tela..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Captura de tela salva"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Iniciar gravação"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Gravar narração"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Mostrar toques"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Toque para parar"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Parar"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pausar"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Retomar"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Economia de bateria"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Ativ. ao pôr do sol"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Até o nascer do sol"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Ativar: <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Até: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"A NFC está desativada"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"A NFC está ativada"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index d17b0026802f..1a6e6739e7ff 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom para preencher o ecrã"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Esticar p. caber em ec. int."</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Captura de ecrã"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Imagem inserida"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"A guardar captura de ecrã..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"A guardar captura de ecrã..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Captura de ecrã guardada"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Iniciar gravação"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Gravar voz-off"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Mostrar toques"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tocar para parar"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Parar"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Colocar em pausa"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Retomar"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Poupança de bateria"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Ativ. ao pôr do sol"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Até ao amanhecer"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Ativado à(s) <xliff:g id="TIME">%s</xliff:g>."</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Até à(s) <xliff:g id="TIME">%s</xliff:g>."</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"O NFC está desativado"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"O NFC está ativado"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index d486b9b2a7ed..a9101d74706f 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom p/ preencher a tela"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Ampliar p/ preencher tela"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Capturar tela"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Imagem inserida"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Salvando captura de tela..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Salvando captura de tela..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Captura de tela salva"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Iniciar gravação"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Gravar narração"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Mostrar toques"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Toque para parar"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Parar"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pausar"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Retomar"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Economia de bateria"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Ativ. ao pôr do sol"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Até o nascer do sol"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Ativar: <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Até: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"A NFC está desativada"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"A NFC está ativada"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 2674504db62e..e34fa2de54d2 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zoom pt. a umple ecranul"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Înt. pt. a umple ecranul"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Captură de ecran"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"S-a inserat imaginea"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Se salv. captura de ecran..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Se salvează captura de ecran..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Captură de ecran salvată"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Începeți înregistrarea"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Înregistrați vocal"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Afișați atingerile"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Atingeți pentru a opri"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Opriți"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Întrerupeți"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Reluați"</string> @@ -390,15 +392,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Economisire baterie"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Activată la apus"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Până la răsărit"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Activată la <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Până la <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Serviciul NFC este dezactivat"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Serviciul NFC este activat"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Înregistrarea ecranului"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Începeți"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Opriți"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Glisați în sus pentru a comuta între aplicații"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Glisați la dreapta pentru a comuta rapid între aplicații"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Comutați secțiunea Recente"</string> @@ -699,22 +700,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Personalizați"</string> <string name="notification_done" msgid="6215117625922713976">"Terminat"</string> <string name="inline_undo" msgid="9026953267645116526">"Anulați"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Marcați această notificare ca nefiind o conversație"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Preferată"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Anulați marcarea ca preferată"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Ignorați"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Afișați"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Afișează sub formă de balon"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Dezactivați baloanele"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Adăugați pe ecranul de pornire"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"comenzile notificării"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"opțiuni de amânare a notificării"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 915698972541..0ee159d0c648 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Подогнать по размерам экрана"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Растянуть на весь экран"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Скриншот"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Изображение вставлено"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Сохранение..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Сохранение..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Скриншот сохранен"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Начать запись"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Записать закадровую речь"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Показывать нажатия"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Нажмите, чтобы остановить"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Остановить"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Приостановить"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Возобновить"</string> @@ -392,15 +394,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Режим энергосбер."</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Вкл. на закате"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"До рассвета"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Включить в <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"До <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"Модуль NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Модуль NFC отключен"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Модуль NFC включен"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Запись экрана"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Начать"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Остановить"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Чтобы переключиться между приложениями, проведите по экрану вверх."</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Перетащите вправо, чтобы быстро переключиться между приложениями"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Переключить режим обзора"</string> @@ -702,22 +703,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Настроить"</string> <string name="notification_done" msgid="6215117625922713976">"Готово"</string> <string name="inline_undo" msgid="9026953267645116526">"Отменить"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Понизить приоритет уведомления (не считать чатом)"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Добавить в избранное"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Удалить из избранного"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Отключить звук"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Включить звук"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Показывать как всплывающее уведомление"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Отключить показ всплывающих уведомлений"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Добавить на главный экран"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g>: <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"настройки уведомлений"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"параметры отсрочки уведомлений"</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 84e01d093f3d..2c5e1d8ba117 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"තිරය පිරවීමට විශාලනය කරන්න"</string> <string name="compat_mode_off" msgid="7682459748279487945">"තිරය පිරවීමට අදින්න"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"තිර රුව"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"රූපය ඇතුල් කරන ලදී"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"තිර රුව සුරකිමින්…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"තිර රුව සුරැකෙමින් පවතී…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"තිර රුව සුරකින ලදී"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"පටිගත කිරීම ආරම්භ කරන්න"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"පසුබිම් කථනය පටිගත කරන්න"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"තට්ටු කිරීම් පෙන්වන්න"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"නතර කිරීමට තට්ටු කරන්න"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"නතර කරන්න"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"විරාම කරන්න"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"නැවත අරඹන්න"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"බැටරි සුරැකුම"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"හිරු බැසීමේදී ඔන්ය"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"හිරු නගින තෙක්"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>ට ක්රියාත්මකයි"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> තෙක්"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC අබලයි"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC සබලයි"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"තිර පටිගත කිරීම"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ආරම්භ කරන්න"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"නතර කරන්න"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"යෙදුම් මාරු කිරීමට ස්වයිප් කරන්න"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ඉක්මනින් යෙදුම් මාරු කිරීමට දකුණට අදින්න"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"දළ විශ්ලේෂණය ටොගල කරන්න"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"අභිරුචිකරණය"</string> <string name="notification_done" msgid="6215117625922713976">"නිමයි"</string> <string name="inline_undo" msgid="9026953267645116526">"පසුගමනය කරන්න"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"මෙම දැනුම් දීම සංවාදයක් නොවේ ලෙස ලකුණු කරන්න"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"ප්රියතම"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"ප්රියතම වෙතින් ඉවත් කරන්න"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"නිහඬ කරන්න"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"නිහඬ වෙතින් ඉවත් කරන්න"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"බුබුලක් ලෙස පෙන්වන්න"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"බුබුලු ක්රියාවිරහිත කරන්න"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"මුල් තිරය වෙත එක් කරන්න"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"දැනුම්දීම් පාලන"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"දැනුම්දීම් මදක් නතර කිරීමේ විකල්ප"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index fced8a42acf4..93f93a2860a9 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Priblížiť na celú obrazovku"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Na celú obrazovku"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Snímka obrazovky"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Bol vložený obrázok"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Prebieha ukladanie snímky obrazovky..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Prebieha ukladanie snímky obrazovky..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Snímka obrazovky bola uložená"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Spustiť zaznamenávanie"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Hlasový vstup počas záznamu"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Zobrazovať klepnutia"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Zastavte klepnutím"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Ukončiť"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pozastaviť"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Obnoviť"</string> @@ -392,6 +394,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Šetrič batérie"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Zap. pri záp. slnka"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Do východu slnka"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Zapne sa o <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Do <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC je deaktivované"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC je aktivované"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 4816a6634dd7..452827fa362f 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Povečava čez cel zaslon"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Raztegnitev čez zaslon"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Posnetek zaslona"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Slika je vstavljena"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Shranjev. posnetka zaslona ..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Shranjevanje posnetka zaslona ..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Posnetek zaslona je shranjen"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Začni snemanje"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Snemanje spremnega govora"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Prikaz dotikov"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Dotaknite se, da ustavite"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Ustavi"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Začasno ustavi"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Nadaljuj"</string> @@ -392,15 +394,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Varč. z ener. bater."</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Ob sončnem zahodu"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Do sončnega vzhoda"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Vklop ob <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Do <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Tehnologija NFC je onemogočena"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Tehnologija NFC je omogočena"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Snemanje zaslona"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Začni"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Ustavi"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Za preklop aplikacij povlecite navzgor"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Povlecite v desno za hiter preklop med aplikacijami"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Vklop/izklop pregleda"</string> @@ -702,22 +703,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Prilagodi"</string> <string name="notification_done" msgid="6215117625922713976">"Dokončano"</string> <string name="inline_undo" msgid="9026953267645116526">"Razveljavi"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Označi, da to obvestilo ni pogovor"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Priljubljeno"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Odstrani iz priljubljenih"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Prezri"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Znova prikaži"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Pokaži kot oblaček"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Izklopi oblačke"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Dodaj na začetni zaslon"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"kontrolniki obvestil"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"možnosti preložitve obvestil"</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 14d72b4e1675..2dc3cc8b1cd2 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zmadho për të mbushur ekranin"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Shtrije për të mbushur ekranin"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Pamja e ekranit"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Imazhi është futur"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Po ruan pamjen e ekranit..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Po ruan pamjen e ekranit…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Pamja e ekranit u ruajt"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Nis regjistrimin"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Regjistro zërin e mikrofonit"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Shfaq trokitjet"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Trokit për të ndaluar"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Ndalo"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Ndërprit"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Vazhdo"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Kursyesi i baterisë"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Aktiv në perëndim"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Deri në lindje të diellit"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Aktiv në <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Deri në <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC është çaktivizuar"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC është aktivizuar"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Regjistrimi i ekranit"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Nis"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Ndalo"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Rrëshqit shpejt lart për të ndërruar aplikacionet"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Zvarrit djathtas për të ndërruar aplikacionet me shpejtësi"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Kalo te përmbledhja"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Personalizo"</string> <string name="notification_done" msgid="6215117625922713976">"U krye"</string> <string name="inline_undo" msgid="9026953267645116526">"Zhbëj"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Shëno se ky njoftim nuk është një bisedë"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Shëno si të preferuar"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Hiq nga të preferuarat"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Kalo në heshtje"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Aktivizo"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Shfaqe si flluskë"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Çaktivizo flluskat"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Shto në ekranin bazë"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"kontrollet e njoftimit"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"opsionet e shtyrjes së njoftimit"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 29e7e1044d61..4127806f9cd3 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Зумирај на целом екрану"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Развуци на цео екран"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Снимак екрана"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Слика је уметнута"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Чување снимка екрана..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Чување снимка екрана..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Снимак екрана је сачуван"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Започни снимање"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Сними пренос гласа"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Приказуј додире"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Додирните да бисте зауставили"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Заустави"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Паузирај"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Настави"</string> @@ -390,6 +392,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Уштеда батерије"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Укључује се по заласку сунца"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"До изласка сунца"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Укључује се у <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"До <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC је онемогућен"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC је омогућен"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index b0d78779daad..3e29fa6e6749 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Zooma för att fylla skärm"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Dra för att fylla skärmen"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Skärmdump"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Bilden har infogats"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Skärmdumpen sparas ..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Skärmdumpen sparas ..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Skärmdumpen har sparats"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Börja spela in"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Spela in med mikrofondubbning"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Visa tryck"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Tryck för att stoppa"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Stoppa"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pausa"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Återuppta"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Batterisparläge"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"På från solnedgången"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Till soluppgången"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Aktivera kl. <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Till <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC är inaktiverat"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC är aktiverat"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index ecaefb0c0e4e..9fd4284710d1 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Kuza ili kujaza skrini"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Tanua ili kujaza skrini"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Picha ya skrini"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Picha imewekwa"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Inahifadhi picha ya skrini..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Inahifadhi picha ya skrini..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Imehifadhi picha ya skrini"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Anza Kurekodi"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Rekodi sauti"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Onyesha unapogusa"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Gusa ili ukomeshe"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Acha"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Sitisha"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Endelea"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Kiokoa betri"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Itawashwa machweo"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Hadi macheo"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Itawashwa saa <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Hadi saa <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC imezimwa"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC imewashwa"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Rekodi ya Skrini"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Anza kurekodi"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Acha kurekodi"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Telezesha kidole juu ili ubadilishe programu"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Buruta kulia ili ubadilishe programu haraka"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Washa Muhtasari"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Weka mapendeleo"</string> <string name="notification_done" msgid="6215117625922713976">"Nimemaliza"</string> <string name="inline_undo" msgid="9026953267645116526">"Tendua"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Tia alama arifa hii kuwa si mazungumzo"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Tia alama ya kipendwa kwenye mazungumzo haya"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Ondoa alama ya kipendwa kwenye mazungumzo haya"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Komesha mazungumzo"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Ruhusu mazungumzo"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Onyesha kuwa kiputo"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Zima viputo"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Ongeza kwenye skrini ya kwanza"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"vidhibiti vya arifa"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"chaguo za kuahirisha arifa"</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 0bea7d6305d6..55bd472a7889 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"திரையை நிரப்ப அளவை மாற்று"</string> <string name="compat_mode_off" msgid="7682459748279487945">"திரையை நிரப்ப இழு"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"ஸ்கிரீன்ஷாட்"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"படம் செருகப்பட்டது"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"ஸ்க்ரீன் ஷாட்டைச் சேமிக்கிறது…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"ஸ்க்ரீன் ஷாட்டைச் சேமிக்கிறது…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"ஸ்கிரீன்ஷாட் சேமிக்கப்பட்டது"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"ரெக்கார்டிங்கைத் தொடங்கு"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"வாய்ஸ் ஓவரை ரெக்கார்டு செய்"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"தட்டல்களைக் காட்டு"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"நிறுத்த, தட்டவும்"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"நிறுத்து"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"இடைநிறுத்து"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"மீண்டும் தொடங்கு"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"பேட்டரி சேமிப்பான்"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"மாலையில் ஆன் செய்"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"காலை வரை"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g>க்கு ஆன் செய்"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> வரை"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC முடக்கப்பட்டது"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC இயக்கப்பட்டது"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"ஸ்கிரீன் ரெக்கார்டு"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"தொடங்கு"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"நிறுத்து"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ஆப்ஸிற்கு இடையே மாற்றுவதற்கு, மேல்நோக்கி ஸ்வைப் செய்க"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ஆப்ஸை வேகமாக மாற்ற, வலப்புறம் இழுக்கவும்"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"மேலோட்டப் பார்வையை நிலைமாற்று"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"தனிப்பயனாக்கு"</string> <string name="notification_done" msgid="6215117625922713976">"முடிந்தது"</string> <string name="inline_undo" msgid="9026953267645116526">"செயல்தவிர்"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"இந்த அறிவிப்பை உரையாடல் அல்லாததாகக் குறிக்கவும்"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"பிடித்தது"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"பிடித்ததிலிருந்து அகற்று"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"அறிவிப்பைக் காட்டாதே"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"அறிவிப்பைக் காட்டு"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"குமிழாகக் காட்டு"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"குமிழ்களை ஆஃப் செய்"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"முகப்புத் திரையில் சேர்"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"அறிவிப்புக் கட்டுப்பாடுகள்"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"அறிவிப்பை உறக்கநிலையாக்கும் விருப்பங்கள்"</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index bb624902beb0..8b9c07ce0264 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"స్క్రీన్కు నింపేలా జూమ్ చేయండి"</string> <string name="compat_mode_off" msgid="7682459748279487945">"స్క్రీన్కు నింపేలా విస్తరించండి"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"స్క్రీన్షాట్"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"చిత్రం చొప్పించబడింది"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"స్క్రీన్షాట్ను సేవ్ చేస్తోంది…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"స్క్రీన్షాట్ను సేవ్ చేస్తోంది…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"స్క్రీన్షాట్ సేవ్ చేయబడింది"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"రికార్డింగ్ను ప్రారంభించు"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"వాయిస్ఓవర్ని రికార్డ్ చేయి"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"నొక్కినవి చూపు"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"ఆపడానికి నొక్కండి"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"ఆపివేయి"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"పాజ్ చేయి"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"కొనసాగించు"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"బ్యాటరీ సేవర్"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"సూర్యాస్తమయానికి"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"సూర్యోదయం వరకు"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> వద్ద"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> వరకు"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC నిలిపివేయబడింది"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC ప్రారంభించబడింది"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"స్క్రీన్ రికార్డ్"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"ప్రారంభించు"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"ఆపు"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"యాప్లను మార్చడం కోసం ఎగువకు స్వైప్ చేయండి"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"యాప్లను శీఘ్రంగా స్విచ్ చేయడానికి కుడి వైపుకు లాగండి"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"స్థూలదృష్టిని టోగుల్ చేయి"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"అనుకూలపరచండి"</string> <string name="notification_done" msgid="6215117625922713976">"పూర్తయింది"</string> <string name="inline_undo" msgid="9026953267645116526">"చర్యరద్దు చేయి"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ఈ నోటిఫికేషన్ను సంభాషణ కానిది అని గుర్తు పెట్టండి"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"ఇష్టమైనది"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"ఇష్టమైనదిగా పెట్టిన గుర్తును తీసివేయి"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"మ్యూట్ చేయి"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"అన్మ్యూట్ చేయి"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"బబుల్లా చూపించు"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"బబుల్లను ఆఫ్ చేయి"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"హోమ్ స్క్రీన్కు జోడించు"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"నోటిఫికేషన్ నియంత్రణలు"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"నోటిఫికేషన్ తాత్కాలిక ఆపివేత ఎంపికలు"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 54c3d7335728..c5e01236912d 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"ขยายจนเต็มหน้าจอ"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ยืดจนเต็มหน้าจอ"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"ภาพหน้าจอ"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"รูปภาพที่แทรก"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"กำลังบันทึกภาพหน้าจอ..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"กำลังบันทึกภาพหน้าจอ..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"บันทึกภาพหน้าจอแล้ว"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"เริ่มต้นการบันทึก"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"บันทึกเสียงบรรยาย"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"แสดงการแตะ"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"แตะเพื่อหยุด"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"หยุด"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"หยุด"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"ทำต่อ"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"โหมดประหยัดแบตเตอรี่"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"เปิดตอนพระอาทิตย์ตก"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"จนพระอาทิตย์ขึ้น"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"เปิดเวลา <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"จนถึง <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC ถูกปิดใช้งาน"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"เปิดใช้งาน NFC แล้ว"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"บันทึกหน้าจอ"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"เริ่ม"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"หยุด"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"เลื่อนขึ้นเพื่อสลับแอป"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"ลากไปทางขวาเพื่อสลับแอปอย่างรวดเร็ว"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"สลับภาพรวม"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"ปรับแต่ง"</string> <string name="notification_done" msgid="6215117625922713976">"เสร็จสิ้น"</string> <string name="inline_undo" msgid="9026953267645116526">"เลิกทำ"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"ทำเครื่องหมายการแจ้งเตือนนี้ว่าไม่ใช่บทสนทนา"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"รายการโปรด"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"นำออกจากรายการโปรด"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"ปิดเสียง"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"เปิดเสียง"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"แสดงเป็นบับเบิล"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"ปิดบับเบิล"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"เพิ่มลงในหน้าจอหลัก"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"ส่วนควบคุมการแจ้งเตือน"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"ตัวเลือกการปิดเสียงแจ้งเตือนชั่วคราว"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index ef812fff45cd..3d343c5b4c0b 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"I-zoom upang punan screen"</string> <string name="compat_mode_off" msgid="7682459748279487945">"I-stretch upang mapuno screen"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Screenshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Inilagay ang larawan"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Sine-save ang screenshot…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Sine-save ang screenshot…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Na-save ang screenshot"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Simulan ang Pag-record"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"I-record ang voiceover"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Ipakita ang mga pag-tap"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"I-tap para ihinto"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Ihinto"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"I-pause"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Ituloy"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Pangtipid sa Baterya"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Mao-on sa sunset"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Hanggang sunrise"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Ma-o-on nang <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Hanggang <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Naka-disable ang NFC"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Naka-enable ang NFC"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Pag-record ng Screen"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Magsimula"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Ihinto"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Mag-swipe pataas upang lumipat ng app"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"I-drag pakanan para mabilisang magpalipat-lipat ng app"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"I-toggle ang Overview"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"I-customize"</string> <string name="notification_done" msgid="6215117625922713976">"Tapos Na"</string> <string name="inline_undo" msgid="9026953267645116526">"I-undo"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Markahan ang notification na ito bilang hindi pag-uusap"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Gawing Paborito"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"I-unfavorite"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"I-mute"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"I-unmute"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Ipakita bilang bubble"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"I-off ang mga bubble"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Idagdag sa home screen"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"mga kontrol ng notification"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"mga opsyon sa pag-snooze ng notification"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 470606f48981..46e583fb5124 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Yakınlaştır (ekranı kaplasın)"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Genişlet (ekran kapansın)"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Ekran görüntüsü"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Resim eklendi"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Ekran görüntüsü kaydediliyor..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Ekran görüntüsü kaydediliyor..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Ekran görüntüsü kaydedildi"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Kaydı Başlat"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Seslendirme kaydet"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Dokunmaları göster"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Durdurmak için dokunun"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Durdur"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Duraklat"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Devam ettir"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Pil Tasarrufu"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Gün batımı açılacak"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Sabaha kadar"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Açılacağı saat: <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Şu saate kadar: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC devre dışı"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC etkin"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ekran Kaydı"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Başlat"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Durdur"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Uygulamalar arasında geçiş yapmak için yukarı kaydırın"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Uygulamaları hızlıca değiştirmek için sağa kaydırın"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Genel bakışı aç/kapat"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Özelleştir"</string> <string name="notification_done" msgid="6215117625922713976">"Bitti"</string> <string name="inline_undo" msgid="9026953267645116526">"Geri al"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Bu bildirimi ileti dizisi değil olarak işaretle"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Favori"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Favorilerden kaldır"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Kapat"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Aç"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Balon olarak göster"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Balonları kapat"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Ana ekrana ekle"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"Bildirim kontrolleri"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"bildirim erteleme seçenekleri"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 496206a18668..7baad0df2e55 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Масштабув. на весь екран"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Розтягнути на весь екран"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Знімок екрана"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Вставлене зображення"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Збереження знімка екрана..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Збереження знімка екрана..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Знімок екрана збережено"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Почати запис"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Записувати голосовий супровід"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Показувати дотики"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Натисніть, щоб зупинити"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Зупинити"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Призупинити"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Відновити"</string> @@ -392,15 +394,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Режим енергозбереження"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Увімкнеться ввечері"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"До сходу сонця"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Вмикається о <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"До <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC вимкнено"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC ввімкнено"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Запис екрана"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Почати"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Зупинити"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Проводьте пальцем угору, щоб переходити між додатками"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Перетягуйте праворуч, щоб швидко переходити між додатками"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Увімкнути або вимкнути огляд"</string> @@ -702,22 +703,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Налаштувати"</string> <string name="notification_done" msgid="6215117625922713976">"Готово"</string> <string name="inline_undo" msgid="9026953267645116526">"Відмінити"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Перетворити з ланцюжка повідомлень на сповіщення"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Вибране"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Видалити з вибраного"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Ігнорувати"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Не ігнорувати"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Показувати як спливаюче сповіщення"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Вимкнути спливаючі сповіщення"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Додати на головний екран"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"елементи керування сповіщеннями"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"параметри відкладення сповіщень"</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index a6de5095e7e2..97d0a5d1d2a3 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"پوری سکرین پر زوم کریں"</string> <string name="compat_mode_off" msgid="7682459748279487945">"پوری سکرین پر پھیلائیں"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"اسکرین شاٹ"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"تصویر داخل کر دی گئی"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"اسکرین شاٹ محفوظ ہو رہا ہے…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"اسکرین شاٹ محفوظ ہو رہا ہے…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"اسکرین شاٹ محفوظ ہو گیا"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"ریکارڈنگ شروع کریں"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"وائس اوور ریکارڈ کریں"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"تھپتھپاہٹیں دکھائیں"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"روکنے کے لیے تھپتھپائیں"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"روکیں"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"موقوف کریں"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"دوبارہ شروع کریں"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"بیٹری سیور"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"شام کے وقت آن ہوگی"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"طلوع آفتاب تک"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"آن ہوگی بوقت <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> تک"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC غیر فعال ہے"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC فعال ہے"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"اسکرین ریکارڈر کریں"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"آغاز"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"روکیں"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"ایپس سوئچ کرنے کیلئے اوپر سوائپ کریں"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"تیزی سے ایپس کو سوئچ کرنے کے لیے دائیں طرف گھسیٹیں"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"مجموعی جائزہ ٹوگل کریں"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"حسب ضرورت بنائیں"</string> <string name="notification_done" msgid="6215117625922713976">"ہوگیا"</string> <string name="inline_undo" msgid="9026953267645116526">"کالعدم کریں"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"اس اطلاع کو بطور گفتگو نشان زد نہ کریں"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"پسندیدہ"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"پسندیدگی ختم کریں"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"خاموش کریں"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"آواز چلائیں"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"بلبلہ کے بطور دکھائیں"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"بلبلے آف کریں"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"ہوم اسکرین میں شامل کریں"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"اطلاع کے کنٹرولز"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"اطلاع اسنوز کرنے کے اختیارات"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 1eb02f3eafa7..b514f1e9754c 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Ekranga moslashtirish"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Ekran hajmida cho‘zish"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Skrinshot"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Rasm joylandi"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Skrinshot saqlanmoqda…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Skrinshot saqlanmoqda…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Skrinshot saqlandi"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Yozuvni boshlash"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Kadrorti nutqini yozib olish"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Bosishlarni ko‘rsatish"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Toʻxtatish uchun bosing"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"To‘xtatish"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pauza"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Davom etish"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Quvvat tejash"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Kunbotarda yoqish"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Quyosh chiqqunicha"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"<xliff:g id="TIME">%s</xliff:g> da yoqish"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"<xliff:g id="TIME">%s</xliff:g> gacha"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC o‘chiq"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC yoniq"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index dc3882e53c3d..c4d76187c817 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"T.phóng để lấp đầy m.hình"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Giãn ra để lấp đầy m.hình"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Chụp ảnh màn hình"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Đã chèn hình ảnh"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Đang lưu ảnh chụp màn hình..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Đang lưu ảnh chụp màn hình..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Đã lưu ảnh chụp màn hình"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Bắt đầu ghi"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Ghi phần thuyết minh"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Hiển thị số lần nhấn"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Nhấn để dừng"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Dừng"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Tạm dừng"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Tiếp tục"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Trình tiết kiệm pin"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Bật khi trời tối"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Cho đến khi trời sáng"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Bật vào lúc <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Cho đến <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC đã được tắt"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC đã được bật"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"Ghi lại nội dung trên màn hình"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Bắt đầu"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Dừng"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"Vuốt lên để chuyển đổi ứng dụng"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"Kéo sang phải để chuyển đổi nhanh giữa các ứng dụng"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"Bật/tắt chế độ xem Tổng quan"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"Tùy chỉnh"</string> <string name="notification_done" msgid="6215117625922713976">"Xong"</string> <string name="inline_undo" msgid="9026953267645116526">"Hoàn tác"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"Đánh dấu thông báo này không phải là cuộc trò chuyện"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"Đánh dấu là yêu thích"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"Bỏ thích"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"Ẩn"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"Hiển thị"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"Hiển thị dưới dạng bong bóng"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"Tắt bong bóng"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"Thêm vào màn hình chính"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"điều khiển thông báo"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"Tùy chọn báo lại thông báo"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index baacdae2da54..56edb64fd798 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"缩放以填满屏幕"</string> <string name="compat_mode_off" msgid="7682459748279487945">"拉伸以填满屏幕"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"屏幕截图"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"已插入图片"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"正在保存屏幕截图..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"正在保存屏幕截图..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"已保存屏幕截图"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"开始录制"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"录制旁白"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"显示点按操作反馈"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"点按即可停止"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"停止"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"暂停"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"继续"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"省电模式"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"在日落时开启"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"在日出时关闭"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"在<xliff:g id="TIME">%s</xliff:g> 开启"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"直到<xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC 已停用"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC 已启用"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"屏幕录制"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"开始"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"停止"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"向上滑动可切换应用"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"向右拖动可快速切换应用"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"切换概览"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"自定义"</string> <string name="notification_done" msgid="6215117625922713976">"完成"</string> <string name="inline_undo" msgid="9026953267645116526">"撤消"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"将此通知标记为非对话"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"收藏"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"取消收藏"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"静音"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"取消静音"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"显示为气泡"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"关闭气泡"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"添加到主屏幕"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g><xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"通知设置"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"通知延后选项"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 0f1696e7b34e..251e23d1526b 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"放大為全螢幕"</string> <string name="compat_mode_off" msgid="7682459748279487945">"放大為全螢幕"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"螢幕截圖"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"已插入圖片"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"正在儲存螢幕擷取畫面..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"正在儲存螢幕擷取畫面..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"螢幕擷取畫面已儲存"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"開始錄影"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"錄製畫面外的音效"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"顯示輕按選項"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"輕按即可停止"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"停止"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"暫停"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"繼續"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"省電模式"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"在日落時開啟"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"在日出時關閉"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"於<xliff:g id="TIME">%s</xliff:g>開啟"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"直至<xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC 已停用"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC 已啟用"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"畫面錄影"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"開始"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"停"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"向上滑動即可切換應用程式"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"向右拖曳即可快速切換應用程式"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"切換概覽"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"自訂"</string> <string name="notification_done" msgid="6215117625922713976">"完成"</string> <string name="inline_undo" msgid="9026953267645116526">"復原"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"將此通知標示為非對話"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"我的最愛"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"取消收藏"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"靜音"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"取消靜音"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"以小視窗顯示"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"關閉小視窗"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"加入主畫面"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"通知控制項"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"通知延後選項"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index e8e76ecb6094..a7ec5985a745 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"放大為全螢幕"</string> <string name="compat_mode_off" msgid="7682459748279487945">"放大為全螢幕"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"擷取螢幕畫面"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"已插入圖片"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"正在儲存螢幕截圖…"</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"正在儲存螢幕截圖…"</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"螢幕截圖已儲存"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"開始錄製"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"錄製畫面外的音效"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"顯示觸控回應"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"輕觸即可停止"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"停止"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"暫停"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"繼續"</string> @@ -388,15 +390,14 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"節約耗電量"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"於日落時開啟"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"於日出時關閉"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"開啟時間：<xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"關閉時間：<xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"NFC 已停用"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"NFC 已啟用"</string> - <!-- no translation found for quick_settings_screen_record_label (1594046461509776676) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_start (1574725369331638985) --> - <skip /> - <!-- no translation found for quick_settings_screen_record_stop (8087348522976412119) --> - <skip /> + <string name="quick_settings_screen_record_label" msgid="1594046461509776676">"螢幕畫面錄製"</string> + <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"開始"</string> + <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"停止"</string> <string name="recents_swipe_up_onboarding" msgid="2820265886420993995">"向上滑動即可切換應用程式"</string> <string name="recents_quick_scrub_onboarding" msgid="765934300283514912">"向右拖曳即可快速切換應用程式"</string> <string name="quick_step_accessibility_toggle_overview" msgid="7908949976727578403">"切換總覽"</string> @@ -696,22 +697,14 @@ <string name="notification_app_settings" msgid="8963648463858039377">"自訂"</string> <string name="notification_done" msgid="6215117625922713976">"完成"</string> <string name="inline_undo" msgid="9026953267645116526">"復原"</string> - <!-- no translation found for demote (6225813324237153980) --> - <skip /> - <!-- no translation found for notification_conversation_favorite (8252976467488182853) --> - <skip /> - <!-- no translation found for notification_conversation_unfavorite (633301300443356176) --> - <skip /> - <!-- no translation found for notification_conversation_mute (477431709687199671) --> - <skip /> - <!-- no translation found for notification_conversation_unmute (410885000669775294) --> - <skip /> - <!-- no translation found for notification_conversation_bubble (4598142032706190028) --> - <skip /> - <!-- no translation found for notification_conversation_unbubble (2303087159802926401) --> - <skip /> - <!-- no translation found for notification_conversation_home_screen (8347136037958438935) --> - <skip /> + <string name="demote" msgid="6225813324237153980">"將這則通知標示為非對話"</string> + <string name="notification_conversation_favorite" msgid="8252976467488182853">"加入收藏"</string> + <string name="notification_conversation_unfavorite" msgid="633301300443356176">"從收藏中移除"</string> + <string name="notification_conversation_mute" msgid="477431709687199671">"忽略"</string> + <string name="notification_conversation_unmute" msgid="410885000669775294">"取消忽略"</string> + <string name="notification_conversation_bubble" msgid="4598142032706190028">"以泡泡形式顯示"</string> + <string name="notification_conversation_unbubble" msgid="2303087159802926401">"關閉泡泡"</string> + <string name="notification_conversation_home_screen" msgid="8347136037958438935">"新增至主螢幕"</string> <string name="notification_menu_accessibility" msgid="8984166825879886773">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="6429668976593634862">"通知控制項"</string> <string name="notification_menu_snooze_description" msgid="4740133348901973244">"通知延後選項"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index fa764b575df0..1203b579c52f 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -71,6 +71,7 @@ <string name="compat_mode_on" msgid="4963711187149440884">"Sondeza ukugcwalisa isikrini"</string> <string name="compat_mode_off" msgid="7682459748279487945">"Nweba ukugcwalisa isikrini"</string> <string name="global_action_screenshot" msgid="2760267567509131654">"Isithombe-skrini"</string> + <string name="remote_input_image_insertion_text" msgid="4613177882724332877">"Isithombe sifakiwe"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"Ilondoloz umfanekiso weskrini..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"Ilondoloz umfanekiso weskrini..."</string> <string name="screenshot_saved_title" msgid="8893267638659083153">"Isithombe-skrini silondoloziwe"</string> @@ -84,6 +85,7 @@ <string name="screenrecord_start_label" msgid="1539048263178882562">"Qala ukurekhoda"</string> <string name="screenrecord_mic_label" msgid="6134198080740031632">"Rekhoda izwi elingaphezulu"</string> <string name="screenrecord_taps_label" msgid="2518244240225925076">"Bonisa amathebhu"</string> + <string name="screenrecord_stop_text" msgid="6549288689506057686">"Thepha ukuze umise"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Misa"</string> <string name="screenrecord_pause_label" msgid="6004054907104549857">"Phumula"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Qalisa kabusha"</string> @@ -388,6 +390,8 @@ <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Isilondolozi sebhethri"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Kuvulwe ekushoneni kwelanga"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"Kuze kube sekuphumeni kwelanga"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Kuvulwe ngo-<xliff:g id="TIME">%s</xliff:g>"</string> + <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Kuze kube ngu-<xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_nfc_label" msgid="1054317416221168085">"I-NFC"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"I-NFC ikhutshaziwe"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"I-NFC inikwe amandla"</string> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 1f13f8dc02fe..8d935ecc691d 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2549,4 +2549,7 @@ <!-- Quick Controls strings [CHAR LIMIT=30] --> <string name="quick_controls_title">Quick Controls</string> + + <!-- The tile in quick settings is unavailable. [CHAR LIMIT=32] --> + <string name="tile_unavailable">Unvailable</string> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java index ccce85ca74fb..45705b76f09c 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java @@ -60,6 +60,14 @@ class Bubble { private long mLastUpdated; private long mLastAccessed; + private BubbleController.NotificationSuppressionChangedListener mSuppressionListener; + + /** Whether the bubble should show a dot for the notification indicating updated content. */ + private boolean mShowBubbleUpdateDot = true; + + /** Whether flyout text should be suppressed, regardless of any other flags or state. */ + private boolean mSuppressFlyout; + // Items that are typically loaded later private String mAppName; private ShortcutInfo mShortcutInfo; @@ -71,20 +79,6 @@ class Bubble { private boolean mInflateSynchronously; /** - * Whether this notification should be shown in the shade when it is also displayed as a bubble. - * - * <p>When a notification is a bubble we don't show it in the shade once the bubble has been - * expanded</p> - */ - private boolean mShowInShadeWhenBubble = true; - - /** Whether the bubble should show a dot for the notification indicating updated content. */ - private boolean mShowBubbleUpdateDot = true; - - /** Whether flyout text should be suppressed, regardless of any other flags or state. */ - private boolean mSuppressFlyout; - - /** * Presentational info about the flyout. */ public static class FlyoutMessage { @@ -106,11 +100,13 @@ class Bubble { /** Used in tests when no UI is required. */ @VisibleForTesting(visibility = PRIVATE) - Bubble(NotificationEntry e) { + Bubble(NotificationEntry e, + BubbleController.NotificationSuppressionChangedListener listener) { mEntry = e; mKey = e.getKey(); mLastUpdated = e.getSbn().getPostTime(); mGroupId = groupId(e); + mSuppressionListener = listener; } public String getKey() { @@ -278,7 +274,7 @@ class Bubble { */ void markAsAccessedAt(long lastAccessedMillis) { mLastAccessed = lastAccessedMillis; - setShowInShade(false); + setSuppressNotification(true); setShowDot(false /* show */, true /* animate */); } @@ -290,20 +286,30 @@ class Bubble { } /** - * Whether this notification should be shown in the shade when it is also displayed as a - * bubble. + * Whether this notification should be shown in the shade. */ boolean showInShade() { - return !mEntry.isRowDismissed() && !shouldSuppressNotification() - && (!mEntry.isClearable() || mShowInShadeWhenBubble); + return !shouldSuppressNotification() || !mEntry.isClearable(); } /** - * Sets whether this notification should be shown in the shade when it is also displayed as a - * bubble. + * Sets whether this notification should be suppressed in the shade. */ - void setShowInShade(boolean showInShade) { - mShowInShadeWhenBubble = showInShade; + void setSuppressNotification(boolean suppressNotification) { + boolean prevShowInShade = showInShade(); + + Notification.BubbleMetadata data = mEntry.getBubbleMetadata(); + int flags = data.getFlags(); + if (suppressNotification) { + flags |= Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION; + } else { + flags &= ~Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION; + } + data.setFlags(flags); + + if (showInShade() != prevShowInShade && mSuppressionListener != null) { + mSuppressionListener.onBubbleNotificationSuppressionChange(this); + } } /** diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index 8c9946fcfc7b..2ed5b10fd564 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -224,6 +224,17 @@ public class BubbleController implements ConfigurationController.ConfigurationLi } /** + * Listener to be notified when a bubbles' notification suppression state changes. + */ + public interface NotificationSuppressionChangedListener { + /** + * Called when the notification suppression state of a bubble changes. + */ + void onBubbleNotificationSuppressionChange(Bubble bubble); + + } + + /** * Listens for the current state of the status bar and updates the visibility state * of bubbles as needed. */ @@ -303,9 +314,22 @@ public class BubbleController implements ConfigurationController.ConfigurationLi configurationController.addCallback(this /* configurationListener */); + mMaxBubbles = mContext.getResources().getInteger(R.integer.bubbles_max_rendered); mBubbleData = data; mBubbleData.setListener(mBubbleDataListener); - mMaxBubbles = mContext.getResources().getInteger(R.integer.bubbles_max_rendered); + mBubbleData.setSuppressionChangedListener(new NotificationSuppressionChangedListener() { + @Override + public void onBubbleNotificationSuppressionChange(Bubble bubble) { + // Make sure NoMan knows it's not showing in the shade anymore so anyone querying it + // can tell. + try { + mBarService.onBubbleNotificationSuppressionChanged(bubble.getKey(), + !bubble.showInShade()); + } catch (RemoteException e) { + // Bad things have happened + } + } + }); mNotificationEntryManager = entryManager; mNotificationEntryManager.addNotificationEntryListener(mEntryListener); @@ -720,7 +744,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi Bubble bubble = mBubbleData.getBubbleWithKey(key); boolean bubbleExtended = entry != null && entry.isBubble() && userRemovedNotif; if (bubbleExtended) { - bubble.setShowInShade(false); + bubble.setSuppressNotification(true); bubble.setShowDot(false /* show */, true /* animate */); mNotificationEntryManager.updateNotifications( "BubbleController.onNotificationRemoveRequested"); @@ -747,7 +771,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi // As far as group manager is concerned, once a child is no longer shown // in the shade, it is essentially removed. mNotificationGroupManager.onEntryRemoved(bubbleChild.getEntry()); - bubbleChild.setShowInShade(false); + bubbleChild.setSuppressNotification(true); bubbleChild.setShowDot(false /* show */, true /* animate */); } // And since all children are removed, remove the summary. diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java index 8b687e7114db..673121f92716 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java @@ -134,6 +134,9 @@ public class BubbleData { @Nullable private Listener mListener; + @Nullable + private BubbleController.NotificationSuppressionChangedListener mSuppressionListener; + /** * We track groups with summaries that aren't visibly displayed but still kept around because * the bubble(s) associated with the summary still exist. @@ -158,6 +161,11 @@ public class BubbleData { mMaxOverflowBubbles = mContext.getResources().getInteger(R.integer.bubbles_max_overflow); } + public void setSuppressionChangedListener( + BubbleController.NotificationSuppressionChangedListener listener) { + mSuppressionListener = listener; + } + public boolean hasBubbles() { return !mBubbles.isEmpty(); } @@ -219,7 +227,7 @@ public class BubbleData { return b; } } - bubble = new Bubble(entry); + bubble = new Bubble(entry, mSuppressionListener); mPendingBubbles.add(bubble); } else { bubble.setEntry(entry); @@ -258,11 +266,13 @@ public class BubbleData { } else if (mSelectedBubble == null) { setSelectedBubbleInternal(bubble); } + boolean isBubbleExpandedAndSelected = mExpanded && mSelectedBubble == bubble; - bubble.setShowInShade(!isBubbleExpandedAndSelected && showInShade); + boolean suppress = isBubbleExpandedAndSelected || !showInShade || !bubble.showInShade(); + bubble.setSuppressNotification(suppress); bubble.setShowDot(!isBubbleExpandedAndSelected /* show */, true /* animate */); - dispatchPendingChanges(); + dispatchPendingChanges(); } public void notificationEntryRemoved(NotificationEntry entry, @DismissReason int reason) { diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java index 6e23777babd9..55a7a11987fc 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java @@ -246,7 +246,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask bubbleMessage.senderName = sender != null ? sender.getName() : null; - bubbleMessage.senderAvatar = sender != null + bubbleMessage.senderAvatar = sender != null && sender.getIcon() != null ? sender.getIcon().loadDrawable(context) : null; return bubbleMessage; diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index 36a845002deb..f793b3df92a4 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -27,6 +27,7 @@ import com.android.systemui.BootCompleteCacheImpl; import com.android.systemui.DumpController; import com.android.systemui.assist.AssistModule; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.log.dagger.LogModule; import com.android.systemui.model.SysUiState; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.recents.Recents; @@ -59,9 +60,12 @@ import dagger.Provides; * A dagger module for injecting components of System UI that are not overridden by the System UI * implementation. */ -@Module(includes = {AssistModule.class, - ConcurrencyModule.class, - PeopleHubModule.class}, +@Module(includes = { + AssistModule.class, + ConcurrencyModule.class, + LogModule.class, + PeopleHubModule.class, + }, subcomponents = {StatusBarComponent.class, NotificationRowComponent.class}) public abstract class SystemUIModule { diff --git a/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt b/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt new file mode 100644 index 000000000000..18c7baec1f74 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt @@ -0,0 +1,213 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log + +import android.util.Log +import com.android.systemui.DumpController +import com.android.systemui.Dumpable +import com.android.systemui.log.dagger.LogModule +import java.text.SimpleDateFormat +import java.util.ArrayDeque +import java.util.Locale + +/** + * A simple ring buffer of recyclable log messages + * + * The goal of this class is to enable logging that is both extremely chatty and extremely + * lightweight. If done properly, logging a message will not result in any heap allocations or + * string generation. Messages are only converted to strings if the log is actually dumped (usually + * as the result of taking a bug report). + * + * You can dump the entire buffer at any time by running: + * + * ``` + * $ adb shell dumpsys activity service com.android.systemui/.SystemUIService \ + * dependency DumpController <bufferName> + * ``` + * + * where `bufferName` is the (case-sensitive) [name] passed to the constructor. + * + * By default, only messages of WARN level or higher are echoed to logcat, but this can be adjusted + * locally (usually for debugging purposes). + * + * To enable logcat echoing for an entire buffer: + * + * ``` + * $ adb shell settings put global systemui/buffer/<bufferName> <level> + * ``` + * + * To enable logcat echoing for a specific tag: + * + * ``` + * $ adb shell settings put global systemui/tag/<tag> <level> + * ``` + * + * In either case, `level` can be any of `verbose`, `debug`, `info`, `warn`, `error`, `assert`, or + * the first letter of any of the previous. + * + * Buffers are provided by [LogModule]. + * + * @param name The name of this buffer + * @param maxLogs The maximum number of messages to keep in memory at any one time, including the + * unused pool. + * @param poolSize The maximum amount that the size of the buffer is allowed to flex in response to + * sequential calls to [document] that aren't immediately followed by a matching call to [push]. + */ +class LogBuffer( + private val name: String, + private val maxLogs: Int, + private val poolSize: Int, + private val logcatEchoTracker: LogcatEchoTracker +) { + private val buffer: ArrayDeque<LogMessageImpl> = ArrayDeque() + + fun attach(dumpController: DumpController) { + dumpController.registerDumpable(name, onDump) + } + + /** + * Logs a message to the log buffer + * + * May also log the message to logcat if echoing is enabled for this buffer or tag. + * + * The actual string of the log message is not constructed until it is needed. To accomplish + * this, logging a message is a two-step process. First, a fresh instance of [LogMessage] is + * obtained and is passed to the [initializer]. The initializer stores any relevant data on the + * message's fields. The message is then inserted into the buffer where it waits until it is + * either pushed out by newer messages or it needs to printed. If and when this latter moment + * occurs, the [printer] function is called on the message. It reads whatever data the + * initializer stored and converts it to a human-readable log message. + * + * @param tag A string of at most 23 characters, used for grouping logs into categories or + * subjects. If this message is echoed to logcat, this will be the tag that is used. + * @param level Which level to log the message at, both to the buffer and to logcat if it's + * echoed. In general, a module should split most of its logs into either INFO or DEBUG level. + * INFO level should be reserved for information that other parts of the system might care + * about, leaving the specifics of code's day-to-day operations to DEBUG. + * @param initializer A function that will be called immediately to store relevant data on the + * log message. The value of `this` will be the LogMessage to be initialized. + * @param printer A function that will be called if and when the message needs to be dumped to + * logcat or a bug report. It should read the data stored by the initializer and convert it to + * a human-readable string. The value of `this` will be the LogMessage to be printed. + * **IMPORTANT:** The printer should ONLY ever reference fields on the LogMessage and NEVER any + * variables in its enclosing scope. Otherwise, the runtime will need to allocate a new instance + * of the printer for each call, thwarting our attempts at avoiding any sort of allocation. + */ + inline fun log( + tag: String, + level: LogLevel, + initializer: LogMessage.() -> Unit, + noinline printer: LogMessage.() -> String + ) { + val message = obtain(tag, level, printer) + initializer(message) + push(message) + } + + /** + * Same as [log], but doesn't push the message to the buffer. Useful if you need to supply a + * "reason" for doing something (the thing you supply the reason to will presumably call [push] + * on that message at some point). + */ + inline fun document( + tag: String, + level: LogLevel, + initializer: LogMessage.() -> Unit, + noinline printer: LogMessage.() -> String + ): LogMessage { + val message = obtain(tag, level, printer) + initializer(message) + return message + } + + /** + * Obtains an instance of [LogMessageImpl], usually from the object pool. If the pool has been + * exhausted, creates a new instance. + * + * In general, you should call [log] or [document] instead of this method. + */ + fun obtain( + tag: String, + level: LogLevel, + printer: (LogMessage) -> String + ): LogMessageImpl { + val message = synchronized(buffer) { + if (buffer.size > maxLogs - poolSize) { + buffer.removeFirst() + } else { + LogMessageImpl.create() + } + } + message.reset(tag, level, System.currentTimeMillis(), printer) + return message + } + + /** + * Pushes a message into buffer, possibly evicting an older message if the buffer is full. + */ + fun push(message: LogMessage) { + synchronized(buffer) { + if (buffer.size == maxLogs) { + Log.e(TAG, "LogBuffer $name has exceeded its pool size") + buffer.removeFirst() + } + buffer.add(message as LogMessageImpl) + if (logcatEchoTracker.isBufferLoggable(name, message.level) || + logcatEchoTracker.isTagLoggable(message.tag, message.level)) { + echoToLogcat(message) + } + } + } + + /** Converts the entire buffer to a newline-delimited string */ + fun dump(): String { + synchronized(buffer) { + val sb = StringBuilder() + for (message in buffer) { + dumpMessage(message, sb) + } + return sb.toString() + } + } + + private fun dumpMessage(message: LogMessage, sb: StringBuilder) { + sb.append(DATE_FORMAT.format(message.timestamp)) + .append(" ").append(message.level) + .append(" ").append(message.tag) + .append(" ").append(message.printer(message)) + .append("\n") + } + + private fun echoToLogcat(message: LogMessage) { + val strMessage = message.printer(message) + when (message.level) { + LogLevel.VERBOSE -> Log.v(message.tag, strMessage) + LogLevel.DEBUG -> Log.d(message.tag, strMessage) + LogLevel.INFO -> Log.i(message.tag, strMessage) + LogLevel.WARNING -> Log.w(message.tag, strMessage) + LogLevel.ERROR -> Log.e(message.tag, strMessage) + LogLevel.WTF -> Log.wtf(message.tag, strMessage) + } + } + + private val onDump = Dumpable { _, pw, _ -> + pw.println(dump()) + } +} + +private const val TAG = "LogBuffer" +private val DATE_FORMAT = SimpleDateFormat("MM-dd HH:mm:ss.S", Locale.US) diff --git a/packages/SystemUI/src/com/android/systemui/log/LogLevel.kt b/packages/SystemUI/src/com/android/systemui/log/LogLevel.kt new file mode 100644 index 000000000000..7b9af0f91200 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/LogLevel.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log + +import android.util.Log + +/** + * Enum version of @Log.Level + */ +enum class LogLevel(@Log.Level val nativeLevel: Int) { + VERBOSE(Log.VERBOSE), + DEBUG(Log.DEBUG), + INFO(Log.INFO), + WARNING(Log.WARN), + ERROR(Log.ERROR), + WTF(Log.ASSERT) +} diff --git a/packages/SystemUI/src/com/android/systemui/log/LogMessage.kt b/packages/SystemUI/src/com/android/systemui/log/LogMessage.kt new file mode 100644 index 000000000000..d971ac58fb0b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/LogMessage.kt @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log + +/** + * Generic data class for storing messages logged to a [LogBuffer] + * + * Each LogMessage has a few standard fields ([level], [tag], and [timestamp]). The rest are generic + * data slots that may or may not be used, depending on the nature of the specific message being + * logged. + * + * When a message is logged, the code doing the logging stores data in one or more of the generic + * fields ([str1], [int1], etc). When it comes time to dump the message to logcat/bugreport/etc, the + * [printer] function reads the data stored in the generic fields and converts that to a human- + * readable string. Thus, for every log type there must be a specialized initializer function that + * stores data specific to that log type and a specialized printer function that prints that data. + * + * See [LogBuffer.log] for more information. + */ +interface LogMessage { + val level: LogLevel + val tag: String + val timestamp: Long + val printer: LogMessage.() -> String + + var str1: String? + var str2: String? + var str3: String? + var int1: Int + var int2: Int + var long1: Long + var double1: Double +} diff --git a/packages/SystemUI/src/com/android/systemui/log/LogMessageImpl.kt b/packages/SystemUI/src/com/android/systemui/log/LogMessageImpl.kt new file mode 100644 index 000000000000..32334bc382e1 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/LogMessageImpl.kt @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log + +/** + * Recyclable implementation of [LogMessage]. + */ +data class LogMessageImpl( + override var level: LogLevel, + override var tag: String, + override var timestamp: Long, + override var printer: LogMessage.() -> String, + override var str1: String?, + override var str2: String?, + override var str3: String?, + override var int1: Int, + override var int2: Int, + override var long1: Long, + override var double1: Double +) : LogMessage { + + fun reset( + tag: String, + level: LogLevel, + timestamp: Long, + renderer: LogMessage.() -> String + ) { + this.level = level + this.tag = tag + this.timestamp = timestamp + this.printer = renderer + str1 = null + str2 = null + str3 = null + int1 = 0 + int2 = 0 + long1 = 0 + double1 = 0.0 + } + + companion object Factory { + fun create(): LogMessageImpl { + return LogMessageImpl( + LogLevel.DEBUG, + DEFAULT_TAG, + 0, + DEFAULT_RENDERER, + null, + null, + null, + 0, + 0, + 0, + 0.0) + } + } +} + +private const val DEFAULT_TAG = "UnknownTag" +private val DEFAULT_RENDERER: LogMessage.() -> String = { "Unknown message: $this" } diff --git a/packages/SystemUI/src/com/android/systemui/log/LogcatEchoTracker.kt b/packages/SystemUI/src/com/android/systemui/log/LogcatEchoTracker.kt new file mode 100644 index 000000000000..3022f4b42a42 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/LogcatEchoTracker.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log + +/** + * Keeps track of which [LogBuffer] messages should also appear in logcat. + */ +interface LogcatEchoTracker { + /** + * Whether [bufferName] should echo messages of [level] or higher to logcat. + */ + fun isBufferLoggable(bufferName: String, level: LogLevel): Boolean + + /** + * Whether [tagName] should echo messages of [level] or higher to logcat. + */ + fun isTagLoggable(tagName: String, level: LogLevel): Boolean +} diff --git a/packages/SystemUI/src/com/android/systemui/log/LogcatEchoTrackerDebug.kt b/packages/SystemUI/src/com/android/systemui/log/LogcatEchoTrackerDebug.kt new file mode 100644 index 000000000000..23942e1d6e3c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/LogcatEchoTrackerDebug.kt @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log + +import android.content.ContentResolver +import android.database.ContentObserver +import android.net.Uri +import android.os.Handler +import android.os.Looper +import android.provider.Settings + +/** + * Version of [LogcatEchoTracker] for debuggable builds + * + * The log level of individual buffers or tags can be controlled via global settings: + * + * ``` + * # Echo any message to <bufferName> of <level> or higher + * $ adb shell settings put global systemui/buffer/<bufferName> <level> + * + * # Echo any message of <tag> and of <level> or higher + * $ adb shell settings put global systemui/tag/<tag> <level> + * ``` + */ +class LogcatEchoTrackerDebug private constructor( + private val contentResolver: ContentResolver +) : LogcatEchoTracker { + private val cachedBufferLevels: MutableMap<String, LogLevel> = mutableMapOf() + private val cachedTagLevels: MutableMap<String, LogLevel> = mutableMapOf() + + companion object Factory { + @JvmStatic + fun create( + contentResolver: ContentResolver, + mainLooper: Looper + ): LogcatEchoTrackerDebug { + val tracker = LogcatEchoTrackerDebug(contentResolver) + tracker.attach(mainLooper) + return tracker + } + } + + private fun attach(mainLooper: Looper) { + contentResolver.registerContentObserver( + Settings.Global.getUriFor(BUFFER_PATH), + true, + object : ContentObserver(Handler(mainLooper)) { + override fun onChange(selfChange: Boolean, uri: Uri) { + super.onChange(selfChange, uri) + cachedBufferLevels.clear() + } + }) + + contentResolver.registerContentObserver( + Settings.Global.getUriFor(TAG_PATH), + true, + object : ContentObserver(Handler(mainLooper)) { + override fun onChange(selfChange: Boolean, uri: Uri) { + super.onChange(selfChange, uri) + cachedTagLevels.clear() + } + }) + } + + /** + * Whether [bufferName] should echo messages of [level] or higher to logcat. + */ + @Synchronized + override fun isBufferLoggable(bufferName: String, level: LogLevel): Boolean { + return level.ordinal >= getLogLevel(bufferName, BUFFER_PATH, cachedBufferLevels).ordinal + } + + /** + * Whether [tagName] should echo messages of [level] or higher to logcat. + */ + @Synchronized + override fun isTagLoggable(tagName: String, level: LogLevel): Boolean { + return level >= getLogLevel(tagName, TAG_PATH, cachedTagLevels) + } + + private fun getLogLevel( + name: String, + path: String, + cache: MutableMap<String, LogLevel> + ): LogLevel { + return cache[name] ?: readSetting("$path/$name").also { cache[name] = it } + } + + private fun readSetting(path: String): LogLevel { + return try { + parseProp(Settings.Global.getString(contentResolver, path)) + } catch (_: Settings.SettingNotFoundException) { + DEFAULT_LEVEL + } + } + + private fun parseProp(propValue: String?): LogLevel { + return when (propValue?.toLowerCase()) { + "verbose" -> LogLevel.VERBOSE + "v" -> LogLevel.VERBOSE + "debug" -> LogLevel.DEBUG + "d" -> LogLevel.DEBUG + "info" -> LogLevel.INFO + "i" -> LogLevel.INFO + "warning" -> LogLevel.WARNING + "warn" -> LogLevel.WARNING + "w" -> LogLevel.WARNING + "error" -> LogLevel.ERROR + "e" -> LogLevel.ERROR + "assert" -> LogLevel.WTF + "wtf" -> LogLevel.WTF + else -> DEFAULT_LEVEL + } + } +} + +private val DEFAULT_LEVEL = LogLevel.WARNING +private const val BUFFER_PATH = "systemui/buffer" +private const val TAG_PATH = "systemui/tag" diff --git a/packages/SystemUI/src/com/android/systemui/log/LogcatEchoTrackerProd.kt b/packages/SystemUI/src/com/android/systemui/log/LogcatEchoTrackerProd.kt new file mode 100644 index 000000000000..394f624a3e58 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/LogcatEchoTrackerProd.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log + +/** + * Production version of [LogcatEchoTracker] that isn't configurable. + */ +class LogcatEchoTrackerProd : LogcatEchoTracker { + override fun isBufferLoggable(bufferName: String, level: LogLevel): Boolean { + return level >= LogLevel.WARNING + } + + override fun isTagLoggable(tagName: String, level: LogLevel): Boolean { + return level >= LogLevel.WARNING + } +} diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/DozeLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/DozeLog.java new file mode 100644 index 000000000000..7c5f4025117f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/DozeLog.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log.dagger; + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import com.android.systemui.log.LogBuffer; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; + +import javax.inject.Qualifier; + +/** A {@link LogBuffer} for dozing-related messages. */ +@Qualifier +@Documented +@Retention(RUNTIME) +public @interface DozeLog { +} diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java new file mode 100644 index 000000000000..b1990beb9f57 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log.dagger; + +import android.content.ContentResolver; +import android.os.Build; +import android.os.Looper; + +import com.android.systemui.DumpController; +import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.log.LogBuffer; +import com.android.systemui.log.LogcatEchoTracker; +import com.android.systemui.log.LogcatEchoTrackerDebug; +import com.android.systemui.log.LogcatEchoTrackerProd; + +import javax.inject.Singleton; + +import dagger.Module; +import dagger.Provides; + +/** + * Dagger module for providing instances of {@link LogBuffer}. + */ +@Module +public class LogModule { + /** Provides a logging buffer for doze-related logs. */ + @Provides + @Singleton + @DozeLog + public static LogBuffer provideDozeLogBuffer( + LogcatEchoTrackerDebug bufferFilter, + DumpController dumpController) { + LogBuffer buffer = new LogBuffer("DozeLog", 100, 10, bufferFilter); + buffer.attach(dumpController); + return buffer; + } + + /** Provides a logging buffer for all logs related to the data layer of notifications. */ + @Provides + @Singleton + @NotificationLog + public static LogBuffer provideNotificationsLogBuffer( + LogcatEchoTracker bufferFilter, + DumpController dumpController) { + LogBuffer buffer = new LogBuffer("NotifLog2", 1000, 10, bufferFilter); + buffer.attach(dumpController); + return buffer; + } + + /** Allows logging buffers to be tweaked via adb on debug builds but not on prod builds. */ + @Provides + @Singleton + public static LogcatEchoTracker provideLogcatEchoTracker( + ContentResolver contentResolver, + @Main Looper looper) { + if (Build.IS_DEBUGGABLE) { + return LogcatEchoTrackerDebug.create(contentResolver, looper); + } else { + return new LogcatEchoTrackerProd(); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLog.java new file mode 100644 index 000000000000..a0b686487bec --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/NotificationLog.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.log.dagger; + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import com.android.systemui.log.LogBuffer; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; + +import javax.inject.Qualifier; + +/** A {@link LogBuffer} for notification-related messages. */ +@Qualifier +@Documented +@Retention(RUNTIME) +public @interface NotificationLog { +} diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java b/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java index 8e34a90e7b51..6f03f18ef64b 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java @@ -261,8 +261,6 @@ public class PipBoundsHandler { mPinnedStackController.startAnimation(destinationBounds, sourceRectHint, -1 /* animationDuration */); mLastDestinationBounds.set(destinationBounds); - mPinnedStackController.reportBounds(defaultBounds, - getMovementBounds(defaultBounds)); } catch (RemoteException e) { Log.e(TAG, "Failed to start PiP animation from SysUI", e); } @@ -317,7 +315,6 @@ public class PipBoundsHandler { outBounds.set(postChangeStackBounds); mLastDestinationBounds.set(outBounds); mPinnedStackController.resetBoundsAnimation(outBounds); - mPinnedStackController.reportBounds(outBounds, getMovementBounds(outBounds)); t.setBounds(pinnedStackInfo.stackToken, outBounds); } catch (RemoteException e) { Log.e(TAG, "Failed to resize PiP on display rotation", e); diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java index f39d1ecb0585..e48a23f4cd2c 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -297,6 +297,13 @@ public class PipManager implements BasePipManager { } /** + * Sets a customized touch gesture that replaces the default one. + */ + public void setTouchGesture(PipTouchGesture gesture) { + mTouchHandler.setTouchGesture(gesture); + } + + /** * Sets both shelf visibility and its height. */ @Override diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchGesture.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchGesture.java index e8e8a4d3215a..72335dbed115 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchGesture.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchGesture.java @@ -24,19 +24,19 @@ public abstract class PipTouchGesture { /** * Handle the touch down. */ - void onDown(PipTouchState touchState) {} + public void onDown(PipTouchState touchState) {} /** * Handle the touch move, and return whether the event was consumed. */ - boolean onMove(PipTouchState touchState) { + public boolean onMove(PipTouchState touchState) { return false; } /** * Handle the touch up, and return whether the gesture was consumed. */ - boolean onUp(PipTouchState touchState) { + public boolean onUp(PipTouchState touchState) { return false; } } diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java index 09f163810d27..65cc666d5164 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java @@ -126,8 +126,8 @@ public class PipTouchHandler { // Touch state private final PipTouchState mTouchState; private final FlingAnimationUtils mFlingAnimationUtils; - private final PipTouchGesture[] mGestures; private final PipMotionHelper mMotionHelper; + private PipTouchGesture mGesture; // Temp vars private final Rect mTmpBounds = new Rect(); @@ -185,9 +185,7 @@ public class PipTouchHandler { mSnapAlgorithm = new PipSnapAlgorithm(mContext); mFlingAnimationUtils = new FlingAnimationUtils(context.getResources().getDisplayMetrics(), 2.5f); - mGestures = new PipTouchGesture[] { - mDefaultMovementGesture - }; + mGesture = new DefaultPipTouchGesture(); mMotionHelper = new PipMotionHelper(mContext, mActivityManager, mActivityTaskManager, mMenuController, mSnapAlgorithm, mFlingAnimationUtils); mTouchState = new PipTouchState(mViewConfig, mHandler, @@ -210,6 +208,10 @@ public class PipTouchHandler { this::onAccessibilityShowMenu, mHandler); } + public void setTouchGesture(PipTouchGesture gesture) { + mGesture = gesture; + } + public void setTouchEnabled(boolean enabled) { mTouchState.setAllowTouches(enabled); } @@ -363,17 +365,12 @@ public class PipTouchHandler { switch (ev.getAction()) { case MotionEvent.ACTION_DOWN: { mMotionHelper.synchronizePinnedStackBounds(); - - for (PipTouchGesture gesture : mGestures) { - gesture.onDown(mTouchState); - } + mGesture.onDown(mTouchState); break; } case MotionEvent.ACTION_MOVE: { - for (PipTouchGesture gesture : mGestures) { - if (gesture.onMove(mTouchState)) { - break; - } + if (mGesture.onMove(mTouchState)) { + break; } shouldDeliverToMenu = !mTouchState.isDragging(); @@ -384,10 +381,8 @@ public class PipTouchHandler { // dragging (ie. when the IME shows) updateMovementBounds(mMenuState); - for (PipTouchGesture gesture : mGestures) { - if (gesture.onUp(mTouchState)) { - break; - } + if (mGesture.onUp(mTouchState)) { + break; } // Fall through to clean up @@ -591,7 +586,7 @@ public class PipTouchHandler { /** * Gesture controlling normal movement of the PIP. */ - private PipTouchGesture mDefaultMovementGesture = new PipTouchGesture() { + private class DefaultPipTouchGesture extends PipTouchGesture { // Whether the PiP was on the left side of the screen at the start of the gesture private boolean mStartedOnLeft; private final Point mStartPosition = new Point(); @@ -623,7 +618,7 @@ public class PipTouchHandler { } @Override - boolean onMove(PipTouchState touchState) { + public boolean onMove(PipTouchState touchState) { if (!touchState.isUserInteracting()) { return false; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index 411980b399bd..557c64b7dfb9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -191,6 +191,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener mTile.setLabel(tile.getLabel()); mTile.setSubtitle(tile.getSubtitle()); mTile.setContentDescription(tile.getContentDescription()); + mTile.setStateDescription(tile.getStateDescription()); mTile.setState(tile.getState()); } @@ -345,6 +346,12 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener state.contentDescription = state.label; } + if (mTile.getStateDescription() != null) { + state.stateDescription = mTile.getStateDescription(); + } else { + state.stateDescription = null; + } + if (state instanceof BooleanState) { state.expandedAccessibilityClassName = Switch.class.getName(); ((BooleanState) state).value = (state.state == Tile.STATE_ACTIVE); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java index 8b7f280608a5..fda9e5b1f1ef 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java @@ -65,7 +65,6 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView { private String mAccessibilityClass; private boolean mTileState; private boolean mCollapsedView; - private boolean mClicked; private boolean mShowRippleEffect = true; private final ImageView mBg; @@ -234,13 +233,35 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView { setLongClickable(state.handlesLongClick); mIcon.setIcon(state, allowAnimations); setContentDescription(state.contentDescription); + final StringBuilder stateDescription = new StringBuilder(); + switch (state.state) { + case Tile.STATE_UNAVAILABLE: + stateDescription.append(mContext.getString(R.string.tile_unavailable)); + break; + case Tile.STATE_INACTIVE: + if (state instanceof QSTile.BooleanState) { + stateDescription.append(mContext.getString(R.string.switch_bar_off)); + } + break; + case Tile.STATE_ACTIVE: + if (state instanceof QSTile.BooleanState) { + stateDescription.append(mContext.getString(R.string.switch_bar_on)); + } + break; + default: + break; + } + if (!TextUtils.isEmpty(state.stateDescription)) { + stateDescription.append(", "); + stateDescription.append(state.stateDescription); + } + setStateDescription(stateDescription.toString()); mAccessibilityClass = state.state == Tile.STATE_UNAVAILABLE ? null : state.expandedAccessibilityClassName; if (state instanceof QSTile.BooleanState) { boolean newState = ((BooleanState) state).value; if (mTileState != newState) { - mClicked = false; mTileState = newState; } } @@ -297,23 +318,10 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView { } @Override - public boolean performClick() { - mClicked = true; - return super.performClick(); - } - - @Override public void onInitializeAccessibilityEvent(AccessibilityEvent event) { super.onInitializeAccessibilityEvent(event); if (!TextUtils.isEmpty(mAccessibilityClass)) { event.setClassName(mAccessibilityClass); - if (Switch.class.getName().equals(mAccessibilityClass)) { - boolean b = mClicked ? !mTileState : mTileState; - String label = getResources() - .getString(b ? R.string.switch_bar_on : R.string.switch_bar_off); - event.setContentDescription(label); - event.setChecked(b); - } } } @@ -325,11 +333,6 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView { if (!TextUtils.isEmpty(mAccessibilityClass)) { info.setClassName(mAccessibilityClass); if (Switch.class.getName().equals(mAccessibilityClass)) { - boolean b = mClicked ? !mTileState : mTileState; - String label = getResources() - .getString(b ? R.string.switch_bar_on : R.string.switch_bar_off); - info.setText(label); - info.setChecked(b); info.setCheckable(true); if (isLongClickable()) { info.addAction( diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index 9282a2e3b312..361b6c1b1260 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -134,25 +134,27 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { state.label = mContext.getString(R.string.quick_settings_bluetooth_label); state.secondaryLabel = TextUtils.emptyIfNull( getSecondaryLabel(enabled, connecting, connected, state.isTransient)); + state.contentDescription = state.label; + state.stateDescription = ""; if (enabled) { if (connected) { state.icon = new BluetoothConnectedTileIcon(); if (!TextUtils.isEmpty(mController.getConnectedDeviceName())) { state.label = mController.getConnectedDeviceName(); } - state.contentDescription = + state.stateDescription = mContext.getString(R.string.accessibility_bluetooth_name, state.label) + ", " + state.secondaryLabel; } else if (state.isTransient) { state.icon = ResourceIcon.get( com.android.internal.R.drawable.ic_bluetooth_transient_animation); - state.contentDescription = state.secondaryLabel; + state.stateDescription = state.secondaryLabel; } else { state.icon = ResourceIcon.get(com.android.internal.R.drawable.ic_qs_bluetooth); state.contentDescription = mContext.getString( - R.string.accessibility_quick_settings_bluetooth) + "," - + mContext.getString(R.string.accessibility_not_connected); + R.string.accessibility_quick_settings_bluetooth); + state.stateDescription = mContext.getString(R.string.accessibility_not_connected); } state.state = Tile.STATE_ACTIVE; } else { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java index 0e813d1ab4e4..58de0575fa75 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java @@ -183,6 +183,7 @@ public class CastTile extends QSTileImpl<BooleanState> { protected void handleUpdateState(BooleanState state, Object arg) { state.label = mContext.getString(R.string.quick_settings_cast_title); state.contentDescription = state.label; + state.stateDescription = ""; state.value = false; final List<CastDevice> devices = mController.getCastDevices(); boolean connecting = false; @@ -192,8 +193,9 @@ public class CastTile extends QSTileImpl<BooleanState> { if (device.state == CastDevice.STATE_CONNECTED) { state.value = true; state.secondaryLabel = getDeviceName(device); - state.contentDescription = state.contentDescription + "," + - mContext.getString(R.string.accessibility_cast_name, state.label); + state.stateDescription = state.stateDescription + "," + + mContext.getString( + R.string.accessibility_cast_name, state.label); connecting = false; break; } else if (device.state == CastDevice.STATE_CONNECTING) { @@ -217,9 +219,8 @@ public class CastTile extends QSTileImpl<BooleanState> { state.state = Tile.STATE_UNAVAILABLE; String noWifi = mContext.getString(R.string.quick_settings_cast_no_wifi); state.secondaryLabel = noWifi; - state.contentDescription = state.contentDescription + ", " + mContext.getString( - R.string.accessibility_quick_settings_not_available, noWifi); } + state.stateDescription = state.stateDescription + ", " + state.secondaryLabel; mDetailAdapter.updateItems(devices); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index 22470c7f5af5..d5f86c951407 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -194,17 +194,13 @@ public class CellularTile extends QSTileImpl<SignalState> { state.secondaryLabel = r.getString(R.string.cell_data_off); } - - // TODO(b/77881974): Instead of switching out the description via a string check for - // we need to have two strings provided by the MobileIconGroup. - final CharSequence contentDescriptionSuffix; + state.contentDescription = state.label; if (state.state == Tile.STATE_INACTIVE) { - contentDescriptionSuffix = r.getString(R.string.cell_data_off_content_description); + // This information is appended later by converting the Tile.STATE_INACTIVE state. + state.stateDescription = ""; } else { - contentDescriptionSuffix = state.secondaryLabel; + state.stateDescription = state.secondaryLabel; } - - state.contentDescription = state.label + ", " + contentDescriptionSuffix; } private CharSequence appendMobileDataType(CharSequence current, CharSequence dataType) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java index 52d1a5b3b991..9215da4cda9a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -240,6 +240,8 @@ public class DndTile extends QSTileImpl<BooleanState> { zen != Global.ZEN_MODE_OFF, mController.getConfig(), false)); state.icon = ResourceIcon.get(com.android.internal.R.drawable.ic_qs_dnd); checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_ADJUST_VOLUME); + // Keeping the secondaryLabel in contentDescription instead of stateDescription is easier + // to understand. switch (zen) { case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS: state.contentDescription = diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java index dafdd89ee62c..792c36477962 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java @@ -102,14 +102,13 @@ public class FlashlightTile extends QSTileImpl<BooleanState> implements } state.label = mHost.getContext().getString(R.string.quick_settings_flashlight_label); state.secondaryLabel = ""; + state.stateDescription = ""; if (!mFlashlightController.isAvailable()) { state.icon = mIcon; state.slash.isSlashed = true; state.secondaryLabel = mContext.getString( R.string.quick_settings_flashlight_camera_in_use); - state.contentDescription = mContext.getString( - R.string.accessibility_quick_settings_flashlight_unavailable) - + ", " + state.secondaryLabel; + state.stateDescription = state.secondaryLabel; state.state = Tile.STATE_UNAVAILABLE; return; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index 001e09406e3a..fd6b936d71c0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java @@ -147,6 +147,7 @@ public class HotspotTile extends QSTileImpl<BooleanState> { state.secondaryLabel = getSecondaryLabel( isTileActive, isTransient, isDataSaverEnabled, numConnectedDevices); + state.stateDescription = state.secondaryLabel; } @Nullable diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index fbdca3ba1c7b..e617867eb10e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -105,15 +105,8 @@ public class LocationTile extends QSTileImpl<BooleanState> { } state.icon = mIcon; state.slash.isSlashed = !state.value; - if (locationEnabled) { - state.label = mContext.getString(R.string.quick_settings_location_label); - state.contentDescription = mContext.getString( - R.string.accessibility_quick_settings_location_on); - } else { - state.label = mContext.getString(R.string.quick_settings_location_label); - state.contentDescription = mContext.getString( - R.string.accessibility_quick_settings_location_off); - } + state.label = mContext.getString(R.string.quick_settings_location_label); + state.contentDescription = state.label; state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; state.expandedAccessibilityClassName = Switch.class.getName(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index b7ce101cacab..6e8dcf36bacc 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -195,6 +195,7 @@ public class WifiTile extends QSTileImpl<SignalState> { state.activityIn = cb.enabled && cb.activityIn; state.activityOut = cb.enabled && cb.activityOut; final StringBuffer minimalContentDescription = new StringBuffer(); + final StringBuffer minimalStateDescription = new StringBuffer(); final Resources r = mContext.getResources(); if (isTransient) { state.icon = ResourceIcon.get( @@ -219,13 +220,14 @@ public class WifiTile extends QSTileImpl<SignalState> { mContext.getString(R.string.quick_settings_wifi_label)).append(","); if (state.value) { if (wifiConnected) { - minimalContentDescription.append(cb.wifiSignalContentDescription).append(","); + minimalStateDescription.append(cb.wifiSignalContentDescription); minimalContentDescription.append(removeDoubleQuotes(cb.ssid)); if (!TextUtils.isEmpty(state.secondaryLabel)) { minimalContentDescription.append(",").append(state.secondaryLabel); } } } + state.stateDescription = minimalStateDescription.toString(); state.contentDescription = minimalContentDescription.toString(); state.dualLabelContentDescription = r.getString( R.string.accessibility_quick_settings_open_settings, getTileLabel()); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java index 7853dc388bcb..e54ee51fb9d4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java @@ -103,14 +103,11 @@ public class WorkModeTile extends QSTileImpl<BooleanState> implements state.icon = mIcon; if (state.value) { state.slash.isSlashed = false; - state.contentDescription = mContext.getString( - R.string.accessibility_quick_settings_work_mode_on); } else { state.slash.isSlashed = true; - state.contentDescription = mContext.getString( - R.string.accessibility_quick_settings_work_mode_off); } state.label = mContext.getString(R.string.quick_settings_work_mode_label); + state.contentDescription = state.label; state.expandedAccessibilityClassName = Switch.class.getName(); state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListEntry.java index 56ad0e1df36f..b048d032feaf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListEntry.java @@ -44,10 +44,11 @@ public abstract class ListEntry { /** * Should return the "representative entry" for this ListEntry. For NotificationEntries, its - * the entry itself. For groups, it should be the summary. This method exists to interface with + * the entry itself. For groups, it should be the summary (but if a summary doesn't exist, + * this can return null). This method exists to interface with * legacy code that expects groups to also be NotificationEntries. */ - public abstract NotificationEntry getRepresentativeEntry(); + public abstract @Nullable NotificationEntry getRepresentativeEntry(); @Nullable public GroupEntry getParent() { return mParent; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java index 86c0d85829b5..92927cf104a0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java @@ -44,7 +44,6 @@ import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.NotificationListenerService.RankingMap; import android.service.notification.StatusBarNotification; import android.util.ArrayMap; -import android.util.Log; import com.android.internal.statusbar.IStatusBarService; import com.android.systemui.DumpController; @@ -56,6 +55,7 @@ import com.android.systemui.statusbar.notification.collection.coalescer.GroupCoa import com.android.systemui.statusbar.notification.collection.notifcollection.CollectionReadyForBuildListener; import com.android.systemui.statusbar.notification.collection.notifcollection.DismissedByUserStats; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener; +import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionLogger; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender; import com.android.systemui.util.Assert; @@ -100,6 +100,7 @@ import javax.inject.Singleton; public class NotifCollection implements Dumpable { private final IStatusBarService mStatusBarService; private final FeatureFlags mFeatureFlags; + private final NotifCollectionLogger mLogger; private final Map<String, NotificationEntry> mNotificationSet = new ArrayMap<>(); private final Collection<NotificationEntry> mReadOnlyNotificationSet = @@ -116,9 +117,11 @@ public class NotifCollection implements Dumpable { public NotifCollection( IStatusBarService statusBarService, DumpController dumpController, - FeatureFlags featureFlags) { + FeatureFlags featureFlags, + NotifCollectionLogger logger) { Assert.isMainThread(); mStatusBarService = statusBarService; + mLogger = logger; dumpController.registerDumpable(TAG, this); mFeatureFlags = featureFlags; } @@ -190,8 +193,8 @@ public class NotifCollection implements Dumpable { private void onNotificationGroupPosted(List<CoalescedEvent> batch) { Assert.isMainThread(); - Log.d(TAG, "POSTED GROUP " + batch.get(0).getSbn().getGroupKey() - + " (" + batch.size() + " events)"); + mLogger.logNotifGroupPosted(batch.get(0).getSbn().getGroupKey(), batch.size()); + for (CoalescedEvent event : batch) { postNotification(event.getSbn(), event.getRanking(), null); } @@ -204,7 +207,7 @@ public class NotifCollection implements Dumpable { int reason) { Assert.isMainThread(); - Log.d(TAG, "REMOVED " + sbn.getKey() + " reason=" + reason); + mLogger.logNotifRemoved(sbn.getKey(), reason); removeNotification(sbn.getKey(), rankingMap, reason, null); } @@ -222,7 +225,7 @@ public class NotifCollection implements Dumpable { if (entry == null) { // A new notification! - Log.d(TAG, "POSTED " + sbn.getKey()); + mLogger.logNotifPosted(sbn.getKey()); entry = new NotificationEntry(sbn, ranking); mNotificationSet.put(sbn.getKey(), entry); @@ -234,7 +237,7 @@ public class NotifCollection implements Dumpable { } else { // Update to an existing entry - Log.d(TAG, "UPDATED " + sbn.getKey()); + mLogger.logNotifUpdated(sbn.getKey()); // Notification is updated so it is essentially re-added and thus alive again. Don't // need to keep its lifetime extended. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java index 97f8ec5f5bb7..9f8f42ee116c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java @@ -32,19 +32,20 @@ import android.annotation.Nullable; import android.util.ArrayMap; import android.util.Pair; +import androidx.annotation.NonNull; + import com.android.systemui.DumpController; import com.android.systemui.Dumpable; import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeRenderListListener; import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeSortListener; import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeTransformGroupsListener; import com.android.systemui.statusbar.notification.collection.listbuilder.PipelineState; +import com.android.systemui.statusbar.notification.collection.listbuilder.ShadeListBuilderLogger; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSection; import com.android.systemui.statusbar.notification.collection.notifcollection.CollectionReadyForBuildListener; -import com.android.systemui.statusbar.notification.logging.NotifEvent; -import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.util.Assert; import com.android.systemui.util.time.SystemClock; @@ -69,7 +70,7 @@ import javax.inject.Singleton; @Singleton public class ShadeListBuilder implements Dumpable { private final SystemClock mSystemClock; - private final NotifLog mNotifLog; + private final ShadeListBuilderLogger mLogger; private List<ListEntry> mNotifList = new ArrayList<>(); private List<ListEntry> mNewNotifList = new ArrayList<>(); @@ -98,11 +99,11 @@ public class ShadeListBuilder implements Dumpable { @Inject public ShadeListBuilder( SystemClock systemClock, - NotifLog notifLog, + ShadeListBuilderLogger logger, DumpController dumpController) { Assert.isMainThread(); mSystemClock = systemClock; - mNotifLog = notifLog; + mLogger = logger; dumpController.registerDumpable(TAG, this); } @@ -205,8 +206,7 @@ public class ShadeListBuilder implements Dumpable { Assert.isMainThread(); mPipelineState.requireIsBefore(STATE_BUILD_STARTED); - mNotifLog.log(NotifEvent.ON_BUILD_LIST, "Request received from " - + "NotifCollection"); + mLogger.logOnBuildList(); mAllEntries = entries; buildList(); } @@ -215,21 +215,15 @@ public class ShadeListBuilder implements Dumpable { private void onPreGroupFilterInvalidated(NotifFilter filter) { Assert.isMainThread(); - mNotifLog.log(NotifEvent.PRE_GROUP_FILTER_INVALIDATED, String.format( - "Filter \"%s\" invalidated; pipeline state is %d", - filter.getName(), - mPipelineState.getState())); + mLogger.logPreGroupFilterInvalidated(filter.getName(), mPipelineState.getState()); rebuildListIfBefore(STATE_PRE_GROUP_FILTERING); } - private void onPromoterInvalidated(NotifPromoter filter) { + private void onPromoterInvalidated(NotifPromoter promoter) { Assert.isMainThread(); - mNotifLog.log(NotifEvent.PROMOTER_INVALIDATED, String.format( - "NotifPromoter \"%s\" invalidated; pipeline state is %d", - filter.getName(), - mPipelineState.getState())); + mLogger.logPromoterInvalidated(promoter.getName(), mPipelineState.getState()); rebuildListIfBefore(STATE_TRANSFORMING); } @@ -237,10 +231,7 @@ public class ShadeListBuilder implements Dumpable { private void onNotifSectionInvalidated(NotifSection section) { Assert.isMainThread(); - mNotifLog.log(NotifEvent.SECTION_INVALIDATED, String.format( - "Section \"%s\" invalidated; pipeline state is %d", - section.getName(), - mPipelineState.getState())); + mLogger.logNotifSectionInvalidated(section.getName(), mPipelineState.getState()); rebuildListIfBefore(STATE_SORTING); } @@ -248,10 +239,7 @@ public class ShadeListBuilder implements Dumpable { private void onPreRenderFilterInvalidated(NotifFilter filter) { Assert.isMainThread(); - mNotifLog.log(NotifEvent.PRE_RENDER_FILTER_INVALIDATED, String.format( - "Filter \"%s\" invalidated; pipeline state is %d", - filter.getName(), - mPipelineState.getState())); + mLogger.logPreRenderFilterInvalidated(filter.getName(), mPipelineState.getState()); rebuildListIfBefore(STATE_PRE_RENDER_FILTERING); } @@ -259,10 +247,7 @@ public class ShadeListBuilder implements Dumpable { private void onNotifComparatorInvalidated(NotifComparator comparator) { Assert.isMainThread(); - mNotifLog.log(NotifEvent.COMPARATOR_INVALIDATED, String.format( - "Comparator \"%s\" invalidated; pipeline state is %d", - comparator.getName(), - mPipelineState.getState())); + mLogger.logNotifComparatorInvalidated(comparator.getName(), mPipelineState.getState()); rebuildListIfBefore(STATE_SORTING); } @@ -288,7 +273,7 @@ public class ShadeListBuilder implements Dumpable { * if we detect that behavior, we should crash instantly. */ private void buildList() { - mNotifLog.log(NotifEvent.START_BUILD_LIST, "Run #" + mIterationCount + "..."); + mLogger.logStartBuildList(mIterationCount); mPipelineState.requireIsBefore(STATE_BUILD_STARTED); mPipelineState.setState(STATE_BUILD_STARTED); @@ -334,16 +319,16 @@ public class ShadeListBuilder implements Dumpable { freeEmptyGroups(); // Step 6: Dispatch the new list, first to any listeners and then to the view layer - mNotifLog.log(NotifEvent.DISPATCH_FINAL_LIST, "List finalized, is:\n" - + ListDumper.dumpTree(mNotifList, false, "\t\t")); + if (mIterationCount % 10 == 0) { + mLogger.logFinalList(mNotifList); + } dispatchOnBeforeRenderList(mReadOnlyNotifList); if (mOnRenderListListener != null) { mOnRenderListListener.onRenderList(mReadOnlyNotifList); } // Step 7: We're done! - mNotifLog.log(NotifEvent.LIST_BUILD_COMPLETE, - "Notif list build #" + mIterationCount + " completed"); + mLogger.logEndBuildList(mIterationCount); mPipelineState.setState(STATE_IDLE); mIterationCount++; } @@ -429,11 +414,10 @@ public class ShadeListBuilder implements Dumpable { if (existingSummary == null) { group.setSummary(entry); } else { - mNotifLog.log(NotifEvent.WARN, String.format( - "Duplicate summary for group '%s': '%s' vs. '%s'", + mLogger.logDuplicateSummary( group.getKey(), existingSummary.getKey(), - entry.getKey())); + entry.getKey()); // Use whichever one was posted most recently if (entry.getSbn().getPostTime() @@ -452,8 +436,7 @@ public class ShadeListBuilder implements Dumpable { final String topLevelKey = entry.getKey(); if (mGroups.containsKey(topLevelKey)) { - mNotifLog.log(NotifEvent.WARN, - "Duplicate non-group top-level key: " + topLevelKey); + mLogger.logDuplicateTopLevelKey(topLevelKey); } else { entry.setParent(ROOT_ENTRY); out.add(entry); @@ -617,24 +600,22 @@ public class ShadeListBuilder implements Dumpable { private void logParentingChanges() { for (NotificationEntry entry : mAllEntries) { if (entry.getParent() != entry.getPreviousParent()) { - mNotifLog.log(NotifEvent.PARENT_CHANGED, String.format( - "%s: parent changed from %s to %s", + mLogger.logParentChanged( entry.getKey(), entry.getPreviousParent() == null - ? "null" : entry.getPreviousParent().getKey(), + ? null : entry.getPreviousParent().getKey(), entry.getParent() == null - ? "null" : entry.getParent().getKey())); + ? null : entry.getParent().getKey()); } } for (GroupEntry group : mGroups.values()) { if (group.getParent() != group.getPreviousParent()) { - mNotifLog.log(NotifEvent.PARENT_CHANGED, String.format( - "%s: parent changed from %s to %s", + mLogger.logParentChanged( group.getKey(), group.getPreviousParent() == null - ? "null" : group.getPreviousParent().getKey(), + ? null : group.getPreviousParent().getKey(), group.getParent() == null - ? "null" : group.getParent().getKey())); + ? null : group.getParent().getKey()); } } } @@ -684,23 +665,10 @@ public class ShadeListBuilder implements Dumpable { NotifFilter filter = findRejectingFilter(entry, now, filters); if (filter != entry.mExcludingFilter) { - if (entry.mExcludingFilter == null) { - mNotifLog.log(NotifEvent.FILTER_CHANGED, String.format( - "%s: filtered out by '%s'", - entry.getKey(), - filter.getName())); - } else if (filter == null) { - mNotifLog.log(NotifEvent.FILTER_CHANGED, String.format( - "%s: no longer filtered out (previous filter was '%s')", - entry.getKey(), - entry.mExcludingFilter.getName())); - } else { - mNotifLog.log(NotifEvent.FILTER_CHANGED, String.format( - "%s: filter changed: '%s' -> '%s'", - entry.getKey(), - entry.mExcludingFilter, - filter)); - } + mLogger.logFilterChanged( + entry.getKey(), + entry.mExcludingFilter != null ? entry.mExcludingFilter.getName() : null, + filter != null ? filter.getName() : null); // Note that groups and summaries can also be filtered out later if they're part of a // malformed group. We currently don't have a great way to track that beyond parenting @@ -728,23 +696,10 @@ public class ShadeListBuilder implements Dumpable { NotifPromoter promoter = findPromoter(entry); if (promoter != entry.mNotifPromoter) { - if (entry.mNotifPromoter == null) { - mNotifLog.log(NotifEvent.PROMOTER_CHANGED, String.format( - "%s: Entry promoted to top level by '%s'", - entry.getKey(), - promoter.getName())); - } else if (promoter == null) { - mNotifLog.log(NotifEvent.PROMOTER_CHANGED, String.format( - "%s: Entry is no longer promoted to top level (previous promoter was '%s')", - entry.getKey(), - entry.mNotifPromoter.getName())); - } else { - mNotifLog.log(NotifEvent.PROMOTER_CHANGED, String.format( - "%s: Top-level promoter changed: '%s' -> '%s'", - entry.getKey(), - entry.mNotifPromoter, - promoter)); - } + mLogger.logPromoterChanged( + entry.getKey(), + entry.mNotifPromoter != null ? entry.mNotifPromoter.getName() : null, + promoter != null ? promoter.getName() : null); entry.mNotifPromoter = promoter; } @@ -767,21 +722,12 @@ public class ShadeListBuilder implements Dumpable { final Integer sectionIndex = sectionWithIndex.second; if (section != entry.mNotifSection) { - if (entry.mNotifSection == null) { - mNotifLog.log(NotifEvent.SECTION_CHANGED, String.format( - "%s: sectioned by '%s' [index=%d].", - entry.getKey(), - section.getName(), - sectionIndex)); - } else { - mNotifLog.log(NotifEvent.SECTION_CHANGED, String.format( - "%s: section changed: '%s' [index=%d] -> '%s [index=%d]'.", - entry.getKey(), - entry.mNotifSection, - entry.getSection(), - section, - sectionIndex)); - } + mLogger.logSectionChanged( + entry.getKey(), + entry.mNotifSection != null ? entry.mNotifSection.getName() : null, + entry.getSection(), + section.getName(), + sectionIndex); entry.mNotifSection = section; entry.setSection(sectionIndex); @@ -826,7 +772,7 @@ public class ShadeListBuilder implements Dumpable { } @Override - public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + public void dump(@NonNull FileDescriptor fd, PrintWriter pw, @NonNull String[] args) { pw.println("\t" + TAG + " shade notifications:"); if (getShadeList().size() == 0) { pw.println("\t\t None"); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescer.java index f5890386a14f..98c45ffd6afb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescer.java @@ -16,11 +16,6 @@ package com.android.systemui.statusbar.notification.collection.coalescer; -import static com.android.systemui.statusbar.notification.logging.NotifEvent.BATCH_MAX_TIMEOUT; -import static com.android.systemui.statusbar.notification.logging.NotifEvent.COALESCED_EVENT; -import static com.android.systemui.statusbar.notification.logging.NotifEvent.EARLY_BATCH_EMIT; -import static com.android.systemui.statusbar.notification.logging.NotifEvent.EMIT_EVENT_BATCH; - import static java.util.Objects.requireNonNull; import android.annotation.MainThread; @@ -35,7 +30,6 @@ import com.android.systemui.Dumpable; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationListener.NotificationHandler; -import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.time.SystemClock; @@ -71,7 +65,7 @@ import javax.inject.Inject; public class GroupCoalescer implements Dumpable { private final DelayableExecutor mMainExecutor; private final SystemClock mClock; - private final NotifLog mLog; + private final GroupCoalescerLogger mLogger; private final long mMinGroupLingerDuration; private final long mMaxGroupLingerDuration; @@ -83,8 +77,9 @@ public class GroupCoalescer implements Dumpable { @Inject public GroupCoalescer( @Main DelayableExecutor mainExecutor, - SystemClock clock, NotifLog log) { - this(mainExecutor, clock, log, MIN_GROUP_LINGER_DURATION, MAX_GROUP_LINGER_DURATION); + SystemClock clock, + GroupCoalescerLogger logger) { + this(mainExecutor, clock, logger, MIN_GROUP_LINGER_DURATION, MAX_GROUP_LINGER_DURATION); } /** @@ -98,12 +93,12 @@ public class GroupCoalescer implements Dumpable { GroupCoalescer( @Main DelayableExecutor mainExecutor, SystemClock clock, - NotifLog log, + GroupCoalescerLogger logger, long minGroupLingerDuration, long maxGroupLingerDuration) { mMainExecutor = mainExecutor; mClock = clock; - mLog = log; + mLogger = logger; mMinGroupLingerDuration = minGroupLingerDuration; mMaxGroupLingerDuration = maxGroupLingerDuration; } @@ -129,7 +124,7 @@ public class GroupCoalescer implements Dumpable { final boolean shouldCoalesce = handleNotificationPosted(sbn, rankingMap); if (shouldCoalesce) { - mLog.log(COALESCED_EVENT, String.format("Coalesced notification %s", sbn.getKey())); + mLogger.logEventCoalesced(sbn.getKey()); mHandler.onNotificationRankingUpdate(rankingMap); } else { mHandler.onNotificationPosted(sbn, rankingMap); @@ -164,15 +159,11 @@ public class GroupCoalescer implements Dumpable { final CoalescedEvent event = mCoalescedEvents.get(sbn.getKey()); final EventBatch batch = mBatches.get(sbn.getGroupKey()); if (event != null) { - mLog.log(EARLY_BATCH_EMIT, - String.format("Modification of %s triggered early emit of batched group %s", - sbn.getKey(), requireNonNull(event.getBatch()).mGroupKey)); + mLogger.logEarlyEmit(sbn.getKey(), requireNonNull(event.getBatch()).mGroupKey); emitBatch(requireNonNull(event.getBatch())); } else if (batch != null && mClock.uptimeMillis() - batch.mCreatedTimestamp >= mMaxGroupLingerDuration) { - mLog.log(BATCH_MAX_TIMEOUT, - String.format("Modification of %s triggered timeout emit of batched group %s", - sbn.getKey(), batch.mGroupKey)); + mLogger.logMaxBatchTimeout(sbn.getKey(), batch.mGroupKey); emitBatch(batch); } } @@ -253,7 +244,7 @@ public class GroupCoalescer implements Dumpable { } events.sort(mEventComparator); - mLog.log(EMIT_EVENT_BATCH, "Emitting event batch for group " + batch.mGroupKey); + mLogger.logEmitBatch(batch.mGroupKey); mHandler.onNotificationBatchPosted(events); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt new file mode 100644 index 000000000000..6e8788db59d7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2020 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.collection.coalescer + +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.dagger.NotificationLog +import javax.inject.Inject + +class GroupCoalescerLogger @Inject constructor( + @NotificationLog private val buffer: LogBuffer +) { + fun logEventCoalesced(key: String) { + buffer.log(TAG, LogLevel.INFO, { + str1 = key + }, { + "COALESCED: $str1" + }) + } + + fun logEmitBatch(groupKey: String) { + buffer.log(TAG, LogLevel.DEBUG, { + str1 = groupKey + }, { + "Emitting event batch for group $str1" + }) + } + + fun logEarlyEmit(modifiedKey: String, groupKey: String) { + buffer.log(TAG, LogLevel.DEBUG, { + str1 = modifiedKey + str2 = groupKey + }, { + "Modification of notif $str1 triggered early emit of batched group $str2" + }) + } + + fun logMaxBatchTimeout(modifiedKey: String, groupKey: String) { + buffer.log(TAG, LogLevel.INFO, { + str1 = modifiedKey + str2 = groupKey + }, { + "Modification of notif $str1 triggered TIMEOUT emit of batched group $str2" + }) + } +} + +private const val TAG = "GroupCoalescer"
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt new file mode 100644 index 000000000000..6e15043973f7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt @@ -0,0 +1,217 @@ +/* + * Copyright (C) 2020 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.collection.listbuilder + +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.INFO +import com.android.systemui.log.LogLevel.WARNING +import com.android.systemui.log.dagger.NotificationLog +import com.android.systemui.statusbar.notification.collection.GroupEntry +import com.android.systemui.statusbar.notification.collection.ListEntry +import javax.inject.Inject + +class ShadeListBuilderLogger @Inject constructor( + @NotificationLog private val buffer: LogBuffer +) { + fun logOnBuildList() { + buffer.log(TAG, INFO, { + }, { + "Request received from NotifCollection" + }) + } + + fun logStartBuildList(iterationCount: Int) { + buffer.log(TAG, INFO, { + int1 = iterationCount + }, { + "Starting to build shade list (run #$int1)" + }) + } + + fun logEndBuildList(iterationCount: Int) { + buffer.log(TAG, INFO, { + int1 = iterationCount + }, { + "Finished building shade list (run #$int1)" + }) + } + + fun logPreGroupFilterInvalidated(filterName: String, pipelineState: Int) { + buffer.log(TAG, DEBUG, { + str1 = filterName + int1 = pipelineState + }, { + """Pre-group NotifFilter "$str1" invalidated; pipeline state is $int1""" + }) + } + + fun logPromoterInvalidated(name: String, pipelineState: Int) { + buffer.log(TAG, DEBUG, { + str1 = name + int1 = pipelineState + }, { + """NotifPromoter "$str1" invalidated; pipeline state is $int1""" + }) + } + + fun logNotifSectionInvalidated(name: String, pipelineState: Int) { + buffer.log(TAG, DEBUG, { + str1 = name + int1 = pipelineState + }, { + """NotifSection "$str1" invalidated; pipeline state is $int1""" + }) + } + + fun logNotifComparatorInvalidated(name: String, pipelineState: Int) { + buffer.log(TAG, DEBUG, { + str1 = name + int1 = pipelineState + }, { + """NotifComparator "$str1" invalidated; pipeline state is $int1""" + }) + } + + fun logPreRenderFilterInvalidated(name: String, pipelineState: Int) { + buffer.log(TAG, DEBUG, { + str1 = name + int1 = pipelineState + }, { + """Pre-render NotifFilter "$str1" invalidated; pipeline state is $int1""" + }) + } + + fun logDuplicateSummary(groupKey: String, existingKey: String, newKey: String) { + buffer.log(TAG, WARNING, { + str1 = groupKey + str2 = existingKey + str3 = newKey + }, { + """Duplicate summary for group "$str1": "$str2" vs. "$str3"""" + }) + } + + fun logDuplicateTopLevelKey(topLevelKey: String) { + buffer.log(TAG, WARNING, { + str1 = topLevelKey + }, { + "Duplicate top-level key: $str1" + }) + } + + fun logParentChanged(key: String, prevParent: String?, newParent: String?) { + buffer.log(TAG, INFO, { + str1 = key + str2 = prevParent + str3 = newParent + }, { + "Parent change for $str1: $str2 -> $str3" + }) + } + + fun logFilterChanged( + key: String, + prevFilter: String?, + newFilter: String? + ) { + buffer.log(TAG, INFO, { + str1 = key + str2 = prevFilter + str3 = newFilter + }, { + "Filter changed for $str1: $str2 -> $str3" + }) + } + + fun logPromoterChanged( + key: String, + prevPromoter: String?, + newPromoter: String? + ) { + buffer.log(TAG, INFO, { + str1 = key + str2 = prevPromoter + str3 = newPromoter + }, { + "Promoter changed for $str1: $str2 -> $str3" + }) + } + + fun logSectionChanged( + key: String, + prevSection: String?, + prevIndex: Int, + section: String, + index: Int + ) { + buffer.log(TAG, INFO, { + str1 = key + str2 = section + int1 = index + str3 = prevSection + int2 = prevIndex + }, { + if (str3 == null) { + "Section assigned for $str1: '$str2' (#$int1)" + } else { + "Section changed for $str1: '$str3' (#$int2) -> '$str2' (#$int1)" + } + }) + } + + fun logFinalList(entries: List<ListEntry>) { + buffer.log(TAG, DEBUG, { + int1 = entries.size + }, { + "List is finalized ($int1 top-level entries):" + }) + if (entries.isEmpty()) { + buffer.log(TAG, DEBUG, {}, { "(empty list)" }) + } + for (i in entries.indices) { + val entry = entries[i] + buffer.log(TAG, DEBUG, { + int1 = i + str1 = entry.key + }, { + "[$int1] $str1" + }) + + if (entry is GroupEntry) { + entry.summary?.let { + buffer.log(TAG, DEBUG, { + str1 = it.key + }, { + " [*] $str1 (summary)" + }) + } + for (j in entry.children.indices) { + val child = entry.children[j] + buffer.log(TAG, DEBUG, { + int1 = j + str1 = child.key + }, { + " [$int1] $str1" + }) + } + } + } + } +} + +private const val TAG = "ShadeListBuilder"
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt new file mode 100644 index 000000000000..bd1bd860f80c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2020 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.collection.notifcollection + +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.dagger.NotificationLog +import javax.inject.Inject + +class NotifCollectionLogger @Inject constructor( + @NotificationLog private val buffer: LogBuffer +) { + fun logNotifPosted(key: String) { + buffer.log(TAG, LogLevel.INFO, { + str1 = key + }, { + "POSTED $str1" + }) + } + + fun logNotifGroupPosted(groupKey: String, batchSize: Int) { + buffer.log(TAG, LogLevel.INFO, { + str1 = groupKey + int1 = batchSize + }, { + "POSTED GROUP $str1 ($int1 events)" + }) + } + + fun logNotifUpdated(key: String) { + buffer.log(TAG, LogLevel.INFO, { + str1 = key + }, { + "UPDATED $str1" + }) + } + + fun logNotifRemoved(key: String, reason: Int) { + buffer.log(TAG, LogLevel.INFO, { + str1 = key + int1 = reason + }, { + "REMOVED $str1 reason=$int1" + }) + } +} + +private const val TAG = "NotifCollection"
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/HighPriorityProvider.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/HighPriorityProvider.java index b49611688bc7..0d9beaefbf8d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/HighPriorityProvider.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/HighPriorityProvider.java @@ -63,6 +63,10 @@ public class HighPriorityProvider { } final NotificationEntry notifEntry = entry.getRepresentativeEntry(); + if (notifEntry == null) { + return false; + } + return notifEntry.getRanking().getImportance() >= NotificationManager.IMPORTANCE_DEFAULT || hasHighPriorityCharacteristics(notifEntry) || hasHighPriorityChild(entry); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java index 18c755da53ff..6045524f30b6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java @@ -29,6 +29,7 @@ import static com.android.systemui.statusbar.notification.row.NotificationConver import static com.android.systemui.statusbar.notification.row.NotificationConversationInfo.UpdateChannelRunnable.ACTION_HOME; import static com.android.systemui.statusbar.notification.row.NotificationConversationInfo.UpdateChannelRunnable.ACTION_MUTE; import static com.android.systemui.statusbar.notification.row.NotificationConversationInfo.UpdateChannelRunnable.ACTION_SNOOZE; +import static com.android.systemui.statusbar.notification.row.NotificationConversationInfo.UpdateChannelRunnable.ACTION_UNBUBBLE; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -121,7 +122,7 @@ public class NotificationConversationInfo extends LinearLayout implements boolean mSkipPost = false; private OnClickListener mOnBubbleClick = v -> { - mSelectedAction = ACTION_BUBBLE; + mSelectedAction = mStartedAsBubble ? ACTION_UNBUBBLE : ACTION_BUBBLE; if (mStartedAsBubble) { mBubbleController.onUserDemotedBubbleFromNotification(mEntry); } else { @@ -586,6 +587,7 @@ public class NotificationConversationInfo extends LinearLayout implements static final int ACTION_SNOOZE = 3; static final int ACTION_MUTE = 4; static final int ACTION_DEMOTE = 5; + static final int ACTION_UNBUBBLE = 6; private final INotificationManager mINotificationManager; private final String mAppPkg; @@ -606,9 +608,17 @@ public class NotificationConversationInfo extends LinearLayout implements @Override public void run() { try { + boolean channelSettingChanged = mAction != ACTION_HOME && mAction != ACTION_SNOOZE; switch (mAction) { case ACTION_BUBBLE: - mChannelToUpdate.setAllowBubbles(!mChannelToUpdate.canBubble()); + case ACTION_UNBUBBLE: + boolean canBubble = mAction == ACTION_BUBBLE; + if (mChannelToUpdate.canBubble() != canBubble) { + channelSettingChanged = true; + mChannelToUpdate.setAllowBubbles(canBubble); + } else { + channelSettingChanged = false; + } break; case ACTION_FAVORITE: // TODO: extend beyond DND @@ -629,7 +639,7 @@ public class NotificationConversationInfo extends LinearLayout implements } - if (mAction != ACTION_HOME && mAction != ACTION_SNOOZE) { + if (channelSettingChanged) { mINotificationManager.updateNotificationChannelForPackage( mAppPkg, mAppUid, mChannelToUpdate); } diff --git a/packages/SystemUI/src/com/android/systemui/wm/SystemWindows.java b/packages/SystemUI/src/com/android/systemui/wm/SystemWindows.java index 5aba013a7fb8..adce1248b04b 100644 --- a/packages/SystemUI/src/com/android/systemui/wm/SystemWindows.java +++ b/packages/SystemUI/src/com/android/systemui/wm/SystemWindows.java @@ -239,12 +239,12 @@ public class SystemWindows { Rect outVisibleInsets, Rect outStableInsets, DisplayCutout.ParcelableWrapper cutout, MergedConfiguration mergedConfiguration, SurfaceControl outSurfaceControl, InsetsState outInsetsState, - Point outSurfaceSize) { + Point outSurfaceSize, SurfaceControl outBLASTSurfaceControl) { int res = super.relayout(window, seq, attrs, requestedWidth, requestedHeight, viewVisibility, flags, frameNumber, outFrame, outOverscanInsets, outContentInsets, outVisibleInsets, outStableInsets, cutout, mergedConfiguration, outSurfaceControl, outInsetsState, - outSurfaceSize); + outSurfaceSize, outBLASTSurfaceControl); if (res != 0) { return res; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java index 2c9058afd7ab..28f01da56f06 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java @@ -282,7 +282,7 @@ public class BubbleControllerTest extends SysuiTestCase { mRow.getEntry().getKey())); // Make it look like dismissed notif - mBubbleData.getBubbleWithKey(mRow.getEntry().getKey()).setShowInShade(false); + mBubbleData.getBubbleWithKey(mRow.getEntry().getKey()).setSuppressNotification(true); // Now remove the bubble mBubbleController.removeBubble( @@ -372,7 +372,8 @@ public class BubbleControllerTest extends SysuiTestCase { // Switch which bubble is expanded mBubbleController.selectBubble(mRow.getEntry().getKey()); - mBubbleController.expandStack(); + mBubbleData.setExpanded(true); + assertEquals(mRow.getEntry(), stackView.getExpandedBubble().getEntry()); assertTrue(mBubbleController.isBubbleNotificationSuppressedFromShade( mRow.getEntry().getKey())); @@ -571,7 +572,6 @@ public class BubbleControllerTest extends SysuiTestCase { verify(mBubbleStateChangeListener).onHasBubblesChanged(true /* hasBubbles */); } - @Test public void testExpandStackAndSelectBubble_removedFirst() { final String key = mRow.getEntry().getKey(); @@ -724,6 +724,52 @@ public class BubbleControllerTest extends SysuiTestCase { assertFalse(intercepted); } + @Test + public void testNotifyShadeSuppressionChange_notificationDismiss() { + BubbleController.NotificationSuppressionChangedListener listener = + mock(BubbleController.NotificationSuppressionChangedListener.class); + mBubbleData.setSuppressionChangedListener(listener); + + mEntryListener.onNotificationAdded(mRow.getEntry()); + + assertTrue(mBubbleController.hasBubbles()); + assertFalse(mBubbleController.isBubbleNotificationSuppressedFromShade( + mRow.getEntry().getKey())); + + mRemoveInterceptor.onNotificationRemoveRequested(mRow.getEntry().getKey(), REASON_CANCEL); + + // Should update show in shade state + assertTrue(mBubbleController.isBubbleNotificationSuppressedFromShade( + mRow.getEntry().getKey())); + + // Should notify delegate that shade state changed + verify(listener).onBubbleNotificationSuppressionChange( + mBubbleData.getBubbleWithKey(mRow.getEntry().getKey())); + } + + @Test + public void testNotifyShadeSuppressionChange_bubbleExpanded() { + BubbleController.NotificationSuppressionChangedListener listener = + mock(BubbleController.NotificationSuppressionChangedListener.class); + mBubbleData.setSuppressionChangedListener(listener); + + mEntryListener.onNotificationAdded(mRow.getEntry()); + + assertTrue(mBubbleController.hasBubbles()); + assertFalse(mBubbleController.isBubbleNotificationSuppressedFromShade( + mRow.getEntry().getKey())); + + mBubbleData.setExpanded(true); + + // Once a bubble is expanded the notif is suppressed + assertTrue(mBubbleController.isBubbleNotificationSuppressedFromShade( + mRow.getEntry().getKey())); + + // Should notify delegate that shade state changed + verify(listener).onBubbleNotificationSuppressionChange( + mBubbleData.getBubbleWithKey(mRow.getEntry().getKey())); + } + static class TestableBubbleController extends BubbleController { // Let's assume surfaces can be synchronized immediately. TestableBubbleController(Context context, diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java index 1a2e23796c78..c9f5b40e8f9f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java @@ -104,6 +104,9 @@ public class BubbleDataTest extends SysuiTestCase { @Captor private ArgumentCaptor<BubbleData.Update> mUpdateCaptor; + @Mock + private BubbleController.NotificationSuppressionChangedListener mSuppressionListener; + @Before public void setUp() throws Exception { mNotificationTestHelper = new NotificationTestHelper(mContext, mDependency); @@ -121,20 +124,20 @@ public class BubbleDataTest extends SysuiTestCase { modifyRanking(mEntryInterruptive) .setVisuallyInterruptive(true) .build(); - mBubbleInterruptive = new Bubble(mEntryInterruptive); + mBubbleInterruptive = new Bubble(mEntryInterruptive, mSuppressionListener); ExpandableNotificationRow row = mNotificationTestHelper.createBubble(); mEntryDismissed = createBubbleEntry(1, "dismissed", "package.d"); mEntryDismissed.setRow(row); - mBubbleDismissed = new Bubble(mEntryDismissed); + mBubbleDismissed = new Bubble(mEntryDismissed, mSuppressionListener); - mBubbleA1 = new Bubble(mEntryA1); - mBubbleA2 = new Bubble(mEntryA2); - mBubbleA3 = new Bubble(mEntryA3); - mBubbleB1 = new Bubble(mEntryB1); - mBubbleB2 = new Bubble(mEntryB2); - mBubbleB3 = new Bubble(mEntryB3); - mBubbleC1 = new Bubble(mEntryC1); + mBubbleA1 = new Bubble(mEntryA1, mSuppressionListener); + mBubbleA2 = new Bubble(mEntryA2, mSuppressionListener); + mBubbleA3 = new Bubble(mEntryA3, mSuppressionListener); + mBubbleB1 = new Bubble(mEntryB1, mSuppressionListener); + mBubbleB2 = new Bubble(mEntryB2, mSuppressionListener); + mBubbleB3 = new Bubble(mEntryB3, mSuppressionListener); + mBubbleC1 = new Bubble(mEntryC1, mSuppressionListener); mBubbleData = new BubbleData(getContext()); @@ -237,9 +240,8 @@ public class BubbleDataTest extends SysuiTestCase { true /* showInShade */); verifyUpdateReceived(); - // Make it look like user swiped away row - mEntryDismissed.getRow().dismiss(false /* refocusOnDismiss */); - assertThat(mBubbleData.getBubbleWithKey(mBubbleDismissed.getKey()).showInShade()).isFalse(); + // Suppress the notif / make it look dismissed + mBubbleDismissed.setSuppressNotification(true); mBubbleData.notificationEntryUpdated(mBubbleDismissed, false /* suppressFlyout */, true /* showInShade */); diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleTest.java b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleTest.java index 02f721ce58a7..7f67657e1109 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleTest.java @@ -16,11 +16,19 @@ package com.android.systemui.bubbles; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; import android.app.Notification; +import android.app.PendingIntent; +import android.content.Intent; +import android.graphics.drawable.Icon; import android.os.Bundle; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; @@ -30,6 +38,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; +import com.android.systemui.tests.R; import org.junit.Before; import org.junit.Test; @@ -46,6 +55,10 @@ public class BubbleTest extends SysuiTestCase { private NotificationEntry mEntry; private Bundle mExtras; + private Bubble mBubble; + + @Mock + private BubbleController.NotificationSuppressionChangedListener mSuppressionListener; @Before public void setUp() { @@ -57,6 +70,15 @@ public class BubbleTest extends SysuiTestCase { mEntry = new NotificationEntryBuilder() .setNotification(mNotif) .build(); + + mBubble = new Bubble(mEntry, mSuppressionListener); + + Intent target = new Intent(mContext, BubblesTestActivity.class); + Notification.BubbleMetadata metadata = new Notification.BubbleMetadata.Builder() + .createIntentBubble(PendingIntent.getActivity(mContext, 0, target, 0), + Icon.createWithResource(mContext, R.drawable.android)) + .build(); + mEntry.setBubbleMetadata(metadata); } @Test @@ -123,4 +145,24 @@ public class BubbleTest extends SysuiTestCase { BubbleViewInfoTask.extractFlyoutMessage(mContext, mEntry).senderName); } + + @Test + public void testSuppressionListener_change_notified() { + assertThat(mBubble.showInShade()).isTrue(); + + mBubble.setSuppressNotification(true); + + assertThat(mBubble.showInShade()).isFalse(); + + verify(mSuppressionListener).onBubbleNotificationSuppressionChange(mBubble); + } + + @Test + public void testSuppressionListener_noChange_doesntNotify() { + assertThat(mBubble.showInShade()).isTrue(); + + mBubble.setSuppressNotification(false); + + verify(mSuppressionListener, never()).onBubbleNotificationSuppressionChange(any()); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/pip/PipBoundsHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/pip/PipBoundsHandlerTest.java new file mode 100644 index 000000000000..bc3ce8baddee --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/pip/PipBoundsHandlerTest.java @@ -0,0 +1,240 @@ +/* + * Copyright (C) 2020 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.pip; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.verify; + +import android.content.ComponentName; +import android.graphics.Rect; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; +import android.testing.TestableResources; +import android.view.DisplayInfo; +import android.view.Gravity; +import android.view.IPinnedStackController; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +/** + * Unit tests against {@link PipBoundsHandler}, including but not limited to: + * - default/movement bounds + * - save/restore PiP position on application lifecycle + * - save/restore PiP position on screen rotation + */ +@RunWith(AndroidTestingRunner.class) +@SmallTest +@TestableLooper.RunWithLooper(setAsMainLooper = true) +public class PipBoundsHandlerTest extends SysuiTestCase { + private static final int ROUNDING_ERROR_MARGIN = 10; + + private PipBoundsHandler mPipBoundsHandler; + private DisplayInfo mDefaultDisplayInfo; + private Rect mDefaultDisplayRect; + + @Mock + private IPinnedStackController mPinnedStackController; + + @Before + public void setUp() throws Exception { + mPipBoundsHandler = new PipBoundsHandler(mContext); + MockitoAnnotations.initMocks(this); + initializeMockResources(); + + mPipBoundsHandler.onDisplayInfoChanged(mDefaultDisplayInfo); + mPipBoundsHandler.setPinnedStackController(mPinnedStackController); + } + + private void initializeMockResources() { + final TestableResources res = mContext.getOrCreateTestableResources(); + res.addOverride( + com.android.internal.R.dimen.config_pictureInPictureDefaultAspectRatio, 1f); + res.addOverride( + com.android.internal.R.integer.config_defaultPictureInPictureGravity, + Gravity.END | Gravity.BOTTOM); + res.addOverride( + com.android.internal.R.dimen.default_minimal_size_pip_resizable_task, 100); + res.addOverride( + com.android.internal.R.string.config_defaultPictureInPictureScreenEdgeInsets, + "16x16"); + res.addOverride( + com.android.internal.R.dimen.config_pictureInPictureMinAspectRatio, 0.5f); + res.addOverride( + com.android.internal.R.dimen.config_pictureInPictureMaxAspectRatio, 2f); + + mDefaultDisplayInfo = new DisplayInfo(); + mDefaultDisplayInfo.displayId = 1; + mDefaultDisplayInfo.logicalWidth = 1000; + mDefaultDisplayInfo.logicalHeight = 1500; + mDefaultDisplayRect = new Rect(0, 0, + mDefaultDisplayInfo.logicalWidth, mDefaultDisplayInfo.logicalHeight); + } + + @Test + public void setShelfHeight_offsetBounds() throws Exception { + final ArgumentCaptor<Rect> destinationBounds = ArgumentCaptor.forClass(Rect.class); + final int shelfHeight = 100; + + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + final Rect lastPosition = destinationBounds.getValue(); + // Reset the pinned stack controller since we will do another verify later on + reset(mPinnedStackController); + + mPipBoundsHandler.setShelfHeight(true, shelfHeight); + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + lastPosition.offset(0, -shelfHeight); + assertBoundsWithMargin("PiP bounds offset by shelf height", + lastPosition, destinationBounds.getValue()); + } + + @Test + public void onImeVisibilityChanged_offsetBounds() throws Exception { + final ArgumentCaptor<Rect> destinationBounds = ArgumentCaptor.forClass(Rect.class); + final int imeHeight = 100; + + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + final Rect lastPosition = destinationBounds.getValue(); + // Reset the pinned stack controller since we will do another verify later on + reset(mPinnedStackController); + + mPipBoundsHandler.onImeVisibilityChanged(true, imeHeight); + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + lastPosition.offset(0, -imeHeight); + assertBoundsWithMargin("PiP bounds offset by IME height", + lastPosition, destinationBounds.getValue()); + } + + @Test + public void onPrepareAnimation_startAnimation() throws Exception { + final Rect sourceRectHint = new Rect(100, 100, 200, 200); + final ArgumentCaptor<Rect> destinationBounds = ArgumentCaptor.forClass(Rect.class); + + mPipBoundsHandler.onPrepareAnimation(sourceRectHint, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), eq(sourceRectHint), anyInt()); + final Rect capturedDestinationBounds = destinationBounds.getValue(); + assertFalse("Destination bounds is not empty", + capturedDestinationBounds.isEmpty()); + assertBoundsWithMargin("Destination bounds within Display", + mDefaultDisplayRect, capturedDestinationBounds); + } + + @Test + public void onSaveReentryBounds_restoreLastPosition() throws Exception { + final ComponentName componentName = new ComponentName(mContext, "component1"); + final ArgumentCaptor<Rect> destinationBounds = ArgumentCaptor.forClass(Rect.class); + + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + final Rect lastPosition = destinationBounds.getValue(); + lastPosition.offset(0, -100); + mPipBoundsHandler.onSaveReentryBounds(componentName, lastPosition); + // Reset the pinned stack controller since we will do another verify later on + reset(mPinnedStackController); + + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + assertBoundsWithMargin("Last position is restored", + lastPosition, destinationBounds.getValue()); + } + + @Test + public void onResetReentryBounds_componentMatch_useDefaultBounds() throws Exception { + final ComponentName componentName = new ComponentName(mContext, "component1"); + final ArgumentCaptor<Rect> destinationBounds = ArgumentCaptor.forClass(Rect.class); + + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + final Rect defaultBounds = new Rect(destinationBounds.getValue()); + final Rect newBounds = new Rect(defaultBounds); + newBounds.offset(0, -100); + mPipBoundsHandler.onSaveReentryBounds(componentName, newBounds); + // Reset the pinned stack controller since we will do another verify later on + reset(mPinnedStackController); + + mPipBoundsHandler.onResetReentryBounds(componentName); + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + final Rect actualBounds = destinationBounds.getValue(); + assertBoundsWithMargin("Use default bounds", defaultBounds, actualBounds); + } + + @Test + public void onResetReentryBounds_componentMismatch_restoreLastPosition() throws Exception { + final ComponentName componentName = new ComponentName(mContext, "component1"); + final ArgumentCaptor<Rect> destinationBounds = ArgumentCaptor.forClass(Rect.class); + + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + final Rect defaultBounds = new Rect(destinationBounds.getValue()); + final Rect newBounds = new Rect(defaultBounds); + newBounds.offset(0, -100); + mPipBoundsHandler.onSaveReentryBounds(componentName, newBounds); + // Reset the pinned stack controller since we will do another verify later on + reset(mPinnedStackController); + + mPipBoundsHandler.onResetReentryBounds(new ComponentName(mContext, "component2")); + mPipBoundsHandler.onPrepareAnimation(null, 1f, null); + + verify(mPinnedStackController).startAnimation( + destinationBounds.capture(), isNull(), anyInt()); + final Rect actualBounds = destinationBounds.getValue(); + assertBoundsWithMargin("Last position is restored", newBounds, actualBounds); + } + + private void assertBoundsWithMargin(String msg, Rect expected, Rect actual) { + expected.inset(-ROUNDING_ERROR_MARGIN, -ROUNDING_ERROR_MARGIN); + assertTrue(msg, expected.contains(actual)); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java index 0251f2d0f542..9a7e97b5d55a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java @@ -62,6 +62,7 @@ import com.android.systemui.statusbar.notification.collection.coalescer.GroupCoa import com.android.systemui.statusbar.notification.collection.notifcollection.CollectionReadyForBuildListener; import com.android.systemui.statusbar.notification.collection.notifcollection.DismissedByUserStats; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener; +import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionLogger; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender; import com.android.systemui.util.Assert; @@ -85,6 +86,7 @@ import java.util.Map; public class NotifCollectionTest extends SysuiTestCase { @Mock private IStatusBarService mStatusBarService; + @Mock private NotifCollectionLogger mLogger; @Mock private GroupCoalescer mGroupCoalescer; @Spy private RecordingCollectionListener mCollectionListener; @Mock private CollectionReadyForBuildListener mBuildListener; @@ -111,9 +113,11 @@ public class NotifCollectionTest extends SysuiTestCase { when(mFeatureFlags.isNewNotifPipelineRenderingEnabled()).thenReturn(true); when(mFeatureFlags.isNewNotifPipelineEnabled()).thenReturn(true); - mCollection = new NotifCollection(mStatusBarService, + mCollection = new NotifCollection( + mStatusBarService, mock(DumpController.class), - mFeatureFlags); + mFeatureFlags, + mLogger); mCollection.attach(mGroupCoalescer); mCollection.addCollectionListener(mCollectionListener); mCollection.setBuildListener(mBuildListener); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java index e915be37705b..18f133f09811 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java @@ -45,12 +45,12 @@ import com.android.systemui.statusbar.notification.collection.ShadeListBuilder.O import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeRenderListListener; import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeSortListener; import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeTransformGroupsListener; +import com.android.systemui.statusbar.notification.collection.listbuilder.ShadeListBuilderLogger; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSection; import com.android.systemui.statusbar.notification.collection.notifcollection.CollectionReadyForBuildListener; -import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.util.Assert; import com.android.systemui.util.time.FakeSystemClock; @@ -81,7 +81,7 @@ public class ShadeListBuilderTest extends SysuiTestCase { private ShadeListBuilder mListBuilder; private FakeSystemClock mSystemClock = new FakeSystemClock(); - @Mock private NotifLog mNotifLog; + @Mock private ShadeListBuilderLogger mLogger; @Mock private NotifCollection mNotifCollection; @Spy private OnBeforeTransformGroupsListener mOnBeforeTransformGroupsListener; @Spy private OnBeforeSortListener mOnBeforeSortListener; @@ -103,7 +103,7 @@ public class ShadeListBuilderTest extends SysuiTestCase { MockitoAnnotations.initMocks(this); Assert.sMainLooper = TestableLooper.get(this).getLooper(); - mListBuilder = new ShadeListBuilder(mSystemClock, mNotifLog, mock(DumpController.class)); + mListBuilder = new ShadeListBuilder(mSystemClock, mLogger, mock(DumpController.class)); mListBuilder.setOnRenderListListener(mOnRenderListListener); mListBuilder.attach(mNotifCollection); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerTest.java index 86c1eb97d186..ac9a57022f53 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerTest.java @@ -16,8 +16,6 @@ package com.android.systemui.statusbar.notification.collection.coalescer; -import static com.android.internal.util.Preconditions.checkNotNull; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.clearInvocations; @@ -25,6 +23,8 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static java.util.Objects.requireNonNull; + import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.NotificationListenerService.RankingMap; import android.service.notification.StatusBarNotification; @@ -39,7 +39,6 @@ import com.android.systemui.statusbar.RankingBuilder; import com.android.systemui.statusbar.notification.collection.NoManSimulator; import com.android.systemui.statusbar.notification.collection.NoManSimulator.NotifEvent; import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; -import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; @@ -63,7 +62,7 @@ public class GroupCoalescerTest extends SysuiTestCase { @Mock private NotificationListener mListenerService; @Mock private GroupCoalescer.BatchableNotificationHandler mListener; - @Mock private NotifLog mLog; + @Mock private GroupCoalescerLogger mLogger; @Captor private ArgumentCaptor<NotificationHandler> mListenerCaptor; @@ -79,14 +78,14 @@ public class GroupCoalescerTest extends SysuiTestCase { new GroupCoalescer( mExecutor, mClock, - mLog, + mLogger, MIN_LINGER_DURATION, MAX_LINGER_DURATION); mCoalescer.setNotificationHandler(mListener); mCoalescer.attach(mListenerService); verify(mListenerService).addNotificationHandler(mListenerCaptor.capture()); - NotificationHandler serviceListener = checkNotNull(mListenerCaptor.getValue()); + NotificationHandler serviceListener = requireNonNull(mListenerCaptor.getValue()); mNoMan.addListener(serviceListener); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfoTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfoTest.java index 5fc40ccb6c8a..20a089f97f51 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfoTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfoTest.java @@ -58,7 +58,6 @@ import android.service.notification.StatusBarNotification; import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; -import android.util.Slog; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; @@ -601,6 +600,34 @@ public class NotificationConversationInfoTest extends SysuiTestCase { } @Test + public void testBubble_noChannelChange() throws Exception { + mNotificationInfo.bindNotification( + mShortcutManager, + mLauncherApps, + mMockPackageManager, + mMockINotificationManager, + mVisualStabilityManager, + TEST_PACKAGE_NAME, + mNotificationChannel, + mBubbleEntry, + null, + null, + null, + true); + + assertFalse(mBubbleEntry.isBubble()); + assertTrue(mNotificationChannel.canBubble()); + + // Promote it + mNotificationInfo.findViewById(R.id.bubble).performClick(); + mTestableLooper.processAllMessages(); + + verify(mBubbleController, times(1)).onUserCreatedBubbleFromNotification(mBubbleEntry); + verify(mMockINotificationManager, never()).updateNotificationChannelForPackage( + anyString(), anyInt(), any()); + } + + @Test public void testFavorite_favorite() throws Exception { mNotificationInfo.bindNotification( mShortcutManager, diff --git a/packages/Tethering/src/android/net/dhcp/DhcpServerCallbacks.java b/packages/Tethering/src/android/net/dhcp/DhcpServerCallbacks.java index 7c41377985d3..9fda1257b4c9 100644 --- a/packages/Tethering/src/android/net/dhcp/DhcpServerCallbacks.java +++ b/packages/Tethering/src/android/net/dhcp/DhcpServerCallbacks.java @@ -28,4 +28,9 @@ public abstract class DhcpServerCallbacks extends IDhcpServerCallbacks.Stub { public int getInterfaceVersion() { return IDhcpServerCallbacks.VERSION; } + + @Override + public String getInterfaceHash() { + return IDhcpServerCallbacks.HASH; + } } diff --git a/packages/Tethering/src/android/net/ip/IpServer.java b/packages/Tethering/src/android/net/ip/IpServer.java index 190d25098644..f39e7af43ee6 100644 --- a/packages/Tethering/src/android/net/ip/IpServer.java +++ b/packages/Tethering/src/android/net/ip/IpServer.java @@ -301,6 +301,11 @@ public class IpServer extends StateMachine { public int getInterfaceVersion() { return this.VERSION; } + + @Override + public String getInterfaceHash() { + return this.HASH; + } } private class DhcpServerCallbacksImpl extends DhcpServerCallbacks { diff --git a/packages/Tethering/src/android/net/util/BaseNetdUnsolicitedEventListener.java b/packages/Tethering/src/android/net/util/BaseNetdUnsolicitedEventListener.java index 3218c0b387bb..b1ffdb01f5f3 100644 --- a/packages/Tethering/src/android/net/util/BaseNetdUnsolicitedEventListener.java +++ b/packages/Tethering/src/android/net/util/BaseNetdUnsolicitedEventListener.java @@ -67,4 +67,9 @@ public class BaseNetdUnsolicitedEventListener extends INetdUnsolicitedEventListe public int getInterfaceVersion() { return INetdUnsolicitedEventListener.VERSION; } + + @Override + public String getInterfaceHash() { + return INetdUnsolicitedEventListener.HASH; + } } diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index bf801fc93809..e28ef0f920e9 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -57,6 +57,7 @@ import android.service.autofill.FillEventHistory; import android.service.autofill.FillEventHistory.Event; import android.service.autofill.FillResponse; import android.service.autofill.IAutoFillService; +import android.service.autofill.InlineSuggestionRenderService; import android.service.autofill.SaveInfo; import android.service.autofill.UserData; import android.util.ArrayMap; @@ -117,6 +118,7 @@ final class AutofillManagerServiceImpl private final LocalLog mUiLatencyHistory; private final LocalLog mWtfHistory; private final FieldClassificationStrategy mFieldClassificationStrategy; + private RemoteInlineSuggestionRenderService mRemoteInlineSuggestionRenderService; /** * Apps disabled by the service; key is package name, value is when they will be enabled again. @@ -212,6 +214,17 @@ final class AutofillManagerServiceImpl sendStateToClients(/* resetClient= */ false); } updateRemoteAugmentedAutofillService(); + + final ComponentName componentName = RemoteInlineSuggestionRenderService + .getServiceComponentName(getContext()); + if (componentName != null) { + mRemoteInlineSuggestionRenderService = new RemoteInlineSuggestionRenderService( + getContext(), componentName, InlineSuggestionRenderService.SERVICE_INTERFACE, + mUserId, new InlineSuggestionRenderCallbacksImpl(), + mMaster.isBindInstantServiceAllowed(), mMaster.verbose); + } else { + mRemoteInlineSuggestionRenderService = null; + } return enabledChanged; } @@ -1542,6 +1555,21 @@ final class AutofillManagerServiceImpl return mFieldClassificationStrategy.getDefaultAlgorithm(); } + RemoteInlineSuggestionRenderService getRemoteInlineSuggestionRenderService() { + return mRemoteInlineSuggestionRenderService; + } + + private class InlineSuggestionRenderCallbacksImpl implements + RemoteInlineSuggestionRenderService.InlineSuggestionRenderCallbacks { + + @Override // from InlineSuggestionRenderCallbacksImpl + public void onServiceDied(@NonNull RemoteInlineSuggestionRenderService service) { + // Don't do anything; eventually the system will bind to it again... + Slog.w(TAG, "remote service died: " + service); + mRemoteInlineSuggestionRenderService = null; + } + } + @Override public String toString() { return "AutofillManagerServiceImpl: [userId=" + mUserId diff --git a/services/autofill/java/com/android/server/autofill/RemoteInlineSuggestionRenderService.java b/services/autofill/java/com/android/server/autofill/RemoteInlineSuggestionRenderService.java new file mode 100644 index 000000000000..f9e08e683b6c --- /dev/null +++ b/services/autofill/java/com/android/server/autofill/RemoteInlineSuggestionRenderService.java @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2020 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.autofill; + +import static com.android.server.autofill.Helper.sVerbose; + +import android.Manifest; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.content.pm.ServiceInfo; +import android.os.IBinder; +import android.service.autofill.IInlineSuggestionRenderService; +import android.service.autofill.IInlineSuggestionUiCallback; +import android.service.autofill.InlinePresentation; +import android.service.autofill.InlineSuggestionRenderService; +import android.util.Slog; + +import com.android.internal.infra.AbstractMultiplePendingRequestsRemoteService; + +final class RemoteInlineSuggestionRenderService extends + AbstractMultiplePendingRequestsRemoteService<RemoteInlineSuggestionRenderService, + IInlineSuggestionRenderService> { + + private static final String TAG = "RemoteInlineSuggestionRenderService"; + + private final int mIdleUnbindTimeoutMs = 5000; + + RemoteInlineSuggestionRenderService(Context context, ComponentName componentName, + String serviceInterface, int userId, InlineSuggestionRenderCallbacks callback, + boolean bindInstantServiceAllowed, boolean verbose) { + super(context, serviceInterface, componentName, userId, callback, + context.getMainThreadHandler(), + bindInstantServiceAllowed ? Context.BIND_ALLOW_INSTANT : 0, verbose, + /* initialCapacity= */ 2); + + ensureBound(); + } + + @Override // from AbstractRemoteService + protected IInlineSuggestionRenderService getServiceInterface(@NonNull IBinder service) { + return IInlineSuggestionRenderService.Stub.asInterface(service); + } + + @Override // from AbstractRemoteService + protected long getTimeoutIdleBindMillis() { + return mIdleUnbindTimeoutMs; + } + + @Override // from AbstractRemoteService + protected void handleOnConnectedStateChanged(boolean connected) { + if (connected && getTimeoutIdleBindMillis() != PERMANENT_BOUND_TIMEOUT_MS) { + scheduleUnbind(); + } + super.handleOnConnectedStateChanged(connected); + } + + public void ensureBound() { + scheduleBind(); + } + + /** + * Called by {@link Session} to generate a call to the + * {@link RemoteInlineSuggestionRenderService} to request rendering a slice . + */ + void renderSuggestion(@NonNull IInlineSuggestionUiCallback callback, + @NonNull InlinePresentation presentation, int width, int height) { + scheduleAsyncRequest((s) -> s.renderSuggestion(callback, presentation, width, height)); + } + + @Nullable + private static ServiceInfo getServiceInfo(Context context) { + final String packageName = + context.getPackageManager().getServicesSystemSharedLibraryPackageName(); + if (packageName == null) { + Slog.w(TAG, "no external services package!"); + return null; + } + + final Intent intent = new Intent(InlineSuggestionRenderService.SERVICE_INTERFACE); + intent.setPackage(packageName); + final ResolveInfo resolveInfo = context.getPackageManager().resolveService(intent, + PackageManager.GET_SERVICES | PackageManager.GET_META_DATA); + final ServiceInfo serviceInfo = resolveInfo == null ? null : resolveInfo.serviceInfo; + if (resolveInfo == null || serviceInfo == null) { + Slog.w(TAG, "No valid components found."); + return null; + } + + if (!Manifest.permission.BIND_INLINE_SUGGESTION_RENDER_SERVICE + .equals(serviceInfo.permission)) { + Slog.w(TAG, serviceInfo.name + " does not require permission " + + Manifest.permission.BIND_INLINE_SUGGESTION_RENDER_SERVICE); + return null; + } + + return serviceInfo; + } + + @Nullable + public static ComponentName getServiceComponentName(Context context) { + final ServiceInfo serviceInfo = getServiceInfo(context); + if (serviceInfo == null) return null; + + final ComponentName componentName = new ComponentName(serviceInfo.packageName, + serviceInfo.name); + + if (sVerbose) Slog.v(TAG, "getServiceComponentName(): " + componentName); + return componentName; + } + + interface InlineSuggestionRenderCallbacks + extends VultureCallback<RemoteInlineSuggestionRenderService> { + // NOTE: so far we don't need to notify the callback implementation + // (AutofillManagerServiceImpl) of the request results (success, timeouts, etc..), so this + // callback interface is empty. + } +} diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java index 16484df9f328..f90d936a5f4d 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -76,6 +76,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -697,11 +698,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { mStageName = new File(backupManagerService.getDataDir(), packageName + ".stage"); mNewStateName = new File(mStateDir, packageName + ".new"); - // don't stage the 'android' package where the wallpaper data lives. this is - // an optimization: we know there's no widget data hosted/published by that - // package, and this way we avoid doing a spurious copy of MB-sized wallpaper - // data following the download. - boolean staging = !packageName.equals(PLATFORM_PACKAGE_NAME); + boolean staging = shouldStageBackupData(packageName); ParcelFileDescriptor stage; File downloadFile = (staging) ? mStageName : mBackupDataName; boolean startedAgentRestore = false; @@ -768,8 +765,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { startedAgentRestore = true; mAgent.doRestoreWithExcludedKeys(mBackupData, appVersionCode, mNewState, mEphemeralOpToken, backupManagerService.getBackupManagerBinder(), - mExcludedKeys.containsKey(packageName) - ? new ArrayList<>(mExcludedKeys.get(packageName)) : null); + new ArrayList<>(getExcludedKeysForPackage(packageName))); } catch (Exception e) { Slog.e(TAG, "Unable to call app for restore: " + packageName, e); EventLog.writeEvent(EventLogTags.RESTORE_AGENT_FAILURE, @@ -785,9 +781,24 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { } @VisibleForTesting + boolean shouldStageBackupData(String packageName) { + // Backup data is staged for 2 reasons: + // 1. We might need to exclude keys from the data before passing it to the agent + // 2. Widget metadata needs to be separated from the rest to be handled separately + // But 'android' package doesn't contain widget metadata so we want to skip staging for it + // when there are no keys to be excluded either. + return !packageName.equals(PLATFORM_PACKAGE_NAME) || + !getExcludedKeysForPackage(PLATFORM_PACKAGE_NAME).isEmpty(); + } + + private Set<String> getExcludedKeysForPackage(String packageName) { + return mExcludedKeys.getOrDefault(packageName, Collections.emptySet()); + } + + @VisibleForTesting void filterExcludedKeys(String packageName, BackupDataInput in, BackupDataOutput out) throws Exception { - Set<String> excludedKeysForPackage = mExcludedKeys.get(packageName); + Set<String> excludedKeysForPackage = getExcludedKeysForPackage(packageName); byte[] buffer = new byte[8192]; // will grow when needed while (in.readNextHeader()) { diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index dd33566322e2..d933e9d8e9da 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2962,6 +2962,11 @@ public class ConnectivityService extends IConnectivityManager.Stub public int getInterfaceVersion() { return this.VERSION; } + + @Override + public String getInterfaceHash() { + return this.HASH; + } } private boolean networkRequiresPrivateDnsValidation(NetworkAgentInfo nai) { diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index 3b6ff26d5f03..f1f2d2abea3f 100644 --- a/services/core/java/com/android/server/LocationManagerService.java +++ b/services/core/java/com/android/server/LocationManagerService.java @@ -104,6 +104,7 @@ import com.android.server.location.MockProvider; import com.android.server.location.MockableLocationProvider; import com.android.server.location.PassiveProvider; import com.android.server.location.UserInfoStore; +import com.android.server.location.gnss.GnssManagerService; import com.android.server.pm.permission.PermissionManagerServiceInternal; import java.io.ByteArrayOutputStream; @@ -859,13 +860,7 @@ public class LocationManagerService extends ILocationManager.Stub { pw.increaseIndent(); - boolean enabled = isEnabled(); - pw.println("enabled=" + enabled); - if (!enabled) { - pw.println("allowed=" + mProvider.getState().allowed); - } - - pw.println("properties=" + mProvider.getState().properties); + pw.println("enabled=" + isEnabled()); } mProvider.dump(fd, pw, args); diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 05d83606b2d0..9d4c78383183 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -735,6 +735,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub { public int getInterfaceVersion() { return INetdUnsolicitedEventListener.VERSION; } + + @Override + public String getInterfaceHash() { + return INetdUnsolicitedEventListener.HASH; + } } // diff --git a/services/core/java/com/android/server/ServiceWatcher.java b/services/core/java/com/android/server/ServiceWatcher.java index 8564cb456ba6..14cd3a5d5c0d 100644 --- a/services/core/java/com/android/server/ServiceWatcher.java +++ b/services/core/java/com/android/server/ServiceWatcher.java @@ -167,7 +167,7 @@ public class ServiceWatcher implements ServiceConnection { @Override public String toString() { - return component + "@" + version + "[u" + userId + "]"; + return component.toShortString() + "@" + version + "[u" + userId + "]"; } } @@ -341,7 +341,7 @@ public class ServiceWatcher implements ServiceConnection { Preconditions.checkState(Looper.myLooper() == mHandler.getLooper()); if (D) { - Log.i(TAG, getLogPrefix() + " connected to " + component); + Log.i(TAG, getLogPrefix() + " connected to " + component.toShortString()); } mBinder = binder; @@ -351,11 +351,22 @@ public class ServiceWatcher implements ServiceConnection { } @Override + public void onBindingDied(ComponentName component) { + Preconditions.checkState(Looper.myLooper() == mHandler.getLooper()); + + if (D) { + Log.i(TAG, getLogPrefix() + " " + component.toShortString() + " died"); + } + + onBestServiceChanged(true); + } + + @Override public final void onServiceDisconnected(ComponentName component) { Preconditions.checkState(Looper.myLooper() == mHandler.getLooper()); if (D) { - Log.i(TAG, getLogPrefix() + " disconnected from " + component); + Log.i(TAG, getLogPrefix() + " disconnected from " + component.toShortString()); } mBinder = null; @@ -383,8 +394,8 @@ public class ServiceWatcher implements ServiceConnection { } /** - * Runs the given function asynchronously if currently connected. Suppresses any RemoteException - * thrown during execution. + * Runs the given function asynchronously if and only if currently connected. Suppresses any + * RemoteException thrown during execution. */ public final void runOnBinder(BinderRunner runner) { runOnHandler(() -> { @@ -473,4 +484,9 @@ public class ServiceWatcher implements ServiceConnection { private String getLogPrefix() { return "[" + mIntent.getAction() + "]"; } + + @Override + public String toString() { + return mServiceInfo.toString(); + } } diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java index 5a56a9fa5367..6bc090a4f7ba 100644 --- a/services/core/java/com/android/server/VibratorService.java +++ b/services/core/java/com/android/server/VibratorService.java @@ -16,6 +16,8 @@ package com.android.server; +import static android.os.VibrationEffect.Composition.PrimitiveEffect; + import android.annotation.Nullable; import android.app.ActivityManager; import android.app.AppOpsManager; @@ -73,8 +75,10 @@ import com.android.internal.util.DumpUtils; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.LinkedList; +import java.util.List; public class VibratorService extends IVibratorService.Stub implements InputManager.InputDeviceListener { @@ -128,10 +132,11 @@ public class VibratorService extends IVibratorService.Stub private final boolean mAllowPriorityVibrationsInLowPowerMode; private final boolean mSupportsAmplitudeControl; private final boolean mSupportsExternalControl; + private final List<Integer> mSupportedEffects; private final long mCapabilities; private final int mDefaultVibrationAmplitude; private final SparseArray<VibrationEffect> mFallbackEffects; - private final SparseArray<Integer> mProcStatesCache = new SparseArray(); + private final SparseArray<Integer> mProcStatesCache = new SparseArray<>(); private final WorkSource mTmpWorkSource = new WorkSource(); private final Handler mH = new Handler(); private final Object mLock = new Object(); @@ -150,7 +155,7 @@ public class VibratorService extends IVibratorService.Stub // mInputDeviceVibrators lock should be acquired after mLock, if both are // to be acquired - private final ArrayList<Vibrator> mInputDeviceVibrators = new ArrayList<Vibrator>(); + private final ArrayList<Vibrator> mInputDeviceVibrators = new ArrayList<>(); private boolean mVibrateInputDevicesSetting; // guarded by mInputDeviceVibrators private boolean mInputDeviceListenerRegistered; // guarded by mInputDeviceVibrators @@ -171,7 +176,10 @@ public class VibratorService extends IVibratorService.Stub static native void vibratorOff(); static native boolean vibratorSupportsAmplitudeControl(); static native void vibratorSetAmplitude(int amplitude); + static native int[] vibratorGetSupportedEffects(); static native long vibratorPerformEffect(long effect, long strength, Vibration vibration); + static native void vibratorPerformComposedEffect( + VibrationEffect.Composition.PrimitiveEffect[] effect, Vibration vibration); static native boolean vibratorSupportsExternalControl(); static native void vibratorSetExternalControl(boolean enabled); static native long vibratorGetCapabilities(); @@ -238,6 +246,8 @@ public class VibratorService extends IVibratorService.Stub } } + // Called by native + @SuppressWarnings("unused") private void onComplete() { synchronized (mLock) { if (this == mCurrentVibration) { @@ -346,10 +356,11 @@ public class VibratorService extends IVibratorService.Stub mSupportsAmplitudeControl = vibratorSupportsAmplitudeControl(); mSupportsExternalControl = vibratorSupportsExternalControl(); + mSupportedEffects = asList(vibratorGetSupportedEffects()); mCapabilities = vibratorGetCapabilities(); mContext = context; - PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE); + PowerManager pm = context.getSystemService(PowerManager.class); mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "*vibrator*"); mWakeLock.setReferenceCounted(true); @@ -510,12 +521,47 @@ public class VibratorService extends IVibratorService.Stub } @Override // Binder call + public boolean[] areEffectsSupported(int[] effectIds) { + // Return null to indicate that the HAL doesn't actually tell us what effects are + // supported. + if (mSupportedEffects == null) { + return null; + } + boolean[] supported = new boolean[effectIds.length]; + for (int i = 0; i < effectIds.length; i++) { + supported[i] = mSupportedEffects.contains(effectIds[i]); + } + return supported; + } + + @Override // Binder call + public boolean[] arePrimitivesSupported(int[] primitiveIds) { + boolean[] supported = new boolean[primitiveIds.length]; + if (hasCapability(IVibrator.CAP_COMPOSE_EFFECTS)) { + Arrays.fill(supported, true); + } + return supported; + } + + + private static List<Integer> asList(int... vals) { + if (vals == null) { + return null; + } + List<Integer> l = new ArrayList<>(vals.length); + for (int val : vals) { + l.add(val); + } + return l; + } + + @Override // Binder call public boolean setAlwaysOnEffect(int uid, String opPkg, int alwaysOnId, VibrationEffect effect, VibrationAttributes attrs) { if (!hasPermission(android.Manifest.permission.VIBRATE_ALWAYS_ON)) { throw new SecurityException("Requires VIBRATE_ALWAYS_ON permission"); } - if ((mCapabilities & IVibrator.CAP_ALWAYS_ON_CONTROL) == 0) { + if (!hasCapability(IVibrator.CAP_ALWAYS_ON_CONTROL)) { Slog.e(TAG, "Always-on effects not supported."); return false; } @@ -817,6 +863,14 @@ public class VibratorService extends IVibratorService.Stub if (timeout > 0) { mH.postDelayed(mVibrationEndRunnable, timeout); } + } else if (vib.effect instanceof VibrationEffect.Composed) { + Trace.asyncTraceBegin(Trace.TRACE_TAG_VIBRATOR, "vibration", 0); + doVibratorComposedEffectLocked(vib); + // FIXME: We rely on the completion callback here, but I don't think we require that + // devices which support composition also support the completion callback. If we + // ever get a device that supports the former but not the latter, then we have no + // real way of knowing how long a given effect should last. + mH.postDelayed(mVibrationEndRunnable, 10000); } else { Slog.e(TAG, "Unknown vibration type, ignoring"); } @@ -1148,7 +1202,7 @@ public class VibratorService extends IVibratorService.Stub } } else { // Note: ordering is important here! Many haptic drivers will reset their - // amplitude when enabled, so we always have to enable frst, then set the + // amplitude when enabled, so we always have to enable first, then set the // amplitude. vibratorOn(millis); doVibratorSetAmplitude(amplitude); @@ -1201,7 +1255,7 @@ public class VibratorService extends IVibratorService.Stub long duration = vibratorPerformEffect(prebaked.getId(), prebaked.getEffectStrength(), vib); long timeout = duration; - if ((mCapabilities & IVibrator.CAP_PERFORM_CALLBACK) != 0) { + if (hasCapability(IVibrator.CAP_PERFORM_CALLBACK)) { timeout *= ASYNC_TIMEOUT_MULTIPLIER; } if (timeout > 0) { @@ -1229,6 +1283,41 @@ public class VibratorService extends IVibratorService.Stub } } + @GuardedBy("mLock") + private void doVibratorComposedEffectLocked(Vibration vib) { + Trace.traceBegin(Trace.TRACE_TAG_VIBRATOR, "doVibratorComposedEffectLocked"); + + try { + final VibrationEffect.Composed composed = (VibrationEffect.Composed) vib.effect; + final boolean usingInputDeviceVibrators; + synchronized (mInputDeviceVibrators) { + usingInputDeviceVibrators = !mInputDeviceVibrators.isEmpty(); + } + // Input devices don't support composed effect, so skip trying it with them. + if (usingInputDeviceVibrators) { + return; + } + + if (!hasCapability(IVibrator.CAP_COMPOSE_EFFECTS)) { + return; + } + + PrimitiveEffect[] primitiveEffects = + composed.getPrimitiveEffects().toArray(new PrimitiveEffect[0]); + vibratorPerformComposedEffect(primitiveEffects, vib); + + // Composed effects don't actually give us an estimated duration, so we just guess here. + noteVibratorOnLocked(vib.uid, 10 * primitiveEffects.length); + } finally { + Trace.traceEnd(Trace.TRACE_TAG_VIBRATOR); + } + + } + + private boolean hasCapability(long capability) { + return (mCapabilities & capability) == capability; + } + private VibrationEffect getFallbackEffect(int effectId) { return mFallbackEffects.get(effectId); } @@ -1424,7 +1513,7 @@ public class VibratorService extends IVibratorService.Stub long[] timings, int[] amplitudes, int startIndex, int repeatIndex) { int i = startIndex; long timing = 0; - while(amplitudes[i] != 0) { + while (amplitudes[i] != 0) { timing += timings[i++]; if (i >= timings.length) { if (repeatIndex >= 0) { @@ -1475,18 +1564,14 @@ public class VibratorService extends IVibratorService.Stub } else { pw.println("null"); } - pw.print(" mCurrentExternalVibration="); - if (mCurrentExternalVibration != null) { - pw.println(mCurrentExternalVibration.toString()); - } else { - pw.println("null"); - } + pw.print(" mCurrentExternalVibration=" + mCurrentExternalVibration); pw.println(" mVibratorUnderExternalControl=" + mVibratorUnderExternalControl); pw.println(" mLowPowerMode=" + mLowPowerMode); pw.println(" mHapticFeedbackIntensity=" + mHapticFeedbackIntensity); pw.println(" mNotificationIntensity=" + mNotificationIntensity); pw.println(" mRingIntensity=" + mRingIntensity); - pw.println(""); + pw.println(" mSupportedEffects=" + mSupportedEffects); + pw.println(); pw.println(" Previous ring vibrations:"); for (VibrationInfo info : mPreviousRingVibrations) { pw.print(" "); @@ -1495,34 +1580,29 @@ public class VibratorService extends IVibratorService.Stub pw.println(" Previous notification vibrations:"); for (VibrationInfo info : mPreviousNotificationVibrations) { - pw.print(" "); - pw.println(info.toString()); + pw.println(" " + info); } pw.println(" Previous alarm vibrations:"); for (VibrationInfo info : mPreviousAlarmVibrations) { - pw.print(" "); - pw.println(info.toString()); + pw.println(" " + info); } pw.println(" Previous vibrations:"); for (VibrationInfo info : mPreviousVibrations) { - pw.print(" "); - pw.println(info.toString()); + pw.println(" " + info); } pw.println(" Previous external vibrations:"); for (ExternalVibration vib : mPreviousExternalVibrations) { - pw.print(" "); - pw.println(vib.toString()); + pw.println(" " + vib); } } } @Override public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err, - String[] args, ShellCallback callback, ResultReceiver resultReceiver) - throws RemoteException { + String[] args, ShellCallback callback, ResultReceiver resultReceiver) { new VibratorShellCommand(this).exec(this, in, out, err, args, callback, resultReceiver); } diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 0a91f9af1cae..ffeea3d12781 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -287,6 +287,7 @@ public final class ActiveServices { static final int MSG_BG_START_TIMEOUT = 1; static final int MSG_UPDATE_FOREGROUND_APPS = 2; + static final int MSG_ENSURE_NOT_START_BG = 3; ServiceMap(Looper looper, int userId) { super(looper); @@ -304,6 +305,11 @@ public final class ActiveServices { case MSG_UPDATE_FOREGROUND_APPS: { updateForegroundApps(this); } break; + case MSG_ENSURE_NOT_START_BG: { + synchronized (mAm) { + rescheduleDelayedStartsLocked(); + } + } break; } } @@ -311,7 +317,9 @@ public final class ActiveServices { if (mStartingBackground.remove(r)) { if (DEBUG_DELAYED_STARTS) Slog.v(TAG_SERVICE, "No longer background starting: " + r); - rescheduleDelayedStartsLocked(); + removeMessages(MSG_ENSURE_NOT_START_BG); + Message msg = obtainMessage(MSG_ENSURE_NOT_START_BG); + sendMessage(msg); } if (mDelayedStartList.remove(r)) { if (DEBUG_DELAYED_STARTS) Slog.v(TAG_SERVICE, "No longer delaying start: " + r); diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index e9d64913a354..3bd7d5c0d075 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -17,8 +17,8 @@ package com.android.server.am; import static android.app.ActivityManager.PROCESS_CAPABILITY_ALL; -import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_CAMERA; import static android.app.ActivityManager.PROCESS_CAPABILITY_ALL_IMPLICIT; +import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_CAMERA; import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_LOCATION; import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_MICROPHONE; import static android.app.ActivityManager.PROCESS_CAPABILITY_NONE; @@ -36,9 +36,7 @@ import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT; import static android.app.ActivityManager.PROCESS_STATE_SERVICE; import static android.app.ActivityManager.PROCESS_STATE_TOP; import static android.app.ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND; -import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION; -import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE; import static android.os.Process.SCHED_OTHER; import static android.os.Process.THREAD_GROUP_BACKGROUND; import static android.os.Process.THREAD_GROUP_DEFAULT; @@ -78,7 +76,6 @@ import android.compat.annotation.Disabled; import android.compat.annotation.EnabledAfter; import android.content.Context; import android.content.pm.ServiceInfo; -import android.os.Build; import android.os.Debug; import android.os.Handler; import android.os.IBinder; @@ -151,6 +148,9 @@ public final class OomAdjuster { @Disabled static final long CAMERA_MICROPHONE_CAPABILITY_CHANGE_ID = 136219221L; + //TODO: remove this when development is done. + private static final int TEMP_PROCESS_CAPABILITY_FOREGROUND_LOCATION = 1 << 31; + /** * For some direct access we need to power manager. */ @@ -1477,13 +1477,24 @@ public final class OomAdjuster { } } - if (s.isForeground && s.mAllowWhileInUsePermissionInFgs) { + if (s.isForeground) { final int fgsType = s.foregroundServiceType; - capabilityFromFGS |= - (fgsType & FOREGROUND_SERVICE_TYPE_LOCATION) - != 0 ? PROCESS_CAPABILITY_FOREGROUND_LOCATION : 0; - capabilityFromFGS |= PROCESS_CAPABILITY_FOREGROUND_CAMERA - | PROCESS_CAPABILITY_FOREGROUND_MICROPHONE; + if (s.mAllowWhileInUsePermissionInFgs) { + capabilityFromFGS |= + (fgsType & FOREGROUND_SERVICE_TYPE_LOCATION) + != 0 ? PROCESS_CAPABILITY_FOREGROUND_LOCATION : 0; + } else { + //The FGS has the location capability, but due to FGS BG start restriction it + //lost the capability, use temp location capability to mark this case. + //TODO: remove this block when development is done. + capabilityFromFGS |= + (fgsType & FOREGROUND_SERVICE_TYPE_LOCATION) + != 0 ? TEMP_PROCESS_CAPABILITY_FOREGROUND_LOCATION : 0; + } + if (s.mAllowWhileInUsePermissionInFgs) { + capabilityFromFGS |= PROCESS_CAPABILITY_FOREGROUND_CAMERA + | PROCESS_CAPABILITY_FOREGROUND_MICROPHONE; + } } ArrayMap<IBinder, ArrayList<ConnectionRecord>> serviceConnections = s.getConnections(); diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index b269c38307e7..954be20122b4 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -1551,6 +1551,45 @@ public final class ProcessList { } } + private int[] computeGidsForProcess(int mountExternal, int uid, int[] permGids) { + ArrayList<Integer> gidList = new ArrayList<>(permGids.length + 5); + + final int sharedAppGid = UserHandle.getSharedAppGid(UserHandle.getAppId(uid)); + final int cacheAppGid = UserHandle.getCacheAppGid(UserHandle.getAppId(uid)); + final int userGid = UserHandle.getUserGid(UserHandle.getUserId(uid)); + + // Add shared application and profile GIDs so applications can share some + // resources like shared libraries and access user-wide resources + for (int permGid : permGids) { + gidList.add(permGid); + } + if (sharedAppGid != UserHandle.ERR_GID) { + gidList.add(sharedAppGid); + } + if (cacheAppGid != UserHandle.ERR_GID) { + gidList.add(cacheAppGid); + } + if (userGid != UserHandle.ERR_GID) { + gidList.add(userGid); + } + if (mountExternal == Zygote.MOUNT_EXTERNAL_ANDROID_WRITABLE) { + // For DownloadProviders and MTP: To grant access to /sdcard/Android/ + gidList.add(Process.SDCARD_RW_GID); + } + if (mountExternal == Zygote.MOUNT_EXTERNAL_PASS_THROUGH) { + // For the FUSE daemon: To grant access to the lower filesystem. + // EmulatedVolumes: /data/media and /mnt/expand/<volume>/data/media + // PublicVolumes: /mnt/media_rw/<volume> + gidList.add(Process.MEDIA_RW_GID); + } + + int[] gidArray = new int[gidList.size()]; + for (int i = 0; i < gidArray.length; i++) { + gidArray[i] = gidList.get(i); + } + return gidArray; + } + /** * @return {@code true} if process start is successful, false otherwise. */ @@ -1625,38 +1664,7 @@ public final class ProcessList { } } - int numGids = 3; - if (mountExternal == Zygote.MOUNT_EXTERNAL_ANDROID_WRITABLE - || app.info.packageName.equals("com.android.externalstorage")) { - numGids++; - } - - /* - * Add shared application and profile GIDs so applications can share some - * resources like shared libraries and access user-wide resources - */ - if (ArrayUtils.isEmpty(permGids)) { - gids = new int[numGids]; - } else { - gids = new int[permGids.length + numGids]; - System.arraycopy(permGids, 0, gids, numGids, permGids.length); - } - gids[0] = UserHandle.getSharedAppGid(UserHandle.getAppId(uid)); - gids[1] = UserHandle.getCacheAppGid(UserHandle.getAppId(uid)); - gids[2] = UserHandle.getUserGid(UserHandle.getUserId(uid)); - - if (numGids > 3) { - if (app.info.packageName.equals("com.android.externalstorage")) { - // Allows access to 'unreliable' (USB OTG) volumes via SAF - gids[3] = Process.MEDIA_RW_GID; - } else if (mountExternal == Zygote.MOUNT_EXTERNAL_ANDROID_WRITABLE) { - gids[3] = Process.SDCARD_RW_GID; - } - } - - // Replace any invalid GIDs - if (gids[0] == UserHandle.ERR_GID) gids[0] = gids[2]; - if (gids[1] == UserHandle.ERR_GID) gids[1] = gids[2]; + gids = computeGidsForProcess(mountExternal, uid, permGids); } app.mountMode = mountExternal; checkSlow(startTime, "startProcess: building args"); diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 62596de7b9a6..1d714a2c99c7 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -213,6 +213,9 @@ public class AppOpsService extends IAppOpsService.Stub { private static final int MAX_UNFORWARED_OPS = 10; private static final int MAX_UNUSED_POOLED_OBJECTS = 3; + //TODO: remove this when development is done. + private static final int TEMP_PROCESS_CAPABILITY_FOREGROUND_LOCATION = 1 << 31; + Context mContext; final AtomicFile mFile; final Handler mHandler; @@ -480,8 +483,15 @@ public class AppOpsService extends IAppOpsService.Stub { case AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION: if ((capability & PROCESS_CAPABILITY_FOREGROUND_LOCATION) != 0) { return AppOpsManager.MODE_ALLOWED; - } else { + } else if ((capability + & TEMP_PROCESS_CAPABILITY_FOREGROUND_LOCATION) != 0) { + // The FGS has the location capability, but due to FGS BG start + // restriction it lost the capability, use temp location capability + // to mark this case. + // TODO change to MODE_IGNORED when enforcing the feature. maybeShowWhileInUseDebugToast(op, mode); + return AppOpsManager.MODE_ALLOWED; + } else { return AppOpsManager.MODE_IGNORED; } case OP_CAMERA: @@ -586,7 +596,7 @@ public class AppOpsService extends IAppOpsService.Stub { return; } final long now = System.currentTimeMillis(); - if (lastTimeShowDebugToast == 0 || now - lastTimeShowDebugToast > 600000) { + if (lastTimeShowDebugToast == 0 || now - lastTimeShowDebugToast > 3600000) { lastTimeShowDebugToast = now; mHandler.sendMessage(PooledLambda.obtainMessage( ActivityManagerInternal::showWhileInUseDebugToast, diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java index bb8b12e86e16..4d5af9ac5d5c 100644 --- a/services/core/java/com/android/server/compat/PlatformCompat.java +++ b/services/core/java/com/android/server/compat/PlatformCompat.java @@ -16,6 +16,11 @@ package com.android.server.compat; +import static android.Manifest.permission.LOG_COMPAT_CHANGE; +import static android.Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG; +import static android.Manifest.permission.READ_COMPAT_CHANGE_CONFIG; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; + import android.app.ActivityManager; import android.app.IActivityManager; import android.content.Context; @@ -68,12 +73,14 @@ public class PlatformCompat extends IPlatformCompat.Stub { @Override public void reportChange(long changeId, ApplicationInfo appInfo) { + checkCompatChangeLogPermission(); reportChange(changeId, appInfo.uid, StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__STATE__LOGGED); } @Override public void reportChangeByPackageName(long changeId, String packageName, int userId) { + checkCompatChangeLogPermission(); ApplicationInfo appInfo = getApplicationInfo(packageName, userId); if (appInfo == null) { return; @@ -83,11 +90,13 @@ public class PlatformCompat extends IPlatformCompat.Stub { @Override public void reportChangeByUid(long changeId, int uid) { + checkCompatChangeLogPermission(); reportChange(changeId, uid, StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__STATE__LOGGED); } @Override public boolean isChangeEnabled(long changeId, ApplicationInfo appInfo) { + checkCompatChangeReadPermission(); if (mCompatConfig.isChangeEnabled(changeId, appInfo)) { reportChange(changeId, appInfo.uid, StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__STATE__ENABLED); @@ -100,6 +109,7 @@ public class PlatformCompat extends IPlatformCompat.Stub { @Override public boolean isChangeEnabledByPackageName(long changeId, String packageName, int userId) { + checkCompatChangeReadPermission(); ApplicationInfo appInfo = getApplicationInfo(packageName, userId); if (appInfo == null) { return true; @@ -109,6 +119,7 @@ public class PlatformCompat extends IPlatformCompat.Stub { @Override public boolean isChangeEnabledByUid(long changeId, int uid) { + checkCompatChangeReadPermission(); String[] packages = mContext.getPackageManager().getPackagesForUid(uid); if (packages == null || packages.length == 0) { return true; @@ -141,6 +152,7 @@ public class PlatformCompat extends IPlatformCompat.Stub { @Override public void setOverrides(CompatibilityChangeConfig overrides, String packageName) throws RemoteException, SecurityException { + checkCompatChangeOverridePermission(); mCompatConfig.addOverrides(overrides, packageName); killPackage(packageName); } @@ -148,11 +160,13 @@ public class PlatformCompat extends IPlatformCompat.Stub { @Override public void setOverridesForTest(CompatibilityChangeConfig overrides, String packageName) throws RemoteException, SecurityException { + checkCompatChangeOverridePermission(); mCompatConfig.addOverrides(overrides, packageName); } @Override public void clearOverrides(String packageName) throws RemoteException, SecurityException { + checkCompatChangeOverridePermission(); mCompatConfig.removePackageOverrides(packageName); killPackage(packageName); } @@ -160,12 +174,14 @@ public class PlatformCompat extends IPlatformCompat.Stub { @Override public void clearOverridesForTest(String packageName) throws RemoteException, SecurityException { + checkCompatChangeOverridePermission(); mCompatConfig.removePackageOverrides(packageName); } @Override public boolean clearOverride(long changeId, String packageName) throws RemoteException, SecurityException { + checkCompatChangeOverridePermission(); boolean existed = mCompatConfig.removeOverride(changeId, packageName); killPackage(packageName); return existed; @@ -173,11 +189,13 @@ public class PlatformCompat extends IPlatformCompat.Stub { @Override public CompatibilityChangeConfig getAppConfig(ApplicationInfo appInfo) { + checkCompatChangeReadPermission(); return mCompatConfig.getAppConfig(appInfo); } @Override public CompatibilityChangeInfo[] listAllChanges() { + checkCompatChangeReadPermission(); return mCompatConfig.dumpChanges(); } @@ -216,6 +234,7 @@ public class PlatformCompat extends IPlatformCompat.Stub { @Override protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + checkCompatChangeReadPermission(); if (!DumpUtils.checkDumpAndUsageStatsPermission(mContext, "platform_compat", pw)) return; mCompatConfig.dumpConfig(pw); } @@ -273,4 +292,25 @@ public class PlatformCompat extends IPlatformCompat.Stub { Binder.restoreCallingIdentity(identity); } } + + private void checkCompatChangeLogPermission() throws SecurityException { + if (mContext.checkCallingOrSelfPermission(LOG_COMPAT_CHANGE) + != PERMISSION_GRANTED) { + throw new SecurityException("Cannot log compat change usage"); + } + } + + private void checkCompatChangeReadPermission() throws SecurityException { + if (mContext.checkCallingOrSelfPermission(READ_COMPAT_CHANGE_CONFIG) + != PERMISSION_GRANTED) { + throw new SecurityException("Cannot read compat change"); + } + } + + private void checkCompatChangeOverridePermission() throws SecurityException { + if (mContext.checkCallingOrSelfPermission(OVERRIDE_COMPAT_CHANGE_CONFIG) + != PERMISSION_GRANTED) { + throw new SecurityException("Cannot override compat change"); + } + } } diff --git a/services/core/java/com/android/server/connectivity/NetdEventListenerService.java b/services/core/java/com/android/server/connectivity/NetdEventListenerService.java index f2892cc81951..17e2f69e9bf1 100644 --- a/services/core/java/com/android/server/connectivity/NetdEventListenerService.java +++ b/services/core/java/com/android/server/connectivity/NetdEventListenerService.java @@ -310,6 +310,11 @@ public class NetdEventListenerService extends INetdEventListener.Stub { return this.VERSION; } + @Override + public String getInterfaceHash() { + return this.HASH; + } + private void addWakeupEvent(WakeupEvent event) { String iface = event.iface; mWakeupEvents.append(event); diff --git a/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java b/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java index 11fe15f0e12b..15dd6464e094 100644 --- a/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java +++ b/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java @@ -260,7 +260,7 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { "Integrity check result: " + result.getEffect() + " due to " - + result.getRule()); + + result.getMatchedRules()); StatsLog.write( StatsLog.INTEGRITY_CHECK_RESULT_REPORTED, @@ -268,9 +268,9 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { appCert, appInstallMetadata.getVersionCode(), installerPackageName, - getLoggingResponse(result), - isCausedByAppCertRule(result), - isCausedByInstallerRule(result)); + result.getLoggingResponse(), + result.isCausedByAppCertRule(), + result.isCausedByInstallerRule()); mPackageManagerInternal.setIntegrityVerificationResult( verificationId, result.getEffect() == IntegrityCheckResult.Effect.ALLOW @@ -583,26 +583,6 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { } } - private static int getLoggingResponse(IntegrityCheckResult result) { - if (result.getEffect() == IntegrityCheckResult.Effect.DENY) { - return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED; - } else if (result.getRule() != null) { - return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED; - } else { - return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED; - } - } - - private static boolean isCausedByAppCertRule(IntegrityCheckResult result) { - // TODO(b/147095027): implement this. - return true; - } - - private static boolean isCausedByInstallerRule(IntegrityCheckResult result) { - // TODO(b/147095027): implement this. - return true; - } - private List<String> getAllowedRuleProviders() { return Arrays.asList(mContext.getResources().getStringArray( R.array.config_integrityRuleProviderPackages)); diff --git a/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java b/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java index 66537ff6105e..9d9430441e07 100644 --- a/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java +++ b/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java @@ -25,8 +25,8 @@ import android.content.integrity.Rule; import com.android.server.integrity.model.IntegrityCheckResult; -import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * A helper class for evaluating rules against app install metadata to find if there are matching @@ -48,29 +48,34 @@ final class RuleEvaluator { @NonNull static IntegrityCheckResult evaluateRules( List<Rule> rules, AppInstallMetadata appInstallMetadata) { - List<Rule> matchedRules = new ArrayList<>(); - for (Rule rule : rules) { - if (rule.getFormula().matches(appInstallMetadata)) { - matchedRules.add(rule); - } + + // Identify the rules that match the {@code appInstallMetadata}. + List<Rule> matchedRules = + rules.stream() + .filter(rule -> rule.getFormula().matches(appInstallMetadata)) + .collect(Collectors.toList()); + + // Identify the matched power allow rules and terminate early if we have any. + List<Rule> matchedPowerAllowRules = + matchedRules.stream() + .filter(rule -> rule.getEffect() == FORCE_ALLOW) + .collect(Collectors.toList()); + + if (!matchedPowerAllowRules.isEmpty()) { + return IntegrityCheckResult.allow(matchedPowerAllowRules); } - boolean denied = false; - Rule denyRule = null; - for (Rule rule : matchedRules) { - switch (rule.getEffect()) { - case DENY: - if (!denied) { - denied = true; - denyRule = rule; - } - break; - case FORCE_ALLOW: - return IntegrityCheckResult.allow(rule); - default: - throw new IllegalArgumentException("Matched an unknown effect rule: " + rule); - } + // Identify the matched deny rules. + List<Rule> matchedDenyRules = + matchedRules.stream() + .filter(rule -> rule.getEffect() == DENY) + .collect(Collectors.toList()); + + if (!matchedDenyRules.isEmpty()) { + return IntegrityCheckResult.deny(matchedDenyRules); } - return denied ? IntegrityCheckResult.deny(denyRule) : IntegrityCheckResult.allow(); + + // When no rules are denied, return default allow result. + return IntegrityCheckResult.allow(); } } diff --git a/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java b/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java index b3cb31ac8cb1..d6dd0464c145 100644 --- a/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java +++ b/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java @@ -18,6 +18,10 @@ package com.android.server.integrity.model; import android.annotation.Nullable; import android.content.integrity.Rule; +import android.util.StatsLog; + +import java.util.Collections; +import java.util.List; /** * A class encapsulating the result from the evaluation engine after evaluating rules against app @@ -34,19 +38,19 @@ public final class IntegrityCheckResult { } private final Effect mEffect; - @Nullable private final Rule mRule; + private final List<Rule> mRuleList; - private IntegrityCheckResult(Effect effect, @Nullable Rule rule) { + private IntegrityCheckResult(Effect effect, @Nullable List<Rule> ruleList) { this.mEffect = effect; - this.mRule = rule; + this.mRuleList = ruleList; } public Effect getEffect() { return mEffect; } - public Rule getRule() { - return mRule; + public List<Rule> getMatchedRules() { + return mRuleList; } /** @@ -55,7 +59,7 @@ public final class IntegrityCheckResult { * @return An evaluation outcome with ALLOW effect and no rule. */ public static IntegrityCheckResult allow() { - return new IntegrityCheckResult(Effect.ALLOW, null); + return new IntegrityCheckResult(Effect.ALLOW, Collections.emptyList()); } /** @@ -63,17 +67,49 @@ public final class IntegrityCheckResult { * * @return An evaluation outcome with ALLOW effect and rule causing that effect. */ - public static IntegrityCheckResult allow(Rule rule) { - return new IntegrityCheckResult(Effect.ALLOW, rule); + public static IntegrityCheckResult allow(List<Rule> ruleList) { + return new IntegrityCheckResult(Effect.ALLOW, ruleList); } /** * Create a DENY evaluation outcome. * - * @param rule Rule causing the DENY effect. + * @param ruleList All valid rules that cause the DENY effect. * @return An evaluation outcome with DENY effect and rule causing that effect. */ - public static IntegrityCheckResult deny(Rule rule) { - return new IntegrityCheckResult(Effect.DENY, rule); + public static IntegrityCheckResult deny(List<Rule> ruleList) { + return new IntegrityCheckResult(Effect.DENY, ruleList); + } + + /** + * Returns the in value of the integrity check result for logging purposes. + */ + public int getLoggingResponse() { + if (getEffect() == Effect.DENY) { + return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED; + } else if (getEffect() == Effect.ALLOW && getMatchedRules().isEmpty()) { + return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED; + } else if (getEffect() == Effect.ALLOW && !getMatchedRules().isEmpty()) { + return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED; + } else { + throw new IllegalStateException("IntegrityCheckResult is not valid."); + } + } + + /** + * Returns true when the {@code Effect.DENY} result is caused by an app certificate mismatch. + */ + public boolean isCausedByAppCertRule() { + // TODO(b/147095027): implement this. + return true; } + + /** + * Returns true when the {@code Effect.DENY} result is caused by an installer rule. + */ + public boolean isCausedByInstallerRule() { + // TODO(b/147095027): implement this. + return true; + } + } diff --git a/services/core/java/com/android/server/location/LocationProviderProxy.java b/services/core/java/com/android/server/location/LocationProviderProxy.java index cf299fe9bb2a..1dee7a809c7e 100644 --- a/services/core/java/com/android/server/location/LocationProviderProxy.java +++ b/services/core/java/com/android/server/location/LocationProviderProxy.java @@ -18,6 +18,8 @@ package com.android.server.location; import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY; +import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; + import android.annotation.Nullable; import android.content.ComponentName; import android.content.Context; @@ -29,6 +31,7 @@ import android.os.RemoteException; import android.util.ArraySet; import android.util.Log; +import com.android.internal.annotations.GuardedBy; import com.android.internal.location.ILocationProvider; import com.android.internal.location.ILocationProviderManager; import com.android.internal.location.ProviderProperties; @@ -71,7 +74,7 @@ public class LocationProviderProxy extends AbstractLocationProvider { @Override public void onSetAdditionalProviderPackages(List<String> packageNames) { int maxCount = Math.min(MAX_ADDITIONAL_PACKAGES, packageNames.size()); - ArraySet<String> allPackages = new ArraySet<>(maxCount); + ArraySet<String> allPackages = new ArraySet<>(maxCount + 1); for (String packageName : packageNames) { if (packageNames.size() >= maxCount) { return; @@ -86,25 +89,39 @@ public class LocationProviderProxy extends AbstractLocationProvider { } } - // add the binder package - ComponentName service = mServiceWatcher.getBoundService().component; - if (service != null) { - allPackages.add(service.getPackageName()); - } + synchronized (mLock) { + if (!mBound) { + return; + } - setPackageNames(allPackages); + // add the binder package + ComponentName service = mServiceWatcher.getBoundService().component; + if (service != null) { + allPackages.add(service.getPackageName()); + } + + setPackageNames(allPackages); + } } // executed on binder thread @Override public void onSetAllowed(boolean allowed) { - setAllowed(allowed); + synchronized (mLock) { + if (mBound) { + setAllowed(allowed); + } + } } // executed on binder thread @Override public void onSetProperties(ProviderProperties properties) { - setProperties(properties); + synchronized (mLock) { + if (mBound) { + setProperties(properties); + } + } } // executed on binder thread @@ -114,18 +131,27 @@ public class LocationProviderProxy extends AbstractLocationProvider { } }; + // also used to synchronized any state changes (setEnabled, setProperties, setState, etc) + private final Object mLock = new Object(); + private final ServiceWatcher mServiceWatcher; - @Nullable private ProviderRequest mRequest; + @GuardedBy("mLock") + private boolean mBound; + @GuardedBy("mLock") + private ProviderRequest mRequest; private LocationProviderProxy(Context context, String action, int enableOverlayResId, int nonOverlayPackageResId) { - super(context, FgThread.getExecutor()); + // safe to use direct executor since none of our callbacks call back into any code above + // this provider - they simply forward to the proxy service + super(context, DIRECT_EXECUTOR); mServiceWatcher = new ServiceWatcher(context, FgThread.getHandler(), action, this::onBind, this::onUnbind, enableOverlayResId, nonOverlayPackageResId); - mRequest = null; + mBound = false; + mRequest = ProviderRequest.EMPTY_REQUEST; } private boolean register() { @@ -135,26 +161,35 @@ public class LocationProviderProxy extends AbstractLocationProvider { private void onBind(IBinder binder) throws RemoteException { ILocationProvider provider = ILocationProvider.Stub.asInterface(binder); - ComponentName service = mServiceWatcher.getBoundService().component; - if (service != null) { - setPackageNames(Collections.singleton(service.getPackageName())); - } + synchronized (mLock) { + mBound = true; - provider.setLocationProviderManager(mManager); + provider.setLocationProviderManager(mManager); + if (!mRequest.equals(ProviderRequest.EMPTY_REQUEST)) { + provider.setRequest(mRequest, mRequest.workSource); + } - if (mRequest != null) { - provider.setRequest(mRequest, mRequest.workSource); + ComponentName service = mServiceWatcher.getBoundService().component; + if (service != null) { + setPackageNames(Collections.singleton(service.getPackageName())); + } } } private void onUnbind() { - setState(State.EMPTY_STATE); + synchronized (mLock) { + mBound = false; + setState(State.EMPTY_STATE); + } } @Override public void onSetRequest(ProviderRequest request) { - mServiceWatcher.runOnBinder(binder -> { + synchronized (mLock) { mRequest = request; + } + + mServiceWatcher.runOnBinder(binder -> { ILocationProvider service = ILocationProvider.Stub.asInterface(binder); service.setRequest(request, request.workSource); }); @@ -179,5 +214,8 @@ public class LocationProviderProxy extends AbstractLocationProvider { @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println("service=" + mServiceWatcher); + synchronized (mLock) { + pw.println("bound=" + mBound); + } } } diff --git a/services/core/java/com/android/server/location/MockableLocationProvider.java b/services/core/java/com/android/server/location/MockableLocationProvider.java index 18615f87609f..5b4f008a581b 100644 --- a/services/core/java/com/android/server/location/MockableLocationProvider.java +++ b/services/core/java/com/android/server/location/MockableLocationProvider.java @@ -233,6 +233,9 @@ public class MockableLocationProvider extends AbstractLocationProvider { AbstractLocationProvider provider; synchronized (mOwnerLock) { provider = mProvider; + pw.println("allowed=" + getState().allowed); + pw.println("properties=" + getState().properties); + pw.println("packages=" + getState().providerPackageNames); pw.println("request=" + mRequest); } diff --git a/services/core/java/com/android/server/GnssManagerService.java b/services/core/java/com/android/server/location/gnss/GnssManagerService.java index 32cdc41472c9..1eb2c525ff22 100644 --- a/services/core/java/com/android/server/GnssManagerService.java +++ b/services/core/java/com/android/server/location/gnss/GnssManagerService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 The Android Open Source Project + * Copyright (C) 2020 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.location.gnss; import android.Manifest; import android.annotation.NonNull; @@ -45,6 +45,9 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.DumpUtils; import com.android.internal.util.IndentingPrintWriter; +import com.android.server.FgThread; +import com.android.server.LocationManagerService; +import com.android.server.LocationManagerServiceUtils; import com.android.server.LocationManagerServiceUtils.LinkedListener; import com.android.server.LocationManagerServiceUtils.LinkedListenerBase; import com.android.server.location.CallerIdentity; @@ -322,7 +325,7 @@ public class GnssManagerService { synchronized (mGnssBatchingLock) { mGnssBatchingCallback = callback; mGnssBatchingDeathCallback = - new LocationManagerServiceUtils.LinkedListener<>( + new LinkedListener<>( callback, "BatchedLocationCallback", callerIdentity, @@ -757,7 +760,10 @@ public class GnssManagerService { } } - protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + /** + * Dump for debugging. + */ + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " "); @@ -776,7 +782,7 @@ public class GnssManagerService { mGnssMeasurementsListeners .values()) { ipw.println(listener + ": " + mLocationManagerService.isThrottlingExemptLocked( - listener.mCallerIdentity)); + listener.getCallerIdentity())); } } ipw.decreaseIndent(); @@ -787,7 +793,7 @@ public class GnssManagerService { for (LinkedListenerBase listener : mGnssNavigationMessageListeners.values()) { ipw.println(listener + ": " + mLocationManagerService.isThrottlingExemptLocked( - listener.mCallerIdentity)); + listener.getCallerIdentity())); } } ipw.decreaseIndent(); @@ -798,7 +804,7 @@ public class GnssManagerService { for (LinkedListenerBase listener : mGnssStatusListeners.values()) { ipw.println(listener + ": " + mLocationManagerService.isThrottlingExemptLocked( - listener.mCallerIdentity)); + listener.getCallerIdentity())); } } ipw.decreaseIndent(); diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index 190557122aa4..46fb24048a20 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -16,6 +16,7 @@ package com.android.server.media; +import android.annotation.Nullable; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; @@ -92,6 +93,20 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR PlaybackState.STATE_CONNECTING, PlaybackState.STATE_PLAYING); + private static final AudioAttributes DEFAULT_ATTRIBUTES = + new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(); + + private static int getVolumeStream(@Nullable AudioAttributes attr) { + if (attr == null) { + return DEFAULT_ATTRIBUTES.getVolumeControlStream(); + } + final int stream = attr.getVolumeControlStream(); + if (stream == AudioManager.USE_DEFAULT_STREAM_TYPE) { + return DEFAULT_ATTRIBUTES.getVolumeControlStream(); + } + return stream; + } + private final MessageHandler mHandler; private final int mOwnerPid; @@ -162,7 +177,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR mHandler = new MessageHandler(handlerLooper); mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); mAudioManagerInternal = LocalServices.getService(AudioManagerInternal.class); - mAudioAttrs = new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(); + mAudioAttrs = DEFAULT_ATTRIBUTES; // May throw RemoteException if the session app is killed. mSessionCb.mCb.asBinder().linkToDeath(this, 0); @@ -262,7 +277,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR } if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_LOCAL) { // Adjust the volume with a handler not to be blocked by other system service. - int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs); + int stream = getVolumeStream(mAudioAttrs); postAdjustLocalVolume(stream, direction, flags, opPackageName, pid, uid, asSystemService, useSuggested, previousFlagPlaySound); } else { @@ -302,7 +317,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR private void setVolumeTo(String packageName, String opPackageName, int pid, int uid, int value, int flags) { if (mVolumeType == PlaybackInfo.PLAYBACK_TYPE_LOCAL) { - int stream = AudioAttributes.toLegacyStreamType(mAudioAttrs); + int stream = getVolumeStream(mAudioAttrs); final int volumeValue = value; mHandler.post(new Runnable() { @Override @@ -720,7 +735,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR volumeType = mVolumeType; attributes = mAudioAttrs; } - int stream = AudioAttributes.toLegacyStreamType(attributes); + int stream = getVolumeStream(attributes); int max = mAudioManager.getStreamMaxVolume(stream); int current = mAudioManager.getStreamVolume(stream); return new PlaybackInfo(volumeType, VolumeProvider.VOLUME_CONTROL_ABSOLUTE, max, diff --git a/services/core/java/com/android/server/notification/NotificationDelegate.java b/services/core/java/com/android/server/notification/NotificationDelegate.java index 88fc072e2481..feb4f0edcc0d 100644 --- a/services/core/java/com/android/server/notification/NotificationDelegate.java +++ b/services/core/java/com/android/server/notification/NotificationDelegate.java @@ -48,7 +48,15 @@ public interface NotificationDelegate { int notificationLocation); void onNotificationDirectReplied(String key); void onNotificationSettingsViewed(String key); + /** + * Called when the state of {@link Notification#FLAG_BUBBLE} is changed. + */ void onNotificationBubbleChanged(String key, boolean isBubble); + /** + * Called when the state of {@link Notification.BubbleMetadata#FLAG_SUPPRESS_NOTIFICATION} + * changes. + */ + void onBubbleNotificationSuppressionChanged(String key, boolean isSuppressed); /** * Grant permission to read the specified URI to the package associated with the diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index eea59ca26f34..38ed67731ab0 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -1175,6 +1175,34 @@ public class NotificationManagerService extends SystemService { } @Override + public void onBubbleNotificationSuppressionChanged(String key, boolean isSuppressed) { + synchronized (mNotificationLock) { + NotificationRecord r = mNotificationsByKey.get(key); + if (r != null) { + Notification.BubbleMetadata data = r.getNotification().getBubbleMetadata(); + if (data == null) { + // No data, do nothing + return; + } + boolean currentlySuppressed = data.isNotificationSuppressed(); + if (currentlySuppressed == isSuppressed) { + // No changes, do nothing + return; + } + int flags = data.getFlags(); + if (isSuppressed) { + flags |= Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION; + } else { + flags &= ~Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION; + } + data.setFlags(flags); + mHandler.post(new EnqueueNotificationRunnable(r.getUser().getIdentifier(), r, + true /* isAppForeground */)); + } + } + } + + @Override /** * Grant permission to read the specified URI to the package specified in the * NotificationRecord associated with the given key. The callingUid represents the UID of diff --git a/services/core/java/com/android/server/om/OverlayActorEnforcer.java b/services/core/java/com/android/server/om/OverlayActorEnforcer.java index 0a9f923ac817..4c85603a719c 100644 --- a/services/core/java/com/android/server/om/OverlayActorEnforcer.java +++ b/services/core/java/com/android/server/om/OverlayActorEnforcer.java @@ -53,10 +53,6 @@ public class OverlayActorEnforcer { */ static Pair<String, ActorState> getPackageNameForActor(String actorUriString, Map<String, Map<String, String>> namedActors) { - if (namedActors.isEmpty()) { - return Pair.create(null, ActorState.NO_NAMED_ACTORS); - } - Uri actorUri = Uri.parse(actorUriString); String actorScheme = actorUri.getScheme(); @@ -65,6 +61,10 @@ public class OverlayActorEnforcer { return Pair.create(null, ActorState.INVALID_OVERLAYABLE_ACTOR_NAME); } + if (namedActors.isEmpty()) { + return Pair.create(null, ActorState.NO_NAMED_ACTORS); + } + String actorNamespace = actorUri.getAuthority(); Map<String, String> namespace = namedActors.get(actorNamespace); if (namespace == null) { diff --git a/services/core/java/com/android/server/om/TEST_MAPPING b/services/core/java/com/android/server/om/TEST_MAPPING index 52163a09e387..75229a1adccc 100644 --- a/services/core/java/com/android/server/om/TEST_MAPPING +++ b/services/core/java/com/android/server/om/TEST_MAPPING @@ -7,6 +7,20 @@ "include-filter": "com.android.server.om." } ] + }, + { + "name": "OverlayDeviceTests" + }, + { + "name": "OverlayHostTests" + }, + { + "name": "CtsAppSecurityHostTestCases", + "options": [ + { + "include-filter": "android.appsecurity.cts.OverlayHostTest" + } + ] } ] } diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java index 6e7e5d884a4a..5c17bec0db47 100644 --- a/services/core/java/com/android/server/pm/AppsFilter.java +++ b/services/core/java/com/android/server/pm/AppsFilter.java @@ -20,10 +20,12 @@ import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; import static android.provider.DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE; import android.Manifest; +import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import android.content.pm.PackageParser; import android.content.pm.parsing.AndroidPackage; import android.content.pm.parsing.ComponentParseUtils; import android.content.pm.parsing.ComponentParseUtils.ParsedActivity; @@ -108,6 +110,7 @@ public class AppsFilter { private final FeatureConfig mFeatureConfig; private final OverlayReferenceMapper mOverlayReferenceMapper; + private PackageParser.SigningDetails mSystemSigningDetails; AppsFilter(FeatureConfig featureConfig, String[] forceQueryableWhitelist, boolean systemAppsQueryable, @@ -321,6 +324,17 @@ public class AppsFilter { */ public void addPackage(PackageSetting newPkgSetting, ArrayMap<String, PackageSetting> existingSettings) { + if (Objects.equals("android", newPkgSetting.name)) { + // let's set aside the framework signatures + mSystemSigningDetails = newPkgSetting.signatures.mSigningDetails; + // and since we add overlays before we add the framework, let's revisit already added + // packages for signature matches + for (PackageSetting setting : existingSettings.values()) { + if (isSystemSigned(mSystemSigningDetails, setting)) { + mForceQueryable.add(setting.appId); + } + } + } Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "filter.addPackage"); try { final AndroidPackage newPkg = newPkgSetting.pkg; @@ -336,7 +350,9 @@ public class AppsFilter { || (newPkgSetting.isSystem() && (mSystemAppsQueryable || ArrayUtils.contains(mForceQueryableByDevicePackageNames, newPkg.getPackageName()))); - if (newIsForceQueryable) { + if (newIsForceQueryable + || (mSystemSigningDetails != null + && isSystemSigned(mSystemSigningDetails, newPkgSetting))) { mForceQueryable.add(newPkgSetting.appId); } @@ -382,6 +398,12 @@ public class AppsFilter { } } + private static boolean isSystemSigned(@NonNull PackageParser.SigningDetails sysSigningDetails, + PackageSetting pkgSetting) { + return pkgSetting.isSystem() + && pkgSetting.signatures.mSigningDetails.signaturesMatchExactly(sysSigningDetails); + } + /** * Removes a package for consideration when filtering visibility between apps. * diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index 1246e4034c8b..43ed25f944c6 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -75,11 +75,13 @@ import android.content.pm.PackageInstaller.SessionInfo; import android.content.pm.PackageInstaller.SessionInfo.StagedSessionErrorCode; import android.content.pm.PackageInstaller.SessionParams; import android.content.pm.PackageManager; +import android.content.pm.PackageManagerInternal; import android.content.pm.PackageParser; import android.content.pm.PackageParser.ApkLite; import android.content.pm.PackageParser.PackageLite; import android.content.pm.PackageParser.PackageParserException; import android.content.pm.dex.DexMetadataHelper; +import android.content.pm.parsing.AndroidPackage; import android.content.pm.parsing.ApkLiteParseUtils; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -101,6 +103,7 @@ import android.os.UserHandle; import android.os.incremental.IncrementalFileStorages; import android.os.incremental.IncrementalManager; import android.os.storage.StorageManager; +import android.provider.Settings.Secure; import android.stats.devicepolicy.DevicePolicyEnums; import android.system.ErrnoException; import android.system.Int64Ref; @@ -154,6 +157,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { private static final int MSG_COMMIT = 1; private static final int MSG_ON_PACKAGE_INSTALLED = 2; private static final int MSG_SEAL = 3; + private static final int MSG_STREAM_AND_VALIDATE = 4; /** XML constants used for persisting a session */ static final String TAG_SESSION = "session"; @@ -369,6 +373,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { @GuardedBy("mLock") private boolean mVerityFound; + private boolean mDataLoaderFinished = false; + // TODO(b/146080380): merge file list with Callback installation. private IncrementalFileStorages mIncrementalFileStorages; @@ -412,6 +418,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { case MSG_SEAL: handleSeal((IntentSender) msg.obj); break; + case MSG_STREAM_AND_VALIDATE: + handleStreamAndValidate(); + break; case MSG_COMMIT: handleCommit(); break; @@ -1019,11 +1028,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } private void handleSeal(@NonNull IntentSender statusReceiver) { - // TODO(b/136132412): update with new APIs - if (mIncrementalFileStorages != null) { - mIncrementalFileStorages.startLoading(); - } - if (!markAsCommitted(statusReceiver)) { + if (!markAsSealed(statusReceiver)) { return; } if (isMultiPackage()) { @@ -1031,21 +1036,52 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { final IntentSender childIntentSender = new ChildStatusIntentReceiver(remainingSessions, statusReceiver) .getIntentSender(); - boolean commitFailed = false; + boolean sealFailed = false; for (int i = mChildSessionIds.size() - 1; i >= 0; --i) { final int childSessionId = mChildSessionIds.keyAt(i); - // commit all children, regardless if any of them fail; we'll throw/return + // seal all children, regardless if any of them fail; we'll throw/return // as appropriate once all children have been processed if (!mSessionProvider.getSession(childSessionId) - .markAsCommitted(childIntentSender)) { - commitFailed = true; + .markAsSealed(childIntentSender)) { + sealFailed = true; } } - if (commitFailed) { + if (sealFailed) { return; } } + dispatchStreamAndValidate(); + } + + private void dispatchStreamAndValidate() { + mHandler.obtainMessage(MSG_STREAM_AND_VALIDATE).sendToTarget(); + } + + private void handleStreamAndValidate() { + // TODO(b/136132412): update with new APIs + if (mIncrementalFileStorages != null) { + mIncrementalFileStorages.startLoading(); + } + + boolean commitFailed = !markAsCommitted(); + + if (isMultiPackage()) { + for (int i = mChildSessionIds.size() - 1; i >= 0; --i) { + final int childSessionId = mChildSessionIds.keyAt(i); + // commit all children, regardless if any of them fail; we'll throw/return + // as appropriate once all children have been processed + if (!mSessionProvider.getSession(childSessionId) + .markAsCommitted()) { + commitFailed = true; + } + } + } + + if (commitFailed) { + return; + } + mHandler.obtainMessage(MSG_COMMIT).sendToTarget(); } @@ -1141,6 +1177,28 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } } + /** + * Returns whether or not a package can be installed while Secure FRP is enabled. + * <p> + * Only callers with the INSTALL_PACKAGES permission are allowed to install. However, + * prevent the package installer from installing anything because, while it has the + * permission, it will allows packages to be installed from anywhere. + */ + private static boolean isSecureFrpInstallAllowed(Context context, int callingUid) { + final PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class); + final String[] systemInstaller = pmi.getKnownPackageNames( + PackageManagerInternal.PACKAGE_INSTALLER, UserHandle.USER_SYSTEM); + final AndroidPackage callingInstaller = pmi.getPackage(callingUid); + if (callingInstaller != null + && ArrayUtils.contains(systemInstaller, callingInstaller.getPackageName())) { + // don't allow the system package installer to install while under secure FRP + return false; + } + + // require caller to hold the INSTALL_PACKAGES permission + return context.checkCallingOrSelfPermission(Manifest.permission.INSTALL_PACKAGES) + == PackageManager.PERMISSION_GRANTED; + } /** * Sanity checks to make sure it's ok to commit the session. @@ -1151,13 +1209,15 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { assertPreparedAndNotDestroyedLocked("commit"); assertNoWriteFileTransfersOpenLocked(); - final boolean enforceInstallPackages = forTransfer - || (android.provider.Settings.Secure.getInt(mContext.getContentResolver(), - android.provider.Settings.Secure.SECURE_FRP_MODE, 0) == 1); - if (enforceInstallPackages) { - mContext.enforceCallingOrSelfPermission(Manifest.permission.INSTALL_PACKAGES, null); + final boolean isSecureFrpEnabled = + (Secure.getInt(mContext.getContentResolver(), Secure.SECURE_FRP_MODE, 0) == 1); + if (isSecureFrpEnabled + && !isSecureFrpInstallAllowed(mContext, Binder.getCallingUid())) { + throw new SecurityException("Can't install packages while in secure FRP"); } + if (forTransfer) { + mContext.enforceCallingOrSelfPermission(Manifest.permission.INSTALL_PACKAGES, null); if (mInstallerUid == mOriginalInstallerUid) { throw new IllegalArgumentException("Session has not been transferred"); } @@ -1170,46 +1230,50 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } /** - * Do everything but actually commit the session. If this was not already called, the session - * will be sealed and marked as committed. The caller of this method is responsible for - * subsequently submitting this session for processing. + * If this was not already called, the session will be sealed. * * This method may be called multiple times to update the status receiver validate caller * permissions. */ - private boolean markAsCommitted(@NonNull IntentSender statusReceiver) { + private boolean markAsSealed(@NonNull IntentSender statusReceiver) { Objects.requireNonNull(statusReceiver); List<PackageInstallerSession> childSessions = getChildSessions(); - final boolean wasSealed; synchronized (mLock) { mRemoteStatusReceiver = statusReceiver; - // After validations and updating the observer, we can skip re-sealing, etc. because we - // have already marked ourselves as committed. - if (mCommitted) { + // After updating the observer, we can skip re-sealing. + if (mSealed) { return true; } - wasSealed = mSealed; try { - if (!mSealed) { - sealLocked(childSessions); - } - - try { - streamAndValidateLocked(); - } catch (StreamingException e) { - // In case of streaming failure we don't want to fail or commit the session. - // Just return from this method and allow caller to commit again. - PackageInstallerService.sendPendingStreaming(mContext, mRemoteStatusReceiver, - sessionId, e); - return false; - } + sealLocked(childSessions); } catch (PackageManagerException e) { return false; } + } + + // Persist the fact that we've sealed ourselves to prevent + // mutations of any hard links we create. We do this without holding + // the session lock, since otherwise it's a lock inversion. + mCallback.onSessionSealedBlocking(this); + + return true; + } + + private boolean markAsCommitted() { + synchronized (mLock) { + Objects.requireNonNull(mRemoteStatusReceiver); + + if (mCommitted) { + return true; + } + + if (!streamAndValidateLocked()) { + return false; + } // Client staging is fully done at this point mClientProgress = 1f; @@ -1222,12 +1286,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { mCommitted = true; } - if (!wasSealed) { - // Persist the fact that we've sealed ourselves to prevent - // mutations of any hard links we create. We do this without holding - // the session lock, since otherwise it's a lock inversion. - mCallback.onSessionSealedBlocking(this); - } return true; } @@ -1295,17 +1353,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } /** - * Convenience wrapper, see {@link #sealLocked(List<PackageInstallerSession>) seal} and - * {@link #streamAndValidateLocked()}. - */ - @GuardedBy("mLock") - private void sealAndValidateLocked(List<PackageInstallerSession> childSessions) - throws PackageManagerException, StreamingException { - sealLocked(childSessions); - streamAndValidateLocked(); - } - - /** * Seal the session to prevent further modification. * * <p>The session will be sealed after calling this method even if it failed. @@ -1338,23 +1385,23 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { * Prepare DataLoader and stream content for DataLoader sessions. * Validate the contents of all session. * - * @throws StreamingException if streaming failed. - * @throws PackageManagerException if validation failed. + * @return false if validation failed. */ @GuardedBy("mLock") - private void streamAndValidateLocked() - throws PackageManagerException, StreamingException { + private boolean streamAndValidateLocked() { try { // Read transfers from the original owner stay open, but as the session's data cannot // be modified anymore, there is no leak of information. For staged sessions, further // validation is performed by the staging manager. if (!params.isMultiPackage) { + if (!prepareDataLoaderLocked()) { + return false; + } + final PackageInfo pkgInfo = mPm.getPackageInfo( params.appPackageName, PackageManager.GET_SIGNATURES | PackageManager.MATCH_STATIC_SHARED_LIBRARIES /*flags*/, userId); - prepareDataLoader(); - if (isApexInstallation()) { validateApexInstallLocked(); } else { @@ -1365,15 +1412,16 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { if (params.isStaged) { mStagingManager.checkNonOverlappingWithStagedSessions(this); } + + return true; } catch (PackageManagerException e) { - throw onSessionVerificationFailure(e); - } catch (StreamingException e) { - throw e; + onSessionVerificationFailure(e); } catch (Throwable e) { // Convert all exceptions into package manager exceptions as only those are handled // in the code above. - throw onSessionVerificationFailure(new PackageManagerException(e)); + onSessionVerificationFailure(new PackageManagerException(e)); } + return false; } private PackageManagerException onSessionVerificationFailure(PackageManagerException e) { @@ -2391,6 +2439,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { synchronized (mLock) { assertCallerIsOwnerOrRootLocked(); assertPreparedAndNotSealedLocked("addFile"); + mFiles.add(FileInfo.added(location, name, lengthBytes, metadata, signature)); } } @@ -2413,48 +2462,30 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } } - static class Notificator { - private int mValue = 0; - - void setValue(int value) { - synchronized (this) { - mValue = value; - this.notify(); - } - } - int waitForValue() { - synchronized (this) { - while (mValue == 0) { - try { - this.wait(); - } catch (InterruptedException e) { - // Happens if someone interrupts your thread. - } - } - return mValue; - } - } - } - /** * Makes sure files are present in staging location. */ - private void prepareDataLoader() - throws PackageManagerException, StreamingException { + @GuardedBy("mLock") + private boolean prepareDataLoaderLocked() + throws PackageManagerException { if (!isDataLoaderInstallation()) { - return; + return true; + } + if (mDataLoaderFinished) { + return true; } - List<InstallationFile> addedFiles = mFiles.stream().filter( + final List<InstallationFile> addedFiles = mFiles.stream().filter( file -> sAddedFilter.accept(new File(file.name))).map( file -> new InstallationFile( - file.name, file.lengthBytes, file.metadata)).collect( + file.name, file.lengthBytes, file.metadata)).collect( Collectors.toList()); - List<String> removedFiles = mFiles.stream().filter( + final List<String> removedFiles = mFiles.stream().filter( file -> sRemovedFilter.accept(new File(file.name))).map( file -> file.name.substring( - 0, file.name.length() - REMOVE_MARKER_EXTENSION.length())).collect( + 0, file.name.length() - REMOVE_MARKER_EXTENSION.length())).collect( Collectors.toList()); + if (mIncrementalFileStorages != null) { for (InstallationFile file : addedFiles) { try { @@ -2465,46 +2496,73 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { "Failed to add and configure Incremental File: " + file.getName(), ex); } } - return; + return true; } - final FileSystemConnector connector = new FileSystemConnector(addedFiles); - - DataLoaderManager dataLoaderManager = mContext.getSystemService(DataLoaderManager.class); + final DataLoaderManager dataLoaderManager = mContext.getSystemService( + DataLoaderManager.class); if (dataLoaderManager == null) { throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE, "Failed to find data loader manager service"); } - // TODO(b/146080380): make this code async. - final Notificator created = new Notificator(); - final Notificator started = new Notificator(); - final Notificator imageReady = new Notificator(); - IDataLoaderStatusListener listener = new IDataLoaderStatusListener.Stub() { @Override public void onStatusChanged(int dataLoaderId, int status) { - switch (status) { - case IDataLoaderStatusListener.DATA_LOADER_CREATED: { - created.setValue(1); - break; - } - case IDataLoaderStatusListener.DATA_LOADER_STARTED: { - started.setValue(1); - break; + try { + if (status == IDataLoaderStatusListener.DATA_LOADER_DESTROYED) { + return; } - case IDataLoaderStatusListener.DATA_LOADER_IMAGE_READY: { - imageReady.setValue(1); - break; + + IDataLoader dataLoader = dataLoaderManager.getDataLoader(dataLoaderId); + if (dataLoader == null) { + mDataLoaderFinished = true; + onSessionVerificationFailure( + new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE, + "Failure to obtain data loader")); + return; } - case IDataLoaderStatusListener.DATA_LOADER_IMAGE_NOT_READY: { - imageReady.setValue(2); - break; + + switch (status) { + case IDataLoaderStatusListener.DATA_LOADER_CREATED: { + dataLoader.start(); + break; + } + case IDataLoaderStatusListener.DATA_LOADER_STARTED: { + dataLoader.prepareImage(addedFiles, removedFiles); + break; + } + case IDataLoaderStatusListener.DATA_LOADER_IMAGE_READY: { + mDataLoaderFinished = true; + if (hasParentSessionId()) { + mSessionProvider.getSession( + mParentSessionId).dispatchStreamAndValidate(); + } else { + dispatchStreamAndValidate(); + } + dataLoader.destroy(); + break; + } + case IDataLoaderStatusListener.DATA_LOADER_IMAGE_NOT_READY: { + mDataLoaderFinished = true; + onSessionVerificationFailure( + new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE, + "Failed to prepare image.")); + dataLoader.destroy(); + break; + } } + } catch (RemoteException e) { + // In case of streaming failure we don't want to fail or commit the session. + // Just return from this method and allow caller to commit again. + PackageInstallerService.sendPendingStreaming(mContext, + mRemoteStatusReceiver, + sessionId, new StreamingException(e)); } } }; + final FileSystemConnector connector = new FileSystemConnector(addedFiles); final FileSystemControlParcel control = new FileSystemControlParcel(); control.callback = connector; @@ -2519,28 +2577,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE, "Failed to initialize data loader"); } - created.waitForValue(); - IDataLoader dataLoader = dataLoaderManager.getDataLoader(sessionId); - if (dataLoader == null) { - throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE, - "Failure to obtain data loader"); - } - - try { - dataLoader.start(); - started.waitForValue(); - - dataLoader.prepareImage(addedFiles, removedFiles); - if (imageReady.waitForValue() == 2) { - throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE, - "Failed to prepare image."); - } - - dataLoader.destroy(); - } catch (RemoteException e) { - throw new StreamingException(e); - } + return false; } @Override diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java b/services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java index 281c44a61153..5dca9e147e31 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java @@ -152,6 +152,7 @@ public class PackageManagerShellCommandDataLoader extends DataLoaderService { } return true; } catch (IOException e) { + Slog.e(TAG, "Exception while streaming files", e); return false; } } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index da0d82047cbe..7c76656e1e6f 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3075,7 +3075,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { event.getAction(), fallbackAction.keyCode, event.getRepeatCount(), fallbackAction.metaState, event.getDeviceId(), event.getScanCode(), - flags, event.getSource(), event.getDisplayId(), null); + flags, event.getSource(), event.getDisplayId(), null /* hmac */, null); if (!interceptFallback(focusedToken, fallbackEvent, policyFlags)) { fallbackEvent.recycle(); diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index df8e30f9387a..b45522d11a5d 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -62,6 +62,8 @@ import com.android.server.inputmethod.InputMethodManagerInternal; import com.android.server.policy.WindowManagerPolicy; import com.android.server.statusbar.StatusBarManagerInternal; +import java.io.PrintWriter; + /** * Sends broadcasts about important power state changes. * <p> @@ -123,6 +125,7 @@ public class Notifier { @Nullable private final StatusBarManagerInternal mStatusBarManagerInternal; private final TrustManager mTrustManager; private final Vibrator mVibrator; + private final WakeLockLog mWakeLockLog; private final NotifierHandler mHandler; private final Intent mScreenOnIntent; @@ -190,6 +193,8 @@ public class Notifier { mShowWirelessChargingAnimationConfig = context.getResources().getBoolean( com.android.internal.R.bool.config_showBuiltinWirelessChargingAnim); + mWakeLockLog = new WakeLockLog(); + // Initialize interactive state for battery stats. try { mBatteryStats.noteInteractive(true); @@ -228,6 +233,8 @@ public class Notifier { // Ignore } } + + mWakeLockLog.onWakeLockAcquired(tag, ownerUid, flags); } public void onLongPartialWakeLockStart(String tag, int ownerUid, WorkSource workSource, @@ -338,6 +345,7 @@ public class Notifier { // Ignore } } + mWakeLockLog.onWakeLockReleased(tag, ownerUid); } private int getBatteryStatsWakeLockMonitorType(int flags) { @@ -647,6 +655,17 @@ public class Notifier { mHandler.sendMessage(msg); } + /** + * Dumps data for bugreports. + * + * @param pw The stream to print to. + */ + public void dump(PrintWriter pw) { + if (mWakeLockLog != null) { + mWakeLockLog.dump(pw); + } + } + private void updatePendingBroadcastLocked() { if (!mBroadcastInProgress && mPendingInteractiveState != INTERACTIVE_STATE_UNKNOWN diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 3f3a13368ffc..4d13658c85b7 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -3810,6 +3810,10 @@ public final class PowerManagerService extends SystemService if (wcd != null) { wcd.dump(pw); } + + if (mNotifier != null) { + mNotifier.dump(pw); + } } private void dumpProto(FileDescriptor fd) { @@ -4268,7 +4272,7 @@ public final class PowerManagerService extends SystemService /** * Represents a wake lock that has been acquired by an application. */ - private final class WakeLock implements IBinder.DeathRecipient { + /* package */ final class WakeLock implements IBinder.DeathRecipient { public final IBinder mLock; public int mFlags; public String mTag; diff --git a/services/core/java/com/android/server/power/WakeLockLog.java b/services/core/java/com/android/server/power/WakeLockLog.java new file mode 100644 index 000000000000..d6060fa419b9 --- /dev/null +++ b/services/core/java/com/android/server/power/WakeLockLog.java @@ -0,0 +1,1355 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.power; + +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.os.PowerManager; +import android.text.TextUtils; +import android.util.Slog; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.os.BackgroundThread; +import com.android.internal.os.SomeArgs; + +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.ConcurrentModificationException; +import java.util.Date; +import java.util.Iterator; +import java.util.NoSuchElementException; + +/** + * Simple Log for wake lock events. Optimized to reduce memory usage. + * + * The wake lock events are ultimately saved in-memory in a pre-allocated byte-based ring-buffer. + * + * Most of the work of this log happens in the {@link BackgroundThread}. + * + * The main log is basically just a sequence of the two wake lock events (ACQUIRE and RELEASE). + * Each entry in the log stores the following data: + * { + * event type (RELEASE | ACQUIRE), + * time (64-bit from System.currentTimeMillis()), + * wake-lock ID {ownerUID (int) + tag (String)}, + * wake-lock flags + * } + * + * In order to maximize the number of entries that fit into the log, there are various efforts made + * to compress what we store; of which two are fairly significant and contribute the most to the + * complexity of this code: + * A) Relative Time + * - Time in each log entry is stored as an 8-bit value and is relative to the time of the + * previous event. When relative time is too large for 8-bits, we add a third type of event + * called TIME_RESET, which is used to add a new 64-bit reference-time event to the log. + * In practice, TIME_RESETs seem to make up about 10% or less of the total events depending + * on the device usage. + * B) Wake-lock tag/ID as indexes + * - Wake locks are often reused many times. To avoid storing large strings in the ring buffer, + * we maintain a {@link TagDatabase} that associates each wakelock tag with an 7-bit index. + * The main log stores only these 7-bit indexes instead of whole strings. + * + * To make the code a bit more organized, there exists a class {@link EntryByteTranslator} which + * uses the tag database, and reference-times to convert between a {@link LogEntry} and the + * byte sequence that is ultimately stored in the main log, {@link TheLog}. + */ +final class WakeLockLog { + private static final String TAG = "PowerManagerService.WLLog"; + + private static final boolean DEBUG = false; + + private static final int MSG_ON_WAKE_LOCK_EVENT = 1; + + private static final int TYPE_TIME_RESET = 0x0; + private static final int TYPE_ACQUIRE = 0x1; + private static final int TYPE_RELEASE = 0x2; + private static final int MAX_LOG_ENTRY_BYTE_SIZE = 9; + private static final int LOG_SIZE = 1024 * 10; + private static final int LOG_SIZE_MIN = MAX_LOG_ENTRY_BYTE_SIZE + 1; + + private static final int TAG_DATABASE_SIZE = 128; + private static final int TAG_DATABASE_SIZE_MAX = 128; + + private static final int LEVEL_UNKNOWN = 0; + private static final int LEVEL_PARTIAL_WAKE_LOCK = 1; + private static final int LEVEL_FULL_WAKE_LOCK = 2; + private static final int LEVEL_SCREEN_DIM_WAKE_LOCK = 3; + private static final int LEVEL_SCREEN_BRIGHT_WAKE_LOCK = 4; + private static final int LEVEL_PROXIMITY_SCREEN_OFF_WAKE_LOCK = 5; + private static final int LEVEL_DOZE_WAKE_LOCK = 6; + private static final int LEVEL_DRAW_WAKE_LOCK = 7; + + private static final String[] LEVEL_TO_STRING = { + "unknown", + "partial", + "full", + "screen-dim", + "screen-bright", + "prox", + "doze", + "draw" + }; + + /** + * Flags use the same bit field as the level, so must start at the next available bit + * after the largest level. + */ + private static final int FLAG_ON_AFTER_RELEASE = 0x8; + private static final int FLAG_ACQUIRE_CAUSES_WAKEUP = 0x10; + + private static final int MASK_LOWER_6_BITS = 0x3F; + private static final int MASK_LOWER_7_BITS = 0x7F; + + private static final String[] REDUCED_TAG_PREFIXES = + {"*job*/", "*gms_scheduler*/", "IntentOp:"}; + + private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS"); + + /** + * Lock protects WakeLockLock.dump (binder thread) from conflicting with changes to the log + * happening on the background thread. + */ + private final Object mLock = new Object(); + + private final Injector mInjector; + private final TheLog mLog; + private final TagDatabase mTagDatabase; + private final Handler mHandler; + private final SimpleDateFormat mDumpsysDateFormat; + + WakeLockLog() { + this(new Injector()); + } + + @VisibleForTesting + WakeLockLog(Injector injector) { + mInjector = injector; + mHandler = new WakeLockLogHandler(injector.getLooper()); + mTagDatabase = new TagDatabase(injector); + EntryByteTranslator translator = new EntryByteTranslator(mTagDatabase); + mLog = new TheLog(injector, translator, mTagDatabase); + mDumpsysDateFormat = injector.getDateFormat(); + } + + /** + * Receives notifications of an ACQUIRE wake lock event from PowerManager. + * + * @param tag The wake lock tag + * @param ownerUid The owner UID of the wake lock. + * @param flags Flags used for the wake lock. + */ + public void onWakeLockAcquired(String tag, int ownerUid, int flags) { + onWakeLockEvent(TYPE_ACQUIRE, tag, ownerUid, flags); + } + + /** + * Receives notifications of a RELEASE wake lock event from PowerManager. + * + * @param tag The wake lock tag + * @param ownerUid The owner UID of the wake lock. + */ + public void onWakeLockReleased(String tag, int ownerUid) { + onWakeLockEvent(TYPE_RELEASE, tag, ownerUid, 0 /* flags */); + } + + /** + * Dumps all the wake lock data currently saved in the wake lock log to the specified + * {@code PrintWriter}. + * + * @param The {@code PrintWriter} to write to. + */ + public void dump(PrintWriter pw) { + dump(pw, false); + } + + @VisibleForTesting + void dump(PrintWriter pw, boolean includeTagDb) { + try { + synchronized (mLock) { + pw.println("Wake Lock Log"); + LogEntry tempEntry = new LogEntry(); // Temporary entry for the iterator to reuse. + final Iterator<LogEntry> iterator = mLog.getAllItems(tempEntry); + int numEvents = 0; + int numResets = 0; + while (iterator.hasNext()) { + String address = null; + if (DEBUG) { + // Gets the byte index in the log for the current entry. + address = iterator.toString(); + } + LogEntry entry = iterator.next(); + if (entry != null) { + if (entry.type == TYPE_TIME_RESET) { + numResets++; + } else { + numEvents++; + if (DEBUG) { + pw.print(address); + } + entry.dump(pw, mDumpsysDateFormat); + } + } + } + pw.println(" -"); + pw.println(" Events: " + numEvents + ", Time-Resets: " + numResets); + pw.println(" Buffer, Bytes used: " + mLog.getUsedBufferSize()); + if (DEBUG || includeTagDb) { + pw.println(" " + mTagDatabase); + } + } + } catch (Exception e) { + pw.println("Exception dumping wake-lock log: " + e.toString()); + } + } + + /** + * Adds a new entry to the log based on the specified wake lock parameters. + * + * Grabs the current time for the event and then posts the rest of the logic (actually + * adding it to the log) to a background thread. + * + * @param eventType The type of event (ACQUIRE, RELEASE); + * @param tag The wake lock's identifying tag. + * @param ownerUid The owner UID of the wake lock. + * @param flags The flags used with the wake lock. + */ + private void onWakeLockEvent(int eventType, String tag, int ownerUid, + int flags) { + if (tag == null) { + Slog.w(TAG, "Insufficient data to log wakelock [tag: " + tag + + ", ownerUid: " + ownerUid + + ", flags: 0x" + Integer.toHexString(flags)); + return; + } + + final long time = mInjector.currentTimeMillis(); + + SomeArgs args = SomeArgs.obtain(); + args.arg1 = tagNameReducer(tag); + args.argi1 = eventType; + args.argi2 = ownerUid; + args.argi3 = eventType == TYPE_ACQUIRE ? translateFlagsFromPowerManager(flags) : 0; + args.argi4 = (int) ((time >> 32) & 0xFFFFFFFFL); + args.argi5 = (int) (time & 0xFFFFFFFFL); + mHandler.obtainMessage(MSG_ON_WAKE_LOCK_EVENT, args).sendToTarget(); + } + + /** + * Handles a new wakelock event in the background thread. + * + * @param eventType The type of event (ACQUIRE, RELEASE) + * @param tag The wake lock's identifying tag. + * @param ownerUid The owner UID of the wake lock. + * @param flags the flags used with the wake lock. + */ + private void handleWakeLockEventInternal(int eventType, String tag, int ownerUid, int flags, + long time) { + synchronized (mLock) { + final TagData tagData = mTagDatabase.findOrCreateTag( + tag, ownerUid, true /* shouldCreate */); + mLog.addEntry(new LogEntry(time, eventType, tagData, flags)); + } + } + + /** + * Translates wake lock flags from PowerManager into a redefined set that fits + * in the lower 6-bits of the return value. The results are an OR-ed combination of the + * flags, {@code WakeLockLog.FLAG_*}, and a log-level, {@code WakeLockLog.LEVEL_*}. + * + * @param flags Wake lock flags including {@code PowerManager.*_WAKE_LOCK} + * {@link PowerManager.ACQUIRE_CAUSES_WAKEUP}, and + * {@link PowerManager.ON_AFTER_RELEASE}. + * @return The compressed flags value. + */ + int translateFlagsFromPowerManager(int flags) { + int newFlags = 0; + switch(PowerManager.WAKE_LOCK_LEVEL_MASK & flags) { + case PowerManager.PARTIAL_WAKE_LOCK: + newFlags = LEVEL_PARTIAL_WAKE_LOCK; + break; + case PowerManager.SCREEN_DIM_WAKE_LOCK: + newFlags = LEVEL_SCREEN_DIM_WAKE_LOCK; + break; + case PowerManager.SCREEN_BRIGHT_WAKE_LOCK: + newFlags = LEVEL_SCREEN_BRIGHT_WAKE_LOCK; + break; + case PowerManager.FULL_WAKE_LOCK: + newFlags = LEVEL_FULL_WAKE_LOCK; + break; + case PowerManager.DOZE_WAKE_LOCK: + newFlags = LEVEL_DOZE_WAKE_LOCK; + break; + case PowerManager.DRAW_WAKE_LOCK: + newFlags = LEVEL_DRAW_WAKE_LOCK; + break; + case PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK: + newFlags = LEVEL_PROXIMITY_SCREEN_OFF_WAKE_LOCK; + break; + default: + Slog.w(TAG, "Unsupported lock level for logging, flags: " + flags); + break; + } + if ((flags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0) { + newFlags |= FLAG_ACQUIRE_CAUSES_WAKEUP; + } + if ((flags & PowerManager.ON_AFTER_RELEASE) != 0) { + newFlags |= FLAG_ON_AFTER_RELEASE; + } + return newFlags; + } + + /** + * Reduce certain wakelock tags to something smaller. + * e.g. "*job* /com.aye.bee.cee/dee.ee.eff.Gee$Eich" -> "*job* /c.a.b.c/d.e.e.Gee$Eich" + * This is used to save space when storing the tags in the Tag Database. + * + * @param tag The tag name to reduce + * @return A reduced version of the tag name. + */ + private String tagNameReducer(String tag) { + if (tag == null) { + return null; + } + + String reduciblePrefix = null; + for (int tp = 0; tp < REDUCED_TAG_PREFIXES.length; tp++) { + if (tag.startsWith(REDUCED_TAG_PREFIXES[tp])) { + reduciblePrefix = REDUCED_TAG_PREFIXES[tp]; + break; + } + } + + if (reduciblePrefix != null) { + final StringBuilder sb = new StringBuilder(); + + // add prefix first + sb.append(tag.substring(0, reduciblePrefix.length())); + + // Stop looping on final marker + final int end = Math.max(tag.lastIndexOf("/"), tag.lastIndexOf(".")); + boolean printNext = true; + int index = sb.length(); // Start looping after the prefix + for (; index < end; index++) { + char c = tag.charAt(index); + boolean isMarker = (c == '.' || c == '/'); + // We print all markers and the character that follows each marker + if (isMarker || printNext) { + sb.append(c); + } + printNext = isMarker; + } + sb.append(tag.substring(index)); // append everything that is left + return sb.toString(); + } + return tag; + } + + /** + * Represents a wakelock-event entry in the log. + * Holds all the data of a wakelock. The lifetime of this class is fairly short as the data + * within this type is eventually written to the log as bytes and the instances discarded until + * the log is read again which is fairly infrequent. + * + * At the time of this writing, this can be one of three types of entries: + * 1) Wake lock acquire + * 2) Wake lock release + * 3) Time reset + */ + static class LogEntry { + /** + * Type of wake lock from the {@code WakeLockLog.TYPE_*} set. + */ + public int type; + + /** + * Time of the wake lock entry as taken from System.currentTimeMillis(). + */ + public long time; + + /** + * Data about the wake lock tag. + */ + public TagData tag; + + /** + * Flags used with the wake lock. + */ + public int flags; + + LogEntry() {} + + LogEntry(long time, int type, TagData tag, int flags) { + set(time, type, tag, flags); + } + + /** + * Sets the values of the log entry. + * This is exposed to ease the reuse of {@code LogEntry} instances. + * + * @param time Time of the entry. + * @param type Type of entry. + * @param tag Tag data of the wake lock. + * @param flags Flags used with the wake lock. + */ + public void set(long time, int type, TagData tag, int flags) { + this.time = time; + this.type = type; + this.tag = tag; + this.flags = flags; + } + + /** + * Dumps this entry to the specified {@link PrintWriter}. + * + * @param pw The print-writer to dump to. + * @param dateFormat The date format to use for outputing times. + */ + public void dump(PrintWriter pw, SimpleDateFormat dateFormat) { + pw.println(" " + toStringInternal(dateFormat)); + } + + /** + * Converts the entry to a string. + * date - ownerUid - (ACQ|REL) tag [(flags)] + * e.g., 1999-01-01 12:01:01.123 - 10012 - ACQ bluetooth_timer (partial) + */ + @Override + public String toString() { + return toStringInternal(DATE_FORMAT); + } + + /** + * Converts the entry to a string. + * date - ownerUid - (ACQ|REL) tag [(flags)] + * e.g., 1999-01-01 12:01:01.123 - 10012 - ACQ bluetooth_timer (partial) + * + * @param dateFormat The date format to use for outputing times. + * @return The string output of this class instance. + */ + private String toStringInternal(SimpleDateFormat dateFormat) { + StringBuilder sb = new StringBuilder(); + if (type == TYPE_TIME_RESET) { + return dateFormat.format(new Date(time)) + " - RESET"; + } + sb.append(dateFormat.format(new Date(time))) + .append(" - ") + .append(tag == null ? "---" : tag.ownerUid) + .append(" - ") + .append(type == TYPE_ACQUIRE ? "ACQ" : "REL") + .append(" ") + .append(tag == null ? "UNKNOWN" : tag.tag); + if (type == TYPE_ACQUIRE) { + sb.append(" ("); + flagsToString(sb); + sb.append(")"); + } + return sb.toString(); + } + + private void flagsToString(StringBuilder sb) { + sb.append(LEVEL_TO_STRING[flags & 0x7]); + if ((flags & FLAG_ON_AFTER_RELEASE) == FLAG_ON_AFTER_RELEASE) { + sb.append(",on-after-release"); + } + if ((flags & FLAG_ACQUIRE_CAUSES_WAKEUP) == FLAG_ACQUIRE_CAUSES_WAKEUP) { + sb.append(",acq-causes-wake"); + } + } + } + + /** + * Converts between a {@link LogEntry} instance and a byte sequence. + * + * This is used to convert {@link LogEntry}s to a series of bytes before being written into + * the log, and vice-versa when reading from the log. + * + * This method employs the compression techniques that are mentioned in the header of + * {@link WakeLockLog}: Relative-time and Tag-indexing. Please see the header for the + * description of both. + * + * The specific byte formats used are explained more thoroughly in the method {@link #toBytes}. + */ + static class EntryByteTranslator { + + // Error codes that can be returned when converting to bytes. + static final int ERROR_TIME_IS_NEGATIVE = -1; // Relative time is negative + static final int ERROR_TIME_TOO_LARGE = -2; // Relative time is out of valid range (0-255) + + private final TagDatabase mTagDatabase; + + EntryByteTranslator(TagDatabase tagDatabase) { + mTagDatabase = tagDatabase; + } + + /** + * Translates the specified bytes into a LogEntry instance, if possible. + * + * See {@link #toBytes} for an explanation of the byte formats. + * + * @param bytes The bytes to read. + * @param timeReference The reference time to use when reading the relative time from the + * bytes buffer. + * @param entryToReuse The entry instance to write to. If null, this method will create a + * new instance. + * @return The converted entry, or null if data is corrupt. + */ + LogEntry fromBytes(byte[] bytes, long timeReference, LogEntry entryToReuse) { + if (bytes == null || bytes.length == 0) { + return null; + } + + // Create an entry if non if passed in to use + LogEntry entry = entryToReuse != null ? entryToReuse : new LogEntry(); + + int type = (bytes[0] >> 6) & 0x3; + if ((type & 0x2) == 0x2) { + // As long as the highest order bit of the byte is set, it is a release + type = TYPE_RELEASE; + } + switch (type) { + case TYPE_ACQUIRE: { + if (bytes.length < 3) { + break; + } + + int flags = bytes[0] & MASK_LOWER_6_BITS; + int tagIndex = bytes[1] & MASK_LOWER_7_BITS; + TagData tag = mTagDatabase.getTag(tagIndex); + long time = (bytes[2] & 0xFF) + timeReference; + entry.set(time, TYPE_ACQUIRE, tag, flags); + return entry; + } + case TYPE_RELEASE: { + if (bytes.length < 2) { + break; + } + + int flags = 0; + int tagIndex = bytes[0] & MASK_LOWER_7_BITS; + TagData tag = mTagDatabase.getTag(tagIndex); + long time = (bytes[1] & 0xFF) + timeReference; + entry.set(time, TYPE_RELEASE, tag, flags); + return entry; + } + case TYPE_TIME_RESET: { + if (bytes.length < 9) { + break; + } + + long time = ((bytes[1] & 0xFFL) << 56) + | ((bytes[2] & 0xFFL) << 48) + | ((bytes[3] & 0xFFL) << 40) + | ((bytes[4] & 0xFFL) << 32) + | ((bytes[5] & 0xFFL) << 24) + | ((bytes[6] & 0xFFL) << 16) + | ((bytes[7] & 0xFFL) << 8) + | (bytes[8] & 0xFFL); + entry.set(time, TYPE_TIME_RESET, null, 0); + return entry; + } + default: + Slog.w(TAG, "Type not recognized [" + type + "]", new Exception()); + break; + } + return null; + } + + /** + * Converts and writes the specified entry into the specified byte array. + * If the byte array is null or too small, then the method writes nothing, but still returns + * the number of bytes necessary to write the entry. + * + * Byte format used for each type: + * + * TYPE_RELEASE: + * bits + * 0 1 2 3 4 5 6 7 + * bytes 0 [ 1 | 7-bit wake lock tag index ] + * 1 [ 8-bit relative time ] + * + * + * TYPE_ACQUIRE: + * bits + * 0 1 2 3 4 5 6 7 + * 0 [ 0 1 | wake lock flags ] + * bytes 1 [unused| 7-bit wake lock tag index ] + * 2 [ 8-bit relative time ] + * + * + * TYPE_TIME_RESET: + * bits + * 0 1 2 3 4 5 6 7 + * 0 [ 0 0 | unused ] + * bytes 1-9 [ 64-bit reference-time ] + * + * @param entry The entry to convert/write + * @param bytes The buffer to write to, or null to just return the necessary bytes. + * @param timeReference The reference-time used to calculate relative time of the entry. + * @return The number of bytes written to buffer, or required to write to the buffer. + */ + int toBytes(LogEntry entry, byte[] bytes, long timeReference) { + int sizeNeeded = -1; + switch (entry.type) { + case TYPE_ACQUIRE: { + sizeNeeded = 3; + if (bytes != null && bytes.length >= sizeNeeded) { + int relativeTime = getRelativeTime(timeReference, entry.time); + if (relativeTime < 0) { + // Negative relative time indicates error code + return relativeTime; + } + bytes[0] = (byte) ((TYPE_ACQUIRE << 6) + | (entry.flags & MASK_LOWER_6_BITS)); + bytes[1] = (byte) mTagDatabase.getTagIndex(entry.tag); + bytes[2] = (byte) (relativeTime & 0xFF); // Lower 8 bits of the time + if (DEBUG) { + Slog.d(TAG, "ACQ - Setting bytes: " + Arrays.toString(bytes)); + } + } + break; + } + case TYPE_RELEASE: { + sizeNeeded = 2; + if (bytes != null && bytes.length >= sizeNeeded) { + int relativeTime = getRelativeTime(timeReference, entry.time); + if (relativeTime < 0) { + // Negative relative time indicates error code + return relativeTime; + } + bytes[0] = (byte) (0x80 | mTagDatabase.getTagIndex(entry.tag)); + bytes[1] = (byte) (relativeTime & 0xFF); // Lower 8 bits of the time + if (DEBUG) { + Slog.d(TAG, "REL - Setting bytes: " + Arrays.toString(bytes)); + } + } + break; + } + case TYPE_TIME_RESET: { + sizeNeeded = 9; + long time = entry.time; + if (bytes != null && bytes.length >= sizeNeeded) { + bytes[0] = (TYPE_TIME_RESET << 6); + bytes[1] = (byte) ((time >> 56) & 0xFF); + bytes[2] = (byte) ((time >> 48) & 0xFF); + bytes[3] = (byte) ((time >> 40) & 0xFF); + bytes[4] = (byte) ((time >> 32) & 0xFF); + bytes[5] = (byte) ((time >> 24) & 0xFF); + bytes[6] = (byte) ((time >> 16) & 0xFF); + bytes[7] = (byte) ((time >> 8) & 0xFF); + bytes[8] = (byte) (time & 0xFF); + } + break; + } + default: + throw new RuntimeException("Unknown type " + entry); + } + + return sizeNeeded; + } + + /** + * Calculates the relative time between the specified time and timeReference. The relative + * time is expected to be non-negative and fit within 8-bits (values between 0-255). If the + * relative time is outside of that range an error code will be returned instead. + * + * @param time + * @param timeReference + * @return The relative time between time and timeReference, or an error code. + */ + private int getRelativeTime(long timeReference, long time) { + if (time < timeReference) { + if (DEBUG) { + Slog.w(TAG, "ERROR_TIME_IS_NEGATIVE"); + } + return ERROR_TIME_IS_NEGATIVE; + } + long relativeTime = time - timeReference; + if (relativeTime > 255) { + if (DEBUG) { + Slog.w(TAG, "ERROR_TIME_TOO_LARGE"); + } + return ERROR_TIME_TOO_LARGE; + } + return (int) relativeTime; + } + } + + /** + * Main implementation of the ring buffer used to store the log entries. This class takes + * {@link LogEntry} instances and adds them to the ring buffer, utilizing + * {@link EntryByteTranslator} to convert byte {@link LogEntry} to bytes within the buffer. + * + * This class also implements the logic around TIME_RESET events. Since the LogEntries store + * their time (8-bit) relative to the previous event, this class can add {@link TYPE_TIME_RESET} + * LogEntries as necessary to allow a LogEntry's relative time to fit within that range. + */ + static class TheLog { + private final EntryByteTranslator mTranslator; + + /** + * Temporary buffer used when converting a new entry to bytes for writing to the buffer. + * Allocating once allows us to avoid allocating a buffer with each write. + */ + private final byte[] mTempBuffer = new byte[MAX_LOG_ENTRY_BYTE_SIZE]; + + /** + * Second temporary buffer used when reading and writing bytes from the buffer. + * A second temporary buffer is necessary since additional items can be read concurrently + * from {@link mTempBuffer}. E.g., Adding an entry to a full buffer requires removing + * other entries from the buffer. + */ + private final byte[] mReadWriteTempBuffer = new byte[MAX_LOG_ENTRY_BYTE_SIZE]; + + /** + * Main log buffer. + */ + private final byte[] mBuffer; + + /** + * Start index of the ring buffer. + */ + private int mStart = 0; + + /** + * Current end index of the ring buffer. + */ + private int mEnd = 0; + + /** + * Start time of the entries in the buffer. The first item stores an 8-bit time that is + * relative to this value. + */ + private long mStartTime = 0; + + /** + * The time of the last entry in the buffer. Reading the time from the last entry to + * calculate the relative time of a new one is sufficiently hard to prefer saving the value + * here instead. + */ + private long mLatestTime = 0; + + /** + * Counter for number of changes (adds or removes) that have been done to the buffer. + */ + private long mChangeCount = 0; + + private final TagDatabase mTagDatabase; + + TheLog(Injector injector, EntryByteTranslator translator, TagDatabase tagDatabase) { + final int logSize = Math.max(injector.getLogSize(), LOG_SIZE_MIN); + mBuffer = new byte[logSize]; + + mTranslator = translator; + mTagDatabase = tagDatabase; + + // Register to be notified when an older tag is removed from the TagDatabase to make + // room for a new entry. + mTagDatabase.setCallback(new TagDatabase.Callback() { + @Override public void onIndexRemoved(int index) { + removeTagIndex(index); + } + }); + } + + /** + * Returns the amount of space being used in the ring buffer (in bytes). + * + * @return Used buffer size in bytes. + */ + int getUsedBufferSize() { + return mBuffer.length - getAvailableSpace(); + } + + /** + * Adds the specified {@link LogEntry} to the log by converting it to bytes and writing + * those bytes to the buffer. + * + * This method can have side effects of removing old values from the ring buffer and + * adding an extra TIME_RESET entry if necessary. + */ + void addEntry(LogEntry entry) { + if (isBufferEmpty()) { + // First item being added, do initialization. + mStartTime = mLatestTime = entry.time; + } + + int size = mTranslator.toBytes(entry, mTempBuffer, mLatestTime); + if (size == EntryByteTranslator.ERROR_TIME_IS_NEGATIVE) { + return; // Wholly unexpected circumstance...just break out now. + } else if (size == EntryByteTranslator.ERROR_TIME_TOO_LARGE) { + // The relative time between the last entry and this new one is too large + // to fit in our byte format...we need to create a new Time-Reset event and add + // that to the log first. + addEntry(new LogEntry(entry.time, TYPE_TIME_RESET, null, 0)); + size = mTranslator.toBytes(entry, mTempBuffer, mLatestTime); + } + + if (size > MAX_LOG_ENTRY_BYTE_SIZE || size <= 0) { + Slog.w(TAG, "Log entry size is out of expected range: " + size); + return; + } + + // In case the buffer is full or nearly full, ensure there is a proper amount of space + // for the new entry. + if (!makeSpace(size)) { + return; // Doesn't fit + } + + if (DEBUG) { + Slog.d(TAG, "Wrote New Entry @(" + mEnd + ") [" + entry + "] as " + + Arrays.toString(mTempBuffer)); + } + // Set the bytes and update our end index & timestamp. + writeBytesAt(mEnd, mTempBuffer, size); + if (DEBUG) { + Slog.d(TAG, "Read written Entry @(" + mEnd + ") [" + + readEntryAt(mEnd, mLatestTime, null)); + } + mEnd = (mEnd + size) % mBuffer.length; + mLatestTime = entry.time; + + TagDatabase.updateTagTime(entry.tag, entry.time); + mChangeCount++; + } + + /** + * Returns an {@link Iterator} of {@link LogEntry}s for all the entries in the log. + * + * If the log is modified while the entries are being read, the iterator will throw a + * {@link ConcurrentModificationExceptoin}. + * + * @param tempEntry A temporary {@link LogEntry} instance to use so that new instances + * aren't allocated with every call to {@code Iterator.next}. + */ + Iterator<LogEntry> getAllItems(final LogEntry tempEntry) { + return new Iterator<LogEntry>() { + private int mCurrent = mStart; // Current read position in the log. + private long mCurrentTimeReference = mStartTime; // Current time-reference to use. + private final long mChangeValue = mChangeCount; // Used to track if buffer changed. + + /** + * @return True if there are more elements to iterate through, false otherwise.\ + * @throws ConcurrentModificationException if the buffer contents change. + */ + @Override + public boolean hasNext() { + checkState(); + return mCurrent != mEnd; + } + + /** + * Returns the next element in the iterator. + * + * @return The next entry in the iterator + * @throws NoSuchElementException if iterator reaches the end. + * @throws ConcurrentModificationException if buffer contents change. + */ + @Override + public LogEntry next() { + checkState(); + + if (!hasNext()) { + throw new NoSuchElementException("No more entries left."); + } + + LogEntry entry = readEntryAt(mCurrent, mCurrentTimeReference, tempEntry); + int size = mTranslator.toBytes(entry, null, mStartTime); + mCurrent = (mCurrent + size) % mBuffer.length; + mCurrentTimeReference = entry.time; + + return entry; + } + + @Override public String toString() { + return "@" + mCurrent; + } + + /** + * @throws ConcurrentModificationException if the underlying buffer has changed + * since this iterator was instantiated. + */ + private void checkState() { + if (mChangeValue != mChangeCount) { + throw new ConcurrentModificationException("Buffer modified, old change: " + + mChangeValue + ", new change: " + mChangeCount); + } + } + }; + } + + /** + * Cleans up old tag index references from the entire log. + * Called when an older wakelock tag is removed from the tag database. This happens + * when the database needed additional room for newer tags. + * + * This is a fairly expensive operation. Reads all the entries from the buffer, which can + * be around 1500 for a 10Kb buffer. It will write back any entries that use the tag as + * well, but that's not many of them. Commonly-used tags dont ever make it to this part. + * + * If necessary, in the future we can keep track of the number of tag-users the same way we + * keep track of a tag's last-used-time to stop having to do this for old tags that dont + * have entries in the logs any more. Light testing has shown that for a 10Kb + * buffer, there are about 5 or fewer (of 1500) entries with "UNKNOWN" tag...which means + * this operation does happen, but not very much. + * + * @param tagIndex The index of the tag, as stored in the log + */ + private void removeTagIndex(int tagIndex) { + if (isBufferEmpty()) { + return; + } + + int readIndex = mStart; + long timeReference = mStartTime; + final LogEntry reusableEntryInstance = new LogEntry(); + while (readIndex != mEnd) { + LogEntry entry = readEntryAt(readIndex, timeReference, reusableEntryInstance); + if (DEBUG) { + Slog.d(TAG, "Searching to remove tags @ " + readIndex + ": " + entry); + } + if (entry == null) { + Slog.w(TAG, "Entry is unreadable - Unexpected @ " + readIndex); + break; // cannot continue if entries are now corrupt + } + if (entry.tag != null && entry.tag.index == tagIndex) { + // We found an entry that uses the tag being removed. Re-write the + // entry back without a tag. + entry.tag = null; // remove the tag, and write it back + writeEntryAt(readIndex, entry, timeReference); + if (DEBUG) { + Slog.d(TAG, "Remove tag index: " + tagIndex + " @ " + readIndex); + } + } + timeReference = entry.time; + int entryByteSize = mTranslator.toBytes(entry, null, 0L); + readIndex = (readIndex + entryByteSize) % mBuffer.length; + } + } + + /** + * Removes entries from the buffer until the specified amount of space is available for use. + * + * @param spaceNeeded The number of bytes needed in the buffer. + * @return True if there is space enough in the buffer, false otherwise. + */ + private boolean makeSpace(int spaceNeeded) { + // Test the size of the buffer can fit it first, so that we dont loop forever in the + // following while loop. + if (mBuffer.length < spaceNeeded + 1) { + return false; + } + + // We check spaceNeeded + 1 so that mStart + mEnd aren't equal. We use them being equal + // to mean that the buffer is empty...so avoid that. + while (getAvailableSpace() < (spaceNeeded + 1)) { + removeOldestItem(); + } + return true; + } + + /** + * Returns the available space of the ring buffer. + */ + private int getAvailableSpace() { + return mEnd > mStart ? mBuffer.length - (mEnd - mStart) : + (mEnd < mStart ? mStart - mEnd : + mBuffer.length); + } + + /** + * Removes the oldest item from the buffer if the buffer is not empty. + */ + private void removeOldestItem() { + if (isBufferEmpty()) { + // No items to remove + return; + } + + // Copy the contents of the start of the buffer to our temporary buffer. + LogEntry entry = readEntryAt(mStart, mStartTime, null); + if (DEBUG) { + Slog.d(TAG, "Removing oldest item at @ " + mStart + ", found: " + entry); + } + int size = mTranslator.toBytes(entry, null, mStartTime); + mStart = (mStart + size) % mBuffer.length; + mStartTime = entry.time; // new start time + mChangeCount++; + } + + /** + * Returns true if the buffer is currently unused (contains zero entries). + * + * @return True if empty, false otherwise. + */ + private boolean isBufferEmpty() { + return mStart == mEnd; + } + + /** + * Reads an entry from the specified index in the buffer. + * + * @param index Index into the buffer from which to read. + * @param timeReference Reference time to use when creating the {@link LogEntry}. + * @param entryToSet Temporary entry to use instead of allocating a new one. + * @return the log-entry instance that was read. + */ + private LogEntry readEntryAt(int index, long timeReference, LogEntry entryToSet) { + for (int i = 0; i < MAX_LOG_ENTRY_BYTE_SIZE; i++) { + int indexIntoMainBuffer = (index + i) % mBuffer.length; + if (indexIntoMainBuffer == mEnd) { + break; + } + mReadWriteTempBuffer[i] = mBuffer[indexIntoMainBuffer]; + } + return mTranslator.fromBytes(mReadWriteTempBuffer, timeReference, entryToSet); + } + + /** + * Write a specified {@link LogEntry} to the buffer at the specified index. + * + * @param index Index in which to write in the buffer. + * @param entry The entry to write into the buffer. + * @param timeReference The reference time to use when calculating the relative time. + */ + private void writeEntryAt(int index, LogEntry entry, long timeReference) { + int size = mTranslator.toBytes(entry, mReadWriteTempBuffer, timeReference); + if (size > 0) { + if (DEBUG) { + Slog.d(TAG, "Writing Entry (" + index + ") [" + entry + "] as " + + Arrays.toString(mReadWriteTempBuffer)); + } + writeBytesAt(index, mReadWriteTempBuffer, size); + } + } + + /** + * Write the specified bytes into the buffer at the specified index. + * Handling wrap-around calculation for the ring-buffer. + * + * @param index The index from which to start writing. + * @param buffer The buffer of bytes to be written. + * @param size The amount of bytes to write from {@code buffer} to the log. + */ + private void writeBytesAt(int index, byte[] buffer, int size) { + for (int i = 0; i < size; i++) { + int indexIntoMainBuffer = (index + i) % mBuffer.length; + mBuffer[indexIntoMainBuffer] = buffer[i]; + } + if (DEBUG) { + Slog.d(TAG, "Write Byte: " + Arrays.toString(buffer)); + } + } + } + + /** + * An in-memory database of wake lock {@link TagData}. All tags stored in the database are given + * a 7-bit index. This index is then used by {@link TheLog} when translating {@link LogEntry} + * instanced into bytes. + * + * If a new tag is added when the database is full, the oldest tag is removed. The oldest tag + * is calcualted using {@link TagData.lastUsedTime}. + */ + static class TagDatabase { + private final int mInvalidIndex; + private final TagData[] mArray; + private Callback mCallback; + + TagDatabase(Injector injector) { + int size = Math.min(injector.getTagDatabaseSize(), TAG_DATABASE_SIZE_MAX); + + // Largest possible index used as "INVALID", hence the (size - 1) sizing. + mArray = new TagData[size - 1]; + mInvalidIndex = size - 1; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("Tag Database: size(").append(mArray.length).append(")"); + int entries = 0; + int byteEstimate = 0; + int tagSize = 0; + int tags = 0; + for (int i = 0; i < mArray.length; i++) { + byteEstimate += 8; // reference pointer + TagData data = mArray[i]; + if (data != null) { + entries++; + byteEstimate += data.getByteSize(); + if (data.tag != null) { + tags++; + tagSize += data.tag.length(); + } + } + } + sb.append(", entries: ").append(entries); + sb.append(", Bytes used: ").append(byteEstimate); + if (DEBUG) { + sb.append(", Avg tag size: ").append(tagSize / tags); + sb.append("\n ").append(Arrays.toString(mArray)); + } + return sb.toString(); + } + + /** + * Sets the callback. + * + * @param callback The callback to set. + */ + public void setCallback(Callback callback) { + mCallback = callback; + } + + /** + * Returns the tag corresponding to the specified index. + * + * @param index The index to search for. + */ + public TagData getTag(int index) { + if (index < 0 || index >= mArray.length || index == mInvalidIndex) { + return null; + } + return mArray[index]; + } + + /** + * Returns an existing tag for the specified wake lock tag + ownerUid. + * + * @param tag The wake lock tag. + * @param ownerUid The wake lock's ownerUid. + * @return the TagData instance. + */ + public TagData getTag(String tag, int ownerUid) { + return findOrCreateTag(tag, ownerUid, false /* shouldCreate */); + } + + /** + * Returns the index for the corresponding tag. + * + * @param tagData The tag-data to search for. + * @return the corresponding index, or mInvalidIndex of none is found. + */ + public int getTagIndex(TagData tagData) { + return tagData == null ? mInvalidIndex : tagData.index; + } + + /** + * Returns a tag instance for the specified wake lock tag and ownerUid. If the data + * does not exist in the database, it will be created if so specified by + * {@code shouldCreate}. + * + * @param tagStr The wake lock's tag. + * @param ownerUid The wake lock's owner Uid. + * @param shouldCreate True when the tag should be created if it doesn't already exist. + * @return The tag-data instance that was found or created. + */ + public TagData findOrCreateTag(String tagStr, int ownerUid, boolean shouldCreate) { + int firstAvailable = -1; + TagData oldest = null; + int oldestIndex = -1; + + // Loop through and find the tag to be used. + TagData tag = new TagData(tagStr, ownerUid); + for (int i = 0; i < mArray.length; i++) { + TagData current = mArray[i]; + if (tag.equals(current)) { + // found it + return current; + } else if (!shouldCreate) { + continue; + } else if (current != null) { + // See if this entry is the oldest entry, in case + // we need to replace it. + if (oldest == null || current.lastUsedTime < oldest.lastUsedTime) { + oldestIndex = i; + oldest = current; + } + } else if (firstAvailable == -1) { + firstAvailable = i; + } + } + + // Item not found, and we shouldn't create one. + if (!shouldCreate) { + return null; + } + + // If we need to remove an index, report to listeners that we are removing an index. + boolean useOldest = firstAvailable == -1; + if (useOldest && mCallback != null) { + if (DEBUG) { + Slog.d(TAG, "Removing tag index: " + oldestIndex + " = " + oldest); + } + mCallback.onIndexRemoved(oldestIndex); + } + setToIndex(tag, firstAvailable != -1 ? firstAvailable : oldestIndex); + return tag; + } + + /** + * Updates the last-used-time of the specified tag. + * + * @param tag The tag to update. + * @param time The new last-used-time for the tag. + */ + public static void updateTagTime(TagData tag, long time) { + if (tag != null) { + tag.lastUsedTime = time; + } + } + + /** + * Sets a specified tag to the specified index. + */ + private void setToIndex(TagData tag, int index) { + if (index < 0 || index >= mArray.length) { + return; + } + TagData current = mArray[index]; + if (current != null) { + // clean up the reference in the TagData instance first. + current.index = mInvalidIndex; + + if (DEBUG) { + Slog.d(TAG, "Replaced tag " + current.tag + " from index " + index + " with tag" + + tag); + } + } + + mArray[index] = tag; + tag.index = index; + } + + /** + * Callback on which to be notified of changes to {@link TagDatabase}. + */ + interface Callback { + + /** + * Handles removals of TagData indexes. + * + * @param index the index being removed. + */ + void onIndexRemoved(int index); + } + } + + /** + * This class represents unique wake lock tags that are stored in {@link TagDatabase}. + * Contains both the wake lock tag data (tag + ownerUid) as well as index and last-used + * time data as it relates to the tag-database. + */ + static class TagData { + public String tag; // Wake lock tag + public int ownerUid; // Wake lock owner Uid + public int index; // Index of the tag in the tag-database + public long lastUsedTime; // Last time that this entry was used + + TagData(String tag, int ownerUid) { + this.tag = tag; + this.ownerUid = ownerUid; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o instanceof TagData) { + TagData other = (TagData) o; + return TextUtils.equals(tag, other.tag) && ownerUid == other.ownerUid; + } + return false; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + if (DEBUG) { + sb.append("(").append(index).append(")"); + } + return "[" + ownerUid + " ; " + tag + "]"; + } + + /** + * Returns an estimate of the number of bytes used by each instance of this class. + * Used for debug purposes. + * + * @return the size of this tag-data. + */ + int getByteSize() { + int bytes = 0; + bytes += 8; // tag reference-pointer; + bytes += tag == null ? 0 : tag.length() * 2; + bytes += 4; // ownerUid + bytes += 4; // index + bytes += 8; // lastUsedTime + return bytes; + } + } + + /** + * Injector used by {@link WakeLockLog} for testing purposes. + */ + public static class Injector { + public Looper getLooper() { + return BackgroundThread.get().getLooper(); + } + + public int getTagDatabaseSize() { + return TAG_DATABASE_SIZE; + } + + public int getLogSize() { + return LOG_SIZE; + } + + public long currentTimeMillis() { + return System.currentTimeMillis(); + } + + public SimpleDateFormat getDateFormat() { + return DATE_FORMAT; + } + } + + private class WakeLockLogHandler extends Handler { + WakeLockLogHandler(Looper looper) { + super(looper); + } + + @Override + public void handleMessage(Message message) { + switch(message.what) { + case MSG_ON_WAKE_LOCK_EVENT: + final SomeArgs args = (SomeArgs) message.obj; + final String tag = (String) args.arg1; + final int eventType = args.argi1; + final int ownerUid = args.argi2; + final int flags = args.argi3; + final long time = (((long) args.argi4) << 32) + (args.argi5 & 0xFFFFFFFFL); + args.recycle(); + handleWakeLockEventInternal(eventType, tag, ownerUid, flags, time); + break; + default: + break; + } + } + } +} diff --git a/services/core/java/com/android/server/stats/pull/ProcfsMemoryUtil.java b/services/core/java/com/android/server/stats/pull/ProcfsMemoryUtil.java index 638dfd23c27f..67677c6cf17e 100644 --- a/services/core/java/com/android/server/stats/pull/ProcfsMemoryUtil.java +++ b/services/core/java/com/android/server/stats/pull/ProcfsMemoryUtil.java @@ -19,8 +19,7 @@ import static android.os.Process.PROC_OUT_STRING; import android.annotation.Nullable; import android.os.Process; - -import java.util.function.BiConsumer; +import android.util.SparseArray; public final class ProcfsMemoryUtil { private static final int[] CMDLINE_OUT = new int[] { PROC_OUT_STRING }; @@ -71,19 +70,25 @@ public final class ProcfsMemoryUtil { return cmdline[0]; } - public static void forEachPid(BiConsumer<Integer, String> func) { + /** + * Scans all /proc/pid/cmdline entries and returns a mapping between pid and cmdline. + */ + public static SparseArray<String> getProcessCmdlines() { int[] pids = new int[1024]; pids = Process.getPids("/proc", pids); + + SparseArray<String> cmdlines = new SparseArray<>(pids.length); for (int pid : pids) { if (pid < 0) { - return; + break; } String cmdline = readCmdlineFromProcfs(pid); if (cmdline.isEmpty()) { continue; } - func.accept(pid, cmdline); + cmdlines.append(pid, cmdline); } + return cmdlines; } public static final class MemorySnapshot { diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index 92e5a01fc796..3aa51fbf2313 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -27,7 +27,7 @@ import static android.os.storage.VolumeInfo.TYPE_PUBLIC; import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem; import static com.android.server.stats.pull.IonMemoryUtil.readProcessSystemIonHeapSizesFromDebugfs; import static com.android.server.stats.pull.IonMemoryUtil.readSystemIonHeapSizeFromDebugfs; -import static com.android.server.stats.pull.ProcfsMemoryUtil.forEachPid; +import static com.android.server.stats.pull.ProcfsMemoryUtil.getProcessCmdlines; import static com.android.server.stats.pull.ProcfsMemoryUtil.readCmdlineFromProcfs; import static com.android.server.stats.pull.ProcfsMemoryUtil.readMemorySnapshotFromProcfs; @@ -93,6 +93,7 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; import android.util.Slog; +import android.util.SparseArray; import android.util.StatsEvent; import android.util.StatsLog; import android.util.proto.ProtoOutputStream; @@ -130,8 +131,6 @@ import com.android.server.stats.pull.ProcfsMemoryUtil.MemorySnapshot; import com.android.server.storage.DiskStatsFileLogger; import com.android.server.storage.DiskStatsLoggingService; -import com.google.android.collect.Sets; - import libcore.io.IoUtils; import org.json.JSONArray; @@ -165,11 +164,24 @@ public class StatsPullAtomService extends SystemService { private static final String TAG = "StatsPullAtomService"; private static final boolean DEBUG = true; + /** + * Lowest available uid for apps. + * + * <p>Used to quickly discard memory snapshots of the zygote forks from native process + * measurements. + */ + private static final int MIN_APP_UID = 10_000; + private static final String RESULT_RECEIVER_CONTROLLER_KEY = "controller_activity"; /** * How long to wait on an individual subsystem to return its stats. */ private static final long EXTERNAL_STATS_SYNC_TIMEOUT_MILLIS = 2000; + private static final long NS_PER_SEC = 1000000000; + private static final long MILLI_AMP_HR_TO_NANO_AMP_SECS = 1_000_000L * 3600L; + + private static final int MAX_BATTERY_STATS_HELPER_FREQUENCY_MS = 1000; + private static final int CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES = 8; private final Object mNetworkStatsLock = new Object(); @GuardedBy("mNetworkStatsLock") @@ -191,40 +203,222 @@ public class StatsPullAtomService extends SystemService { @GuardedBy("mProcessStatsLock") private IProcessStats mProcessStatsService; + private final Object mCpuTrackerLock = new Object(); + @GuardedBy("mCpuTrackerLock") + private ProcessCpuTracker mProcessCpuTracker; + + private final Object mDebugElapsedClockLock = new Object(); + @GuardedBy("mDebugElapsedClockLock") + private long mDebugElapsedClockPreviousValue = 0; + @GuardedBy("mDebugElapsedClockLock") + private long mDebugElapsedClockPullCount = 0; + + private final Object mDebugFailingElapsedClockLock = new Object(); + @GuardedBy("mDebugFailingElapsedClockLock") + private long mDebugFailingElapsedClockPreviousValue = 0; + @GuardedBy("mDebugFailingElapsedClockLock") + private long mDebugFailingElapsedClockPullCount = 0; + private final Context mContext; private StatsManager mStatsManager; private StorageManager mStorageManager; + private WifiManager mWifiManager; + private TelephonyManager mTelephony; + + private KernelWakelockReader mKernelWakelockReader; + private KernelWakelockStats mTmpWakelockStats; + + private StoragedUidIoStatsReader mStoragedUidIoStatsReader; + + private KernelCpuSpeedReader[] mKernelCpuSpeedReaders; + // Disables throttler on CPU time readers. + private KernelCpuUidUserSysTimeReader mCpuUidUserSysTimeReader; + private KernelCpuUidFreqTimeReader mCpuUidFreqTimeReader; + private KernelCpuUidActiveTimeReader mCpuUidActiveTimeReader; + private KernelCpuUidClusterTimeReader mCpuUidClusterTimeReader; + + private File mBaseDir; + + @Nullable + private KernelCpuThreadReaderDiff mKernelCpuThreadReader; + + private BatteryStatsHelper mBatteryStatsHelper = null; + private long mBatteryStatsHelperTimestampMs = -MAX_BATTERY_STATS_HELPER_FREQUENCY_MS; + + private StatsPullAtomCallbackImpl mStatsCallbackImpl; public StatsPullAtomService(Context context) { super(context); mContext = context; } + /** + * Use of this StatsPullAtomCallbackImpl means we avoid one class per tagId, which we would + * get if we used lambdas. + * + * The pull methods are intentionally left to be package private to avoid the creation + * of synthetic methods to save unnecessary bytecode. + */ + private class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCallback { + @Override + public int onPullAtom(int atomTag, List<StatsEvent> data) { + switch(atomTag) { + case StatsLog.WIFI_BYTES_TRANSFER: + return pullWifiBytesTransfer(atomTag, data); + case StatsLog.WIFI_BYTES_TRANSFER_BY_FG_BG: + return pullWifiBytesTransferBackground(atomTag, data); + case StatsLog.MOBILE_BYTES_TRANSFER: + return pullMobileBytesTransfer(atomTag, data); + case StatsLog.MOBILE_BYTES_TRANSFER_BY_FG_BG: + return pullMobileBytesTransferBackground(atomTag, data); + case StatsLog.BLUETOOTH_BYTES_TRANSFER: + return pullBluetoothBytesTransfer(atomTag, data); + case StatsLog.KERNEL_WAKELOCK: + return pullKernelWakelock(atomTag, data); + case StatsLog.CPU_TIME_PER_FREQ: + return pullCpuTimePerFreq(atomTag, data); + case StatsLog.CPU_TIME_PER_UID: + return pullCpuTimePerUid(atomTag, data); + case StatsLog.CPU_TIME_PER_UID_FREQ: + return pullCpuTimeperUidFreq(atomTag, data); + case StatsLog.CPU_ACTIVE_TIME: + return pullCpuActiveTime(atomTag, data); + case StatsLog.CPU_CLUSTER_TIME: + return pullCpuClusterTime(atomTag, data); + case StatsLog.WIFI_ACTIVITY_INFO: + return pullWifiActivityInfo(atomTag, data); + case StatsLog.MODEM_ACTIVITY_INFO: + return pullModemActivityInfo(atomTag, data); + case StatsLog.BLUETOOTH_ACTIVITY_INFO: + return pullBluetoothActivityInfo(atomTag, data); + case StatsLog.SYSTEM_ELAPSED_REALTIME: + return pullSystemElapsedRealtime(atomTag, data); + case StatsLog.SYSTEM_UPTIME: + return pullSystemUptime(atomTag, data); + case StatsLog.PROCESS_MEMORY_STATE: + return pullProcessMemoryState(atomTag, data); + case StatsLog.PROCESS_MEMORY_HIGH_WATER_MARK: + return pullProcessMemoryHighWaterMark(atomTag, data); + case StatsLog.PROCESS_MEMORY_SNAPSHOT: + return pullProcessMemorySnapshot(atomTag, data); + case StatsLog.SYSTEM_ION_HEAP_SIZE: + return pullSystemIonHeapSize(atomTag, data); + case StatsLog.ION_HEAP_SIZE: + return pullIonHeapSize(atomTag, data); + case StatsLog.PROCESS_SYSTEM_ION_HEAP_SIZE: + return pullProcessSystemIonHeapSize(atomTag, data); + case StatsLog.TEMPERATURE: + return pullTemperature(atomTag, data); + case StatsLog.COOLING_DEVICE: + return pullCooldownDevice(atomTag, data); + case StatsLog.BINDER_CALLS: + return pullBinderCallsStats(atomTag, data); + case StatsLog.BINDER_CALLS_EXCEPTIONS: + return pullBinderCallsStatsExceptions(atomTag, data); + case StatsLog.LOOPER_STATS: + return pullLooperStats(atomTag, data); + case StatsLog.DISK_STATS: + return pullDiskStats(atomTag, data); + case StatsLog.DIRECTORY_USAGE: + return pullDirectoryUsage(atomTag, data); + case StatsLog.APP_SIZE: + return pullAppSize(atomTag, data); + case StatsLog.CATEGORY_SIZE: + return pullCategorySize(atomTag, data); + case StatsLog.NUM_FINGERPRINTS_ENROLLED: + return pullNumBiometricsEnrolled( + BiometricsProtoEnums.MODALITY_FINGERPRINT, atomTag, data); + case StatsLog.NUM_FACES_ENROLLED: + return pullNumBiometricsEnrolled( + BiometricsProtoEnums.MODALITY_FACE, atomTag, data); + case StatsLog.PROC_STATS: + return pullProcStats(ProcessStats.REPORT_ALL, atomTag, data); + case StatsLog.PROC_STATS_PKG_PROC: + return pullProcStats(ProcessStats.REPORT_PKG_PROC_STATS, atomTag, data); + case StatsLog.DISK_IO: + return pullDiskIO(atomTag, data); + case StatsLog.POWER_PROFILE: + return pullPowerProfile(atomTag, data); + case StatsLog.PROCESS_CPU_TIME: + return pullProcessCpuTime(atomTag, data); + case StatsLog.CPU_TIME_PER_THREAD_FREQ: + return pullCpuTimePerThreadFreq(atomTag, data); + case StatsLog.DEVICE_CALCULATED_POWER_USE: + return pullDeviceCalculatedPowerUse(atomTag, data); + case StatsLog.DEVICE_CALCULATED_POWER_BLAME_UID: + return pullDeviceCalculatedPowerBlameUid(atomTag, data); + case StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER: + return pullDeviceCalculatedPowerBlameOther(atomTag, data); + case StatsLog.DEBUG_ELAPSED_CLOCK: + return pullDebugElapsedClock(atomTag, data); + case StatsLog.DEBUG_FAILING_ELAPSED_CLOCK: + return pullDebugFailingElapsedClock(atomTag, data); + case StatsLog.BUILD_INFORMATION: + return pullBuildInformation(atomTag, data); + case StatsLog.ROLE_HOLDER: + return pullRoleHolder(atomTag, data); + case StatsLog.DANGEROUS_PERMISSION_STATE: + return pullDangerousPermissionState(atomTag, data); + case StatsLog.TIME_ZONE_DATA_INFO: + return pullTimeZoneDataInfo(atomTag, data); + case StatsLog.EXTERNAL_STORAGE_INFO: + return pullExternalStorageInfo(atomTag, data); + case StatsLog.APPS_ON_EXTERNAL_STORAGE_INFO: + return pullAppsOnExternalStorageInfo(atomTag, data); + case StatsLog.FACE_SETTINGS: + return pullFaceSettings(atomTag, data); + case StatsLog.APP_OPS: + return pullAppOps(atomTag, data); + case StatsLog.NOTIFICATION_REMOTE_VIEWS: + return pullNotificationRemoteViews(atomTag, data); + case StatsLog.DANGEROUS_PERMISSION_STATE_SAMPLED: + return pullDangerousPermissionState(atomTag, data); + default: + throw new UnsupportedOperationException("Unknown tagId=" + atomTag); + } + } + } + @Override public void onStart() { + // no op + } + + @Override + public void onBootPhase(int phase) { + super.onBootPhase(phase); + if (phase == PHASE_SYSTEM_SERVICES_READY) { + BackgroundThread.getHandler().post(() -> { + initializePullersState(); + registerAllPullers(); + registerEventListeners(); + }); + } + } + + void initializePullersState() { + // Get Context Managers mStatsManager = (StatsManager) mContext.getSystemService(Context.STATS_MANAGER); mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); mTelephony = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); mStorageManager = (StorageManager) mContext.getSystemService(StorageManager.class); - final ConnectivityManager connectivityManager = - (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); - // Default NetworkRequest should cover all transport types. - final NetworkRequest request = new NetworkRequest.Builder().build(); - connectivityManager.registerNetworkCallback(request, new ConnectivityStatsCallback()); + // Initialize DiskIO + mStoragedUidIoStatsReader = new StoragedUidIoStatsReader(); - // Enable push notifications of throttling from vendor thermal - // management subsystem via thermalservice. - IThermalService thermalService = getIThermalService(); - if (thermalService != null) { - try { - thermalService.registerThermalEventListener( - new ThermalEventListener()); - Slog.i(TAG, "register thermal listener successfully"); - } catch (RemoteException e) { - Slog.i(TAG, "failed to register thermal listener"); - } - } + // Initialize PROC_STATS + // TODO (b/148402814): Change this directory to stats_pull. + mBaseDir = new File(SystemServiceManager.ensureSystemDir(), "stats_companion"); + + // Disables throttler on CPU time readers. + mCpuUidUserSysTimeReader = new KernelCpuUidUserSysTimeReader(false); + mCpuUidFreqTimeReader = new KernelCpuUidFreqTimeReader(false); + mCpuUidActiveTimeReader = new KernelCpuUidActiveTimeReader(false); + mCpuUidClusterTimeReader = new KernelCpuUidClusterTimeReader(false); + + // Initialize state for KERNEL_WAKELOCK + mKernelWakelockReader = new KernelWakelockReader(); + mTmpWakelockStats = new KernelWakelockStats(); // Initialize state for CPU_TIME_PER_FREQ atom PowerProfile powerProfile = new PowerProfile(mContext); @@ -246,13 +440,23 @@ public class StatsPullAtomService extends SystemService { mBaseDir.mkdirs(); } - @Override - public void onBootPhase(int phase) { - super.onBootPhase(phase); - if (phase == PHASE_SYSTEM_SERVICES_READY) { - BackgroundThread.getHandler().post(() -> { - registerAllPullers(); - }); + void registerEventListeners() { + final ConnectivityManager connectivityManager = + (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); + // Default NetworkRequest should cover all transport types. + final NetworkRequest request = new NetworkRequest.Builder().build(); + connectivityManager.registerNetworkCallback(request, new ConnectivityStatsCallback()); + + // Enable push notifications of throttling from vendor thermal + // management subsystem via thermalservice. + IThermalService thermalService = getIThermalService(); + if (thermalService != null) { + try { + thermalService.registerThermalEventListener(new ThermalEventListener()); + Slog.i(TAG, "register thermal listener successfully"); + } catch (RemoteException e) { + Slog.i(TAG, "failed to register thermal listener"); + } } } @@ -260,6 +464,7 @@ public class StatsPullAtomService extends SystemService { if (DEBUG) { Slog.d(TAG, "Registering all pullers with statsd"); } + mStatsCallbackImpl = new StatsPullAtomCallbackImpl(); registerWifiBytesTransfer(); registerWifiBytesTransferBackground(); registerMobileBytesTransfer(); @@ -276,11 +481,6 @@ public class StatsPullAtomService extends SystemService { registerBluetoothActivityInfo(); registerSystemElapsedRealtime(); registerSystemUptime(); - registerRemainingBatteryCapacity(); - registerFullBatteryCapacity(); - registerBatteryVoltage(); - registerBatteryLevel(); - registerBatteryCycleCount(); registerProcessMemoryState(); registerProcessMemoryHighWaterMark(); registerProcessMemorySnapshot(); @@ -441,11 +641,11 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullWifiBytesTransfer(atomTag, data) + mStatsCallbackImpl ); } - private int pullWifiBytesTransfer(int atomTag, List<StatsEvent> pulledData) { + int pullWifiBytesTransfer(int atomTag, List<StatsEvent> pulledData) { INetworkStatsService networkStatsService = getINetworkStatsService(); if (networkStatsService == null) { Slog.e(TAG, "NetworkStats Service is not available!"); @@ -453,7 +653,7 @@ public class StatsPullAtomService extends SystemService { } long token = Binder.clearCallingIdentity(); try { - // TODO: Consider caching the following call to get BatteryStatsInternal. + // TODO(b/148402814): Consider caching the following call to get BatteryStatsInternal. BatteryStatsInternal bs = LocalServices.getService(BatteryStatsInternal.class); String[] ifaces = bs.getWifiIfaces(); if (ifaces.length == 0) { @@ -533,11 +733,11 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullWifiBytesTransferBackground(atomTag, data) + mStatsCallbackImpl ); } - private int pullWifiBytesTransferBackground(int atomTag, List<StatsEvent> pulledData) { + int pullWifiBytesTransferBackground(int atomTag, List<StatsEvent> pulledData) { INetworkStatsService networkStatsService = getINetworkStatsService(); if (networkStatsService == null) { Slog.e(TAG, "NetworkStats Service is not available!"); @@ -571,11 +771,11 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullMobileBytesTransfer(atomTag, data) + mStatsCallbackImpl ); } - private int pullMobileBytesTransfer(int atomTag, List<StatsEvent> pulledData) { + int pullMobileBytesTransfer(int atomTag, List<StatsEvent> pulledData) { INetworkStatsService networkStatsService = getINetworkStatsService(); if (networkStatsService == null) { Slog.e(TAG, "NetworkStats Service is not available!"); @@ -609,11 +809,11 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullMobileBytesTransferBackground(atomTag, data) + mStatsCallbackImpl ); } - private int pullMobileBytesTransferBackground(int atomTag, List<StatsEvent> pulledData) { + int pullMobileBytesTransferBackground(int atomTag, List<StatsEvent> pulledData) { INetworkStatsService networkStatsService = getINetworkStatsService(); if (networkStatsService == null) { Slog.e(TAG, "NetworkStats Service is not available!"); @@ -647,7 +847,7 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullBluetoothBytesTransfer(atomTag, data) + mStatsCallbackImpl ); } @@ -694,7 +894,7 @@ public class StatsPullAtomService extends SystemService { } } - private int pullBluetoothBytesTransfer(int atomTag, List<StatsEvent> pulledData) { + int pullBluetoothBytesTransfer(int atomTag, List<StatsEvent> pulledData) { BluetoothActivityEnergyInfo info = fetchBluetoothData(); if (info == null || info.getUidTraffic() == null) { return StatsManager.PULL_SKIP; @@ -711,20 +911,17 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - private final KernelWakelockReader mKernelWakelockReader = new KernelWakelockReader(); - private final KernelWakelockStats mTmpWakelockStats = new KernelWakelockStats(); - private void registerKernelWakelock() { int tagId = StatsLog.KERNEL_WAKELOCK; mStatsManager.registerPullAtomCallback( tagId, /* PullAtomMetadata */ null, BackgroundThread.getExecutor(), - (atomTag, data) -> pullKernelWakelock(atomTag, data) + mStatsCallbackImpl ); } - private int pullKernelWakelock(int atomTag, List<StatsEvent> pulledData) { + int pullKernelWakelock(int atomTag, List<StatsEvent> pulledData) { final KernelWakelockStats wakelockStats = mKernelWakelockReader.readKernelWakelockStats(mTmpWakelockStats); for (Map.Entry<String, KernelWakelockStats.Entry> ent : wakelockStats.entrySet()) { @@ -742,17 +939,6 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - private KernelCpuSpeedReader[] mKernelCpuSpeedReaders; - // Disables throttler on CPU time readers. - private KernelCpuUidUserSysTimeReader mCpuUidUserSysTimeReader = - new KernelCpuUidUserSysTimeReader(false); - private KernelCpuUidFreqTimeReader mCpuUidFreqTimeReader = - new KernelCpuUidFreqTimeReader(false); - private KernelCpuUidActiveTimeReader mCpuUidActiveTimeReader = - new KernelCpuUidActiveTimeReader(false); - private KernelCpuUidClusterTimeReader mCpuUidClusterTimeReader = - new KernelCpuUidClusterTimeReader(false); - private void registerCpuTimePerFreq() { int tagId = StatsLog.CPU_TIME_PER_FREQ; PullAtomMetadata metadata = new PullAtomMetadata.Builder() @@ -762,11 +948,11 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullCpuTimePerFreq(atomTag, data) + mStatsCallbackImpl ); } - private int pullCpuTimePerFreq(int atomTag, List<StatsEvent> pulledData) { + int pullCpuTimePerFreq(int atomTag, List<StatsEvent> pulledData) { for (int cluster = 0; cluster < mKernelCpuSpeedReaders.length; cluster++) { long[] clusterTimeMs = mKernelCpuSpeedReaders[cluster].readAbsolute(); if (clusterTimeMs != null) { @@ -793,11 +979,11 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullCpuTimePerUid(atomTag, data) + mStatsCallbackImpl ); } - private int pullCpuTimePerUid(int atomTag, List<StatsEvent> pulledData) { + int pullCpuTimePerUid(int atomTag, List<StatsEvent> pulledData) { mCpuUidUserSysTimeReader.readAbsolute((uid, timesUs) -> { long userTimeUs = timesUs[0], systemTimeUs = timesUs[1]; StatsEvent e = StatsEvent.newBuilder() @@ -822,11 +1008,11 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullCpuTimeperUidFreq(atomTag, data) + mStatsCallbackImpl ); } - private int pullCpuTimeperUidFreq(int atomTag, List<StatsEvent> pulledData) { + int pullCpuTimeperUidFreq(int atomTag, List<StatsEvent> pulledData) { mCpuUidFreqTimeReader.readAbsolute((uid, cpuFreqTimeMs) -> { for (int freqIndex = 0; freqIndex < cpuFreqTimeMs.length; ++freqIndex) { if (cpuFreqTimeMs[freqIndex] != 0) { @@ -854,11 +1040,11 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullCpuActiveTime(atomTag, data) + mStatsCallbackImpl ); } - private int pullCpuActiveTime(int atomTag, List<StatsEvent> pulledData) { + int pullCpuActiveTime(int atomTag, List<StatsEvent> pulledData) { mCpuUidActiveTimeReader.readAbsolute((uid, cpuActiveTimesMs) -> { StatsEvent e = StatsEvent.newBuilder() .setAtomId(atomTag) @@ -881,11 +1067,11 @@ public class StatsPullAtomService extends SystemService { tagId, metadata, BackgroundThread.getExecutor(), - (atomTag, data) -> pullCpuClusterTime(atomTag, data) + mStatsCallbackImpl ); } - private int pullCpuClusterTime(int atomTag, List<StatsEvent> pulledData) { + int pullCpuClusterTime(int atomTag, List<StatsEvent> pulledData) { mCpuUidClusterTimeReader.readAbsolute((uid, cpuClusterTimesMs) -> { for (int i = 0; i < cpuClusterTimesMs.length; i++) { StatsEvent e = StatsEvent.newBuilder() @@ -905,15 +1091,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullWifiActivityInfo(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private WifiManager mWifiManager; - private TelephonyManager mTelephony; - - private int pullWifiActivityInfo(int atomTag, List<StatsEvent> pulledData) { + int pullWifiActivityInfo(int atomTag, List<StatsEvent> pulledData) { long token = Binder.clearCallingIdentity(); try { SynchronousResultReceiver wifiReceiver = new SynchronousResultReceiver("wifi"); @@ -960,12 +1143,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullModemActivityInfo(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullModemActivityInfo(int atomTag, List<StatsEvent> pulledData) { + int pullModemActivityInfo(int atomTag, List<StatsEvent> pulledData) { long token = Binder.clearCallingIdentity(); try { SynchronousResultReceiver modemReceiver = new SynchronousResultReceiver("telephony"); @@ -999,11 +1182,11 @@ public class StatsPullAtomService extends SystemService { tagId, /* metadata */ null, BackgroundThread.getExecutor(), - (atomTag, data) -> pullBluetoothActivityInfo(atomTag, data) + mStatsCallbackImpl ); } - private int pullBluetoothActivityInfo(int atomTag, List<StatsEvent> pulledData) { + int pullBluetoothActivityInfo(int atomTag, List<StatsEvent> pulledData) { BluetoothActivityEnergyInfo info = fetchBluetoothData(); if (info == null) { return StatsManager.PULL_SKIP; @@ -1021,23 +1204,21 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - private static final long NS_PER_SEC = 1000000000; - private void registerSystemElapsedRealtime() { int tagId = StatsLog.SYSTEM_ELAPSED_REALTIME; - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setCoolDownNs(NS_PER_SEC) .setTimeoutNs(NS_PER_SEC / 2) .build(); mStatsManager.registerPullAtomCallback( tagId, metadata, - (atomTag, data) -> pullSystemElapsedRealtime(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullSystemElapsedRealtime(int atomTag, List<StatsEvent> pulledData) { + int pullSystemElapsedRealtime(int atomTag, List<StatsEvent> pulledData) { StatsEvent e = StatsEvent.newBuilder() .setAtomId(atomTag) .writeLong(SystemClock.elapsedRealtime()) @@ -1052,11 +1233,11 @@ public class StatsPullAtomService extends SystemService { tagId, null, // use default PullAtomMetadata values BackgroundThread.getExecutor(), - (atomTag, data) -> pullSystemUptime(atomTag, data) + mStatsCallbackImpl ); } - private int pullSystemUptime(int atomTag, List<StatsEvent> pulledData) { + int pullSystemUptime(int atomTag, List<StatsEvent> pulledData) { StatsEvent e = StatsEvent.newBuilder() .setAtomId(atomTag) .writeLong(SystemClock.elapsedRealtime()) @@ -1065,60 +1246,20 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - private void registerRemainingBatteryCapacity() { - // No op. - } - - private void pullRemainingBatteryCapacity() { - // No op. - } - - private void registerFullBatteryCapacity() { - // No op. - } - - private void pullFullBatteryCapacity() { - // No op. - } - - private void registerBatteryVoltage() { - // No op. - } - - private void pullBatteryVoltage() { - // No op. - } - - private void registerBatteryLevel() { - // No op. - } - - private void pullBatteryLevel() { - // No op. - } - - private void registerBatteryCycleCount() { - // No op. - } - - private void pullBatteryCycleCount() { - // No op. - } - private void registerProcessMemoryState() { int tagId = StatsLog.PROCESS_MEMORY_STATE; - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setAdditiveFields(new int[] {4, 5, 6, 7, 8}) .build(); mStatsManager.registerPullAtomCallback( tagId, metadata, - (atomTag, data) -> pullProcessMemoryState(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullProcessMemoryState(int atomTag, List<StatsEvent> pulledData) { + int pullProcessMemoryState(int atomTag, List<StatsEvent> pulledData) { List<ProcessMemoryState> processMemoryStates = LocalServices.getService(ActivityManagerInternal.class) .getMemoryStateForProcesses(); @@ -1147,45 +1288,6 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - /** - * Which native processes to snapshot memory for. - * - * <p>Processes are matched by their cmdline in procfs. Example: cat /proc/pid/cmdline returns - * /system/bin/statsd for the stats daemon. - */ - private static final Set<String> MEMORY_INTERESTING_NATIVE_PROCESSES = Sets.newHashSet( - "/system/bin/statsd", // Stats daemon. - "/system/bin/surfaceflinger", - "/system/bin/apexd", // APEX daemon. - "/system/bin/audioserver", - "/system/bin/cameraserver", - "/system/bin/drmserver", - "/system/bin/healthd", - "/system/bin/incidentd", - "/system/bin/installd", - "/system/bin/lmkd", // Low memory killer daemon. - "/system/bin/logd", - "media.codec", - "media.extractor", - "media.metrics", - "/system/bin/mediadrmserver", - "/system/bin/mediaserver", - "/system/bin/performanced", - "/system/bin/tombstoned", - "/system/bin/traced", // Perfetto. - "/system/bin/traced_probes", // Perfetto. - "webview_zygote", - "zygote", - "zygote64"); - - /** - * Lowest available uid for apps. - * - * <p>Used to quickly discard memory snapshots of the zygote forks from native process - * measurements. - */ - private static final int MIN_APP_UID = 10_000; - private static boolean isAppUid(int uid) { return uid >= MIN_APP_UID; } @@ -1195,12 +1297,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullProcessMemoryHighWaterMark(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullProcessMemoryHighWaterMark(int atomTag, List<StatsEvent> pulledData) { + int pullProcessMemoryHighWaterMark(int atomTag, List<StatsEvent> pulledData) { List<ProcessMemoryState> managedProcessList = LocalServices.getService(ActivityManagerInternal.class) .getMemoryStateForProcesses(); @@ -1219,30 +1321,25 @@ public class StatsPullAtomService extends SystemService { .build(); pulledData.add(e); } - forEachPid((pid, cmdLine) -> { - if (!MEMORY_INTERESTING_NATIVE_PROCESSES.contains(cmdLine)) { - return; - } - final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(pid); - if (snapshot == null) { - return; - } - // Sometimes we get here a process that is not included in the whitelist. It comes - // from forking the zygote for an app. We can ignore that sample because this process - // is collected by ProcessMemoryState. - if (isAppUid(snapshot.uid)) { - return; + // Complement the data with native system processes + SparseArray<String> processCmdlines = getProcessCmdlines(); + managedProcessList.forEach(managedProcess -> processCmdlines.delete(managedProcess.pid)); + int size = processCmdlines.size(); + for (int i = 0; i < size; ++i) { + final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(processCmdlines.keyAt(i)); + if (snapshot == null || isAppUid(snapshot.uid)) { + continue; } StatsEvent e = StatsEvent.newBuilder() .setAtomId(atomTag) .writeInt(snapshot.uid) - .writeString(cmdLine) + .writeString(processCmdlines.valueAt(i)) // RSS high-water mark in bytes. .writeLong(snapshot.rssHighWaterMarkInKilobytes * 1024L) .writeInt(snapshot.rssHighWaterMarkInKilobytes) .build(); pulledData.add(e); - }); + } // Invoke rss_hwm_reset binary to reset RSS HWM counters for all processes. SystemProperties.set("sys.rss_hwm_reset.on", "1"); return StatsManager.PULL_SUCCESS; @@ -1253,12 +1350,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullProcessMemorySnapshot(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullProcessMemorySnapshot(int atomTag, List<StatsEvent> pulledData) { + int pullProcessMemorySnapshot(int atomTag, List<StatsEvent> pulledData) { List<ProcessMemoryState> managedProcessList = LocalServices.getService(ActivityManagerInternal.class) .getMemoryStateForProcesses(); @@ -1280,24 +1377,22 @@ public class StatsPullAtomService extends SystemService { .build(); pulledData.add(e); } - forEachPid((pid, cmdLine) -> { - if (!MEMORY_INTERESTING_NATIVE_PROCESSES.contains(cmdLine)) { - return; - } + // Complement the data with native system processes. Given these measurements can be taken + // in response to LMKs happening, we want to first collect the managed app stats (to + // maximize the probability that a heavyweight process will be sampled before it dies). + SparseArray<String> processCmdlines = getProcessCmdlines(); + managedProcessList.forEach(managedProcess -> processCmdlines.delete(managedProcess.pid)); + int size = processCmdlines.size(); + for (int i = 0; i < size; ++i) { + int pid = processCmdlines.keyAt(i); final MemorySnapshot snapshot = readMemorySnapshotFromProcfs(pid); - if (snapshot == null) { - return; - } - // Sometimes we get here a process that is not included in the whitelist. It comes - // from forking the zygote for an app. We can ignore that sample because this process - // is collected by ProcessMemoryState. - if (isAppUid(snapshot.uid)) { - return; + if (snapshot == null || isAppUid(snapshot.uid)) { + continue; } StatsEvent e = StatsEvent.newBuilder() .setAtomId(atomTag) .writeInt(snapshot.uid) - .writeString(cmdLine) + .writeString(processCmdlines.valueAt(i)) .writeInt(pid) .writeInt(-1001) // Placeholder for native processes, OOM_SCORE_ADJ_MIN - 1. .writeInt(snapshot.rssInKilobytes) @@ -1306,7 +1401,7 @@ public class StatsPullAtomService extends SystemService { .writeInt(snapshot.anonRssInKilobytes + snapshot.swapInKilobytes) .build(); pulledData.add(e); - }); + } return StatsManager.PULL_SUCCESS; } @@ -1315,12 +1410,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullSystemIonHeapSize(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullSystemIonHeapSize(int atomTag, List<StatsEvent> pulledData) { + int pullSystemIonHeapSize(int atomTag, List<StatsEvent> pulledData) { final long systemIonHeapSizeInBytes = readSystemIonHeapSizeFromDebugfs(); StatsEvent e = StatsEvent.newBuilder() .setAtomId(atomTag) @@ -1336,11 +1431,11 @@ public class StatsPullAtomService extends SystemService { tagId, /* PullAtomMetadata */ null, BackgroundThread.getExecutor(), - (atomTag, data) -> pullIonHeapSize(atomTag, data) + mStatsCallbackImpl ); } - private int pullIonHeapSize(int atomTag, List<StatsEvent> pulledData) { + int pullIonHeapSize(int atomTag, List<StatsEvent> pulledData) { int ionHeapSizeInKilobytes = (int) getIonHeapsSizeKb(); StatsEvent e = StatsEvent.newBuilder() .setAtomId(atomTag) @@ -1355,12 +1450,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullProcessSystemIonHeapSize(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullProcessSystemIonHeapSize(int atomTag, List<StatsEvent> pulledData) { + int pullProcessSystemIonHeapSize(int atomTag, List<StatsEvent> pulledData) { List<IonAllocations> result = readProcessSystemIonHeapSizesFromDebugfs(); for (IonAllocations allocations : result) { StatsEvent e = StatsEvent.newBuilder() @@ -1381,12 +1476,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullTemperature(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullTemperature(int atomTag, List<StatsEvent> pulledData) { + int pullTemperature(int atomTag, List<StatsEvent> pulledData) { IThermalService thermalService = getIThermalService(); if (thermalService == null) { return StatsManager.PULL_SKIP; @@ -1419,12 +1514,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullCooldownDevice(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullCooldownDevice(int atomTag, List<StatsEvent> pulledData) { + int pullCooldownDevice(int atomTag, List<StatsEvent> pulledData) { IThermalService thermalService = getIThermalService(); if (thermalService == null) { return StatsManager.PULL_SKIP; @@ -1453,18 +1548,18 @@ public class StatsPullAtomService extends SystemService { private void registerBinderCallsStats() { int tagId = StatsLog.BINDER_CALLS; - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setAdditiveFields(new int[] {4, 5, 6, 8, 12}) .build(); mStatsManager.registerPullAtomCallback( tagId, metadata, - (atomTag, data) -> pullBinderCallsStats(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullBinderCallsStats(int atomTag, List<StatsEvent> pulledData) { + int pullBinderCallsStats(int atomTag, List<StatsEvent> pulledData) { BinderCallsStatsService.Internal binderStats = LocalServices.getService(BinderCallsStatsService.Internal.class); if (binderStats == null) { @@ -1502,12 +1597,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullBinderCallsStatsExceptions(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullBinderCallsStatsExceptions(int atomTag, List<StatsEvent> pulledData) { + int pullBinderCallsStatsExceptions(int atomTag, List<StatsEvent> pulledData) { BinderCallsStatsService.Internal binderStats = LocalServices.getService(BinderCallsStatsService.Internal.class); if (binderStats == null) { @@ -1531,18 +1626,18 @@ public class StatsPullAtomService extends SystemService { private void registerLooperStats() { int tagId = StatsLog.LOOPER_STATS; - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setAdditiveFields(new int[] {5, 6, 7, 8, 9}) .build(); mStatsManager.registerPullAtomCallback( tagId, metadata, - (atomTag, data) -> pullLooperStats(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullLooperStats(int atomTag, List<StatsEvent> pulledData) { + int pullLooperStats(int atomTag, List<StatsEvent> pulledData) { LooperStats looperStats = LocalServices.getService(LooperStats.class); if (looperStats == null) { return StatsManager.PULL_SKIP; @@ -1579,12 +1674,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullDiskStats(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullDiskStats(int atomTag, List<StatsEvent> pulledData) { + int pullDiskStats(int atomTag, List<StatsEvent> pulledData) { // Run a quick-and-dirty performance test: write 512 bytes byte[] junk = new byte[512]; for (int i = 0; i < junk.length; i++) junk[i] = (byte) i; // Write nonzero bytes @@ -1645,12 +1740,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullDirectoryUsage(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullDirectoryUsage(int atomTag, List<StatsEvent> pulledData) { + int pullDirectoryUsage(int atomTag, List<StatsEvent> pulledData) { StatFs statFsData = new StatFs(Environment.getDataDirectory().getAbsolutePath()); StatFs statFsSystem = new StatFs(Environment.getRootDirectory().getAbsolutePath()); StatFs statFsCache = new StatFs(Environment.getDownloadCacheDirectory().getAbsolutePath()); @@ -1686,12 +1781,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullAppSize(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullAppSize(int atomTag, List<StatsEvent> pulledData) { + int pullAppSize(int atomTag, List<StatsEvent> pulledData) { try { String jsonStr = IoUtils.readFileAsString(DiskStatsLoggingService.DUMPSYS_CACHE_PATH); JSONObject json = new JSONObject(jsonStr); @@ -1730,12 +1825,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullCategorySize(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullCategorySize(int atomTag, List<StatsEvent> pulledData) { + int pullCategorySize(int atomTag, List<StatsEvent> pulledData) { try { String jsonStr = IoUtils.readFileAsString(DiskStatsLoggingService.DUMPSYS_CACHE_PATH); JSONObject json = new JSONObject(jsonStr); @@ -1833,9 +1928,8 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullNumBiometricsEnrolled( - BiometricsProtoEnums.MODALITY_FINGERPRINT, atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } @@ -1844,9 +1938,8 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullNumBiometricsEnrolled( - BiometricsProtoEnums.MODALITY_FACE, atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } @@ -1898,15 +1991,13 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - private File mBaseDir = new File(SystemServiceManager.ensureSystemDir(), "stats_companion"); - private void registerProcStats() { int tagId = StatsLog.PROC_STATS; mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullProcStats(ProcessStats.REPORT_ALL, atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } @@ -1915,8 +2006,8 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullProcStats(ProcessStats.REPORT_PKG_PROC_STATS, atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } @@ -1979,25 +2070,21 @@ public class StatsPullAtomService extends SystemService { return 0; } - - private StoragedUidIoStatsReader mStoragedUidIoStatsReader = - new StoragedUidIoStatsReader(); - private void registerDiskIO() { int tagId = StatsLog.DISK_IO; - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setAdditiveFields(new int[] {2, 3, 4, 5, 6, 7, 8, 9, 10, 11}) .setCoolDownNs(3 * NS_PER_SEC) .build(); mStatsManager.registerPullAtomCallback( tagId, metadata, - (atomTag, data) -> pullDiskIO(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullDiskIO(int atomTag, List<StatsEvent> pulledData) { + int pullDiskIO(int atomTag, List<StatsEvent> pulledData) { mStoragedUidIoStatsReader.readAbsolute((uid, fgCharsRead, fgCharsWrite, fgBytesRead, fgBytesWrite, bgCharsRead, bgCharsWrite, bgBytesRead, bgBytesWrite, fgFsync, bgFsync) -> { @@ -2026,11 +2113,11 @@ public class StatsPullAtomService extends SystemService { tagId, /* PullAtomMetadata */ null, BackgroundThread.getExecutor(), - (atomTag, data) -> pullPowerProfile(atomTag, data) + mStatsCallbackImpl ); } - private int pullPowerProfile(int atomTag, List<StatsEvent> pulledData) { + int pullPowerProfile(int atomTag, List<StatsEvent> pulledData) { PowerProfile powerProfile = new PowerProfile(mContext); ProtoOutputStream proto = new ProtoOutputStream(); powerProfile.dumpDebug(proto); @@ -2043,25 +2130,21 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - private final Object mCpuTrackerLock = new Object(); - @GuardedBy("mCpuTrackerLock") - private ProcessCpuTracker mProcessCpuTracker; - private void registerProcessCpuTime() { int tagId = StatsLog.PROCESS_CPU_TIME; // Min cool-down is 5 sec, in line with what ActivityManagerService uses. - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setCoolDownNs(5 * NS_PER_SEC) .build(); mStatsManager.registerPullAtomCallback( tagId, metadata, - (atomTag, data) -> pullProcessCpuTime(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullProcessCpuTime(int atomTag, List<StatsEvent> pulledData) { + int pullProcessCpuTime(int atomTag, List<StatsEvent> pulledData) { synchronized (mCpuTrackerLock) { if (mProcessCpuTracker == null) { mProcessCpuTracker = new ProcessCpuTracker(false); @@ -2083,24 +2166,20 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - @Nullable - private KernelCpuThreadReaderDiff mKernelCpuThreadReader; - private static final int CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES = 8; - private void registerCpuTimePerThreadFreq() { int tagId = StatsLog.CPU_TIME_PER_THREAD_FREQ; - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setAdditiveFields(new int[] {7, 9, 11, 13, 15, 17, 19, 21}) .build(); mStatsManager.registerPullAtomCallback( tagId, metadata, - (atomTag, data) -> pullCpuTimePerThreadFreq(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullCpuTimePerThreadFreq(int atomTag, List<StatsEvent> pulledData) { + int pullCpuTimePerThreadFreq(int atomTag, List<StatsEvent> pulledData) { if (this.mKernelCpuThreadReader == null) { Slog.e(TAG, "mKernelCpuThreadReader is null"); return StatsManager.PULL_SKIP; @@ -2157,12 +2236,6 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - // TODO: move to top of file when all migrations are complete - private BatteryStatsHelper mBatteryStatsHelper = null; - private static final int MAX_BATTERY_STATS_HELPER_FREQUENCY_MS = 1000; - private long mBatteryStatsHelperTimestampMs = -MAX_BATTERY_STATS_HELPER_FREQUENCY_MS; - private static final long MILLI_AMP_HR_TO_NANO_AMP_SECS = 1_000_000L * 3600L; - private BatteryStatsHelper getBatteryStatsHelper() { if (mBatteryStatsHelper == null) { final long callingToken = Binder.clearCallingIdentity(); @@ -2194,12 +2267,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullDeviceCalculatedPowerUse(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullDeviceCalculatedPowerUse(int atomTag, List<StatsEvent> pulledData) { + int pullDeviceCalculatedPowerUse(int atomTag, List<StatsEvent> pulledData) { BatteryStatsHelper bsHelper = getBatteryStatsHelper(); StatsEvent e = StatsEvent.newBuilder() .setAtomId(atomTag) @@ -2214,12 +2287,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullDeviceCalculatedPowerBlameUid(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullDeviceCalculatedPowerBlameUid(int atomTag, List<StatsEvent> pulledData) { + int pullDeviceCalculatedPowerBlameUid(int atomTag, List<StatsEvent> pulledData) { final List<BatterySipper> sippers = getBatteryStatsHelper().getUsageList(); if (sippers == null) { return StatsManager.PULL_SKIP; @@ -2244,12 +2317,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullDeviceCalculatedPowerBlameOther(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullDeviceCalculatedPowerBlameOther(int atomTag, List<StatsEvent> pulledData) { + int pullDeviceCalculatedPowerBlameOther(int atomTag, List<StatsEvent> pulledData) { final List<BatterySipper> sippers = getBatteryStatsHelper().getUsageList(); if (sippers == null) { return StatsManager.PULL_SKIP; @@ -2272,24 +2345,20 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - private final Object mDebugElapsedClockLock = new Object(); - private long mDebugElapsedClockPreviousValue = 0; - private long mDebugElapsedClockPullCount = 0; - private void registerDebugElapsedClock() { int tagId = StatsLog.DEBUG_ELAPSED_CLOCK; - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setAdditiveFields(new int[] {1, 2, 3, 4}) .build(); mStatsManager.registerPullAtomCallback( tagId, metadata, - (atomTag, data) -> pullDebugElapsedClock(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullDebugElapsedClock(int atomTag, List<StatsEvent> pulledData) { + int pullDebugElapsedClock(int atomTag, List<StatsEvent> pulledData) { final long elapsedMillis = SystemClock.elapsedRealtime(); synchronized (mDebugElapsedClockLock) { @@ -2327,24 +2396,20 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - private final Object mDebugFailingElapsedClockLock = new Object(); - private long mDebugFailingElapsedClockPreviousValue = 0; - private long mDebugFailingElapsedClockPullCount = 0; - private void registerDebugFailingElapsedClock() { int tagId = StatsLog.DEBUG_FAILING_ELAPSED_CLOCK; - PullAtomMetadata metadata = PullAtomMetadata.newBuilder() + PullAtomMetadata metadata = new PullAtomMetadata.Builder() .setAdditiveFields(new int[] {1, 2, 3, 4}) .build(); mStatsManager.registerPullAtomCallback( tagId, metadata, - (atomTag, data) -> pullDebugFailingElapsedClock(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullDebugFailingElapsedClock(int atomTag, List<StatsEvent> pulledData) { + int pullDebugFailingElapsedClock(int atomTag, List<StatsEvent> pulledData) { final long elapsedMillis = SystemClock.elapsedRealtime(); synchronized (mDebugFailingElapsedClockLock) { @@ -2378,11 +2443,11 @@ public class StatsPullAtomService extends SystemService { tagId, null, // use default PullAtomMetadata values BackgroundThread.getExecutor(), - (atomTag, data) -> pullBuildInformation(atomTag, data) + mStatsCallbackImpl ); } - private int pullBuildInformation(int atomTag, List<StatsEvent> pulledData) { + int pullBuildInformation(int atomTag, List<StatsEvent> pulledData) { StatsEvent e = StatsEvent.newBuilder() .setAtomId(atomTag) .writeString(Build.FINGERPRINT) @@ -2404,13 +2469,13 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullRoleHolder(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } // Add a RoleHolder atom for each package that holds a role. - private int pullRoleHolder(int atomTag, List<StatsEvent> pulledData) { + int pullRoleHolder(int atomTag, List<StatsEvent> pulledData) { long callingToken = Binder.clearCallingIdentity(); try { PackageManager pm = mContext.getPackageManager(); @@ -2462,12 +2527,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullDangerousPermissionState(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullDangerousPermissionState(int atomTag, List<StatsEvent> pulledData) { + int pullDangerousPermissionState(int atomTag, List<StatsEvent> pulledData) { final long token = Binder.clearCallingIdentity(); Set<Integer> reportedUids = new HashSet<>(); try { @@ -2548,12 +2613,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullTimeZoneDataInfo(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullTimeZoneDataInfo(int atomTag, List<StatsEvent> pulledData) { + int pullTimeZoneDataInfo(int atomTag, List<StatsEvent> pulledData) { String tzDbVersion = "Unknown"; try { tzDbVersion = android.icu.util.TimeZone.getTZDataVersion(); @@ -2575,12 +2640,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullExternalStorageInfo(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullExternalStorageInfo(int atomTag, List<StatsEvent> pulledData) { + int pullExternalStorageInfo(int atomTag, List<StatsEvent> pulledData) { if (mStorageManager == null) { return StatsManager.PULL_SKIP; } @@ -2625,12 +2690,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullAppsOnExternalStorageInfo(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullAppsOnExternalStorageInfo(int atomTag, List<StatsEvent> pulledData) { + int pullAppsOnExternalStorageInfo(int atomTag, List<StatsEvent> pulledData) { if (mStorageManager == null) { return StatsManager.PULL_SKIP; } @@ -2681,12 +2746,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullFaceSettings(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullFaceSettings(int atomTag, List<StatsEvent> pulledData) { + int pullFaceSettings(int atomTag, List<StatsEvent> pulledData) { final long callingToken = Binder.clearCallingIdentity(); try { List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers(); @@ -2735,13 +2800,13 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullAppOps(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullAppOps(int atomTag, List<StatsEvent> pulledData) { + int pullAppOps(int atomTag, List<StatsEvent> pulledData) { final long token = Binder.clearCallingIdentity(); try { AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class); @@ -2846,12 +2911,12 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullNotificationRemoteViews(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } - private int pullNotificationRemoteViews(int atomTag, List<StatsEvent> pulledData) { + int pullNotificationRemoteViews(int atomTag, List<StatsEvent> pulledData) { INotificationManager notificationManagerService = getINotificationManagerService(); if (notificationManagerService == null) { return StatsManager.PULL_SKIP; @@ -2890,8 +2955,8 @@ public class StatsPullAtomService extends SystemService { mStatsManager.registerPullAtomCallback( tagId, null, // use default PullAtomMetadata values - (atomTag, data) -> pullDangerousPermissionState(atomTag, data), - BackgroundThread.getExecutor() + BackgroundThread.getExecutor(), + mStatsCallbackImpl ); } diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 3f7d373c1848..57a6776ebc6c 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -1364,6 +1364,17 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D } @Override + public void onBubbleNotificationSuppressionChanged(String key, boolean isNotifSuppressed) { + enforceStatusBarService(); + long identity = Binder.clearCallingIdentity(); + try { + mNotificationDelegate.onBubbleNotificationSuppressionChanged(key, isNotifSuppressed); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + + @Override public void grantInlineReplyUriPermission(String key, Uri uri, UserHandle user, String packageName) { enforceStatusBarService(); diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java index e8704ab789f2..4f010d5e0f2c 100755 --- a/services/core/java/com/android/server/tv/TvInputManagerService.java +++ b/services/core/java/com/android/server/tv/TvInputManagerService.java @@ -1681,7 +1681,8 @@ public final class TvInputManagerService extends SystemService { } @Override - public void startRecording(IBinder sessionToken, @Nullable Uri programUri, int userId) { + public void startRecording(IBinder sessionToken, @Nullable Uri programUri, + @Nullable Bundle params, int userId) { final int callingUid = Binder.getCallingUid(); final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid, userId, "startRecording"); @@ -1690,7 +1691,7 @@ public final class TvInputManagerService extends SystemService { synchronized (mLock) { try { getSessionLocked(sessionToken, callingUid, resolvedUserId).startRecording( - programUri); + programUri, params); } catch (RemoteException | SessionNotFoundException e) { Slog.e(TAG, "error in startRecording", e); } diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java index 663423f8728b..ddf0117987dd 100644 --- a/services/core/java/com/android/server/wm/ActivityStack.java +++ b/services/core/java/com/android/server/wm/ActivityStack.java @@ -660,6 +660,8 @@ class ActivityStack extends Task implements BoundsAnimationTarget { super.onConfigurationChanged(newParentConfig); + updateTaskOrganizerState(); + // Only need to update surface size here since the super method will handle updating // surface position. updateSurfaceSize(getPendingTransaction()); @@ -762,6 +764,22 @@ class ActivityStack extends Task implements BoundsAnimationTarget { } } + void updateTaskOrganizerState() { + if (!isRootTask()) { + return; + } + + final int windowingMode = getWindowingMode(); + /* + * Different windowing modes may be managed by different task organizers. If + * getTaskOrganizer returns null, we still call setTaskOrganizer to + * make sure we clear it. + */ + final ITaskOrganizer org = + mWmService.mAtmService.mTaskOrganizerController.getTaskOrganizer(windowingMode); + setTaskOrganizer(org); + } + @Override public void setWindowingMode(int windowingMode) { // Calling Task#setWindowingMode() for leaf task since this is the a specialization of @@ -774,15 +792,6 @@ class ActivityStack extends Task implements BoundsAnimationTarget { setWindowingMode(windowingMode, false /* animate */, false /* showRecents */, false /* enteringSplitScreenMode */, false /* deferEnsuringVisibility */, false /* creating */); - windowingMode = getWindowingMode(); - /* - * Different windowing modes may be managed by different task organizers. If - * getTaskOrganizer returns null, we still call transferToTaskOrganizer to - * make sure we clear it. - */ - final ITaskOrganizer org = - mWmService.mAtmService.mTaskOrganizerController.getTaskOrganizer(windowingMode); - transferToTaskOrganizer(org); } /** @@ -1583,24 +1592,6 @@ class ActivityStack extends Task implements BoundsAnimationTarget { return topActivity != null && topActivity.mVisibleRequested; } - private static void transferSingleTaskToOrganizer(Task tr, ITaskOrganizer organizer) { - tr.setTaskOrganizer(organizer); - } - - /** - * Transfer control of the leashes and IWindowContainers to the given ITaskOrganizer. - * This will (or shortly there-after) invoke the taskAppeared callbacks. - * If the tasks had a previous TaskOrganizer, setTaskOrganizer will take care of - * emitting the taskVanished callbacks. - */ - void transferToTaskOrganizer(ITaskOrganizer organizer) { - final PooledConsumer c = PooledLambda.obtainConsumer( - ActivityStack::transferSingleTaskToOrganizer, - PooledLambda.__(Task.class), organizer); - forAllTasks(c, true /* traverseTopToBottom */, this); - c.recycle(); - } - /** * Returns true if the stack should be visible. * diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 26812f462b3f..9e3292b59402 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1595,11 +1595,11 @@ class ActivityStarter { mRootWindowContainer.resumeFocusedStacksTopActivities( mTargetStack, mStartActivity, mOptions); } - } else if (mStartActivity != null) { - mSupervisor.mRecentTasks.add(mStartActivity.getTask()); } mRootWindowContainer.updateUserStack(mStartActivity.mUserId, mTargetStack); + // Update the recent tasks list immediately when the activity starts + mSupervisor.mRecentTasks.add(mStartActivity.getTask()); mSupervisor.handleNonResizableTaskIfNeeded(mStartActivity.getTask(), preferredWindowingMode, mPreferredDisplayId, mTargetStack); diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index bf89bab53f30..c50048eeab64 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -112,7 +112,6 @@ import static com.android.server.wm.DisplayContentProto.ID; import static com.android.server.wm.DisplayContentProto.IME_WINDOWS; import static com.android.server.wm.DisplayContentProto.OPENING_APPS; import static com.android.server.wm.DisplayContentProto.OVERLAY_WINDOWS; -import static com.android.server.wm.DisplayContentProto.PINNED_STACK_CONTROLLER; import static com.android.server.wm.DisplayContentProto.ROTATION; import static com.android.server.wm.DisplayContentProto.SCREEN_ROTATION_ANIMATION; import static com.android.server.wm.DisplayContentProto.STACKS; @@ -2779,7 +2778,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo stack.dumpDebugInnerStackOnly(proto, STACKS, logLevel); } mDividerControllerLocked.dumpDebug(proto, DOCKED_STACK_DIVIDER_CONTROLLER); - mPinnedStackControllerLocked.dumpDebug(proto, PINNED_STACK_CONTROLLER); for (int i = mAboveAppWindowsContainers.getChildCount() - 1; i >= 0; --i) { final WindowToken windowToken = mAboveAppWindowsContainers.getChildAt(i); windowToken.dumpDebug(proto, ABOVE_APP_WINDOWS, logLevel); @@ -4732,7 +4730,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo // exists so it get's layered above the starting window. if (imeTarget != null && !(imeTarget.mActivityRecord != null && imeTarget.mActivityRecord.hasStartingWindow()) && ( - !(imeTarget.inSplitScreenWindowingMode() + !(imeTarget.inMultiWindowMode() || imeTarget.mToken.isAppTransitioning()) && ( imeTarget.getSurfaceControl() != null))) { mImeWindowsContainers.assignRelativeLayer(t, imeTarget.getSurfaceControl(), diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index f8df883a3e1c..d211cfd83549 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -1014,8 +1014,19 @@ public class DisplayPolicy { mNavigationBarController.setWindow(win); mNavigationBarController.setOnBarVisibilityChangedListener( mNavBarVisibilityListener, true); - mDisplayContent.setInsetProvider(ITYPE_NAVIGATION_BAR, - win, null /* frameProvider */); + mDisplayContent.setInsetProvider(ITYPE_NAVIGATION_BAR, win, + (displayFrames, windowState, inOutFrame) -> { + + // In Gesture Nav, navigation bar frame is larger than frame to + // calculate inset. + if (mNavigationBarPosition == NAV_BAR_BOTTOM) { + sTmpRect.set(displayFrames.mUnrestricted); + sTmpRect.intersectUnchecked(displayFrames.mDisplayCutoutSafe); + inOutFrame.top = sTmpRect.bottom + - getNavigationBarHeight(displayFrames.mRotation, + mDisplayContent.getConfiguration().uiMode); + } + }); mDisplayContent.setInsetProvider(ITYPE_BOTTOM_GESTURES, win, (displayFrames, windowState, inOutFrame) -> { inOutFrame.top -= mBottomGestureAdditionalInset; diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index 4c5914bfd8c2..faa6e52da8bc 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -161,7 +161,13 @@ final class InputMonitor { void onDisplayRemoved() { mHandler.removeCallbacks(mUpdateInputWindows); - mService.mInputManager.onDisplayRemoved(mDisplayId); + mHandler.post(() -> { + // Make sure any pending setInputWindowInfo transactions are completed. That prevents + // the timing of updating input info of removed display after cleanup. + mService.mTransactionFactory.get().syncInputWindows().apply(); + // It calls InputDispatcher::setInputWindows directly. + mService.mInputManager.onDisplayRemoved(mDisplayId); + }); mDisplayRemoved = true; } diff --git a/services/core/java/com/android/server/wm/InsetsSourceProvider.java b/services/core/java/com/android/server/wm/InsetsSourceProvider.java index 5a591ecd4746..2bb58ddc5b38 100644 --- a/services/core/java/com/android/server/wm/InsetsSourceProvider.java +++ b/services/core/java/com/android/server/wm/InsetsSourceProvider.java @@ -233,7 +233,7 @@ class InsetsSourceProvider { // window crop of the surface controls (including the leash) until the client finishes // drawing the new frame of the new orientation. Although we cannot defer the reparent // operation, it is fine, because reparent won't cause any visual effect. - final SurfaceControl barrier = mWin.mWinAnimator.mSurfaceController.mSurfaceControl; + final SurfaceControl barrier = mWin.getDeferTransactionBarrier(); t.deferTransactionUntil(mWin.getSurfaceControl(), barrier, frameNumber); t.deferTransactionUntil(leash, barrier, frameNumber); } diff --git a/services/core/java/com/android/server/wm/PinnedStackController.java b/services/core/java/com/android/server/wm/PinnedStackController.java index 1d5b5d1a46a4..668b6095738f 100644 --- a/services/core/java/com/android/server/wm/PinnedStackController.java +++ b/services/core/java/com/android/server/wm/PinnedStackController.java @@ -18,8 +18,6 @@ package com.android.server.wm; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; -import static com.android.server.wm.PinnedStackControllerProto.DEFAULT_BOUNDS; -import static com.android.server.wm.PinnedStackControllerProto.MOVEMENT_BOUNDS; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; @@ -34,7 +32,6 @@ import android.os.RemoteException; import android.util.DisplayMetrics; import android.util.Log; import android.util.Slog; -import android.util.proto.ProtoOutputStream; import android.view.DisplayInfo; import android.view.IPinnedStackController; import android.view.IPinnedStackListener; @@ -97,11 +94,6 @@ class PinnedStackController { // Temp vars for calculation private final DisplayMetrics mTmpMetrics = new DisplayMetrics(); - // TODO(b/141200935): remove this when we have default/movement bounds tests in SysUI. - // Keep record of the default and movement bounds - private final Rect mLastReportedDefaultBounds = new Rect(); - private final Rect mLastReportedMovementBounds = new Rect(); - /** * The callback object passed to listeners for them to notify the controller of state changes. */ @@ -143,14 +135,6 @@ class PinnedStackController { } } } - - @Override - public void reportBounds(Rect defaultBounds, Rect movementBounds) { - synchronized (mService.mGlobalLock) { - mLastReportedDefaultBounds.set(defaultBounds); - mLastReportedMovementBounds.set(movementBounds); - } - } } /** @@ -421,8 +405,6 @@ class PinnedStackController { void dump(String prefix, PrintWriter pw) { pw.println(prefix + "PinnedStackController"); - pw.println(prefix + " mLastReportedDefaultBounds=" + mLastReportedDefaultBounds); - pw.println(prefix + " mLastReportedMovementBounds=" + mLastReportedMovementBounds); pw.println(prefix + " mDefaultAspectRatio=" + mDefaultAspectRatio); pw.println(prefix + " mIsImeShowing=" + mIsImeShowing); pw.println(prefix + " mImeHeight=" + mImeHeight); @@ -443,11 +425,4 @@ class PinnedStackController { } pw.println(prefix + " mDisplayInfo=" + mDisplayInfo); } - - void dumpDebug(ProtoOutputStream proto, long fieldId) { - final long token = proto.start(fieldId); - mLastReportedDefaultBounds.dumpDebug(proto, DEFAULT_BOUNDS); - mLastReportedMovementBounds.dumpDebug(proto, MOVEMENT_BOUNDS); - proto.end(token); - } } diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java index 292e8aaa0c04..a9dc36d91a3f 100644 --- a/services/core/java/com/android/server/wm/RecentTasks.java +++ b/services/core/java/com/android/server/wm/RecentTasks.java @@ -173,6 +173,9 @@ class RecentTasks { private final ArrayList<Task> mTasks = new ArrayList<>(); private final ArrayList<Callbacks> mCallbacks = new ArrayList<>(); + /** The non-empty tasks that are removed from recent tasks (see {@link #removeForAddTask}). */ + private final ArrayList<Task> mHiddenTasks = new ArrayList<>(); + // These values are generally loaded from resources, but can be set dynamically in the tests private boolean mHasVisibleRecentTasks; private int mGlobalMaxNumTasks; @@ -1024,6 +1027,12 @@ class RecentTasks { void add(Task task) { if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "add: task=" + task); + // Clean up the hidden tasks when going to home because the user may not be unable to return + // to the task from recents. + if (!mHiddenTasks.isEmpty() && task.isActivityTypeHome()) { + removeUnreachableHiddenTasks(task.getWindowingMode()); + } + final boolean isAffiliated = task.mAffiliatedTaskId != task.mTaskId || task.mNextAffiliateTaskId != INVALID_TASK_ID || task.mPrevAffiliateTaskId != INVALID_TASK_ID; @@ -1390,6 +1399,28 @@ class RecentTasks { return display.getIndexOf(stack) < display.getIndexOf(display.getRootHomeTask()); } + /** Remove the tasks that user may not be able to return. */ + private void removeUnreachableHiddenTasks(int windowingMode) { + for (int i = mHiddenTasks.size() - 1; i >= 0; i--) { + final Task hiddenTask = mHiddenTasks.get(i); + if (!hiddenTask.hasChild()) { + // The task was removed by other path. + mHiddenTasks.remove(i); + continue; + } + if (hiddenTask.getWindowingMode() != windowingMode + || hiddenTask.getTopVisibleActivity() != null) { + // The task may be reachable from the back stack of other windowing mode or it is + // currently in use. Keep the task in the hidden list to avoid losing track, e.g. + // after dismissing primary split screen. + continue; + } + mHiddenTasks.remove(i); + mSupervisor.removeTask(hiddenTask, false /* killProcess */, + !REMOVE_FROM_RECENTS, "remove-hidden-task"); + } + } + /** * If needed, remove oldest existing entries in recents that are for the same kind * of task as the given one. @@ -1406,6 +1437,14 @@ class RecentTasks { // callbacks here. final Task removedTask = mTasks.remove(removeIndex); if (removedTask != task) { + // The added task is in recents so it is not hidden. + mHiddenTasks.remove(task); + if (removedTask.hasChild()) { + // A non-empty task is replaced by a new task. Because the removed task is no longer + // managed by the recent tasks list, add it to the hidden list to prevent the task + // from becoming dangling. + mHiddenTasks.add(removedTask); + } notifyTaskRemoved(removedTask, false /* wasTrimmed */, false /* killProcess */); if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "Trimming task=" + removedTask + " for addition of task=" + task); @@ -1662,6 +1701,9 @@ class RecentTasks { pw.println("mFreezeTaskListReordering=" + mFreezeTaskListReordering); pw.println("mFreezeTaskListReorderingPendingTimeout=" + mService.mH.hasCallbacks(mResetFreezeTaskListOnTimeoutRunnable)); + if (!mHiddenTasks.isEmpty()) { + pw.println("mHiddenTasks=" + mHiddenTasks); + } if (mTasks.isEmpty()) { return; } diff --git a/services/core/java/com/android/server/wm/SeamlessRotator.java b/services/core/java/com/android/server/wm/SeamlessRotator.java index ba31818d6331..c621c48b0028 100644 --- a/services/core/java/com/android/server/wm/SeamlessRotator.java +++ b/services/core/java/com/android/server/wm/SeamlessRotator.java @@ -101,9 +101,9 @@ public class SeamlessRotator { t.setPosition(win.mSurfaceControl, win.mLastSurfacePosition.x, win.mLastSurfacePosition.y); if (win.mWinAnimator.mSurfaceController != null && !timeout) { t.deferTransactionUntil(win.mSurfaceControl, - win.mWinAnimator.mSurfaceController.mSurfaceControl, win.getFrameNumber()); + win.getDeferTransactionBarrier(), win.getFrameNumber()); t.deferTransactionUntil(win.mWinAnimator.mSurfaceController.mSurfaceControl, - win.mWinAnimator.mSurfaceController.mSurfaceControl, win.getFrameNumber()); + win.getDeferTransactionBarrier(), win.getFrameNumber()); } } diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index 5babdafc856d..de7f9e41cac0 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -191,7 +191,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { Rect outStableInsets, Rect outBackdropFrame, DisplayCutout.ParcelableWrapper cutout, MergedConfiguration mergedConfiguration, SurfaceControl outSurfaceControl, InsetsState outInsetsState, - Point outSurfaceSize) { + Point outSurfaceSize, SurfaceControl outBLASTSurfaceControl) { if (false) Slog.d(TAG_WM, ">>>>>> ENTERED relayout from " + Binder.getCallingPid()); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, mRelayoutTag); @@ -199,7 +199,8 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { requestedWidth, requestedHeight, viewFlags, flags, frameNumber, outFrame, outContentInsets, outVisibleInsets, outStableInsets, outBackdropFrame, cutout, - mergedConfiguration, outSurfaceControl, outInsetsState, outSurfaceSize); + mergedConfiguration, outSurfaceControl, outInsetsState, outSurfaceSize, + outBLASTSurfaceControl); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); if (false) Slog.d(TAG_WM, "<<<<<< EXITING relayout to " + Binder.getCallingPid()); diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 9dba0d3ee051..a02ba64b4c9c 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -3864,9 +3864,8 @@ class Task extends WindowContainer<WindowContainer> { } boolean isControlledByTaskOrganizer() { - // TODO(b/147849315): Clean-up relationship between task-org and task-hierarchy. Ideally - // we only give control of the root task. - return getTopMostTask().mTaskOrganizer != null; + final Task rootTask = getRootTask(); + return rootTask == this && rootTask.mTaskOrganizer != null; } @Override @@ -3938,23 +3937,6 @@ class Task extends WindowContainer<WindowContainer> { super.getRelativeDisplayedPosition(outPos); } - @Override - public void setWindowingMode(int windowingMode) { - super.setWindowingMode(windowingMode); - windowingMode = getWindowingMode(); - - // TODO(b/147849315): Clean-up relationship between task-org and task-hierarchy. Ideally - // we only give control of the root task. - // Different windowing modes may be managed by different task organizers. If - // getTaskOrganizer returns null, we still call transferToTaskOrganizer to make sure we - // clear it. - if (!isRootTask()) { - final ITaskOrganizer org = - mAtmService.mTaskOrganizerController.getTaskOrganizer(windowingMode); - setTaskOrganizer(org); - } - } - /** * @return true if the task is currently focused. */ diff --git a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java index 57de7536409f..e47eaee5bce4 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java @@ -116,7 +116,11 @@ class TaskSnapshotSurface implements StartingSurface { private static final String TAG = TAG_WITH_CLASS_NAME ? "SnapshotStartingWindow" : TAG_WM; private static final int MSG_REPORT_DRAW = 0; private static final String TITLE_FORMAT = "SnapshotStartingWindow for taskId=%s"; - private static final Point sSurfaceSize = new Point(); //tmp var for unused relayout param + + //tmp vars for unused relayout params + private static final Point sTmpSurfaceSize = new Point(); + private static final SurfaceControl sTmpSurfaceControl = new SurfaceControl(); + private final Window mWindow; private final Surface mSurface; private SurfaceControl mSurfaceControl; @@ -230,7 +234,7 @@ class TaskSnapshotSurface implements StartingSurface { session.relayout(window, window.mSeq, layoutParams, -1, -1, View.VISIBLE, 0, -1, tmpFrame, tmpContentInsets, tmpRect, tmpStableInsets, tmpRect, tmpCutout, tmpMergedConfiguration, surfaceControl, mTmpInsetsState, - sSurfaceSize); + sTmpSurfaceSize, sTmpSurfaceControl); } catch (RemoteException e) { // Local call. } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index e13083007237..2c6c756dda3b 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2071,7 +2071,7 @@ public class WindowManagerService extends IWindowManager.Stub Rect outVisibleInsets, Rect outStableInsets, Rect outBackdropFrame, DisplayCutout.ParcelableWrapper outCutout, MergedConfiguration mergedConfiguration, SurfaceControl outSurfaceControl, InsetsState outInsetsState, - Point outSurfaceSize) { + Point outSurfaceSize, SurfaceControl outBLASTSurfaceControl) { int result = 0; boolean configChanged; final int pid = Binder.getCallingPid(); @@ -2238,7 +2238,8 @@ public class WindowManagerService extends IWindowManager.Stub result = win.relayoutVisibleWindow(result, attrChanges); try { - result = createSurfaceControl(outSurfaceControl, result, win, winAnimator); + result = createSurfaceControl(outSurfaceControl, outBLASTSurfaceControl, + result, win, winAnimator); } catch (Exception e) { displayContent.getInputMonitor().updateInputWindowsLw(true /*force*/); @@ -2270,6 +2271,7 @@ public class WindowManagerService extends IWindowManager.Stub // surface, let the client use that, but don't create new surface at this point. Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: getSurface"); winAnimator.mSurfaceController.getSurfaceControl(outSurfaceControl); + winAnimator.mSurfaceController.getBLASTSurfaceControl(outBLASTSurfaceControl); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); } else { if (DEBUG_VISIBILITY) Slog.i(TAG_WM, "Releasing surface in: " + win); @@ -2451,7 +2453,8 @@ public class WindowManagerService extends IWindowManager.Stub } private int createSurfaceControl(SurfaceControl outSurfaceControl, - int result, WindowState win, WindowStateAnimator winAnimator) { + SurfaceControl outBLASTSurfaceControl, int result, + WindowState win, WindowStateAnimator winAnimator) { if (!win.mHasSurface) { result |= RELAYOUT_RES_SURFACE_CHANGED; } @@ -2465,6 +2468,7 @@ public class WindowManagerService extends IWindowManager.Stub } if (surfaceController != null) { surfaceController.getSurfaceControl(outSurfaceControl); + surfaceController.getBLASTSurfaceControl(outBLASTSurfaceControl); ProtoLog.i(WM_SHOW_TRANSACTIONS, "OUT SURFACE %s: copied", outSurfaceControl); } else { diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 73984fd49f73..b9694c3b9bd3 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -5616,4 +5616,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP boolean isNonToastWindowVisibleForPid(int pid) { return mSession.mPid == pid && isNonToastOrStarting() && isVisibleNow(); } + + SurfaceControl getDeferTransactionBarrier() { + return mWinAnimator.getDeferTransactionBarrier(); + } } diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 069ee4fea8ec..9552df7b5899 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -1010,7 +1010,7 @@ class WindowStateAnimator { // the WS position is reset (so the stack position is shown) at the same // time that the buffer size changes. setOffsetPositionForStackResize(false); - mSurfaceController.deferTransactionUntil(mSurfaceController.mSurfaceControl, + mSurfaceController.deferTransactionUntil(mWin.getDeferTransactionBarrier(), mWin.getFrameNumber()); } else { final ActivityStack stack = mWin.getRootTask(); @@ -1041,7 +1041,7 @@ class WindowStateAnimator { // comes in at the new size (normally position and crop are unfrozen). // deferTransactionUntil accomplishes this for us. if (wasForceScaled && !mForceScaleUntilResize) { - mSurfaceController.deferTransactionUntil(mSurfaceController.mSurfaceControl, + mSurfaceController.deferTransactionUntil(mWin.getDeferTransactionBarrier(), mWin.getFrameNumber()); mSurfaceController.forceScaleableInTransaction(false); } @@ -1518,4 +1518,11 @@ class WindowStateAnimator { void setOffsetPositionForStackResize(boolean offsetPositionForStackResize) { mOffsetPositionForStackResize = offsetPositionForStackResize; } + + SurfaceControl getDeferTransactionBarrier() { + if (!hasSurface()) { + return null; + } + return mSurfaceController.getDeferTransactionBarrier(); + } } diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java index 5b8015be1a7a..383c0d9ab3d4 100644 --- a/services/core/java/com/android/server/wm/WindowSurfaceController.java +++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java @@ -51,6 +51,11 @@ class WindowSurfaceController { SurfaceControl mSurfaceControl; + /** + * WM only uses for deferred transactions. + */ + SurfaceControl mBLASTSurfaceControl; + // Should only be set from within setShown(). private boolean mSurfaceShown = false; private float mSurfaceX = 0; @@ -110,13 +115,22 @@ class WindowSurfaceController { .setMetadata(METADATA_WINDOW_TYPE, windowType) .setMetadata(METADATA_OWNER_UID, ownerUid); - if ((win.getAttrs().privateFlags & - WindowManager.LayoutParams.PRIVATE_FLAG_USE_BLAST) != 0) { + final boolean useBLAST = (win.getAttrs().privateFlags & + WindowManager.LayoutParams.PRIVATE_FLAG_USE_BLAST) != 0; + if (useBLAST) { b.setContainerLayer(); } - mSurfaceControl = b.build(); + + if (useBLAST) { + mBLASTSurfaceControl = win.makeSurface() + .setParent(mSurfaceControl) + .setName("BLAST Adapter Layer") + .setBLASTLayer() + .build(); + } + Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); } @@ -168,6 +182,9 @@ class WindowSurfaceController { } finally { setShown(false); mSurfaceControl = null; + if (mBLASTSurfaceControl != null) { + mBLASTSurfaceControl.release(); + } } } @@ -474,6 +491,12 @@ class WindowSurfaceController { outSurfaceControl.copyFrom(mSurfaceControl); } + void getBLASTSurfaceControl(SurfaceControl outSurfaceControl) { + if (mBLASTSurfaceControl != null) { + outSurfaceControl.copyFrom(mBLASTSurfaceControl); + } + } + int getLayer() { return mSurfaceLayer; } @@ -510,6 +533,13 @@ class WindowSurfaceController { return mSurfaceH; } + SurfaceControl getDeferTransactionBarrier() { + if (mBLASTSurfaceControl != null) { + return mBLASTSurfaceControl; + } + return mSurfaceControl; + } + void dumpDebug(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); proto.write(SHOWN, mSurfaceShown); diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index 77d814e3076b..4a2636ee6ca4 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -14,6 +14,7 @@ cc_library_static { srcs: [ ":graphicsstats_proto", + ":lib_alarmManagerService_native", "BroadcastRadio/JavaRef.cpp", "BroadcastRadio/NativeCallbackThread.cpp", "BroadcastRadio/BroadcastRadioService.cpp", @@ -21,7 +22,6 @@ cc_library_static { "BroadcastRadio/TunerCallback.cpp", "BroadcastRadio/convert.cpp", "BroadcastRadio/regions.cpp", - "com_android_server_AlarmManagerService.cpp", "com_android_server_am_BatteryStatsService.cpp", "com_android_server_connectivity_Vpn.cpp", "com_android_server_ConsumerIrService.cpp", @@ -182,3 +182,10 @@ filegroup { "com_android_server_net_NetworkStatsFactory.cpp", ], } + +filegroup { + name: "lib_alarmManagerService_native", + srcs: [ + "com_android_server_AlarmManagerService.cpp", + ], +} diff --git a/services/core/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp index 6811e6d0e6f2..5a8e25e4cf1c 100644 --- a/services/core/jni/com_android_server_VibratorService.cpp +++ b/services/core/jni/com_android_server_VibratorService.cpp @@ -49,6 +49,12 @@ namespace android { static jmethodID sMethodIdOnComplete; +static struct { + jfieldID id; + jfieldID scale; + jfieldID delay; +} gPrimitiveClassInfo; + static_assert(static_cast<uint8_t>(V1_0::EffectStrength::LIGHT) == static_cast<uint8_t>(aidl::EffectStrength::LIGHT)); static_assert(static_cast<uint8_t>(V1_0::EffectStrength::MEDIUM) == @@ -333,6 +339,21 @@ static void vibratorSetExternalControl(JNIEnv*, jclass, jboolean enabled) { } } +static jintArray vibratorGetSupportedEffects(JNIEnv *env, jclass) { + if (auto hal = getHal<aidl::IVibrator>()) { + std::vector<aidl::Effect> supportedEffects; + if (!hal->call(&aidl::IVibrator::getSupportedEffects, &supportedEffects).isOk()) { + return nullptr; + } + jintArray arr = env->NewIntArray(supportedEffects.size()); + env->SetIntArrayRegion(arr, 0, supportedEffects.size(), + reinterpret_cast<jint*>(supportedEffects.data())); + return arr; + } else { + return nullptr; + } +} + static jlong vibratorPerformEffect(JNIEnv* env, jclass, jlong effect, jlong strength, jobject vibration) { if (auto hal = getHal<aidl::IVibrator>()) { @@ -398,6 +419,37 @@ static jlong vibratorPerformEffect(JNIEnv* env, jclass, jlong effect, jlong stre return -1; } +static aidl::CompositeEffect effectFromJavaPrimitive(JNIEnv* env, jobject primitive) { + aidl::CompositeEffect effect; + effect.primitive = static_cast<aidl::CompositePrimitive>( + env->GetIntField(primitive, gPrimitiveClassInfo.id)); + effect.scale = static_cast<float>(env->GetFloatField(primitive, gPrimitiveClassInfo.scale)); + effect.delayMs = static_cast<int>(env->GetIntField(primitive, gPrimitiveClassInfo.delay)); + return effect; +} + +static void vibratorPerformComposedEffect(JNIEnv* env, jclass, jobjectArray composition, + jobject vibration) { + auto hal = getHal<aidl::IVibrator>(); + if (!hal) { + return; + } + size_t size = env->GetArrayLength(composition); + std::vector<aidl::CompositeEffect> effects; + for (size_t i = 0; i < size; i++) { + jobject element = env->GetObjectArrayElement(composition, i); + effects.push_back(effectFromJavaPrimitive(env, element)); + } + sp<AidlVibratorCallback> effectCallback = new AidlVibratorCallback(env, vibration); + + auto status = hal->call(&aidl::IVibrator::compose, effects, effectCallback); + if (!status.isOk()) { + if (status.exceptionCode() != binder::Status::EX_UNSUPPORTED_OPERATION) { + ALOGE("Failed to play haptic effect composition"); + } + } +} + static jlong vibratorGetCapabilities(JNIEnv*, jclass) { if (auto hal = getHal<aidl::IVibrator>()) { int32_t cap = 0; @@ -433,7 +485,12 @@ static const JNINativeMethod method_table[] = { { "vibratorSupportsAmplitudeControl", "()Z", (void*)vibratorSupportsAmplitudeControl}, { "vibratorSetAmplitude", "(I)V", (void*)vibratorSetAmplitude}, { "vibratorPerformEffect", "(JJLcom/android/server/VibratorService$Vibration;)J", - (void*)vibratorPerformEffect}, + (void*)vibratorPerformEffect}, + { "vibratorPerformComposedEffect", + "([Landroid/os/VibrationEffect$Composition$PrimitiveEffect;Lcom/android/server/VibratorService$Vibration;)V", + (void*)vibratorPerformComposedEffect}, + { "vibratorGetSupportedEffects", "()[I", + (void*)vibratorGetSupportedEffects}, { "vibratorSupportsExternalControl", "()Z", (void*)vibratorSupportsExternalControl}, { "vibratorSetExternalControl", "(Z)V", (void*)vibratorSetExternalControl}, { "vibratorGetCapabilities", "()J", (void*)vibratorGetCapabilities}, @@ -441,11 +498,15 @@ static const JNINativeMethod method_table[] = { { "vibratorAlwaysOnDisable", "(J)V", (void*)vibratorAlwaysOnDisable}, }; -int register_android_server_VibratorService(JNIEnv *env) -{ +int register_android_server_VibratorService(JNIEnv *env) { sMethodIdOnComplete = GetMethodIDOrDie(env, FindClassOrDie(env, "com/android/server/VibratorService$Vibration"), "onComplete", "()V"); + jclass primitiveClass = FindClassOrDie(env, + "android/os/VibrationEffect$Composition$PrimitiveEffect"); + gPrimitiveClassInfo.id = GetFieldIDOrDie(env, primitiveClass, "id", "I"); + gPrimitiveClassInfo.scale = GetFieldIDOrDie(env, primitiveClass, "scale", "F"); + gPrimitiveClassInfo.delay = GetFieldIDOrDie(env, primitiveClass, "delay", "I"); return jniRegisterNativeMethods(env, "com/android/server/VibratorService", method_table, NELEM(method_table)); } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 258d7628e502..df2b9e932fbc 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1724,9 +1724,11 @@ public final class SystemServer { mSystemServiceManager.startService(SensorNotificationService.class); t.traceEnd(); - t.traceBegin("StartContextHubSystemService"); - mSystemServiceManager.startService(ContextHubSystemService.class); - t.traceEnd(); + if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_CONTEXTHUB)) { + t.traceBegin("StartContextHubSystemService"); + mSystemServiceManager.startService(ContextHubSystemService.class); + t.traceEnd(); + } t.traceBegin("StartDiskStatsService"); try { diff --git a/services/net/java/android/net/IpMemoryStore.java b/services/net/java/android/net/IpMemoryStore.java index 6f91e006c853..dcefb537d0a0 100644 --- a/services/net/java/android/net/IpMemoryStore.java +++ b/services/net/java/android/net/IpMemoryStore.java @@ -52,6 +52,11 @@ public class IpMemoryStore extends IpMemoryStoreClient { public int getInterfaceVersion() { return this.VERSION; } + + @Override + public String getInterfaceHash() { + return this.HASH; + } }); } diff --git a/services/net/java/android/net/ip/IpClientUtil.java b/services/net/java/android/net/ip/IpClientUtil.java index 7f723b1c232b..a3618b47171a 100644 --- a/services/net/java/android/net/ip/IpClientUtil.java +++ b/services/net/java/android/net/ip/IpClientUtil.java @@ -189,6 +189,11 @@ public class IpClientUtil { public int getInterfaceVersion() { return this.VERSION; } + + @Override + public String getInterfaceHash() { + return this.HASH; + } } /** diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml index d2ddff3627b9..b7c900130e39 100644 --- a/services/tests/servicestests/AndroidManifest.xml +++ b/services/tests/servicestests/AndroidManifest.xml @@ -66,6 +66,8 @@ <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/> <uses-permission android:name="android.permission.SUSPEND_APPS"/> <uses-permission android:name="android.permission.CONTROL_KEYGUARD"/> + <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG"/> + <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/> <uses-permission android:name="android.permission.MANAGE_BIND_INSTANT_SERVICE"/> <uses-permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" /> <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" /> diff --git a/services/tests/servicestests/src/com/android/server/backup/restore/PerformUnifiedRestoreTaskTest.java b/services/tests/servicestests/src/com/android/server/backup/restore/PerformUnifiedRestoreTaskTest.java index 6359edf190b0..3d220432cc8e 100644 --- a/services/tests/servicestests/src/com/android/server/backup/restore/PerformUnifiedRestoreTaskTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/restore/PerformUnifiedRestoreTaskTest.java @@ -20,7 +20,6 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; @@ -55,6 +54,8 @@ public class PerformUnifiedRestoreTaskTest { private static final String INCLUDED_KEY = "included_key"; private static final String EXCLUDED_KEY_1 = "excluded_key_1"; private static final String EXCLUDED_KEY_2 = "excluded_key_2"; + private static final String SYSTEM_PACKAGE_NAME = "android"; + private static final String NON_SYSTEM_PACKAGE_NAME = "package"; @Mock private BackupDataInput mBackupDataInput; @Mock private BackupDataOutput mBackupDataOutput; @@ -98,9 +99,6 @@ public class PerformUnifiedRestoreTaskTest { return null; } }); - - mRestoreTask = new PerformUnifiedRestoreTask(Collections.singletonMap( - PACKAGE_NAME, mExcludedkeys)); } private void populateTestData() { @@ -116,6 +114,8 @@ public class PerformUnifiedRestoreTaskTest { @Test public void testFilterExcludedKeys() throws Exception { + mRestoreTask = new PerformUnifiedRestoreTask(Collections.singletonMap( + PACKAGE_NAME, mExcludedkeys)); mRestoreTask.filterExcludedKeys(PACKAGE_NAME, mBackupDataInput, mBackupDataOutput); // Verify only the correct were written into BackupDataOutput object. @@ -123,4 +123,34 @@ public class PerformUnifiedRestoreTaskTest { allowedBackupKeys.removeAll(mExcludedkeys); assertEquals(allowedBackupKeys, mBackupDataDump); } + + @Test + public void testStageBackupData_stageForNonSystemPackageWithKeysToExclude() { + mRestoreTask = new PerformUnifiedRestoreTask(Collections.singletonMap( + PACKAGE_NAME, mExcludedkeys)); + + assertTrue(mRestoreTask.shouldStageBackupData(NON_SYSTEM_PACKAGE_NAME)); + } + + @Test + public void testStageBackupData_stageForNonSystemPackageWithNoKeysToExclude() { + mRestoreTask = new PerformUnifiedRestoreTask(Collections.emptyMap()); + + assertTrue(mRestoreTask.shouldStageBackupData(NON_SYSTEM_PACKAGE_NAME)); + } + + @Test + public void testStageBackupData_doNotStageForSystemPackageWithNoKeysToExclude() { + mRestoreTask = new PerformUnifiedRestoreTask(Collections.emptyMap()); + + assertFalse(mRestoreTask.shouldStageBackupData(SYSTEM_PACKAGE_NAME)); + } + + @Test + public void testStageBackupData_stageForSystemPackageWithKeysToExclude() { + mRestoreTask = new PerformUnifiedRestoreTask(Collections.singletonMap( + PACKAGE_NAME, mExcludedkeys)); + + assertTrue(mRestoreTask.shouldStageBackupData(NON_SYSTEM_PACKAGE_NAME)); + } } diff --git a/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java b/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java index 770afb0a24d5..49ad866a56a4 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java @@ -328,10 +328,11 @@ public class AppIntegrityManagerServiceImplTest { when(mRuleEvaluationEngine.evaluate(any(), any())) .thenReturn( IntegrityCheckResult.deny( - new Rule( - new AtomicFormula.BooleanAtomicFormula( - AtomicFormula.PRE_INSTALLED, false), - Rule.DENY))); + Arrays.asList( + new Rule( + new AtomicFormula.BooleanAtomicFormula( + AtomicFormula.PRE_INSTALLED, false), + Rule.DENY)))); Intent intent = makeVerificationIntent(); broadcastReceiverCaptor.getValue().onReceive(mMockContext, intent); diff --git a/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluatorTest.java b/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluatorTest.java index 629fd14befcc..7b53e5e7c762 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluatorTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluatorTest.java @@ -63,7 +63,7 @@ public class RuleEvaluatorTest { @Test public void testEvaluateRules_noMatchedRules_allow() { - Rule rule1 = + Rule rule = new Rule( new StringAtomicFormula( AtomicFormula.PACKAGE_NAME, @@ -72,7 +72,7 @@ public class RuleEvaluatorTest { Rule.DENY); IntegrityCheckResult result = - RuleEvaluator.evaluateRules(Collections.singletonList(rule1), APP_INSTALL_METADATA); + RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); assertThat(result.getEffect()).isEqualTo(ALLOW); } @@ -98,7 +98,7 @@ public class RuleEvaluatorTest { RuleEvaluator.evaluateRules(Arrays.asList(rule1, rule2), APP_INSTALL_METADATA); assertThat(result.getEffect()).isEqualTo(DENY); - assertThat(result.getRule()).isEqualTo(rule1); + assertThat(result.getMatchedRules()).containsExactly(rule1); } @Test @@ -110,7 +110,7 @@ public class RuleEvaluatorTest { PACKAGE_NAME_1, /* isHashedValue= */ false), Rule.DENY); - CompoundFormula compoundFormula2 = + Rule rule2 = new Rule( new CompoundFormula( CompoundFormula.AND, Arrays.asList( @@ -121,33 +121,33 @@ public class RuleEvaluatorTest { new StringAtomicFormula( AtomicFormula.APP_CERTIFICATE, APP_CERTIFICATE, - /* isHashedValue= */ false))); - Rule rule2 = new Rule(compoundFormula2, Rule.DENY); + /* isHashedValue= */ false))), + Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Arrays.asList(rule1, rule2), APP_INSTALL_METADATA); assertThat(result.getEffect()).isEqualTo(DENY); - assertThat(result.getRule()).isEqualTo(rule1); + assertThat(result.getMatchedRules()).containsExactly(rule1, rule2); } @Test public void testEvaluateRules_ruleWithNot_deny() { - CompoundFormula compoundFormula = + Rule rule = new Rule( new CompoundFormula( CompoundFormula.NOT, Collections.singletonList( new StringAtomicFormula( AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_2, - /* isHashedValue= */ false))); - Rule rule = new Rule(compoundFormula, Rule.DENY); + /* isHashedValue= */ false))), + Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); assertThat(result.getEffect()).isEqualTo(DENY); - assertThat(result.getRule()).isEqualTo(rule); + assertThat(result.getMatchedRules()).containsExactly(rule); } @Test @@ -162,12 +162,12 @@ public class RuleEvaluatorTest { RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); assertThat(result.getEffect()).isEqualTo(DENY); - assertThat(result.getRule()).isEqualTo(rule); + assertThat(result.getMatchedRules()).containsExactly(rule); } @Test public void testEvaluateRules_validForm_deny() { - CompoundFormula compoundFormula = + Rule rule = new Rule( new CompoundFormula( CompoundFormula.AND, Arrays.asList( @@ -178,19 +178,19 @@ public class RuleEvaluatorTest { new StringAtomicFormula( AtomicFormula.APP_CERTIFICATE, APP_CERTIFICATE, - /* isHashedValue= */ false))); - Rule rule = new Rule(compoundFormula, Rule.DENY); + /* isHashedValue= */ false))), + Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); assertThat(result.getEffect()).isEqualTo(DENY); - assertThat(result.getRule()).isEqualTo(rule); + assertThat(result.getMatchedRules()).containsExactly(rule); } @Test public void testEvaluateRules_orRules() { - CompoundFormula compoundFormula = + Rule rule = new Rule( new CompoundFormula( CompoundFormula.OR, Arrays.asList( @@ -201,13 +201,14 @@ public class RuleEvaluatorTest { new StringAtomicFormula( AtomicFormula.APP_CERTIFICATE, APP_CERTIFICATE, - /* isHashedValue= */ false))); - Rule rule = new Rule(compoundFormula, Rule.DENY); + /* isHashedValue= */ false))), + Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); assertThat(result.getEffect()).isEqualTo(DENY); + assertThat(result.getMatchedRules()).containsExactly(rule); } @Test @@ -232,6 +233,7 @@ public class RuleEvaluatorTest { RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); assertThat(result.getEffect()).isEqualTo(DENY); + assertThat(result.getMatchedRules()).containsExactly(rule); } @Test @@ -243,7 +245,7 @@ public class RuleEvaluatorTest { PACKAGE_NAME_1, /* isHashedValue= */ false), Rule.FORCE_ALLOW); - CompoundFormula compoundFormula2 = + Rule rule2 = new Rule( new CompoundFormula( CompoundFormula.AND, Arrays.asList( @@ -254,13 +256,43 @@ public class RuleEvaluatorTest { new StringAtomicFormula( AtomicFormula.APP_CERTIFICATE, APP_CERTIFICATE, - /* isHashedValue= */ false))); - Rule rule2 = new Rule(compoundFormula2, Rule.DENY); + /* isHashedValue= */ false))), + Rule.DENY); + + IntegrityCheckResult result = + RuleEvaluator.evaluateRules(Arrays.asList(rule1, rule2), APP_INSTALL_METADATA); + + assertThat(result.getEffect()).isEqualTo(ALLOW); + assertThat(result.getMatchedRules()).containsExactly(rule1); + } + + @Test + public void testEvaluateRules_multipleMatches_forceAllow() { + Rule rule1 = + new Rule( + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_1, + /* isHashedValue= */ false), + Rule.FORCE_ALLOW); + Rule rule2 = new Rule( + new CompoundFormula( + CompoundFormula.AND, + Arrays.asList( + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_1, + /* isHashedValue= */ false), + new StringAtomicFormula( + AtomicFormula.APP_CERTIFICATE, + APP_CERTIFICATE, + /* isHashedValue= */ false))), + Rule.FORCE_ALLOW); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Arrays.asList(rule1, rule2), APP_INSTALL_METADATA); assertThat(result.getEffect()).isEqualTo(ALLOW); - assertThat(result.getRule()).isEqualTo(rule1); + assertThat(result.getMatchedRules()).containsExactly(rule1, rule2); } }
\ No newline at end of file diff --git a/services/tests/servicestests/src/com/android/server/integrity/model/IntegrityCheckResultTest.java b/services/tests/servicestests/src/com/android/server/integrity/model/IntegrityCheckResultTest.java new file mode 100644 index 000000000000..9cc9f10e2c82 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/integrity/model/IntegrityCheckResultTest.java @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2020 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.integrity.model; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.integrity.AtomicFormula; +import android.content.integrity.Rule; +import android.util.StatsLog; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.util.Collections; + +@RunWith(JUnit4.class) +public class IntegrityCheckResultTest { + + @Test + public void createAllowResult() { + IntegrityCheckResult allowResult = IntegrityCheckResult.allow(); + + assertThat(allowResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.ALLOW); + assertThat(allowResult.getMatchedRules()).isEmpty(); + assertThat(allowResult.getLoggingResponse()) + .isEqualTo(StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED); + } + + @Test + public void createAllowResultWithRule() { + String packageName = "com.test.deny"; + Rule forceAllowRule = + new Rule( + new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, + packageName), + Rule.FORCE_ALLOW); + + IntegrityCheckResult allowResult = + IntegrityCheckResult.allow(Collections.singletonList(forceAllowRule)); + + assertThat(allowResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.ALLOW); + assertThat(allowResult.getMatchedRules()).containsExactly(forceAllowRule); + assertThat(allowResult.getLoggingResponse()) + .isEqualTo(StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED); + } + + @Test + public void createDenyResultWithRule() { + String packageName = "com.test.deny"; + Rule failedRule = + new Rule( + new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, + packageName), + Rule.DENY); + + IntegrityCheckResult denyResult = + IntegrityCheckResult.deny(Collections.singletonList(failedRule)); + + assertThat(denyResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.DENY); + assertThat(denyResult.getMatchedRules()).containsExactly(failedRule); + assertThat(denyResult.getLoggingResponse()) + .isEqualTo(StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED); + } +} diff --git a/services/tests/servicestests/src/com/android/server/GnssManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/location/gnss/GnssManagerServiceTest.java index 8b5444c2c55c..f262733bb882 100644 --- a/services/tests/servicestests/src/com/android/server/GnssManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/location/gnss/GnssManagerServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 The Android Open Source Project + * Copyright (C) 2020 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.location.gnss; import static com.google.common.truth.Truth.assertThat; @@ -52,6 +52,7 @@ import android.os.IInterface; import android.os.Message; import android.os.RemoteException; +import com.android.server.LocationManagerService; import com.android.server.location.GnssBatchingProvider; import com.android.server.location.GnssCapabilitiesProvider; import com.android.server.location.GnssLocationProvider; @@ -71,11 +72,12 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; /** - * Unit tests for {@link com.android.server.GnssManagerService}. + * Unit tests for {@link com.android.server.location.gnss.GnssManagerService}. */ public class GnssManagerServiceTest { @@ -111,7 +113,7 @@ public class GnssManagerServiceTest { private Context mMockContext; // Class under test - private GnssManagerService mGnssManagerService; + private com.android.server.location.gnss.GnssManagerService mGnssManagerService; @Before public void setUp() { @@ -371,7 +373,7 @@ public class GnssManagerServiceTest { @Test public void addGnssBatchCallbackWithoutPermissionsTest() throws RemoteException { IBatchedLocationCallback mockBatchedLocationCallback = createMockBatchedLocationCallback(); - List<Location> mockLocationList = (List<Location>) mock(List.class); + List<Location> mockLocationList = new ArrayList<>(); disableLocationPermissions(); @@ -387,7 +389,7 @@ public class GnssManagerServiceTest { @Test public void addGnssBatchCallbackWithPermissionsTest() throws RemoteException { IBatchedLocationCallback mockBatchedLocationCallback = createMockBatchedLocationCallback(); - List<Location> mockLocationList = (List<Location>) mock(List.class); + List<Location> mockLocationList = new ArrayList<>(); enableLocationPermissions(); @@ -404,7 +406,7 @@ public class GnssManagerServiceTest { public void replaceGnssBatchCallbackTest() throws RemoteException { IBatchedLocationCallback mockBatchedLocationCallback1 = createMockBatchedLocationCallback(); IBatchedLocationCallback mockBatchedLocationCallback2 = createMockBatchedLocationCallback(); - List<Location> mockLocationList = (List<Location>) mock(List.class); + List<Location> mockLocationList = new ArrayList<>(); enableLocationPermissions(); @@ -441,7 +443,7 @@ public class GnssManagerServiceTest { @Test public void removeGnssBatchingCallbackWithoutPermissionsTest() throws RemoteException { IBatchedLocationCallback mockBatchedLocationCallback = createMockBatchedLocationCallback(); - List<Location> mockLocationList = (List<Location>) mock(List.class); + List<Location> mockLocationList = new ArrayList<>(); enableLocationPermissions(); @@ -461,7 +463,7 @@ public class GnssManagerServiceTest { @Test public void removeGnssBatchingCallbackWithPermissionsTest() throws RemoteException { IBatchedLocationCallback mockBatchedLocationCallback = createMockBatchedLocationCallback(); - List<Location> mockLocationList = (List<Location>) mock(List.class); + List<Location> mockLocationList = new ArrayList<>(); enableLocationPermissions(); diff --git a/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java b/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java index 7f66f3c49185..3e3f40d31d0e 100644 --- a/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java @@ -27,6 +27,8 @@ import android.annotation.Nullable; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ApplicationInfo; +import android.content.pm.PackageParser; +import android.content.pm.Signature; import android.content.pm.parsing.AndroidPackage; import android.content.pm.parsing.ComponentParseUtils; import android.content.pm.parsing.ComponentParseUtils.ParsedActivity; @@ -48,8 +50,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import java.security.cert.CertificateException; import java.util.Collections; import java.util.Map; import java.util.Set; @@ -284,6 +288,33 @@ public class AppsFilterTest { assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0)); } + + @Test + public void testSystemSignedTarget_DoesntFilter() throws CertificateException { + final AppsFilter appsFilter = + new AppsFilter(mFeatureConfigMock, new String[]{}, false, null); + appsFilter.onSystemReady(); + + final Signature frameworkSignature = Mockito.mock(Signature.class); + final PackageParser.SigningDetails frameworkSigningDetails = + new PackageParser.SigningDetails(new Signature[]{frameworkSignature}, 1); + + final Signature otherSignature = Mockito.mock(Signature.class); + final PackageParser.SigningDetails otherSigningDetails = + new PackageParser.SigningDetails(new Signature[]{otherSignature}, 1); + + simulateAddPackage(appsFilter, pkg("android"), 1000, + b -> b.setSigningDetails(frameworkSigningDetails)); + PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), + DUMMY_TARGET_UID, + b -> b.setSigningDetails(frameworkSigningDetails)); + PackageSetting calling = simulateAddPackage(appsFilter, + pkg("com.some.other.package"), DUMMY_CALLING_UID, + b -> b.setSigningDetails(otherSigningDetails)); + + assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_UID, calling, target, 0)); + } + @Test public void testForceQueryableByDevice_NonSystemCaller_Filters() { final AppsFilter appsFilter = diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java b/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java index 84414947056f..338d5fa347a6 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageSettingBuilder.java @@ -16,6 +16,7 @@ package com.android.server.pm; +import android.content.pm.PackageParser; import android.content.pm.PackageUserState; import android.content.pm.parsing.AndroidPackage; import android.util.SparseArray; @@ -42,6 +43,7 @@ public class PackageSettingBuilder { private AndroidPackage mPkg; private int mAppId; private InstallSource mInstallSource; + private PackageParser.SigningDetails mSigningDetails; public PackageSettingBuilder setPackage(AndroidPackage pkg) { this.mPkg = pkg; @@ -143,12 +145,21 @@ public class PackageSettingBuilder { return this; } + public PackageSettingBuilder setSigningDetails( + PackageParser.SigningDetails signingDetails) { + mSigningDetails = signingDetails; + return this; + } + public PackageSetting build() { final PackageSetting packageSetting = new PackageSetting(mName, mRealName, new File(mCodePath), new File(mResourcePath), mLegacyNativeLibraryPathString, mPrimaryCpuAbiString, mSecondaryCpuAbiString, mCpuAbiOverrideString, mPVersionCode, mPkgFlags, mPrivateFlags, mSharedUserId, mUsesStaticLibraries, mUsesStaticLibrariesVersions); + packageSetting.signatures = mSigningDetails != null + ? new PackageSignatures(mSigningDetails) + : new PackageSignatures(); packageSetting.pkg = mPkg; packageSetting.appId = mAppId; packageSetting.volumeUuid = this.mVolumeUuid; diff --git a/services/tests/servicestests/src/com/android/server/power/WakeLockLogTest.java b/services/tests/servicestests/src/com/android/server/power/WakeLockLogTest.java new file mode 100644 index 000000000000..a03ba9c5e87e --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/power/WakeLockLogTest.java @@ -0,0 +1,268 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.power; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import android.os.Looper; +import android.os.PowerManager; +import android.os.test.TestLooper; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.text.SimpleDateFormat; +import java.util.TimeZone; + +/** + * Tests for {@link WakeLockLog}. + */ +public class WakeLockLogTest { + + private TestLooper mTestLooper; + + @Before + public void setUp() throws Exception { + mTestLooper = new TestLooper(); + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testAddTwoItems() { + final int tagDatabaseSize = 128; + final int logSize = 20; + TestInjector injectorSpy = spy(new TestInjector(tagDatabaseSize, logSize)); + WakeLockLog log = new WakeLockLog(injectorSpy); + + when(injectorSpy.currentTimeMillis()).thenReturn(1000L); + log.onWakeLockAcquired("TagPartial", 101, + PowerManager.PARTIAL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE); + + when(injectorSpy.currentTimeMillis()).thenReturn(1150L); + log.onWakeLockAcquired("TagFull", 102, + PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP); + + assertEquals("Wake Lock Log\n" + + " 01-01 00:00:01.000 - 101 - ACQ TagPartial (partial,on-after-release)\n" + + " 01-01 00:00:01.150 - 102 - ACQ TagFull (full,acq-causes-wake)\n" + + " -\n" + + " Events: 2, Time-Resets: 0\n" + + " Buffer, Bytes used: 6\n", + dispatchAndDump(log, false)); + } + + @Test + public void testAddTwoItemsWithTimeReset() { + final int tagDatabaseSize = 128; + final int logSize = 20; + TestInjector injectorSpy = spy(new TestInjector(tagDatabaseSize, logSize)); + WakeLockLog log = new WakeLockLog(injectorSpy); + + when(injectorSpy.currentTimeMillis()).thenReturn(1000L); + log.onWakeLockAcquired("TagPartial", 101, PowerManager.PARTIAL_WAKE_LOCK); + + when(injectorSpy.currentTimeMillis()).thenReturn(1350L); + log.onWakeLockAcquired("TagFull", 102, PowerManager.FULL_WAKE_LOCK); + + assertEquals("Wake Lock Log\n" + + " 01-01 00:00:01.000 - 101 - ACQ TagPartial (partial)\n" + + " 01-01 00:00:01.350 - 102 - ACQ TagFull (full)\n" + + " -\n" + + " Events: 2, Time-Resets: 1\n" + + " Buffer, Bytes used: 15\n", + dispatchAndDump(log, false)); + } + + @Test + public void testAddTwoItemsWithTagOverwrite() { + final int tagDatabaseSize = 2; + final int logSize = 20; + TestInjector injectorSpy = spy(new TestInjector(tagDatabaseSize, logSize)); + WakeLockLog log = new WakeLockLog(injectorSpy); + + when(injectorSpy.currentTimeMillis()).thenReturn(1000L); + log.onWakeLockAcquired("TagPartial", 101, PowerManager.PARTIAL_WAKE_LOCK); + + when(injectorSpy.currentTimeMillis()).thenReturn(1150L); + log.onWakeLockAcquired("TagFull", 102, PowerManager.FULL_WAKE_LOCK); + + assertEquals("Wake Lock Log\n" + + " 01-01 00:00:01.000 - --- - ACQ UNKNOWN (partial)\n" + + " 01-01 00:00:01.150 - 102 - ACQ TagFull (full)\n" + + " -\n" + + " Events: 2, Time-Resets: 0\n" + + " Buffer, Bytes used: 6\n", + dispatchAndDump(log, false)); + } + + @Test + public void testAddFourItemsWithRingBufferOverflow() { + final int tagDatabaseSize = 6; + final int logSize = 10; + TestInjector injectorSpy = spy(new TestInjector(tagDatabaseSize, logSize)); + WakeLockLog log = new WakeLockLog(injectorSpy); + + // This first item will get deleted when ring buffer loops around + when(injectorSpy.currentTimeMillis()).thenReturn(1000L); + log.onWakeLockAcquired("TagPartial", 101, PowerManager.PARTIAL_WAKE_LOCK); + + when(injectorSpy.currentTimeMillis()).thenReturn(1150L); + log.onWakeLockAcquired("TagFull", 102, PowerManager.FULL_WAKE_LOCK); + when(injectorSpy.currentTimeMillis()).thenReturn(1151L); + log.onWakeLockAcquired("TagThree", 101, PowerManager.PARTIAL_WAKE_LOCK); + when(injectorSpy.currentTimeMillis()).thenReturn(1152L); + log.onWakeLockAcquired("TagFour", 101, PowerManager.PARTIAL_WAKE_LOCK); + + assertEquals("Wake Lock Log\n" + + " 01-01 00:00:01.150 - 102 - ACQ TagFull (full)\n" + + " 01-01 00:00:01.151 - 101 - ACQ TagThree (partial)\n" + + " 01-01 00:00:01.152 - 101 - ACQ TagFour (partial)\n" + + " -\n" + + " Events: 3, Time-Resets: 0\n" + + " Buffer, Bytes used: 9\n", + dispatchAndDump(log, false)); + } + + @Test + public void testAddItemWithBadTag() { + final int tagDatabaseSize = 6; + final int logSize = 10; + TestInjector injectorSpy = spy(new TestInjector(tagDatabaseSize, logSize)); + WakeLockLog log = new WakeLockLog(injectorSpy); + + // Bad tag means it wont get written + when(injectorSpy.currentTimeMillis()).thenReturn(1000L); + log.onWakeLockAcquired(null /* tag */, 0 /* ownerUid */, PowerManager.PARTIAL_WAKE_LOCK); + + assertEquals("Wake Lock Log\n" + + " -\n" + + " Events: 0, Time-Resets: 0\n" + + " Buffer, Bytes used: 0\n", + dispatchAndDump(log, false)); + } + + @Test + public void testAddItemWithReducedTagName() { + final int tagDatabaseSize = 6; + final int logSize = 10; + TestInjector injectorSpy = spy(new TestInjector(tagDatabaseSize, logSize)); + WakeLockLog log = new WakeLockLog(injectorSpy); + + when(injectorSpy.currentTimeMillis()).thenReturn(1000L); + log.onWakeLockAcquired("*job*/com.one.two.3hree/.one..Last", 101, + PowerManager.PARTIAL_WAKE_LOCK); + + assertEquals("Wake Lock Log\n" + + " 01-01 00:00:01.000 - 101 - ACQ *job*/c.o.t.3/.o..Last (partial)\n" + + " -\n" + + " Events: 1, Time-Resets: 0\n" + + " Buffer, Bytes used: 3\n", + dispatchAndDump(log, false)); + } + + @Test + public void testAddAcquireAndReleaseWithRepeatTagName() { + final int tagDatabaseSize = 6; + final int logSize = 10; + TestInjector injectorSpy = spy(new TestInjector(tagDatabaseSize, logSize)); + WakeLockLog log = new WakeLockLog(injectorSpy); + + when(injectorSpy.currentTimeMillis()).thenReturn(1000L); + log.onWakeLockAcquired("HowdyTag", 101, PowerManager.PARTIAL_WAKE_LOCK); + when(injectorSpy.currentTimeMillis()).thenReturn(1001L); + log.onWakeLockReleased("HowdyTag", 101); + + assertEquals("Wake Lock Log\n" + + " 01-01 00:00:01.000 - 101 - ACQ HowdyTag (partial)\n" + + " 01-01 00:00:01.001 - 101 - REL HowdyTag\n" + + " -\n" + + " Events: 2, Time-Resets: 0\n" + + " Buffer, Bytes used: 5\n" + + " Tag Database: size(5), entries: 1, Bytes used: 80\n", + dispatchAndDump(log, true)); + } + + @Test + public void testAddAcquireAndReleaseWithTimeTravel() { + final int tagDatabaseSize = 6; + final int logSize = 10; + TestInjector injectorSpy = spy(new TestInjector(tagDatabaseSize, logSize)); + WakeLockLog log = new WakeLockLog(injectorSpy); + + when(injectorSpy.currentTimeMillis()).thenReturn(1100L); + log.onWakeLockAcquired("HowdyTag", 101, PowerManager.PARTIAL_WAKE_LOCK); + + // New element goes back in time...should not be written to log. + when(injectorSpy.currentTimeMillis()).thenReturn(1000L); + log.onWakeLockReleased("HowdyTag", 101); + + assertEquals("Wake Lock Log\n" + + " 01-01 00:00:01.100 - 101 - ACQ HowdyTag (partial)\n" + + " -\n" + + " Events: 1, Time-Resets: 0\n" + + " Buffer, Bytes used: 3\n", + dispatchAndDump(log, false)); + } + + private String dispatchAndDump(WakeLockLog log, boolean includeTagDb) { + mTestLooper.dispatchAll(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + log.dump(pw, includeTagDb); + return sw.toString(); + } + + public class TestInjector extends WakeLockLog.Injector { + private final int mTagDatabaseSize; + private final int mLogSize; + + public TestInjector(int tagDatabaseSize, int logSize) { + mTagDatabaseSize = tagDatabaseSize; + mLogSize = logSize; + } + + @Override + public Looper getLooper() { + return mTestLooper.getLooper(); + } + + @Override + public int getTagDatabaseSize() { + return mTagDatabaseSize; + } + + @Override + public int getLogSize() { + return mLogSize; + } + + @Override + public SimpleDateFormat getDateFormat() { + SimpleDateFormat format = new SimpleDateFormat(super.getDateFormat().toPattern()); + format.setTimeZone(TimeZone.getTimeZone("UTC")); + return format; + } + } +} diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index 1b92abef7c94..768b4721a1ee 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -5438,6 +5438,46 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } @Test + public void testOnBubbleNotificationSuppressionChanged() throws Exception { + // Bubble notification + NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "tag"); + + // Bubbles are allowed! + setUpPrefsForBubbles(PKG, nr.sbn.getUserId(), true /* global */, + true /* app */, true /* channel */); + + mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.sbn.getTag(), + nr.sbn.getId(), nr.sbn.getNotification(), nr.sbn.getUserId()); + waitForIdle(); + + // NOT suppressed + Notification n = mBinderService.getActiveNotifications(PKG)[0].getNotification(); + assertFalse(n.getBubbleMetadata().isNotificationSuppressed()); + + // Reset as this is called when the notif is first sent + reset(mListeners); + + // Test: update suppression to true + mService.mNotificationDelegate.onBubbleNotificationSuppressionChanged(nr.getKey(), true); + waitForIdle(); + + // Check + n = mBinderService.getActiveNotifications(PKG)[0].getNotification(); + assertTrue(n.getBubbleMetadata().isNotificationSuppressed()); + + // Reset to check again + reset(mListeners); + + // Test: update suppression to false + mService.mNotificationDelegate.onBubbleNotificationSuppressionChanged(nr.getKey(), false); + waitForIdle(); + + // Check + n = mBinderService.getActiveNotifications(PKG)[0].getNotification(); + assertFalse(n.getBubbleMetadata().isNotificationSuppressed()); + } + + @Test public void testGrantInlineReplyUriPermission_recordExists() throws Exception { NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, 0); mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", 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 0fc2bc510d05..bab877e6c26f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -1008,4 +1008,18 @@ public class ActivityStarterTests extends ActivityTestsBase { .setOutActivity(outActivity).execute(); assertThat(outActivity[0].inSplitScreenSecondaryWindowingMode()).isTrue(); } + + @Test + public void testActivityStart_expectAddedToRecentTask() { + RecentTasks recentTasks = mock(RecentTasks.class); + mService.mStackSupervisor.setRecentTasks(recentTasks); + doReturn(true).when(recentTasks).isCallerRecents(anyInt()); + + final ActivityStarter starter = prepareStarter(0 /* flags */); + + starter.setReason("testAddToTaskListOnActivityStart") + .execute(); + + verify(recentTasks, times(1)).add(any()); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java index b5e7dd58f7cc..a672a95dcc12 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java @@ -39,6 +39,8 @@ import static com.google.common.truth.Truth.assertWithMessage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -83,6 +85,7 @@ import java.util.HashSet; import java.util.List; import java.util.Random; import java.util.Set; +import java.util.function.Function; /** * Build/Install/Run: @@ -419,6 +422,36 @@ public class RecentTasksTest extends ActivityTestsBase { } @Test + public void testAddTasksHomeClearUntrackedTasks_expectFinish() { + // There may be multiple tasks with the same base intent by flags (FLAG_ACTIVITY_NEW_TASK | + // FLAG_ACTIVITY_MULTIPLE_TASK). If the previous task is still active, it should be removed + // because user may not be able to return to the task. + final String className = ".PermissionsReview"; + final Function<Boolean, Task> taskBuilder = visible -> { + final Task task = createTaskBuilder(className).build(); + // Make the task non-empty. + final ActivityRecord r = new ActivityBuilder(mService).setTask(task).build(); + r.setVisibility(visible); + return task; + }; + + final Task task1 = taskBuilder.apply(false /* visible */); + mRecentTasks.add(task1); + final Task task2 = taskBuilder.apply(true /* visible */); + mRecentTasks.add(task2); + // Only the last task is kept in recents and the previous 2 tasks will becomes untracked + // tasks because their intents are identical. + mRecentTasks.add(createTaskBuilder(className).build()); + // Go home to trigger the removal of untracked tasks. + mRecentTasks.add(createTaskBuilder(".Home").setStack(mDisplay.getRootHomeTask()).build()); + + // All activities in the invisible task should be finishing or removed. + assertNull(task1.getTopNonFinishingActivity()); + // The visible task should not be affected. + assertNotNull(task2.getTopNonFinishingActivity()); + } + + @Test public void testUsersTasks() { mRecentTasks.setOnlyTestVisibleRange(); mRecentTasks.unloadUserDataFromMemoryLocked(TEST_USER_0_ID); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java index 8d2da1e6cb5b..c9fd79fb4e39 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java @@ -80,7 +80,6 @@ public class TaskOrganizerTests extends WindowTestsBase { task.setTaskOrganizer(organizer); verify(organizer).taskAppeared(any(), any()); - assertTrue(task.isControlledByTaskOrganizer()); task.removeImmediately(); verify(organizer).taskVanished(any()); @@ -106,48 +105,13 @@ public class TaskOrganizerTests extends WindowTestsBase { final Task task = createTaskInStack(stack, 0 /* userId */); final ITaskOrganizer organizer = makeAndRegisterMockOrganizer(); - task.setTaskOrganizer(organizer); - verify(organizer).taskAppeared(any(), any()); - assertTrue(task.isControlledByTaskOrganizer()); - - task.setTaskOrganizer(null); - verify(organizer).taskVanished(any()); - assertFalse(task.isControlledByTaskOrganizer()); - } - - @Test - public void testTransferStackToOrganizer() throws RemoteException { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); - final Task task = createTaskInStack(stack, 0 /* userId */); - final Task task2 = createTaskInStack(stack, 0 /* userId */); - final ITaskOrganizer organizer = makeAndRegisterMockOrganizer(); - - stack.transferToTaskOrganizer(organizer); - - verify(organizer, times(2)).taskAppeared(any(), any()); - assertTrue(task.isControlledByTaskOrganizer()); - assertTrue(task2.isControlledByTaskOrganizer()); - - stack.transferToTaskOrganizer(null); - - verify(organizer, times(2)).taskVanished(any()); - assertFalse(task.isControlledByTaskOrganizer()); - assertFalse(task2.isControlledByTaskOrganizer()); - } - - @Test - public void testRegisterTaskOrganizerTaskWindowingModeChanges() throws RemoteException { - final ITaskOrganizer organizer = makeAndRegisterMockOrganizer(); - - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); - final Task task = createTaskInStack(stack, 0 /* userId */); - task.setWindowingMode(WINDOWING_MODE_PINNED); + stack.setTaskOrganizer(organizer); verify(organizer).taskAppeared(any(), any()); - assertTrue(task.isControlledByTaskOrganizer()); + assertTrue(stack.isControlledByTaskOrganizer()); - task.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + stack.setTaskOrganizer(null); verify(organizer).taskVanished(any()); - assertFalse(task.isControlledByTaskOrganizer()); + assertFalse(stack.isControlledByTaskOrganizer()); } @Test @@ -158,13 +122,9 @@ public class TaskOrganizerTests extends WindowTestsBase { final Task task = createTaskInStack(stack, 0 /* userId */); final Task task2 = createTaskInStack(stack, 0 /* userId */); stack.setWindowingMode(WINDOWING_MODE_PINNED); - verify(organizer, times(2)).taskAppeared(any(), any()); - assertTrue(task.isControlledByTaskOrganizer()); - assertTrue(task2.isControlledByTaskOrganizer()); + verify(organizer, times(1)).taskAppeared(any(), any()); stack.setWindowingMode(WINDOWING_MODE_FULLSCREEN); - verify(organizer, times(2)).taskVanished(any()); - assertFalse(task.isControlledByTaskOrganizer()); - assertFalse(task2.isControlledByTaskOrganizer()); + verify(organizer, times(1)).taskVanished(any()); } } diff --git a/startop/scripts/app_startup/metrics/com.google.android.GoogleCamera b/startop/scripts/app_startup/metrics/com.google.android.GoogleCamera deleted file mode 100755 index d95fa32dce3f..000000000000 --- a/startop/scripts/app_startup/metrics/com.google.android.GoogleCamera +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Copyright 2019, The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# 05-06 14:51:17.688 29691 29897 I CAM_Timing: CameraActivity: START -> ACTIVITY_FIRST_PREVIEW_FRAME_RECEIVED: 385ms -pattern="CAM_Timing: CameraActivity: START -> ACTIVITY_FIRST_PREVIEW_FRAME_RECEIVED:" -re_pattern='.*ACTIVITY_FIRST_PREVIEW_FRAME_RECEIVED: \([[:digit:]]\+\)ms' -parse_metric_from_logcat "ACTIVITY_FIRST_PREVIEW_FRAME_RECEIVED_ms" "$pattern" "$re_pattern" - -# 05-06 14:51:17.724 29691 29691 I CAM_Timing: CameraActivity: START -> ACTIVITY_FIRST_PREVIEW_FRAME_RENDERED: 421ms -pattern="CAM_Timing: CameraActivity: START -> ACTIVITY_FIRST_PREVIEW_FRAME_RENDERED:" -re_pattern='.*ACTIVITY_FIRST_PREVIEW_FRAME_RENDERED: \([[:digit:]]\+\)ms' -parse_metric_from_logcat "ACTIVITY_FIRST_PREVIEW_FRAME_RENDERED_ms" "$pattern" "$re_pattern" diff --git a/startop/scripts/app_startup/parse_metrics b/startop/scripts/app_startup/parse_metrics index c6bf08ee9dfd..036609ff02be 100755 --- a/startop/scripts/app_startup/parse_metrics +++ b/startop/scripts/app_startup/parse_metrics @@ -50,7 +50,7 @@ source "$DIR/lib/common" package="" activity="" -timeout=10 +timeout=5 simulate="n" parse_arguments() { while [[ $# -gt 0 ]]; do @@ -123,6 +123,9 @@ parse_metric_from_logcat() { local pattern="$2" local re_pattern="$3" local retcode + local result + local sec + local ms # parse logcat for 'Displayed...' and that other one... @@ -137,14 +140,28 @@ parse_metric_from_logcat() { return 0 fi - logcat_extract_pattern "$timeout" "$timestamp" "$pattern" "$re_pattern" + result="$(logcat_extract_pattern "$timeout" "$timestamp" "$pattern" "$re_pattern")" retcode=$? if [[ $retcode -ne 0 ]]; then # Timed out before finding the pattern. Could also mean the pattern is wrong. + echo "Parse $re_pattern from logcat TIMED OUT after $timeout seconds." >&2 echo "-$?" + return $retcode fi + # "10s123ms" -> "10s123" + result=${result/ms/} + if [[ $result =~ s ]]; then + ms=${result/*s/} + sec=${result/s*/} + else + sec=0 + ms=$result + fi + ((result=sec*1000+ms)) + + echo "$result" return $retcode } @@ -169,10 +186,17 @@ echo "TotalTime_ms=$total_time" # 05-06 14:34:08.854 29460 29481 I ActivityTaskManager: Displayed com.google.android.dialer/.extensions.GoogleDialtactsActivity: +361ms pattern="ActivityTaskManager: Displayed ${package}" -re_pattern='.*Displayed[[:blank:]]\+'"${package}"'[/][^[:blank:]]\+[[:blank:]]+\([[:digit:]]\+\).*' +re_pattern='.*Displayed[[:blank:]]\+'"${package}"'[/][^[:blank:]]\+[[:blank:]]+\([[:digit:]]\+ms\|[[:digit:]]\+s[[:digit:]]\+ms\).*' parse_metric_from_logcat "Displayed_ms" "$pattern" "$re_pattern" +# 01-16 17:31:44.550 11172 11204 I ActivityTaskManager: Fully drawn com.google.android.GoogleCamera/com.android.camera.CameraLauncher: +10s897ms +pattern="ActivityTaskManager: Fully drawn ${package}" +#re_pattern='.*Fully drawn[[:blank:]]\+'"${package}"'[/][^[:blank:]]\+[[:blank:]]+\([[:digit:]]\+\).*' +re_pattern='.*Fully drawn[[:blank:]]\+'"${package}"'[/][^[:blank:]]\+[[:blank:]]+\([[:digit:]]\+ms\|[[:digit:]]\+s[[:digit:]]\+ms\).*' + +parse_metric_from_logcat "Fully_drawn_ms" "$pattern" "$re_pattern" + # also call into package-specific scripts if there are additional metrics if [[ -x "$DIR/metrics/$package" ]]; then source "$DIR/metrics/$package" "$timestamp" diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java index 32f9d53e59f8..bb6f154335a9 100644 --- a/telephony/common/com/android/internal/telephony/SmsApplication.java +++ b/telephony/common/com/android/internal/telephony/SmsApplication.java @@ -35,7 +35,6 @@ import android.content.pm.ServiceInfo; import android.net.Uri; import android.os.AsyncTask; import android.os.Binder; -import android.os.Debug; import android.os.Process; import android.os.UserHandle; import android.provider.Telephony; @@ -45,8 +44,6 @@ import android.telephony.TelephonyManager; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.util.Collection; import java.util.HashMap; @@ -197,7 +194,7 @@ public final class SmsApplication { final int callingUid = Binder.getCallingUid(); if (DEBUG_MULTIUSER) { Log.i(LOG_TAG, "getIncomingUserHandle caller=" + callingUid + ", myuid=" - + android.os.Process.myUid() + "\n\t" + Debug.getCallers(4)); + + android.os.Process.myUid()); } if (UserHandle.getAppId(callingUid) < android.os.Process.FIRST_APPLICATION_UID) { @@ -669,9 +666,21 @@ public final class SmsApplication { } /** + * Broadcast action: + * Same as {@link Intent#ACTION_DEFAULT_SMS_PACKAGE_CHANGED} but it's implicit (e.g. sent to + * all apps) and requires + * {@link #PERMISSION_MONITOR_DEFAULT_SMS_PACKAGE} to receive. + */ + public static final String ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL = + "android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL"; + + public static final String PERMISSION_MONITOR_DEFAULT_SMS_PACKAGE = + "android.permission.MONITOR_DEFAULT_SMS_PACKAGE"; + + /** * Sends broadcasts on sms app change: * {@link Intent#ACTION_DEFAULT_SMS_PACKAGE_CHANGED} - * {@link Intents.ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL} + * {@link #ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL} */ public static void broadcastSmsAppChange(Context context, UserHandle userHandle, @Nullable String oldPackage, @Nullable String newPackage) { @@ -721,16 +730,11 @@ public final class SmsApplication { } // Send an implicit broadcast for the system server. - // (or anyone with MONITOR_DEFAULT_SMS_PACKAGE, really.) + // (or anyone with PERMISSION_MONITOR_DEFAULT_SMS_PACKAGE, really.) final Intent intent = - new Intent(Intents.ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL); + new Intent(ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL); context.sendBroadcastAsUser(intent, userHandle, - permission.MONITOR_DEFAULT_SMS_PACKAGE); - - if (applicationData != null) { - MetricsLogger.action(context, MetricsEvent.ACTION_DEFAULT_SMS_APP_CHANGED, - applicationData.mPackageName); - } + PERMISSION_MONITOR_DEFAULT_SMS_PACKAGE); } /** diff --git a/telephony/common/com/android/internal/telephony/SmsNumberUtils.java b/telephony/common/com/android/internal/telephony/SmsNumberUtils.java index cd365a113189..95098e89539d 100644 --- a/telephony/common/com/android/internal/telephony/SmsNumberUtils.java +++ b/telephony/common/com/android/internal/telephony/SmsNumberUtils.java @@ -31,6 +31,7 @@ import android.util.Log; import com.android.internal.telephony.HbpcdLookup.MccIdd; import com.android.internal.telephony.HbpcdLookup.MccLookup; +import com.android.internal.telephony.util.TelephonyUtils; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -677,7 +678,7 @@ public class SmsNumberUtils { */ private static String secureHash(byte[] input) { // Refrain from logging user personal information in user build. - if (android.os.Build.IS_USER) { + if (TelephonyUtils.IS_USER) { return "****"; } diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java index 89cd4615637b..7b3aace798f7 100644 --- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java @@ -31,7 +31,6 @@ import android.os.UserHandle; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; -import android.util.StatsLog; import com.android.internal.annotations.VisibleForTesting; @@ -393,8 +392,8 @@ public final class TelephonyPermissions { invokedMethods = sReportedDeviceIDPackages.get(callingPackage); } invokedMethods.add(message); - StatsLog.write(StatsLog.DEVICE_IDENTIFIER_ACCESS_DENIED, callingPackage, message, - isPreinstalled, false); + TelephonyCommonStatsLog.write(TelephonyCommonStatsLog.DEVICE_IDENTIFIER_ACCESS_DENIED, + callingPackage, message, isPreinstalled, false); } Log.w(LOG_TAG, "reportAccessDeniedToReadIdentifiers:" + callingPackage + ":" + message + ":isPreinstalled=" + isPreinstalled); diff --git a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java index a7ad884ca107..682697469af9 100644 --- a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java +++ b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java @@ -28,6 +28,8 @@ import android.os.RemoteException; import android.os.SystemProperties; import java.io.PrintWriter; +import java.util.Collections; +import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; @@ -61,6 +63,11 @@ public final class TelephonyUtils { return str == null ? "" : str; } + /** Returns an empty list if the input is {@code null}. */ + public static @NonNull <T> List<T> emptyIfNull(@Nullable List<T> cur) { + return cur == null ? Collections.emptyList() : cur; + } + /** Throws a {@link RuntimeException} that wrapps the {@link RemoteException}. */ public static RuntimeException rethrowAsRuntimeException(RemoteException remoteException) { throw new RuntimeException(remoteException); diff --git a/telephony/common/com/google/android/mms/util/DrmConvertSession.java b/telephony/common/com/google/android/mms/util/DrmConvertSession.java index 156c7ad8baac..17ab15470670 100644 --- a/telephony/common/com/google/android/mms/util/DrmConvertSession.java +++ b/telephony/common/com/google/android/mms/util/DrmConvertSession.java @@ -20,7 +20,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.drm.DrmConvertedStatus; import android.drm.DrmManagerClient; -import android.provider.Downloads; import android.util.Log; import java.io.FileNotFoundException; @@ -33,6 +32,13 @@ public class DrmConvertSession { private int mConvertSessionId; private static final String TAG = "DrmConvertSession"; + // These values are copied from Downloads.Impl.* for backward compatibility since + // {@link #close()} that uses it is marked @UnsupportedAppUsage. + public static final int STATUS_SUCCESS = 200; + public static final int STATUS_NOT_ACCEPTABLE = 406; + public static final int STATUS_UNKNOWN_ERROR = 491; + public static final int STATUS_FILE_ERROR = 492; + private DrmConvertSession(DrmManagerClient drmClient, int convertSessionId) { mDrmClient = drmClient; mConvertSessionId = convertSessionId; @@ -118,38 +124,38 @@ public class DrmConvertSession { * Ends a conversion session of a file. * * @param fileName The filename of the converted file. - * @return Downloads.Impl.STATUS_SUCCESS if execution is ok. - * Downloads.Impl.STATUS_FILE_ERROR in case converted file can not - * be accessed. Downloads.Impl.STATUS_NOT_ACCEPTABLE if a problem + * @return STATUS_SUCCESS if execution is ok. + * STATUS_FILE_ERROR in case converted file can not + * be accessed. STATUS_NOT_ACCEPTABLE if a problem * occurs when accessing drm framework. - * Downloads.Impl.STATUS_UNKNOWN_ERROR if a general error occurred. + * STATUS_UNKNOWN_ERROR if a general error occurred. */ @UnsupportedAppUsage public int close(String filename) { DrmConvertedStatus convertedStatus = null; - int result = Downloads.Impl.STATUS_UNKNOWN_ERROR; + int result = STATUS_UNKNOWN_ERROR; if (mDrmClient != null && mConvertSessionId >= 0) { try { convertedStatus = mDrmClient.closeConvertSession(mConvertSessionId); if (convertedStatus == null || convertedStatus.statusCode != DrmConvertedStatus.STATUS_OK || convertedStatus.convertedData == null) { - result = Downloads.Impl.STATUS_NOT_ACCEPTABLE; + result = STATUS_NOT_ACCEPTABLE; } else { RandomAccessFile rndAccessFile = null; try { rndAccessFile = new RandomAccessFile(filename, "rw"); rndAccessFile.seek(convertedStatus.offset); rndAccessFile.write(convertedStatus.convertedData); - result = Downloads.Impl.STATUS_SUCCESS; + result = STATUS_SUCCESS; } catch (FileNotFoundException e) { - result = Downloads.Impl.STATUS_FILE_ERROR; + result = STATUS_FILE_ERROR; Log.w(TAG, "File: " + filename + " could not be found.", e); } catch (IOException e) { - result = Downloads.Impl.STATUS_FILE_ERROR; + result = STATUS_FILE_ERROR; Log.w(TAG, "Could not access File: " + filename + " .", e); } catch (IllegalArgumentException e) { - result = Downloads.Impl.STATUS_FILE_ERROR; + result = STATUS_FILE_ERROR; Log.w(TAG, "Could not open file in mode: rw", e); } catch (SecurityException e) { Log.w(TAG, "Access to File: " + filename + @@ -159,7 +165,7 @@ public class DrmConvertSession { try { rndAccessFile.close(); } catch (IOException e) { - result = Downloads.Impl.STATUS_FILE_ERROR; + result = STATUS_FILE_ERROR; Log.w(TAG, "Failed to close File:" + filename + ".", e); } diff --git a/telephony/java/android/telephony/Annotation.java b/telephony/java/android/telephony/Annotation.java index db17a9505a27..d2a5905f7a99 100644 --- a/telephony/java/android/telephony/Annotation.java +++ b/telephony/java/android/telephony/Annotation.java @@ -1,6 +1,7 @@ package android.telephony; import android.annotation.IntDef; +import android.provider.Telephony; import android.telecom.Connection; import android.telephony.data.ApnSetting; @@ -651,4 +652,13 @@ public class Annotation { }) @Retention(RetentionPolicy.SOURCE) public @interface UiccAppType{} + + /** @hide */ + @IntDef({ + Telephony.Carriers.SKIP_464XLAT_DEFAULT, + Telephony.Carriers.SKIP_464XLAT_DISABLE, + Telephony.Carriers.SKIP_464XLAT_ENABLE, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface Skip464XlatStatus {} } diff --git a/telephony/java/android/telephony/CallAttributes.java b/telephony/java/android/telephony/CallAttributes.java index cd830adf23b0..0c258f4b6435 100644 --- a/telephony/java/android/telephony/CallAttributes.java +++ b/telephony/java/android/telephony/CallAttributes.java @@ -21,8 +21,8 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; - import android.telephony.Annotation.NetworkType; + import java.util.Objects; /** @@ -130,14 +130,14 @@ public final class CallAttributes implements Parcelable { /** * {@link Parcelable#describeContents} */ - public @Parcelable.ContentsFlags int describeContents() { + public int describeContents() { return 0; } /** * {@link Parcelable#writeToParcel} */ - public void writeToParcel(Parcel dest, @Parcelable.WriteFlags int flags) { + public void writeToParcel(Parcel dest, int flags) { dest.writeParcelable(mPreciseCallState, flags); dest.writeInt(mNetworkType); dest.writeParcelable(mCallQuality, flags); diff --git a/telephony/java/android/telephony/CallQuality.java b/telephony/java/android/telephony/CallQuality.java index 1e1cdba70ad0..428a515844e6 100644 --- a/telephony/java/android/telephony/CallQuality.java +++ b/telephony/java/android/telephony/CallQuality.java @@ -400,14 +400,14 @@ public final class CallQuality implements Parcelable { /** * {@link Parcelable#describeContents} */ - public @Parcelable.ContentsFlags int describeContents() { + public int describeContents() { return 0; } /** * {@link Parcelable#writeToParcel} */ - public void writeToParcel(Parcel dest, @Parcelable.WriteFlags int flags) { + public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mDownlinkCallQualityLevel); dest.writeInt(mUplinkCallQualityLevel); dest.writeInt(mCallDuration); diff --git a/telephony/java/android/telephony/PhoneCapability.java b/telephony/java/android/telephony/PhoneCapability.java index 90244b3df350..a53792802d92 100644 --- a/telephony/java/android/telephony/PhoneCapability.java +++ b/telephony/java/android/telephony/PhoneCapability.java @@ -25,7 +25,7 @@ import android.telephony.AccessNetworkConstants.AccessNetworkType; import android.telephony.AccessNetworkConstants.RadioAccessNetworkType; import android.telephony.TelephonyManager.NetworkTypeBitMask; -import com.android.internal.util.CollectionUtils; +import com.android.internal.telephony.util.TelephonyUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -181,13 +181,13 @@ public final class PhoneCapability implements Parcelable { this.mEutranUeCategoryUl = eutranUeCategoryUl; this.mPsDataConnectionLingerTimeMillis = psDataConnectionLingerTimeMillis; this.mSupportedRats = supportedRats; - this.mGeranBands = CollectionUtils.emptyIfNull(geranBands); - this.mUtranBands = CollectionUtils.emptyIfNull(utranBands); - this.mEutranBands = CollectionUtils.emptyIfNull(eutranBands); - this.mNgranBands = CollectionUtils.emptyIfNull(ngranBands); - this.mLogicalModemUuids = CollectionUtils.emptyIfNull(logicalModemUuids); - this.mSimSlotCapabilities = CollectionUtils.emptyIfNull(simSlotCapabilities); - this.mConcurrentFeaturesSupport = CollectionUtils.emptyIfNull(concurrentFeaturesSupport); + this.mGeranBands = TelephonyUtils.emptyIfNull(geranBands); + this.mUtranBands = TelephonyUtils.emptyIfNull(utranBands); + this.mEutranBands = TelephonyUtils.emptyIfNull(eutranBands); + this.mNgranBands = TelephonyUtils.emptyIfNull(ngranBands); + this.mLogicalModemUuids = TelephonyUtils.emptyIfNull(logicalModemUuids); + this.mSimSlotCapabilities = TelephonyUtils.emptyIfNull(simSlotCapabilities); + this.mConcurrentFeaturesSupport = TelephonyUtils.emptyIfNull(concurrentFeaturesSupport); } private PhoneCapability(Parcel in) { @@ -429,14 +429,14 @@ public final class PhoneCapability implements Parcelable { /** * {@link Parcelable#describeContents} */ - public @Parcelable.ContentsFlags int describeContents() { + public int describeContents() { return 0; } /** * {@link Parcelable#writeToParcel} */ - public void writeToParcel(@NonNull Parcel dest, @Parcelable.WriteFlags int flags) { + public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeInt(mUtranUeCategoryDl); dest.writeInt(mUtranUeCategoryUl); dest.writeInt(mEutranUeCategoryDl); diff --git a/telephony/java/android/telephony/SimSlotCapability.java b/telephony/java/android/telephony/SimSlotCapability.java index 3d38d0429908..b4fef46725a4 100644 --- a/telephony/java/android/telephony/SimSlotCapability.java +++ b/telephony/java/android/telephony/SimSlotCapability.java @@ -105,14 +105,14 @@ public final class SimSlotCapability implements Parcelable { /** * {@link Parcelable#describeContents} */ - public @ContentsFlags int describeContents() { + public int describeContents() { return 0; } /** * {@link Parcelable#writeToParcel} */ - public void writeToParcel(@NonNull Parcel dest, @WriteFlags int flags) { + public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeInt(mPhysicalSlotIndex); dest.writeInt(mSlotType); } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 584b000f8705..26dc5f01e67b 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -5640,13 +5640,6 @@ public class TelephonyManager { // /** - * To check the SDK version for {@link TelephonyManager#listen}. - */ - @ChangeId - @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.P) - private static final long LISTEN_CODE_CHANGE = 147600208L; - - /** * Registers a listener object to receive notification of changes * in specified telephony states. * <p> @@ -5683,19 +5676,7 @@ public class TelephonyManager { (TelephonyRegistryManager) mContext.getSystemService(Context.TELEPHONY_REGISTRY_SERVICE); if (telephonyRegistry != null) { - // subId from PhoneStateListener is deprecated Q on forward, use the subId from - // TelephonyManager instance. keep using subId from PhoneStateListener for pre-Q. - int subId = mSubId; - if (Compatibility.isChangeEnabled(LISTEN_CODE_CHANGE)) { - // since mSubId in PhoneStateListener is deprecated from Q on forward, this is - // the only place to set mSubId and its for "informational" only. - // TODO: remove this once we completely get rid of mSubId in PhoneStateListener - listener.mSubId = (events == PhoneStateListener.LISTEN_NONE) - ? SubscriptionManager.INVALID_SUBSCRIPTION_ID : subId; - } else if (listener.mSubId != null) { - subId = listener.mSubId; - } - telephonyRegistry.listenForSubscriber(subId, getOpPackageName(), getFeatureId(), + telephonyRegistry.listenForSubscriber(mSubId, getOpPackageName(), getFeatureId(), listener, events, notifyNow); } else { Rlog.w(TAG, "telephony registry not ready."); @@ -5714,7 +5695,7 @@ public class TelephonyManager { @NonNull public CdmaEriInformation getCdmaEriInformation() { return new CdmaEriInformation( - getCdmaEriIconMode(getSubId()), getCdmaEriIconIndex(getSubId())); + getCdmaEriIconIndex(getSubId()), getCdmaEriIconMode(getSubId())); } /** diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index 789632082758..f5dfacc6a0be 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -27,6 +27,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.provider.Telephony; import android.provider.Telephony.Carriers; +import android.telephony.Annotation; import android.telephony.Annotation.ApnType; import android.telephony.Annotation.NetworkType; import android.telephony.ServiceState; @@ -744,7 +745,7 @@ public class ApnSetting implements Parcelable { * @return SKIP_464XLAT_DEFAULT, SKIP_464XLAT_DISABLE or SKIP_464XLAT_ENABLE * @hide */ - @Carriers.Skip464XlatStatus + @Annotation.Skip464XlatStatus public int getSkip464Xlat() { return mSkip464Xlat; } @@ -2061,10 +2062,10 @@ public class ApnSetting implements Parcelable { /** * Sets skip464xlat flag for this APN. * - * @param skip464xlat skip464xlat for this APN + * @param skip464xlat skip464xlat for this APN. * @hide */ - public Builder setSkip464Xlat(@Carriers.Skip464XlatStatus int skip464xlat) { + public Builder setSkip464Xlat(@Annotation.Skip464XlatStatus int skip464xlat) { this.mSkip464Xlat = skip464xlat; return this; } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java index 42cafd43f8bd..5a66e805c575 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java @@ -66,7 +66,7 @@ public class ChangeAppRotationTest extends FlickerTestBase { @Parameters(name = "{0}-{1}") public static Collection<Object[]> getParams() { int[] supportedRotations = - {Surface.ROTATION_0, Surface.ROTATION_90, Surface.ROTATION_270}; + {Surface.ROTATION_0, Surface.ROTATION_90}; Collection<Object[]> params = new ArrayList<>(); for (int begin : supportedRotations) { for (int end : supportedRotations) { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java index fc6719e2f9d9..f740af9b89bf 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java @@ -25,6 +25,7 @@ import com.android.server.wm.flicker.helpers.ImeAppHelper; import org.junit.Before; import org.junit.FixMethodOrder; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; @@ -62,6 +63,7 @@ public class CloseImeWindowToHomeTest extends NonRotationTestBase { .forAllEntries()); } + @Ignore("Flaky") @Test public void checkVisibility_imeLayerBecomesInvisible() { checkResults(result -> LayersTraceSubject.assertThat(result) @@ -71,6 +73,7 @@ public class CloseImeWindowToHomeTest extends NonRotationTestBase { .forAllEntries()); } + @Ignore("Flaky") @Test public void checkVisibility_imeAppLayerBecomesInvisible() { checkResults(result -> LayersTraceSubject.assertThat(result) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java index 8559cb9f51f7..37d7c4ca2b46 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java @@ -69,7 +69,7 @@ public class SeamlessAppRotationTest extends FlickerTestBase { @Parameters(name = "{0}") public static Collection<Object[]> getParams() { int[] supportedRotations = - {Surface.ROTATION_0, Surface.ROTATION_90, Surface.ROTATION_270}; + {Surface.ROTATION_0, Surface.ROTATION_90}; Collection<Object[]> params = new ArrayList<>(); ArrayList<Intent> testIntents = new ArrayList<>(); @@ -112,7 +112,7 @@ public class SeamlessAppRotationTest extends FlickerTestBase { super.runTransition( changeAppRotation(mIntent, intentId, InstrumentationRegistry.getContext(), - mUiDevice, mBeginRotation, mEndRotation).repeat(5).build()); + mUiDevice, mBeginRotation, mEndRotation).build()); } @Test diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/AlphaLayersActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/AlphaLayersActivity.java index 1a68a93eed19..37661828da22 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/AlphaLayersActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/AlphaLayersActivity.java @@ -50,7 +50,7 @@ public class AlphaLayersActivity extends Activity { setContentView(container); } - + @SuppressWarnings({"UnusedDeclaration"}) static int dipToPx(Context c, int dip) { return (int) (c.getResources().getDisplayMetrics().density * dip + 0.5f); @@ -86,30 +86,24 @@ public class AlphaLayersActivity extends Activity { canvas.save(); canvas.clipRect(20.0f, 0.0f, 40.0f, 20.0f); Log.d(LOG_TAG, "clipRect = " + canvas.getClipBounds()); - Log.d(LOG_TAG, "rejected = " + canvas.quickReject(100.0f, 100.0f, 110.0f, 110.0f, - Canvas.EdgeType.BW)); - Log.d(LOG_TAG, "rejected = " + canvas.quickReject(25.0f, 5.0f, 30.0f, 10.0f, - Canvas.EdgeType.BW)); + Log.d(LOG_TAG, "rejected = " + canvas.quickReject(100.0f, 100.0f, 110.0f, 110.0f)); + Log.d(LOG_TAG, "rejected = " + canvas.quickReject(25.0f, 5.0f, 30.0f, 10.0f)); canvas.restore(); - + canvas.save(); canvas.scale(2.0f, 2.0f); canvas.clipRect(20.0f, 0.0f, 40.0f, 20.0f); Log.d(LOG_TAG, "clipRect = " + canvas.getClipBounds()); - Log.d(LOG_TAG, "rejected = " + canvas.quickReject(50.0f, 50.0f, 60.0f, 60.0f, - Canvas.EdgeType.BW)); - Log.d(LOG_TAG, "rejected = " + canvas.quickReject(25.0f, 5.0f, 30.0f, 10.0f, - Canvas.EdgeType.BW)); + Log.d(LOG_TAG, "rejected = " + canvas.quickReject(50.0f, 50.0f, 60.0f, 60.0f)); + Log.d(LOG_TAG, "rejected = " + canvas.quickReject(25.0f, 5.0f, 30.0f, 10.0f)); canvas.restore(); canvas.save(); canvas.translate(20.0f, 20.0f); canvas.clipRect(20.0f, 0.0f, 40.0f, 20.0f); Log.d(LOG_TAG, "clipRect = " + canvas.getClipBounds()); - Log.d(LOG_TAG, "rejected = " + canvas.quickReject(80.0f, 80.0f, 90.0f, 90.0f, - Canvas.EdgeType.BW)); - Log.d(LOG_TAG, "rejected = " + canvas.quickReject(25.0f, 5.0f, 30.0f, 10.0f, - Canvas.EdgeType.BW)); + Log.d(LOG_TAG, "rejected = " + canvas.quickReject(80.0f, 80.0f, 90.0f, 90.0f)); + Log.d(LOG_TAG, "rejected = " + canvas.quickReject(25.0f, 5.0f, 30.0f, 10.0f)); canvas.restore(); canvas.save(); diff --git a/tests/PlatformCompatGating/Android.bp b/tests/PlatformCompatGating/Android.bp index 5e9ef8efc402..609896ea9e95 100644 --- a/tests/PlatformCompatGating/Android.bp +++ b/tests/PlatformCompatGating/Android.bp @@ -18,7 +18,6 @@ android_test { name: "PlatformCompatGating", // Only compile source java files in this apk. srcs: ["src/**/*.java"], - certificate: "platform", libs: [ "android.test.runner", "android.test.base", diff --git a/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java b/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java index 932ec643d478..c00aa2ac25b3 100644 --- a/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java +++ b/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java @@ -16,7 +16,9 @@ package android.compat.testing; +import android.Manifest; import android.app.Instrumentation; +import android.app.UiAutomation; import android.compat.Compatibility; import android.compat.Compatibility.ChangeConfig; import android.content.Context; @@ -83,12 +85,16 @@ public class PlatformCompatChangeRule extends CoreCompatChangeRule { @Override public void evaluate() throws Throwable { Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); + UiAutomation uiAutomation = instrumentation.getUiAutomation(); String packageName = instrumentation.getTargetContext().getPackageName(); IPlatformCompat platformCompat = IPlatformCompat.Stub .asInterface(ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); if (platformCompat == null) { throw new IllegalStateException("Could not get IPlatformCompat service!"); } + uiAutomation.adoptShellPermissionIdentity( + Manifest.permission.READ_COMPAT_CHANGE_CONFIG, + Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG); Compatibility.setOverrides(mConfig); try { platformCompat.setOverridesForTest(new CompatibilityChangeConfig(mConfig), @@ -101,6 +107,7 @@ public class PlatformCompatChangeRule extends CoreCompatChangeRule { } catch (RemoteException e) { throw new RuntimeException("Could not call IPlatformCompat binder method!", e); } finally { + uiAutomation.dropShellPermissionIdentity(); Compatibility.clearOverrides(); } } diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index c7475ee92dc7..1d71cf972aec 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -4924,7 +4924,10 @@ public class WifiManager { */ @Nullable @SystemApi - @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) + @RequiresPermission(anyOf = { + android.Manifest.permission.NETWORK_SETTINGS, + android.Manifest.permission.NETWORK_SETUP_WIZARD + }) public Network getCurrentNetwork() { try { return mService.getCurrentNetwork(); @@ -5026,10 +5029,8 @@ public class WifiManager { * and ipconfig.txt file. * @param supplicantData bytes representing wpa_supplicant.conf * @param ipConfigData bytes representing ipconfig.txt - * @deprecated this is no longer supported. * @hide */ - @Deprecated @SystemApi @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void restoreSupplicantBackupData( diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index 18533ef5b117..6f01350d8af4 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -1037,10 +1037,8 @@ public class WifiScanner { /** * Retrieve the most recent scan results from a single scan request. - * {@hide} */ @NonNull - @SystemApi @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public List<ScanResult> getSingleScanResults() { validateChannel(); |