diff options
243 files changed, 4134 insertions, 2946 deletions
diff --git a/Android.bp b/Android.bp index 48d955955425..ce2729d361af 100644 --- a/Android.bp +++ b/Android.bp @@ -418,7 +418,6 @@ java_defaults { "app-compat-annotations", "ext", "unsupportedappusage", - "framework-updatable-stubs-module_libs_api", ], jarjar_rules: ":framework-jarjar-rules", @@ -492,6 +491,7 @@ java_library { "services-platform-compat-config", "documents-ui-compat-config", ], + libs: ["framework-updatable-stubs-module_libs_api"], static_libs: [ // If MimeMap ever becomes its own APEX, then this dependency would need to be removed // in favor of an API stubs dependency in java_library "framework" below. @@ -545,6 +545,7 @@ java_library { visibility: [ // DO NOT ADD ANY MORE ENTRIES TO THIS LIST "//external/robolectric-shadows:__subpackages__", + "//frameworks/base", "//frameworks/layoutlib:__subpackages__", ], } diff --git a/Android.mk b/Android.mk index 815a169f3880..beb09b94345e 100644 --- a/Android.mk +++ b/Android.mk @@ -42,6 +42,8 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE)) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE):apistubs/android/public/api/android.txt) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE):apistubs/android/system/api/android.txt) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE):apistubs/android/test/api/android.txt) +$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_MODULE_LIB_API_FILE):apistubs/android/module-lib/api/android.txt) +$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_SERVER_API_FILE):apistubs/android/system-server/api/android.txt) # sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip. # So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to diff --git a/StubLibraries.bp b/StubLibraries.bp index da9f1654d60f..01f27d22ea3d 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -79,7 +79,11 @@ stubs_defaults { stubs_defaults { name: "metalava-non-updatable-api-stubs-default", defaults: ["metalava-base-api-stubs-default"], - sdk_version: "system_current", + sdk_version: "core_platform", + libs: ["framework-all"], + aidl: { + local_include_dirs: ["apex/media/framework/java"], + }, } ///////////////////////////////////////////////////////////////////// @@ -195,6 +199,7 @@ droidstubs { droidstubs { name: "module-lib-api", defaults: ["metalava-full-api-stubs-default"], + api_tag_name: "MODULE_LIB", arg_files: ["core/res/AndroidManifest.xml"], args: metalava_framework_docs_args + module_libs, check_api: { diff --git a/apex/statsd/service/Android.bp b/apex/statsd/service/Android.bp index ff56bb513a1d..df0ccfc54d64 100644 --- a/apex/statsd/service/Android.bp +++ b/apex/statsd/service/Android.bp @@ -1,6 +1,16 @@ -// Statsd Service jar, which will eventually be put in the statsd mainline apex. -// service-statsd needs to be added to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS. -// This jar will contain StatsCompanionService +// 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. filegroup { name: "service-statsd-sources", @@ -11,28 +21,13 @@ filegroup { java_library { name: "service-statsd", - installable: true, - - srcs: [ - ":service-statsd-sources", - ], - - // TODO(b/146757305) should be "module_current" since not allowed to use - // @CorePlatformApi's - sdk_version: "core_platform", - + srcs: [ ":service-statsd-sources" ], + sdk_version: "system_server_current", libs: [ "framework-annotations-lib", - "services-stubs", "framework-statsd", - - // TODO(b/146757305): should be unnecessary once - // sdk_version="module_lib_current" or "module_current" - "android_module_lib_stubs_current", ], - plugins: ["java_api_finder"], - apex_available: [ "com.android.os.statsd", "test_com.android.os.statsd", diff --git a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java index c84627de3e36..c4f1531dfcdf 100644 --- a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java +++ b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java @@ -30,6 +30,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Binder; import android.os.Bundle; +import android.os.FileUtils; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -47,8 +48,6 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.GuardedBy; -import libcore.io.IoUtils; - import java.io.File; import java.io.FileDescriptor; import java.io.FileOutputStream; @@ -226,7 +225,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { Log.d(TAG, "Sent data for " + numRecords + " apps"); } } finally { - IoUtils.closeQuietly(fout); + FileUtils.closeQuietly(fout); backgroundThread.quit(); backgroundThread.interrupt(); } diff --git a/api/current.txt b/api/current.txt index 533434b86a73..7307bad7ef2b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2879,7 +2879,11 @@ package android.accessibilityservice { method public void setGestureDetectionPassthroughRegion(int, @NonNull android.graphics.Region); method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo); method public void setTouchExplorationPassthroughRegion(int, @NonNull android.graphics.Region); - method public boolean takeScreenshot(int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.accessibilityservice.AccessibilityService.ScreenshotResult>); + method public void takeScreenshot(int, @NonNull java.util.concurrent.Executor, @NonNull android.accessibilityservice.AccessibilityService.TakeScreenshotCallback); + field public static final int ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR = 1; // 0x1 + field public static final int ERROR_TAKE_SCREENSHOT_INTERVAL_TIME_SHORT = 3; // 0x3 + field public static final int ERROR_TAKE_SCREENSHOT_INVALID_DISPLAY = 4; // 0x4 + field public static final int ERROR_TAKE_SCREENSHOT_NO_ACCESSIBILITY_ACCESS = 2; // 0x2 field public static final int GESTURE_2_FINGER_DOUBLE_TAP = 20; // 0x14 field public static final int GESTURE_2_FINGER_DOUBLE_TAP_AND_HOLD = 40; // 0x28 field public static final int GESTURE_2_FINGER_SINGLE_TAP = 19; // 0x13 @@ -2980,6 +2984,11 @@ package android.accessibilityservice { method public void onShowModeChanged(@NonNull android.accessibilityservice.AccessibilityService.SoftKeyboardController, int); } + public static interface AccessibilityService.TakeScreenshotCallback { + method public void onFailure(int); + method public void onSuccess(@NonNull android.accessibilityservice.AccessibilityService.ScreenshotResult); + } + public class AccessibilityServiceInfo implements android.os.Parcelable { ctor public AccessibilityServiceInfo(); method public static String capabilityToString(int); @@ -30247,9 +30256,6 @@ package android.net { public final class NetworkCapabilities implements android.os.Parcelable { ctor public NetworkCapabilities(); ctor public NetworkCapabilities(android.net.NetworkCapabilities); - method @NonNull public android.net.NetworkCapabilities addCapability(int); - method @NonNull public android.net.NetworkCapabilities addTransportType(int); - method public void clearAll(); method public int describeContents(); method public int getLinkDownstreamBandwidthKbps(); method public int getLinkUpstreamBandwidthKbps(); @@ -30259,13 +30265,6 @@ package android.net { method @Nullable public android.net.TransportInfo getTransportInfo(); method public boolean hasCapability(int); method public boolean hasTransport(int); - method @NonNull public android.net.NetworkCapabilities removeCapability(int); - method @NonNull public android.net.NetworkCapabilities setCapability(int, boolean); - method @NonNull public android.net.NetworkCapabilities setLinkDownstreamBandwidthKbps(int); - method @NonNull public android.net.NetworkCapabilities setLinkUpstreamBandwidthKbps(int); - method @NonNull public android.net.NetworkCapabilities setNetworkSpecifier(@NonNull android.net.NetworkSpecifier); - method @NonNull public android.net.NetworkCapabilities setOwnerUid(int); - method @NonNull public android.net.NetworkCapabilities setSignalStrength(int); method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkCapabilities> CREATOR; field public static final int NET_CAPABILITY_CAPTIVE_PORTAL = 17; // 0x11 @@ -47933,7 +47932,6 @@ package android.telephony { method public byte[] getPdu(); method public int getProtocolIdentifier(); method public String getPseudoSubject(); - method @Nullable public String getRecipientAddress(); method public String getServiceCenterAddress(); method public int getStatus(); method public int getStatusOnIcc(); diff --git a/api/system-current.txt b/api/system-current.txt index 5046e3d4e1a2..50900aa3e697 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10,7 +10,6 @@ package android { field @Deprecated public static final String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO"; field public static final String ACCESS_INSTANT_APPS = "android.permission.ACCESS_INSTANT_APPS"; field public static final String ACCESS_LOCUS_ID_USAGE_STATS = "android.permission.ACCESS_LOCUS_ID_USAGE_STATS"; - field public static final String ACCESS_MESSAGES_ON_ICC = "android.permission.ACCESS_MESSAGES_ON_ICC"; field public static final String ACCESS_MOCK_LOCATION = "android.permission.ACCESS_MOCK_LOCATION"; field public static final String ACCESS_MTP = "android.permission.ACCESS_MTP"; field public static final String ACCESS_NETWORK_CONDITIONS = "android.permission.ACCESS_NETWORK_CONDITIONS"; @@ -104,7 +103,6 @@ package android { field public static final String INTERNAL_SYSTEM_WINDOW = "android.permission.INTERNAL_SYSTEM_WINDOW"; field public static final String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP"; field public static final String KILL_UID = "android.permission.KILL_UID"; - field public static final String LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH = "android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH"; field public static final String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS"; field public static final String LOCK_DEVICE = "android.permission.LOCK_DEVICE"; field public static final String LOOP_RADIO = "android.permission.LOOP_RADIO"; @@ -253,7 +251,6 @@ package android { public static final class R.array { field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005 - field public static final int simColors = 17235974; // 0x1070006 } public static final class R.attr { @@ -1643,13 +1640,11 @@ package android.bluetooth { } public final class BluetoothPan implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile { - method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public void close(); - method @RequiresPermission(android.Manifest.permission.BLUETOOTH) protected void finalize(); - method @NonNull public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices(); - method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionState(@Nullable android.bluetooth.BluetoothDevice); - method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean isTetheringOn(); - method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public void setBluetoothTethering(boolean); - method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int); + method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices(); + method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionState(@Nullable android.bluetooth.BluetoothDevice); + method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isTetheringOn(); + method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public void setBluetoothTethering(boolean); + method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int); field public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.pan.profile.action.CONNECTION_STATE_CHANGED"; field public static final String EXTRA_LOCAL_ROLE = "android.bluetooth.pan.extra.LOCAL_ROLE"; field public static final int LOCAL_NAP_ROLE = 1; // 0x1 @@ -4934,7 +4929,7 @@ package android.media.tv.tuner.dvr { } public class DvrSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.dvr.DvrSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.dvr.DvrSettings.Builder builder(); method public int getDataFormat(); method public long getHighThreshold(); method public long getLowThreshold(); @@ -4969,7 +4964,7 @@ package android.media.tv.tuner.dvr { package android.media.tv.tuner.filter { public final class AlpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.AlpFilterConfiguration.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.filter.AlpFilterConfiguration.Builder builder(); method public int getLengthType(); method public int getPacketType(); method public int getType(); @@ -5000,11 +4995,11 @@ package android.media.tv.tuner.filter { } public class AvSettings extends android.media.tv.tuner.filter.Settings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.AvSettings.Builder builder(@NonNull android.content.Context, int, boolean); + method @NonNull public static android.media.tv.tuner.filter.AvSettings.Builder builder(int, boolean); method public boolean isPassthrough(); } - public static class AvSettings.Builder extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.AvSettings.Builder> { + public static class AvSettings.Builder { method @NonNull public android.media.tv.tuner.filter.AvSettings build(); method @NonNull public android.media.tv.tuner.filter.AvSettings.Builder setPassthrough(boolean); } @@ -5018,11 +5013,11 @@ package android.media.tv.tuner.filter { } public class DownloadSettings extends android.media.tv.tuner.filter.Settings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.DownloadSettings.Builder builder(@NonNull android.content.Context, int); + method @NonNull public static android.media.tv.tuner.filter.DownloadSettings.Builder builder(int); method public int getDownloadId(); } - public static class DownloadSettings.Builder extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.DownloadSettings.Builder> { + public static class DownloadSettings.Builder { method @NonNull public android.media.tv.tuner.filter.DownloadSettings build(); method @NonNull public android.media.tv.tuner.filter.DownloadSettings.Builder setDownloadId(int); } @@ -5080,7 +5075,7 @@ package android.media.tv.tuner.filter { } public final class IpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.IpFilterConfiguration.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.filter.IpFilterConfiguration.Builder builder(); method @NonNull @Size(min=4, max=16) public byte[] getDstIpAddress(); method public int getDstPort(); method @NonNull @Size(min=4, max=16) public byte[] getSrcIpAddress(); @@ -5119,7 +5114,7 @@ package android.media.tv.tuner.filter { } public final class MmtpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.MmtpFilterConfiguration.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.filter.MmtpFilterConfiguration.Builder builder(); method public int getMmtpPacketId(); method public int getType(); } @@ -5142,7 +5137,7 @@ package android.media.tv.tuner.filter { } public class PesSettings extends android.media.tv.tuner.filter.Settings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.PesSettings.Builder builder(@NonNull android.content.Context, int); + method @NonNull public static android.media.tv.tuner.filter.PesSettings.Builder builder(int); method public int getStreamId(); method public boolean isRaw(); } @@ -5154,7 +5149,7 @@ package android.media.tv.tuner.filter { } public class RecordSettings extends android.media.tv.tuner.filter.Settings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.RecordSettings.Builder builder(@NonNull android.content.Context, int); + method @NonNull public static android.media.tv.tuner.filter.RecordSettings.Builder builder(int); method public int getScIndexMask(); method public int getScIndexType(); method public int getTsIndexMask(); @@ -5188,7 +5183,7 @@ package android.media.tv.tuner.filter { field public static final int TS_INDEX_SPLICING_POINT_FLAG = 1024; // 0x400 } - public static class RecordSettings.Builder extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.RecordSettings.Builder> { + public static class RecordSettings.Builder { method @NonNull public android.media.tv.tuner.filter.RecordSettings build(); method @NonNull public android.media.tv.tuner.filter.RecordSettings.Builder setScIndexMask(int); method @NonNull public android.media.tv.tuner.filter.RecordSettings.Builder setScIndexType(int); @@ -5208,14 +5203,14 @@ package android.media.tv.tuner.filter { method public boolean isRepeat(); } - public abstract static class SectionSettings.Builder<T extends android.media.tv.tuner.filter.SectionSettings.Builder<T>> extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.SectionSettings.Builder<T>> { + public abstract static class SectionSettings.Builder<T extends android.media.tv.tuner.filter.SectionSettings.Builder<T>> { method @NonNull public T setCrcEnabled(boolean); method @NonNull public T setRaw(boolean); method @NonNull public T setRepeat(boolean); } public class SectionSettingsWithSectionBits extends android.media.tv.tuner.filter.SectionSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.SectionSettingsWithSectionBits.Builder builder(@NonNull android.content.Context, int); + method @NonNull public static android.media.tv.tuner.filter.SectionSettingsWithSectionBits.Builder builder(int); method @NonNull public byte[] getFilterBytes(); method @NonNull public byte[] getMask(); method @NonNull public byte[] getMode(); @@ -5229,7 +5224,7 @@ package android.media.tv.tuner.filter { } public class SectionSettingsWithTableInfo extends android.media.tv.tuner.filter.SectionSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.SectionSettingsWithTableInfo.Builder builder(@NonNull android.content.Context, int); + method @NonNull public static android.media.tv.tuner.filter.SectionSettingsWithTableInfo.Builder builder(int); method public int getTableId(); method public int getVersion(); } @@ -5244,9 +5239,6 @@ package android.media.tv.tuner.filter { method public int getType(); } - public abstract static class Settings.Builder<T extends android.media.tv.tuner.filter.Settings.Builder<T>> { - } - public class TemiEvent extends android.media.tv.tuner.filter.FilterEvent { method @NonNull public byte[] getDescriptorData(); method public byte getDescriptorTag(); @@ -5262,7 +5254,7 @@ package android.media.tv.tuner.filter { } public final class TlvFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.TlvFilterConfiguration.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.filter.TlvFilterConfiguration.Builder builder(); method public int getPacketType(); method public int getType(); method public boolean isCompressedIpPacket(); @@ -5283,7 +5275,7 @@ package android.media.tv.tuner.filter { } public final class TsFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.TsFilterConfiguration.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.filter.TsFilterConfiguration.Builder builder(); method public int getTpid(); method public int getType(); } @@ -5311,7 +5303,7 @@ package android.media.tv.tuner.frontend { } public class AnalogFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.AnalogFrontendSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.AnalogFrontendSettings.Builder builder(); method public int getSifStandard(); method public int getSignalType(); method public int getType(); @@ -5362,7 +5354,7 @@ package android.media.tv.tuner.frontend { } public class Atsc3FrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder builder(); method public int getBandwidth(); method public int getDemodOutputFormat(); method @NonNull public android.media.tv.tuner.frontend.Atsc3PlpSettings[] getPlpSettings(); @@ -5425,7 +5417,7 @@ package android.media.tv.tuner.frontend { } public class Atsc3PlpSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.Atsc3PlpSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.Atsc3PlpSettings.Builder builder(); method public int getCodeRate(); method public int getFec(); method public int getInterleaveMode(); @@ -5447,7 +5439,7 @@ package android.media.tv.tuner.frontend { } public class AtscFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.AtscFrontendSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.AtscFrontendSettings.Builder builder(); method public int getModulation(); method public int getType(); field public static final int MODULATION_AUTO = 1; // 0x1 @@ -5469,7 +5461,7 @@ package android.media.tv.tuner.frontend { } public class DvbcFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder builder(); method public int getAnnex(); method public long getInnerFec(); method public int getModulation(); @@ -5508,7 +5500,7 @@ package android.media.tv.tuner.frontend { } public class DvbsCodeRate { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.DvbsCodeRate.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.DvbsCodeRate.Builder builder(); method public int getBitsPer1000Symbol(); method public long getInnerFec(); method public boolean isLinear(); @@ -5530,7 +5522,7 @@ package android.media.tv.tuner.frontend { } public class DvbsFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder builder(); method @Nullable public android.media.tv.tuner.frontend.DvbsCodeRate getCodeRate(); method public int getInputStreamId(); method public int getModulation(); @@ -5600,7 +5592,7 @@ package android.media.tv.tuner.frontend { } public class DvbtFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder builder(); method public int getBandwidth(); method public int getConstellation(); method public int getGuardInterval(); @@ -5701,7 +5693,7 @@ package android.media.tv.tuner.frontend { method public int getAcquireRange(); method public int getExclusiveGroupId(); method @NonNull public android.util.Range<java.lang.Integer> getFrequencyRange(); - method @NonNull public android.media.tv.tuner.frontend.FrontendCapabilities getFrontendCapability(); + method @NonNull public android.media.tv.tuner.frontend.FrontendCapabilities getFrontendCapabilities(); method public int getId(); method @NonNull public int[] getStatusCapabilities(); method @NonNull public android.util.Range<java.lang.Integer> getSymbolRateRange(); @@ -5762,7 +5754,7 @@ package android.media.tv.tuner.frontend { public class FrontendStatus { method public int getAgc(); - method @NonNull public android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpInfo[] getAtsc3PlpInfo(); + method @NonNull public android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpTuningInfo[] getAtsc3PlpTuningInfo(); method public int getBer(); method public int getFreqOffset(); method public int getHierarchy(); @@ -5782,7 +5774,7 @@ package android.media.tv.tuner.frontend { method public boolean isDemodLocked(); method public boolean isEwbs(); method public boolean isLnaOn(); - method public boolean isRfLock(); + method public boolean isRfLocked(); field public static final int FRONTEND_STATUS_TYPE_AGC = 14; // 0xe field public static final int FRONTEND_STATUS_TYPE_ATSC3_PLP_INFO = 21; // 0x15 field public static final int FRONTEND_STATUS_TYPE_BER = 2; // 0x2 @@ -5807,10 +5799,10 @@ package android.media.tv.tuner.frontend { field public static final int FRONTEND_STATUS_TYPE_SYMBOL_RATE = 7; // 0x7 } - public static class FrontendStatus.Atsc3PlpInfo { + public static class FrontendStatus.Atsc3PlpTuningInfo { method public int getPlpId(); method public int getUec(); - method public boolean isLock(); + method public boolean isLocked(); } public class Isdbs3FrontendCapabilities extends android.media.tv.tuner.frontend.FrontendCapabilities { @@ -5819,7 +5811,7 @@ package android.media.tv.tuner.frontend { } public class Isdbs3FrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.Isdbs3FrontendSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.Isdbs3FrontendSettings.Builder builder(); method public int getCodeRate(); method public int getModulation(); method public int getRolloff(); @@ -5868,7 +5860,7 @@ package android.media.tv.tuner.frontend { } public class IsdbsFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.IsdbsFrontendSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.IsdbsFrontendSettings.Builder builder(); method public int getCodeRate(); method public int getModulation(); method public int getRolloff(); @@ -5914,7 +5906,7 @@ package android.media.tv.tuner.frontend { } public class IsdbtFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.IsdbtFrontendSettings.Builder builder(@NonNull android.content.Context); + method @NonNull public static android.media.tv.tuner.frontend.IsdbtFrontendSettings.Builder builder(); method public int getBandwidth(); method public int getCodeRate(); method public int getGuardInterval(); @@ -6128,10 +6120,10 @@ package android.net { public class InvalidPacketException extends java.lang.Exception { ctor public InvalidPacketException(int); + method public int getError(); field public static final int ERROR_INVALID_IP_ADDRESS = -21; // 0xffffffeb field public static final int ERROR_INVALID_LENGTH = -23; // 0xffffffe9 field public static final int ERROR_INVALID_PORT = -22; // 0xffffffea - field public final int error; } public final class IpConfiguration implements android.os.Parcelable { @@ -6185,12 +6177,12 @@ package android.net { } public class KeepalivePacketData { - ctor protected KeepalivePacketData(@NonNull java.net.InetAddress, int, @NonNull java.net.InetAddress, int, @NonNull byte[]) throws android.net.InvalidPacketException; + ctor protected KeepalivePacketData(@NonNull java.net.InetAddress, @IntRange(from=0, to=65535) int, @NonNull java.net.InetAddress, @IntRange(from=0, to=65535) int, @NonNull byte[]) throws android.net.InvalidPacketException; + method @NonNull public java.net.InetAddress getDstAddress(); + method public int getDstPort(); method @NonNull public byte[] getPacket(); - field @NonNull public final java.net.InetAddress dstAddress; - field public final int dstPort; - field @NonNull public final java.net.InetAddress srcAddress; - field public final int srcPort; + method @NonNull public java.net.InetAddress getSrcAddress(); + method public int getSrcPort(); } public class LinkAddress implements android.os.Parcelable { @@ -6263,8 +6255,8 @@ package android.net { public class Network implements android.os.Parcelable { ctor public Network(@NonNull android.net.Network); + method public int getNetId(); method @NonNull public android.net.Network getPrivateDnsBypassingCopy(); - field public final int netId; } public abstract class NetworkAgent { @@ -6313,18 +6305,33 @@ package android.net { public final class NetworkCapabilities implements android.os.Parcelable { method @NonNull public int[] getAdministratorUids(); - method @Nullable public String getSSID(); + method @Nullable public String getSsid(); method @NonNull public int[] getTransportTypes(); method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities); - method @NonNull public android.net.NetworkCapabilities setAdministratorUids(@NonNull int[]); - method @NonNull public android.net.NetworkCapabilities setRequestorPackageName(@NonNull String); - method @NonNull public android.net.NetworkCapabilities setRequestorUid(int); - method @NonNull public android.net.NetworkCapabilities setSSID(@Nullable String); - method @NonNull public android.net.NetworkCapabilities setTransportInfo(@NonNull android.net.TransportInfo); field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16 field public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24; // 0x18 } + public static class NetworkCapabilities.Builder { + ctor public NetworkCapabilities.Builder(); + ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities); + method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int); + method @NonNull public android.net.NetworkCapabilities.Builder addTransportType(int); + method @NonNull public android.net.NetworkCapabilities build(); + method @NonNull public android.net.NetworkCapabilities.Builder removeCapability(int); + method @NonNull public android.net.NetworkCapabilities.Builder removeTransportType(int); + method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setAdministratorUids(@NonNull int[]); + method @NonNull public android.net.NetworkCapabilities.Builder setLinkDownstreamBandwidthKbps(int); + method @NonNull public android.net.NetworkCapabilities.Builder setLinkUpstreamBandwidthKbps(int); + method @NonNull public android.net.NetworkCapabilities.Builder setNetworkSpecifier(@Nullable android.net.NetworkSpecifier); + method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setOwnerUid(int); + method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorPackageName(@Nullable String); + method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorUid(int); + method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkCapabilities.Builder setSignalStrength(int); + method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String); + method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo); + } + public class NetworkKey implements android.os.Parcelable { ctor public NetworkKey(android.net.WifiKey); method @Nullable public static android.net.NetworkKey createFromScanResult(@NonNull android.net.wifi.ScanResult); @@ -11255,11 +11262,8 @@ package android.telephony { } public final class SmsManager { - method @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public boolean copyMessageToIcc(@Nullable byte[], @NonNull byte[], int); - method @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public boolean deleteMessageFromIcc(int); method public boolean disableCellBroadcastRange(int, int, int); method public boolean enableCellBroadcastRange(int, int, int); - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public java.util.List<android.telephony.SmsMessage> getMessagesFromIcc(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getPremiumSmsConsent(@NonNull String); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getSmsCapacityOnIcc(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void sendMultipartTextMessageWithoutPersisting(String, String, java.util.List<java.lang.String>, java.util.List<android.app.PendingIntent>, java.util.List<android.app.PendingIntent>); @@ -11298,8 +11302,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultDataSubId(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultSmsSubId(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setDisplayName(@Nullable String, int, int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIconTint(@ColorInt int, int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPreferredDataSubscriptionId(int, boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setSubscriptionEnabled(int, boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUiccApplicationsEnabled(int, boolean); @@ -11439,7 +11441,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings(); method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAlwaysAllowMmsData(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int); diff --git a/api/test-current.txt b/api/test-current.txt index 4704c0b11d49..89394b342655 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1820,16 +1820,39 @@ package android.net { public class Network implements android.os.Parcelable { ctor public Network(@NonNull android.net.Network); + method public int getNetId(); method @NonNull public android.net.Network getPrivateDnsBypassingCopy(); } public final class NetworkCapabilities implements android.os.Parcelable { + method @NonNull public int[] getAdministratorUids(); method public int[] getCapabilities(); + method @Nullable public String getSsid(); method @NonNull public int[] getTransportTypes(); method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities); field public static final int TRANSPORT_TEST = 7; // 0x7 } + public static class NetworkCapabilities.Builder { + ctor public NetworkCapabilities.Builder(); + ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities); + method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int); + method @NonNull public android.net.NetworkCapabilities.Builder addTransportType(int); + method @NonNull public android.net.NetworkCapabilities build(); + method @NonNull public android.net.NetworkCapabilities.Builder removeCapability(int); + method @NonNull public android.net.NetworkCapabilities.Builder removeTransportType(int); + method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setAdministratorUids(@NonNull int[]); + method @NonNull public android.net.NetworkCapabilities.Builder setLinkDownstreamBandwidthKbps(int); + method @NonNull public android.net.NetworkCapabilities.Builder setLinkUpstreamBandwidthKbps(int); + method @NonNull public android.net.NetworkCapabilities.Builder setNetworkSpecifier(@Nullable android.net.NetworkSpecifier); + method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setOwnerUid(int); + method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setRequestorPackageName(@Nullable String); + method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setRequestorUid(int); + method @NonNull @RequiresPermission("android.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP") public android.net.NetworkCapabilities.Builder setSignalStrength(int); + method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setSsid(@Nullable String); + method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo); + } + public class NetworkStack { method @Nullable public static android.os.IBinder getService(); method public static void setServiceForTest(@Nullable android.os.IBinder); diff --git a/cmds/incidentd/src/Section.cpp b/cmds/incidentd/src/Section.cpp index 60d1ac74f657..c703c3ce0951 100644 --- a/cmds/incidentd/src/Section.cpp +++ b/cmds/incidentd/src/Section.cpp @@ -263,10 +263,6 @@ void sigpipe_handler(int signum) { } status_t WorkerThreadSection::Execute(ReportWriter* writer) const { - status_t err = NO_ERROR; - bool workerDone = false; - FdBuffer buffer; - // Create shared data and pipe. Don't put data on the stack since this thread may exit early. sp<WorkerThreadData> data = new WorkerThreadData(this); if (!data->pipe.init()) { @@ -289,6 +285,9 @@ status_t WorkerThreadSection::Execute(ReportWriter* writer) const { }).detach(); // Loop reading until either the timeout or the worker side is done (i.e. eof). + status_t err = NO_ERROR; + bool workerDone = false; + FdBuffer buffer; err = buffer.read(data->pipe.readFd().get(), this->timeoutMs); if (err != NO_ERROR) { ALOGE("[%s] reader failed with error '%s'", this->name.string(), strerror(-err)); @@ -440,7 +439,7 @@ status_t DumpsysSection::BlockingCall(unique_fd& pipeWriteFd) const { // ================================================================================ TextDumpsysSection::TextDumpsysSection(int id, const char* service, ...) - : WorkerThreadSection(id, REMOTE_CALL_TIMEOUT_MS), mService(service) { + :Section(id), mService(service) { name = "dumpsys "; name += service; @@ -460,7 +459,7 @@ TextDumpsysSection::TextDumpsysSection(int id, const char* service, ...) TextDumpsysSection::~TextDumpsysSection() {} -status_t TextDumpsysSection::BlockingCall(unique_fd& pipeWriteFd) const { +status_t TextDumpsysSection::Execute(ReportWriter* writer) const { // checkService won't wait for the service to show up like getService will. sp<IBinder> service = defaultServiceManager()->checkService(mService); if (service == NULL) { @@ -488,25 +487,36 @@ status_t TextDumpsysSection::BlockingCall(unique_fd& pipeWriteFd) const { }); // Collect dump content - std::string content; - bool success = ReadFdToString(dumpPipe.readFd(), &content); - worker.join(); // Wait for worker to finish + FdBuffer buffer; + ProtoOutputStream proto; + proto.write(TextDumpProto::COMMAND, std::string(name.string())); + proto.write(TextDumpProto::DUMP_DURATION_NS, int64_t(Nanotime() - start)); + buffer.write(proto.data()); + + sp<EncodedBuffer> internalBuffer = buffer.data(); + internalBuffer->writeHeader((uint32_t)TextDumpProto::CONTENT, WIRE_TYPE_LENGTH_DELIMITED); + size_t editPos = internalBuffer->wp()->pos(); + internalBuffer->wp()->move(8); // reserve 8 bytes for the varint of the data size + size_t dataBeginPos = internalBuffer->wp()->pos(); + + status_t readStatus = buffer.read(dumpPipe.readFd(), this->timeoutMs); dumpPipe.readFd().reset(); - if (!success) { - ALOGW("[%s] failed to read data from pipe", this->name.string()); - return -1; + writer->setSectionStats(buffer); + if (readStatus != OK || buffer.timedOut()) { + ALOGW("[%s] failed to read from dumpsys: %s, timedout: %s", this->name.string(), + strerror(-readStatus), buffer.timedOut() ? "true" : "false"); + worker.detach(); + return readStatus; } + worker.join(); // wait for worker to finish - ProtoOutputStream proto; - proto.write(util::TextDumpProto::COMMAND, std::string(name.string())); - proto.write(util::TextDumpProto::CONTENT, content); - proto.write(util::TextDumpProto::DUMP_DURATION_NS, int64_t(Nanotime() - start)); + // Revisit the actual size from dumpsys and edit the internal buffer accordingly. + size_t dumpSize = buffer.size() - dataBeginPos; + internalBuffer->wp()->rewind()->move(editPos); + internalBuffer->writeRawVarint32(dumpSize); + internalBuffer->copy(dataBeginPos, dumpSize); - if (!proto.flush(pipeWriteFd.get()) && errno == EPIPE) { - ALOGE("[%s] wrote to a broken pipe\n", this->name.string()); - return EPIPE; - } - return OK; + return writer->writeSection(buffer); } // ================================================================================ diff --git a/cmds/incidentd/src/Section.h b/cmds/incidentd/src/Section.h index 6162b3ae2ceb..2ce45ed66a32 100644 --- a/cmds/incidentd/src/Section.h +++ b/cmds/incidentd/src/Section.h @@ -130,12 +130,12 @@ private: /** * Section that calls text dumpsys on a system service, usually "dumpsys [service_name]". */ -class TextDumpsysSection : public WorkerThreadSection { +class TextDumpsysSection : public Section { public: TextDumpsysSection(int id, const char* service, ...); virtual ~TextDumpsysSection(); - virtual status_t BlockingCall(unique_fd& pipeWriteFd) const; + virtual status_t Execute(ReportWriter* writer) const; private: String16 mService; diff --git a/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp b/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp index 14b191e5d5e0..ae6769ee72ee 100644 --- a/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp @@ -3155,1025 +3155,902 @@ TEST(ValueMetricProducerTest_BucketDrop, TestInvalidBucketWhenPullFailed) { EXPECT_EQ(NanoToMillis(dumpReportTimeNs), dropEvent.drop_time_millis()); } -///* -// * Test that MULTIPLE_BUCKETS_SKIPPED dump reason is logged when a log event -// * skips over more than one bucket. -// */ -// TEST(ValueMetricProducerTest_BucketDrop, TestInvalidBucketWhenMultipleBucketsSkipped) { -// ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithCondition(); -// -// sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); -// EXPECT_CALL(*pullerManager, Pull(tagId, _)) -// // Condition change to true. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); -// event->write("field1"); -// event->write(10); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Dump report requested. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = -// make_shared<LogEvent>(tagId, bucket4StartTimeNs + 1000); -// event->write("field1"); -// event->write(15); -// event->init(); -// data->push_back(event); -// return true; -// })); -// -// sp<ValueMetricProducer> valueProducer = -// ValueMetricProducerTestHelper::createValueProducerWithCondition(pullerManager, -// metric); -// -// // Condition change event. -// valueProducer->onConditionChanged(true, bucketStartTimeNs + 10); -// -// // Condition change event that skips forward by three buckets. -// valueProducer->onConditionChanged(false, bucket4StartTimeNs + 10); -// -// // Check dump report. -// ProtoOutputStream output; -// std::set<string> strSet; -// valueProducer->onDumpReport(bucket4StartTimeNs + 1000, true /* include recent buckets */, -// true, -// NO_TIME_CONSTRAINTS /* dumpLatency */, &strSet, &output); -// -// StatsLogReport report = outputStreamToProto(&output); -// EXPECT_TRUE(report.has_value_metrics()); -// EXPECT_EQ(0, report.value_metrics().data_size()); -// EXPECT_EQ(1, report.value_metrics().skipped_size()); -// -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs), -// report.value_metrics().skipped(0).start_bucket_elapsed_millis()); -// EXPECT_EQ(NanoToMillis(bucket2StartTimeNs), -// report.value_metrics().skipped(0).end_bucket_elapsed_millis()); -// EXPECT_EQ(1, report.value_metrics().skipped(0).drop_event_size()); -// -// auto dropEvent = report.value_metrics().skipped(0).drop_event(0); -// EXPECT_EQ(BucketDropReason::MULTIPLE_BUCKETS_SKIPPED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucket4StartTimeNs + 10), dropEvent.drop_time_millis()); -//} -// -///* -// * Test that BUCKET_TOO_SMALL dump reason is logged when a flushed bucket size -// * is smaller than the "min_bucket_size_nanos" specified in the metric config. -// */ -// TEST(ValueMetricProducerTest_BucketDrop, TestBucketDropWhenBucketTooSmall) { -// ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithCondition(); -// metric.set_min_bucket_size_nanos(10000000000); // 10 seconds -// -// sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); -// EXPECT_CALL(*pullerManager, Pull(tagId, _)) -// // Condition change to true. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); -// event->write("field1"); -// event->write(10); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Dump report requested. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = -// make_shared<LogEvent>(tagId, bucketStartTimeNs + 9000000); -// event->write("field1"); -// event->write(15); -// event->init(); -// data->push_back(event); -// return true; -// })); -// -// sp<ValueMetricProducer> valueProducer = -// ValueMetricProducerTestHelper::createValueProducerWithCondition(pullerManager, -// metric); -// -// // Condition change event. -// valueProducer->onConditionChanged(true, bucketStartTimeNs + 10); -// -// // Check dump report. -// ProtoOutputStream output; -// std::set<string> strSet; -// int64_t dumpReportTimeNs = bucketStartTimeNs + 9000000; -// valueProducer->onDumpReport(dumpReportTimeNs, true /* include recent buckets */, true, -// NO_TIME_CONSTRAINTS /* dumpLatency */, &strSet, &output); -// -// StatsLogReport report = outputStreamToProto(&output); -// EXPECT_TRUE(report.has_value_metrics()); -// EXPECT_EQ(0, report.value_metrics().data_size()); -// EXPECT_EQ(1, report.value_metrics().skipped_size()); -// -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs), -// report.value_metrics().skipped(0).start_bucket_elapsed_millis()); -// EXPECT_EQ(NanoToMillis(dumpReportTimeNs), -// report.value_metrics().skipped(0).end_bucket_elapsed_millis()); -// EXPECT_EQ(1, report.value_metrics().skipped(0).drop_event_size()); -// -// auto dropEvent = report.value_metrics().skipped(0).drop_event(0); -// EXPECT_EQ(BucketDropReason::BUCKET_TOO_SMALL, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(dumpReportTimeNs), dropEvent.drop_time_millis()); -//} -// -///* -// * Test multiple bucket drop events in the same bucket. -// */ -// TEST(ValueMetricProducerTest_BucketDrop, TestMultipleBucketDropEvents) { -// ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithCondition(); -// -// sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); -// EXPECT_CALL(*pullerManager, Pull(tagId, _)) -// // Condition change to true. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); -// event->write("field1"); -// event->write(10); -// event->init(); -// data->push_back(event); -// return true; -// })); -// -// sp<ValueMetricProducer> valueProducer = -// ValueMetricProducerTestHelper::createValueProducerWithNoInitialCondition(pullerManager, -// metric); -// -// // Condition change event. -// valueProducer->onConditionChanged(true, bucketStartTimeNs + 10); -// -// // Check dump report. -// ProtoOutputStream output; -// std::set<string> strSet; -// int64_t dumpReportTimeNs = bucketStartTimeNs + 1000; -// valueProducer->onDumpReport(dumpReportTimeNs, true /* include recent buckets */, true, -// FAST /* dumpLatency */, &strSet, &output); -// -// StatsLogReport report = outputStreamToProto(&output); -// EXPECT_TRUE(report.has_value_metrics()); -// EXPECT_EQ(0, report.value_metrics().data_size()); -// EXPECT_EQ(1, report.value_metrics().skipped_size()); -// -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs), -// report.value_metrics().skipped(0).start_bucket_elapsed_millis()); -// EXPECT_EQ(NanoToMillis(dumpReportTimeNs), -// report.value_metrics().skipped(0).end_bucket_elapsed_millis()); -// EXPECT_EQ(2, report.value_metrics().skipped(0).drop_event_size()); -// -// auto dropEvent = report.value_metrics().skipped(0).drop_event(0); -// EXPECT_EQ(BucketDropReason::CONDITION_UNKNOWN, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 10), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(1); -// EXPECT_EQ(BucketDropReason::DUMP_REPORT_REQUESTED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(dumpReportTimeNs), dropEvent.drop_time_millis()); -//} -// -///* -// * Test that the number of logged bucket drop events is capped at the maximum. -// * The maximum is currently 10 and is set in MetricProducer::maxDropEventsReached(). -// */ -// TEST(ValueMetricProducerTest_BucketDrop, TestMaxBucketDropEvents) { -// ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithCondition(); -// -// sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); -// EXPECT_CALL(*pullerManager, Pull(tagId, _)) -// // First condition change event. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// for (int i = 0; i < 2000; i++) { -// shared_ptr<LogEvent> event = -// make_shared<LogEvent>(tagId, bucketStartTimeNs + 1); -// event->write(i); -// event->write(i); -// event->init(); -// data->push_back(event); -// } -// return true; -// })) -// .WillOnce(Return(false)) -// .WillOnce(Return(false)) -// .WillOnce(Return(false)) -// .WillOnce(Return(false)) -// .WillOnce(Return(false)) -// .WillOnce(Return(false)) -// .WillOnce(Return(false)) -// .WillOnce(Return(false)) -// .WillOnce(Return(false)) -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + -// 220); event->write("field1"); event->write(10); event->init(); -// data->push_back(event); -// return true; -// })); -// -// sp<ValueMetricProducer> valueProducer = -// ValueMetricProducerTestHelper::createValueProducerWithNoInitialCondition(pullerManager, -// metric); -// -// // First condition change event causes guardrail to be reached. -// valueProducer->onConditionChanged(true, bucketStartTimeNs + 10); -// -// // 2-10 condition change events result in failed pulls. -// valueProducer->onConditionChanged(false, bucketStartTimeNs + 30); -// valueProducer->onConditionChanged(true, bucketStartTimeNs + 50); -// valueProducer->onConditionChanged(false, bucketStartTimeNs + 70); -// valueProducer->onConditionChanged(true, bucketStartTimeNs + 90); -// valueProducer->onConditionChanged(false, bucketStartTimeNs + 100); -// valueProducer->onConditionChanged(true, bucketStartTimeNs + 150); -// valueProducer->onConditionChanged(false, bucketStartTimeNs + 170); -// valueProducer->onConditionChanged(true, bucketStartTimeNs + 190); -// valueProducer->onConditionChanged(false, bucketStartTimeNs + 200); -// -// // Condition change event 11 -// valueProducer->onConditionChanged(true, bucketStartTimeNs + 220); -// -// // Check dump report. -// ProtoOutputStream output; -// std::set<string> strSet; -// int64_t dumpReportTimeNs = bucketStartTimeNs + 1000; -// // Because we already have 10 dump events in the current bucket, -// // this case should not be added to the list of dump events. -// valueProducer->onDumpReport(bucketStartTimeNs + 1000, true /* include recent buckets */, true, -// FAST /* dumpLatency */, &strSet, &output); -// -// StatsLogReport report = outputStreamToProto(&output); -// EXPECT_TRUE(report.has_value_metrics()); -// EXPECT_EQ(0, report.value_metrics().data_size()); -// EXPECT_EQ(1, report.value_metrics().skipped_size()); -// -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs), -// report.value_metrics().skipped(0).start_bucket_elapsed_millis()); -// EXPECT_EQ(NanoToMillis(dumpReportTimeNs), -// report.value_metrics().skipped(0).end_bucket_elapsed_millis()); -// EXPECT_EQ(10, report.value_metrics().skipped(0).drop_event_size()); -// -// auto dropEvent = report.value_metrics().skipped(0).drop_event(0); -// EXPECT_EQ(BucketDropReason::CONDITION_UNKNOWN, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 10), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(1); -// EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 30), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(2); -// EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 50), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(3); -// EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 70), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(4); -// EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 90), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(5); -// EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 100), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(6); -// EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 150), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(7); -// EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 170), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(8); -// EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 190), dropEvent.drop_time_millis()); -// -// dropEvent = report.value_metrics().skipped(0).drop_event(9); -// EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); -// EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 200), dropEvent.drop_time_millis()); -//} -// -///* -// * Test metric with a simple sliced state -// * - Increasing values -// * - Using diff -// * - Second field is value field -// */ -// TEST(ValueMetricProducerTest, TestSlicedState) { -// // Set up ValueMetricProducer. -// ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithState("SCREEN_STATE"); -// sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); -// EXPECT_CALL(*pullerManager, Pull(tagId, _)) -// // ValueMetricProducer initialized. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs); -// event->write("field1"); -// event->write(3); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Screen state change to ON. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 5); -// event->write("field1"); -// event->write(5); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Screen state change to OFF. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); -// event->write("field1"); -// event->write(9); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Screen state change to ON. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 15); -// event->write("field1"); -// event->write(21); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Dump report requested. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 50); -// event->write("field1"); -// event->write(30); -// event->init(); -// data->push_back(event); -// return true; -// })); -// -// sp<ValueMetricProducer> valueProducer = -// ValueMetricProducerTestHelper::createValueProducerWithState( -// pullerManager, metric, {util::SCREEN_STATE_CHANGED}, {}); -// -// // Set up StateManager and check that StateTrackers are initialized. -// StateManager::getInstance().clear(); -// StateManager::getInstance().registerListener(SCREEN_STATE_ATOM_ID, valueProducer); -// EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount()); -// EXPECT_EQ(1, StateManager::getInstance().getListenersCount(SCREEN_STATE_ATOM_ID)); -// -// // Bucket status after metric initialized. -// EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {} -// auto it = valueProducer->mCurrentSlicedBucket.begin(); -// auto itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(3, itBase->second[0].base.long_value); -// // Value for dimension, state key {{}, kStateUnknown} -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Bucket status after screen state change kStateUnknown->ON. -// auto screenEvent = CreateScreenStateChangedEvent( -// android::view::DisplayStateEnum::DISPLAY_STATE_ON, bucketStartTimeNs + 5); -// StateManager::getInstance().onLogEvent(*screenEvent); -// EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {} -// it = valueProducer->mCurrentSlicedBucket.begin(); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(5, itBase->second[0].base.long_value); -// // Value for dimension, state key {{}, kStateUnknown} -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(2, it->second[0].value.long_value); -// -// // Bucket status after screen state change ON->OFF. -// screenEvent = -// CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_OFF, -// bucketStartTimeNs + 10); -// StateManager::getInstance().onLogEvent(*screenEvent); -// EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {} -// it = valueProducer->mCurrentSlicedBucket.begin(); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(9, itBase->second[0].base.long_value); -// // Value for dimension, state key {{}, ON} -// EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_ON, -// it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(4, it->second[0].value.long_value); -// // Value for dimension, state key {{}, kStateUnknown} -// it++; -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(2, it->second[0].value.long_value); -// -// // Bucket status after screen state change OFF->ON. -// screenEvent = CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_ON, -// bucketStartTimeNs + 15); -// StateManager::getInstance().onLogEvent(*screenEvent); -// EXPECT_EQ(3UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {} -// it = valueProducer->mCurrentSlicedBucket.begin(); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(21, itBase->second[0].base.long_value); -// // Value for dimension, state key {{}, OFF} -// EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_OFF, -// it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(12, it->second[0].value.long_value); -// // Value for dimension, state key {{}, ON} -// it++; -// EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_ON, -// it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(4, it->second[0].value.long_value); -// // Value for dimension, state key {{}, kStateUnknown} -// it++; -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(2, it->second[0].value.long_value); -// -// // Start dump report and check output. -// ProtoOutputStream output; -// std::set<string> strSet; -// valueProducer->onDumpReport(bucketStartTimeNs + 50, true /* include recent buckets */, true, -// NO_TIME_CONSTRAINTS, &strSet, &output); -// -// StatsLogReport report = outputStreamToProto(&output); -// EXPECT_TRUE(report.has_value_metrics()); -// EXPECT_EQ(3, report.value_metrics().data_size()); -// -// auto data = report.value_metrics().data(0); -// EXPECT_EQ(1, data.bucket_info_size()); -// EXPECT_EQ(2, report.value_metrics().data(0).bucket_info(0).values(0).value_long()); -// -// data = report.value_metrics().data(1); -// EXPECT_EQ(1, report.value_metrics().data(1).bucket_info_size()); -// EXPECT_EQ(13, report.value_metrics().data(1).bucket_info(0).values(0).value_long()); -// EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); -// EXPECT_TRUE(data.slice_by_state(0).has_value()); -// EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_ON, data.slice_by_state(0).value()); -// -// data = report.value_metrics().data(2); -// EXPECT_EQ(1, report.value_metrics().data(2).bucket_info_size()); -// EXPECT_EQ(12, report.value_metrics().data(2).bucket_info(0).values(0).value_long()); -// EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); -// EXPECT_TRUE(data.slice_by_state(0).has_value()); -// EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_OFF, data.slice_by_state(0).value()); -//} -// -///* -// * Test metric with sliced state with map -// * - Increasing values -// * - Using diff -// * - Second field is value field -// */ -// TEST(ValueMetricProducerTest, TestSlicedStateWithMap) { -// // Set up ValueMetricProducer. -// ValueMetric metric = -// ValueMetricProducerTestHelper::createMetricWithState("SCREEN_STATE_ONOFF"); -// sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); -// EXPECT_CALL(*pullerManager, Pull(tagId, _)) -// // ValueMetricProducer initialized. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs); -// event->write("field1"); -// event->write(3); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Screen state change to ON. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 5); -// event->write("field1"); -// event->write(5); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Screen state change to VR. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); -// event->write("field1"); -// event->write(9); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Screen state change to OFF. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 15); -// event->write("field1"); -// event->write(21); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Dump report requested. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 50); -// event->write("field1"); -// event->write(30); -// event->init(); -// data->push_back(event); -// return true; -// })); -// -// const StateMap& stateMap = CreateScreenStateOnOffMap(); -// const StateMap_StateGroup screenOnGroup = stateMap.group(0); -// const StateMap_StateGroup screenOffGroup = stateMap.group(1); -// -// unordered_map<int, unordered_map<int, int64_t>> stateGroupMap; -// for (auto group : stateMap.group()) { -// for (auto value : group.value()) { -// stateGroupMap[SCREEN_STATE_ATOM_ID][value] = group.group_id(); -// } -// } -// -// sp<ValueMetricProducer> valueProducer = -// ValueMetricProducerTestHelper::createValueProducerWithState( -// pullerManager, metric, {util::SCREEN_STATE_CHANGED}, stateGroupMap); -// -// // Set up StateManager and check that StateTrackers are initialized. -// StateManager::getInstance().clear(); -// StateManager::getInstance().registerListener(SCREEN_STATE_ATOM_ID, valueProducer); -// EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount()); -// EXPECT_EQ(1, StateManager::getInstance().getListenersCount(SCREEN_STATE_ATOM_ID)); -// -// // Bucket status after metric initialized. -// EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {} -// auto it = valueProducer->mCurrentSlicedBucket.begin(); -// auto itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(3, itBase->second[0].base.long_value); -// // Value for dimension, state key {{}, {}} -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Bucket status after screen state change kStateUnknown->ON. -// auto screenEvent = CreateScreenStateChangedEvent( -// android::view::DisplayStateEnum::DISPLAY_STATE_ON, bucketStartTimeNs + 5); -// StateManager::getInstance().onLogEvent(*screenEvent); -// EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {} -// it = valueProducer->mCurrentSlicedBucket.begin(); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(5, itBase->second[0].base.long_value); -// // Value for dimension, state key {{}, kStateUnknown} -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(2, it->second[0].value.long_value); -// -// // Bucket status after screen state change ON->VR (also ON). -// screenEvent = CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_VR, -// bucketStartTimeNs + 10); -// StateManager::getInstance().onLogEvent(*screenEvent); -// EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {} -// it = valueProducer->mCurrentSlicedBucket.begin(); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(9, itBase->second[0].base.long_value); -// // Value for dimension, state key {{}, ON GROUP} -// EXPECT_EQ(screenOnGroup.group_id(), -// it->first.getStateValuesKey().getValues()[0].mValue.long_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(4, it->second[0].value.long_value); -// // Value for dimension, state key {{}, kStateUnknown} -// it++; -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(2, it->second[0].value.long_value); -// -// // Bucket status after screen state change VR->OFF. -// screenEvent = -// CreateScreenStateChangedEvent(android::view::DisplayStateEnum::DISPLAY_STATE_OFF, -// bucketStartTimeNs + 15); -// StateManager::getInstance().onLogEvent(*screenEvent); -// EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {} -// it = valueProducer->mCurrentSlicedBucket.begin(); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(21, itBase->second[0].base.long_value); -// // Value for dimension, state key {{}, ON GROUP} -// EXPECT_EQ(screenOnGroup.group_id(), -// it->first.getStateValuesKey().getValues()[0].mValue.long_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(16, it->second[0].value.long_value); -// // Value for dimension, state key {{}, kStateUnknown} -// it++; -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(2, it->second[0].value.long_value); -// -// // Start dump report and check output. -// ProtoOutputStream output; -// std::set<string> strSet; -// valueProducer->onDumpReport(bucketStartTimeNs + 50, true /* include recent buckets */, true, -// NO_TIME_CONSTRAINTS, &strSet, &output); -// -// StatsLogReport report = outputStreamToProto(&output); -// EXPECT_TRUE(report.has_value_metrics()); -// EXPECT_EQ(3, report.value_metrics().data_size()); -// -// auto data = report.value_metrics().data(0); -// EXPECT_EQ(1, data.bucket_info_size()); -// EXPECT_EQ(2, report.value_metrics().data(0).bucket_info(0).values(0).value_long()); -// -// data = report.value_metrics().data(1); -// EXPECT_EQ(1, report.value_metrics().data(1).bucket_info_size()); -// EXPECT_EQ(16, report.value_metrics().data(1).bucket_info(0).values(0).value_long()); -// EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); -// EXPECT_TRUE(data.slice_by_state(0).has_group_id()); -// EXPECT_EQ(screenOnGroup.group_id(), data.slice_by_state(0).group_id()); -// -// data = report.value_metrics().data(2); -// EXPECT_EQ(1, report.value_metrics().data(2).bucket_info_size()); -// EXPECT_EQ(9, report.value_metrics().data(2).bucket_info(0).values(0).value_long()); -// EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); -// EXPECT_TRUE(data.slice_by_state(0).has_group_id()); -// EXPECT_EQ(screenOffGroup.group_id(), data.slice_by_state(0).group_id()); -//} -// -///* -// * Test metric that slices by state with a primary field and has dimensions -// * - Increasing values -// * - Using diff -// * - Second field is value field -// */ -// TEST(ValueMetricProducerTest, TestSlicedStateWithPrimaryField_WithDimensions) { -// // Set up ValueMetricProducer. -// ValueMetric metric = -// ValueMetricProducerTestHelper::createMetricWithState("UID_PROCESS_STATE"); -// metric.mutable_dimensions_in_what()->set_field(tagId); -// metric.mutable_dimensions_in_what()->add_child()->set_field(1); -// -// MetricStateLink* stateLink = metric.add_state_link(); -// stateLink->set_state_atom_id(UID_PROCESS_STATE_ATOM_ID); -// auto fieldsInWhat = stateLink->mutable_fields_in_what(); -// *fieldsInWhat = CreateDimensions(tagId, {1 /* uid */}); -// auto fieldsInState = stateLink->mutable_fields_in_state(); -// *fieldsInState = CreateDimensions(UID_PROCESS_STATE_ATOM_ID, {1 /* uid */}); -// -// sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); -// EXPECT_CALL(*pullerManager, Pull(tagId, _)) -// // ValueMetricProducer initialized. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs); -// event->write(2 /* uid */); -// event->write(7); -// event->init(); -// data->push_back(event); -// -// event = make_shared<LogEvent>(tagId, bucketStartTimeNs); -// event->write(1 /* uid */); -// event->write(3); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Uid 1 process state change from kStateUnknown -> Foreground -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 20); -// event->write(1 /* uid */); -// event->write(6); -// event->init(); -// data->push_back(event); -// -// // This event should be skipped. -// event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 20); -// event->write(2 /* uid */); -// event->write(8); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Uid 2 process state change from kStateUnknown -> Background -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 40); -// event->write(2 /* uid */); -// event->write(9); -// event->init(); -// data->push_back(event); -// -// // This event should be skipped. -// event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 40); -// event->write(1 /* uid */); -// event->write(12); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Uid 1 process state change from Foreground -> Background -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + -// 20); event->write(1 /* uid */); event->write(13); event->init(); -// data->push_back(event); -// -// // This event should be skipped. -// event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + 20); -// event->write(2 /* uid */); -// event->write(11); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Uid 1 process state change from Background -> Foreground -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + -// 40); event->write(1 /* uid */); event->write(17); event->init(); -// data->push_back(event); -// -// // This event should be skipped. -// event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + 40); -// event->write(2 /* uid */); -// event->write(15); -// event->init(); -// data->push_back(event); -// return true; -// })) -// // Dump report pull. -// .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { -// data->clear(); -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + -// 50); event->write(2 /* uid */); event->write(20); event->init(); -// data->push_back(event); -// -// event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + 50); -// event->write(1 /* uid */); -// event->write(21); -// event->init(); -// data->push_back(event); -// return true; -// })); -// -// sp<ValueMetricProducer> valueProducer = -// ValueMetricProducerTestHelper::createValueProducerWithState( -// pullerManager, metric, {UID_PROCESS_STATE_ATOM_ID}, {}); -// -// // Set up StateManager and check that StateTrackers are initialized. -// StateManager::getInstance().clear(); -// StateManager::getInstance().registerListener(UID_PROCESS_STATE_ATOM_ID, valueProducer); -// EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount()); -// EXPECT_EQ(1, StateManager::getInstance().getListenersCount(UID_PROCESS_STATE_ATOM_ID)); -// -// // Bucket status after metric initialized. -// EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {uid 1}. -// auto it = valueProducer->mCurrentSlicedBucket.begin(); -// EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// auto itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(3, itBase->second[0].base.long_value); -// // Value for dimension, state key {{uid 1}, kStateUnknown} -// // TODO(tsaichristine): test equality of state values key -// // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(false, it->second[0].hasValue); -// // Base for dimension key {uid 2} -// it++; -// EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(7, itBase->second[0].base.long_value); -// // Value for dimension, state key {{uid 2}, kStateUnknown} -// // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Bucket status after uid 1 process state change kStateUnknown -> Foreground. -// auto uidProcessEvent = CreateUidProcessStateChangedEvent( -// 1 /* uid */, android::app::PROCESS_STATE_IMPORTANT_FOREGROUND, bucketStartTimeNs + -// 20); -// StateManager::getInstance().onLogEvent(*uidProcessEvent); -// EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {uid 1}. -// it = valueProducer->mCurrentSlicedBucket.begin(); -// EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(6, itBase->second[0].base.long_value); -// // Value for key {uid 1, kStateUnknown}. -// // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(3, it->second[0].value.long_value); -// -// // Base for dimension key {uid 2} -// it++; -// EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(7, itBase->second[0].base.long_value); -// // Value for key {uid 2, kStateUnknown} -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Bucket status after uid 2 process state change kStateUnknown -> Background. -// uidProcessEvent = CreateUidProcessStateChangedEvent( -// 2 /* uid */, android::app::PROCESS_STATE_IMPORTANT_BACKGROUND, bucketStartTimeNs + -// 40); -// StateManager::getInstance().onLogEvent(*uidProcessEvent); -// EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); -// // Base for dimension key {uid 1}. -// it = valueProducer->mCurrentSlicedBucket.begin(); -// EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(6, itBase->second[0].base.long_value); -// // Value for key {uid 1, kStateUnknown}. -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(3, it->second[0].value.long_value); -// -// // Base for dimension key {uid 2} -// it++; -// EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(9, itBase->second[0].base.long_value); -// // Value for key {uid 2, kStateUnknown} -// // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(2, it->second[0].value.long_value); -// -// // Pull at end of first bucket. -// vector<shared_ptr<LogEvent>> allData; -// shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucket2StartTimeNs); -// event->write(1 /* uid */); -// event->write(10); -// event->init(); -// allData.push_back(event); -// -// event = make_shared<LogEvent>(tagId, bucket2StartTimeNs); -// event->write(2 /* uid */); -// event->write(15); -// event->init(); -// allData.push_back(event); -// -// valueProducer->onDataPulled(allData, /** succeeds */ true, bucket2StartTimeNs + 1); -// -// // Buckets flushed after end of first bucket. -// // None of the buckets should have a value. -// EXPECT_EQ(4UL, valueProducer->mCurrentSlicedBucket.size()); -// EXPECT_EQ(4UL, valueProducer->mPastBuckets.size()); -// EXPECT_EQ(2UL, valueProducer->mCurrentBaseInfo.size()); -// // Base for dimension key {uid 2}. -// it = valueProducer->mCurrentSlicedBucket.begin(); -// EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(15, itBase->second[0].base.long_value); -// // Value for key {uid 2, BACKGROUND}. -// EXPECT_EQ(1, it->first.getStateValuesKey().getValues().size()); -// EXPECT_EQ(1006, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Base for dimension key {uid 1} -// it++; -// EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(10, itBase->second[0].base.long_value); -// // Value for key {uid 1, kStateUnknown} -// EXPECT_EQ(0, it->first.getStateValuesKey().getValues().size()); -// // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Value for key {uid 1, FOREGROUND} -// it++; -// EXPECT_EQ(1, it->first.getStateValuesKey().getValues().size()); -// EXPECT_EQ(1005, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Value for key {uid 2, kStateUnknown} -// it++; -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Bucket status after uid 1 process state change from Foreground -> Background. -// uidProcessEvent = CreateUidProcessStateChangedEvent( -// 1 /* uid */, android::app::PROCESS_STATE_IMPORTANT_BACKGROUND, bucket2StartTimeNs + -// 20); -// StateManager::getInstance().onLogEvent(*uidProcessEvent); -// -// EXPECT_EQ(4UL, valueProducer->mCurrentSlicedBucket.size()); -// EXPECT_EQ(4UL, valueProducer->mPastBuckets.size()); -// EXPECT_EQ(2UL, valueProducer->mCurrentBaseInfo.size()); -// // Base for dimension key {uid 2}. -// it = valueProducer->mCurrentSlicedBucket.begin(); -// EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(15, itBase->second[0].base.long_value); -// // Value for key {uid 2, BACKGROUND}. -// EXPECT_EQ(false, it->second[0].hasValue); -// // Base for dimension key {uid 1} -// it++; -// EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(13, itBase->second[0].base.long_value); -// // Value for key {uid 1, kStateUnknown} -// EXPECT_EQ(false, it->second[0].hasValue); -// // Value for key {uid 1, FOREGROUND} -// it++; -// EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// EXPECT_EQ(1005, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(3, it->second[0].value.long_value); -// // Value for key {uid 2, kStateUnknown} -// it++; -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Bucket status after uid 1 process state change Background->Foreground. -// uidProcessEvent = CreateUidProcessStateChangedEvent( -// 1 /* uid */, android::app::PROCESS_STATE_IMPORTANT_FOREGROUND, bucket2StartTimeNs + -// 40); -// StateManager::getInstance().onLogEvent(*uidProcessEvent); -// -// EXPECT_EQ(5UL, valueProducer->mCurrentSlicedBucket.size()); -// EXPECT_EQ(2UL, valueProducer->mCurrentBaseInfo.size()); -// // Base for dimension key {uid 2} -// it = valueProducer->mCurrentSlicedBucket.begin(); -// EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(true, itBase->second[0].hasBase); -// EXPECT_EQ(15, itBase->second[0].base.long_value); -// EXPECT_EQ(false, it->second[0].hasValue); -// -// it++; -// EXPECT_EQ(false, it->second[0].hasValue); -// -// // Base for dimension key {uid 1} -// it++; -// EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); -// itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); -// EXPECT_EQ(17, itBase->second[0].base.long_value); -// // Value for key {uid 1, BACKGROUND} -// EXPECT_EQ(1006, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(4, it->second[0].value.long_value); -// // Value for key {uid 1, FOREGROUND} -// it++; -// EXPECT_EQ(1005, it->first.getStateValuesKey().getValues()[0].mValue.int_value); -// EXPECT_EQ(true, it->second[0].hasValue); -// EXPECT_EQ(3, it->second[0].value.long_value); -// -// // Start dump report and check output. -// ProtoOutputStream output; -// std::set<string> strSet; -// valueProducer->onDumpReport(bucket2StartTimeNs + 50, true /* include recent buckets */, true, -// NO_TIME_CONSTRAINTS, &strSet, &output); -// -// StatsLogReport report = outputStreamToProto(&output); -// EXPECT_TRUE(report.has_value_metrics()); -// EXPECT_EQ(5, report.value_metrics().data_size()); -// -// auto data = report.value_metrics().data(0); -// EXPECT_EQ(1, data.bucket_info_size()); -// EXPECT_EQ(4, report.value_metrics().data(0).bucket_info(0).values(0).value_long()); -// EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); -// EXPECT_TRUE(data.slice_by_state(0).has_value()); -// EXPECT_EQ(android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_BACKGROUND, -// data.slice_by_state(0).value()); -// -// data = report.value_metrics().data(1); -// EXPECT_EQ(1, report.value_metrics().data(1).bucket_info_size()); -// EXPECT_EQ(2, report.value_metrics().data(1).bucket_info(0).values(0).value_long()); -// -// data = report.value_metrics().data(2); -// EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); -// EXPECT_TRUE(data.slice_by_state(0).has_value()); -// EXPECT_EQ(android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_FOREGROUND, -// data.slice_by_state(0).value()); -// EXPECT_EQ(2, report.value_metrics().data(2).bucket_info_size()); -// EXPECT_EQ(4, report.value_metrics().data(2).bucket_info(0).values(0).value_long()); -// EXPECT_EQ(7, report.value_metrics().data(2).bucket_info(1).values(0).value_long()); -// -// data = report.value_metrics().data(3); -// EXPECT_EQ(1, report.value_metrics().data(3).bucket_info_size()); -// EXPECT_EQ(3, report.value_metrics().data(3).bucket_info(0).values(0).value_long()); -// -// data = report.value_metrics().data(4); -// EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); -// EXPECT_TRUE(data.slice_by_state(0).has_value()); -// EXPECT_EQ(android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_BACKGROUND, -// data.slice_by_state(0).value()); -// EXPECT_EQ(2, report.value_metrics().data(4).bucket_info_size()); -// EXPECT_EQ(6, report.value_metrics().data(4).bucket_info(0).values(0).value_long()); -// EXPECT_EQ(5, report.value_metrics().data(4).bucket_info(1).values(0).value_long()); -//} +/* + * Test that MULTIPLE_BUCKETS_SKIPPED dump reason is logged when a log event + * skips over more than one bucket. + */ +TEST(ValueMetricProducerTest_BucketDrop, TestInvalidBucketWhenMultipleBucketsSkipped) { + ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithCondition(); + + sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); + EXPECT_CALL(*pullerManager, Pull(tagId, _)) + // Condition change to true. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 10, 10)); + return true; + })) + // Dump report requested. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucket4StartTimeNs + 1000, 15)); + return true; + })); + + sp<ValueMetricProducer> valueProducer = + ValueMetricProducerTestHelper::createValueProducerWithCondition(pullerManager, metric); + + // Condition change event. + valueProducer->onConditionChanged(true, bucketStartTimeNs + 10); + + // Condition change event that skips forward by three buckets. + valueProducer->onConditionChanged(false, bucket4StartTimeNs + 10); + + // Check dump report. + ProtoOutputStream output; + std::set<string> strSet; + valueProducer->onDumpReport(bucket4StartTimeNs + 1000, true /* include recent buckets */, true, + NO_TIME_CONSTRAINTS /* dumpLatency */, &strSet, &output); + + StatsLogReport report = outputStreamToProto(&output); + EXPECT_TRUE(report.has_value_metrics()); + EXPECT_EQ(0, report.value_metrics().data_size()); + EXPECT_EQ(1, report.value_metrics().skipped_size()); + + EXPECT_EQ(NanoToMillis(bucketStartTimeNs), + report.value_metrics().skipped(0).start_bucket_elapsed_millis()); + EXPECT_EQ(NanoToMillis(bucket2StartTimeNs), + report.value_metrics().skipped(0).end_bucket_elapsed_millis()); + EXPECT_EQ(1, report.value_metrics().skipped(0).drop_event_size()); + + auto dropEvent = report.value_metrics().skipped(0).drop_event(0); + EXPECT_EQ(BucketDropReason::MULTIPLE_BUCKETS_SKIPPED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucket4StartTimeNs + 10), dropEvent.drop_time_millis()); +} + +/* + * Test that BUCKET_TOO_SMALL dump reason is logged when a flushed bucket size + * is smaller than the "min_bucket_size_nanos" specified in the metric config. + */ +TEST(ValueMetricProducerTest_BucketDrop, TestBucketDropWhenBucketTooSmall) { + ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithCondition(); + metric.set_min_bucket_size_nanos(10000000000); // 10 seconds + + sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); + EXPECT_CALL(*pullerManager, Pull(tagId, _)) + // Condition change to true. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 10, 10)); + return true; + })) + // Dump report requested. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back( + CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 9000000, 15)); + return true; + })); + + sp<ValueMetricProducer> valueProducer = + ValueMetricProducerTestHelper::createValueProducerWithCondition(pullerManager, metric); + + // Condition change event. + valueProducer->onConditionChanged(true, bucketStartTimeNs + 10); + + // Check dump report. + ProtoOutputStream output; + std::set<string> strSet; + int64_t dumpReportTimeNs = bucketStartTimeNs + 9000000; + valueProducer->onDumpReport(dumpReportTimeNs, true /* include recent buckets */, true, + NO_TIME_CONSTRAINTS /* dumpLatency */, &strSet, &output); + + StatsLogReport report = outputStreamToProto(&output); + EXPECT_TRUE(report.has_value_metrics()); + EXPECT_EQ(0, report.value_metrics().data_size()); + EXPECT_EQ(1, report.value_metrics().skipped_size()); + + EXPECT_EQ(NanoToMillis(bucketStartTimeNs), + report.value_metrics().skipped(0).start_bucket_elapsed_millis()); + EXPECT_EQ(NanoToMillis(dumpReportTimeNs), + report.value_metrics().skipped(0).end_bucket_elapsed_millis()); + EXPECT_EQ(1, report.value_metrics().skipped(0).drop_event_size()); + + auto dropEvent = report.value_metrics().skipped(0).drop_event(0); + EXPECT_EQ(BucketDropReason::BUCKET_TOO_SMALL, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(dumpReportTimeNs), dropEvent.drop_time_millis()); +} + +/* + * Test multiple bucket drop events in the same bucket. + */ +TEST(ValueMetricProducerTest_BucketDrop, TestMultipleBucketDropEvents) { + ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithCondition(); + + sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); + EXPECT_CALL(*pullerManager, Pull(tagId, _)) + // Condition change to true. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 10, 10)); + return true; + })); + + sp<ValueMetricProducer> valueProducer = + ValueMetricProducerTestHelper::createValueProducerWithNoInitialCondition(pullerManager, + metric); + + // Condition change event. + valueProducer->onConditionChanged(true, bucketStartTimeNs + 10); + + // Check dump report. + ProtoOutputStream output; + std::set<string> strSet; + int64_t dumpReportTimeNs = bucketStartTimeNs + 1000; + valueProducer->onDumpReport(dumpReportTimeNs, true /* include recent buckets */, true, + FAST /* dumpLatency */, &strSet, &output); + + StatsLogReport report = outputStreamToProto(&output); + EXPECT_TRUE(report.has_value_metrics()); + EXPECT_EQ(0, report.value_metrics().data_size()); + EXPECT_EQ(1, report.value_metrics().skipped_size()); + + EXPECT_EQ(NanoToMillis(bucketStartTimeNs), + report.value_metrics().skipped(0).start_bucket_elapsed_millis()); + EXPECT_EQ(NanoToMillis(dumpReportTimeNs), + report.value_metrics().skipped(0).end_bucket_elapsed_millis()); + EXPECT_EQ(2, report.value_metrics().skipped(0).drop_event_size()); + + auto dropEvent = report.value_metrics().skipped(0).drop_event(0); + EXPECT_EQ(BucketDropReason::CONDITION_UNKNOWN, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 10), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(1); + EXPECT_EQ(BucketDropReason::DUMP_REPORT_REQUESTED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(dumpReportTimeNs), dropEvent.drop_time_millis()); +} + +/* + * Test that the number of logged bucket drop events is capped at the maximum. + * The maximum is currently 10 and is set in MetricProducer::maxDropEventsReached(). + */ +TEST(ValueMetricProducerTest_BucketDrop, TestMaxBucketDropEvents) { + ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithCondition(); + + sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); + EXPECT_CALL(*pullerManager, Pull(tagId, _)) + // First condition change event. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + for (int i = 0; i < 2000; i++) { + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 1, i)); + } + return true; + })) + .WillOnce(Return(false)) + .WillOnce(Return(false)) + .WillOnce(Return(false)) + .WillOnce(Return(false)) + .WillOnce(Return(false)) + .WillOnce(Return(false)) + .WillOnce(Return(false)) + .WillOnce(Return(false)) + .WillOnce(Return(false)) + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 220, 10)); + return true; + })); + + sp<ValueMetricProducer> valueProducer = + ValueMetricProducerTestHelper::createValueProducerWithNoInitialCondition(pullerManager, + metric); + + // First condition change event causes guardrail to be reached. + valueProducer->onConditionChanged(true, bucketStartTimeNs + 10); + + // 2-10 condition change events result in failed pulls. + valueProducer->onConditionChanged(false, bucketStartTimeNs + 30); + valueProducer->onConditionChanged(true, bucketStartTimeNs + 50); + valueProducer->onConditionChanged(false, bucketStartTimeNs + 70); + valueProducer->onConditionChanged(true, bucketStartTimeNs + 90); + valueProducer->onConditionChanged(false, bucketStartTimeNs + 100); + valueProducer->onConditionChanged(true, bucketStartTimeNs + 150); + valueProducer->onConditionChanged(false, bucketStartTimeNs + 170); + valueProducer->onConditionChanged(true, bucketStartTimeNs + 190); + valueProducer->onConditionChanged(false, bucketStartTimeNs + 200); + + // Condition change event 11 + valueProducer->onConditionChanged(true, bucketStartTimeNs + 220); + + // Check dump report. + ProtoOutputStream output; + std::set<string> strSet; + int64_t dumpReportTimeNs = bucketStartTimeNs + 1000; + // Because we already have 10 dump events in the current bucket, + // this case should not be added to the list of dump events. + valueProducer->onDumpReport(bucketStartTimeNs + 1000, true /* include recent buckets */, true, + FAST /* dumpLatency */, &strSet, &output); + + StatsLogReport report = outputStreamToProto(&output); + EXPECT_TRUE(report.has_value_metrics()); + EXPECT_EQ(0, report.value_metrics().data_size()); + EXPECT_EQ(1, report.value_metrics().skipped_size()); + + EXPECT_EQ(NanoToMillis(bucketStartTimeNs), + report.value_metrics().skipped(0).start_bucket_elapsed_millis()); + EXPECT_EQ(NanoToMillis(dumpReportTimeNs), + report.value_metrics().skipped(0).end_bucket_elapsed_millis()); + EXPECT_EQ(10, report.value_metrics().skipped(0).drop_event_size()); + + auto dropEvent = report.value_metrics().skipped(0).drop_event(0); + EXPECT_EQ(BucketDropReason::CONDITION_UNKNOWN, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 10), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(1); + EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 30), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(2); + EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 50), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(3); + EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 70), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(4); + EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 90), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(5); + EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 100), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(6); + EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 150), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(7); + EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 170), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(8); + EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 190), dropEvent.drop_time_millis()); + + dropEvent = report.value_metrics().skipped(0).drop_event(9); + EXPECT_EQ(BucketDropReason::PULL_FAILED, dropEvent.drop_reason()); + EXPECT_EQ(NanoToMillis(bucketStartTimeNs + 200), dropEvent.drop_time_millis()); +} + +/* + * Test metric with a simple sliced state + * - Increasing values + * - Using diff + * - Second field is value field + */ +TEST(ValueMetricProducerTest, TestSlicedState) { + // Set up ValueMetricProducer. + ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithState("SCREEN_STATE"); + sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); + EXPECT_CALL(*pullerManager, Pull(tagId, _)) + // ValueMetricProducer initialized. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs, 3)); + return true; + })) + // Screen state change to ON. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 5, 5)); + return true; + })) + // Screen state change to OFF. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 10, 9)); + return true; + })) + // Screen state change to ON. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 15, 21)); + return true; + })) + // Dump report requested. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 50, 30)); + return true; + })); + + sp<ValueMetricProducer> valueProducer = + ValueMetricProducerTestHelper::createValueProducerWithState( + pullerManager, metric, {util::SCREEN_STATE_CHANGED}, {}); + + // Set up StateManager and check that StateTrackers are initialized. + StateManager::getInstance().clear(); + StateManager::getInstance().registerListener(SCREEN_STATE_ATOM_ID, valueProducer); + EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount()); + EXPECT_EQ(1, StateManager::getInstance().getListenersCount(SCREEN_STATE_ATOM_ID)); + + // Bucket status after metric initialized. + EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {} + auto it = valueProducer->mCurrentSlicedBucket.begin(); + auto itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(3, itBase->second[0].base.long_value); + // Value for dimension, state key {{}, kStateUnknown} + EXPECT_EQ(false, it->second[0].hasValue); + + // Bucket status after screen state change kStateUnknown->ON. + auto screenEvent = CreateScreenStateChangedEvent( + bucketStartTimeNs + 5, android::view::DisplayStateEnum::DISPLAY_STATE_ON); + StateManager::getInstance().onLogEvent(*screenEvent); + EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {} + it = valueProducer->mCurrentSlicedBucket.begin(); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(5, itBase->second[0].base.long_value); + // Value for dimension, state key {{}, kStateUnknown} + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(2, it->second[0].value.long_value); + + // Bucket status after screen state change ON->OFF. + screenEvent = CreateScreenStateChangedEvent(bucketStartTimeNs + 10, + android::view::DisplayStateEnum::DISPLAY_STATE_OFF); + StateManager::getInstance().onLogEvent(*screenEvent); + EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {} + it = valueProducer->mCurrentSlicedBucket.begin(); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(9, itBase->second[0].base.long_value); + // Value for dimension, state key {{}, ON} + EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_ON, + it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(4, it->second[0].value.long_value); + // Value for dimension, state key {{}, kStateUnknown} + it++; + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(2, it->second[0].value.long_value); + + // Bucket status after screen state change OFF->ON. + screenEvent = CreateScreenStateChangedEvent(bucketStartTimeNs + 15, + android::view::DisplayStateEnum::DISPLAY_STATE_ON); + StateManager::getInstance().onLogEvent(*screenEvent); + EXPECT_EQ(3UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {} + it = valueProducer->mCurrentSlicedBucket.begin(); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(21, itBase->second[0].base.long_value); + // Value for dimension, state key {{}, OFF} + EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_OFF, + it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(12, it->second[0].value.long_value); + // Value for dimension, state key {{}, ON} + it++; + EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_ON, + it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(4, it->second[0].value.long_value); + // Value for dimension, state key {{}, kStateUnknown} + it++; + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(2, it->second[0].value.long_value); + + // Start dump report and check output. + ProtoOutputStream output; + std::set<string> strSet; + valueProducer->onDumpReport(bucketStartTimeNs + 50, true /* include recent buckets */, true, + NO_TIME_CONSTRAINTS, &strSet, &output); + + StatsLogReport report = outputStreamToProto(&output); + EXPECT_TRUE(report.has_value_metrics()); + EXPECT_EQ(3, report.value_metrics().data_size()); + + auto data = report.value_metrics().data(0); + EXPECT_EQ(1, data.bucket_info_size()); + EXPECT_EQ(2, report.value_metrics().data(0).bucket_info(0).values(0).value_long()); + + data = report.value_metrics().data(1); + EXPECT_EQ(1, report.value_metrics().data(1).bucket_info_size()); + EXPECT_EQ(13, report.value_metrics().data(1).bucket_info(0).values(0).value_long()); + EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); + EXPECT_TRUE(data.slice_by_state(0).has_value()); + EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_ON, data.slice_by_state(0).value()); + + data = report.value_metrics().data(2); + EXPECT_EQ(1, report.value_metrics().data(2).bucket_info_size()); + EXPECT_EQ(12, report.value_metrics().data(2).bucket_info(0).values(0).value_long()); + EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); + EXPECT_TRUE(data.slice_by_state(0).has_value()); + EXPECT_EQ(android::view::DisplayStateEnum::DISPLAY_STATE_OFF, data.slice_by_state(0).value()); +} + +/* + * Test metric with sliced state with map + * - Increasing values + * - Using diff + * - Second field is value field + */ +TEST(ValueMetricProducerTest, TestSlicedStateWithMap) { + // Set up ValueMetricProducer. + ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithState("SCREEN_STATE_ONOFF"); + sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); + EXPECT_CALL(*pullerManager, Pull(tagId, _)) + // ValueMetricProducer initialized. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs, 3)); + return true; + })) + // Screen state change to ON. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 5, 5)); + return true; + })) + // Screen state change to VR. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 10, 9)); + return true; + })) + // Screen state change to OFF. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 15, 21)); + return true; + })) + // Dump report requested. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 50, 30)); + return true; + })); + + const StateMap& stateMap = CreateScreenStateOnOffMap(); + const StateMap_StateGroup screenOnGroup = stateMap.group(0); + const StateMap_StateGroup screenOffGroup = stateMap.group(1); + + unordered_map<int, unordered_map<int, int64_t>> stateGroupMap; + for (auto group : stateMap.group()) { + for (auto value : group.value()) { + stateGroupMap[SCREEN_STATE_ATOM_ID][value] = group.group_id(); + } + } + + sp<ValueMetricProducer> valueProducer = + ValueMetricProducerTestHelper::createValueProducerWithState( + pullerManager, metric, {util::SCREEN_STATE_CHANGED}, stateGroupMap); + + // Set up StateManager and check that StateTrackers are initialized. + StateManager::getInstance().clear(); + StateManager::getInstance().registerListener(SCREEN_STATE_ATOM_ID, valueProducer); + EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount()); + EXPECT_EQ(1, StateManager::getInstance().getListenersCount(SCREEN_STATE_ATOM_ID)); + + // Bucket status after metric initialized. + EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {} + auto it = valueProducer->mCurrentSlicedBucket.begin(); + auto itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(3, itBase->second[0].base.long_value); + // Value for dimension, state key {{}, {}} + EXPECT_EQ(false, it->second[0].hasValue); + + // Bucket status after screen state change kStateUnknown->ON. + auto screenEvent = CreateScreenStateChangedEvent( + bucketStartTimeNs + 5, android::view::DisplayStateEnum::DISPLAY_STATE_ON); + StateManager::getInstance().onLogEvent(*screenEvent); + EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {} + it = valueProducer->mCurrentSlicedBucket.begin(); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(5, itBase->second[0].base.long_value); + // Value for dimension, state key {{}, kStateUnknown} + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(2, it->second[0].value.long_value); + + // Bucket status after screen state change ON->VR (also ON). + screenEvent = CreateScreenStateChangedEvent(bucketStartTimeNs + 10, + android::view::DisplayStateEnum::DISPLAY_STATE_VR); + StateManager::getInstance().onLogEvent(*screenEvent); + EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {} + it = valueProducer->mCurrentSlicedBucket.begin(); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(9, itBase->second[0].base.long_value); + // Value for dimension, state key {{}, ON GROUP} + EXPECT_EQ(screenOnGroup.group_id(), + it->first.getStateValuesKey().getValues()[0].mValue.long_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(4, it->second[0].value.long_value); + // Value for dimension, state key {{}, kStateUnknown} + it++; + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(2, it->second[0].value.long_value); + + // Bucket status after screen state change VR->OFF. + screenEvent = CreateScreenStateChangedEvent(bucketStartTimeNs + 15, + android::view::DisplayStateEnum::DISPLAY_STATE_OFF); + StateManager::getInstance().onLogEvent(*screenEvent); + EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {} + it = valueProducer->mCurrentSlicedBucket.begin(); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(21, itBase->second[0].base.long_value); + // Value for dimension, state key {{}, ON GROUP} + EXPECT_EQ(screenOnGroup.group_id(), + it->first.getStateValuesKey().getValues()[0].mValue.long_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(16, it->second[0].value.long_value); + // Value for dimension, state key {{}, kStateUnknown} + it++; + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(2, it->second[0].value.long_value); + + // Start dump report and check output. + ProtoOutputStream output; + std::set<string> strSet; + valueProducer->onDumpReport(bucketStartTimeNs + 50, true /* include recent buckets */, true, + NO_TIME_CONSTRAINTS, &strSet, &output); + + StatsLogReport report = outputStreamToProto(&output); + EXPECT_TRUE(report.has_value_metrics()); + EXPECT_EQ(3, report.value_metrics().data_size()); + + auto data = report.value_metrics().data(0); + EXPECT_EQ(1, data.bucket_info_size()); + EXPECT_EQ(2, report.value_metrics().data(0).bucket_info(0).values(0).value_long()); + + data = report.value_metrics().data(1); + EXPECT_EQ(1, report.value_metrics().data(1).bucket_info_size()); + EXPECT_EQ(16, report.value_metrics().data(1).bucket_info(0).values(0).value_long()); + EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); + EXPECT_TRUE(data.slice_by_state(0).has_group_id()); + EXPECT_EQ(screenOnGroup.group_id(), data.slice_by_state(0).group_id()); + + data = report.value_metrics().data(2); + EXPECT_EQ(1, report.value_metrics().data(2).bucket_info_size()); + EXPECT_EQ(9, report.value_metrics().data(2).bucket_info(0).values(0).value_long()); + EXPECT_EQ(SCREEN_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); + EXPECT_TRUE(data.slice_by_state(0).has_group_id()); + EXPECT_EQ(screenOffGroup.group_id(), data.slice_by_state(0).group_id()); +} + +/* + * Test metric that slices by state with a primary field and has dimensions + * - Increasing values + * - Using diff + * - Second field is value field + */ +TEST(ValueMetricProducerTest, TestSlicedStateWithPrimaryField_WithDimensions) { + // Set up ValueMetricProducer. + ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithState("UID_PROCESS_STATE"); + metric.mutable_dimensions_in_what()->set_field(tagId); + metric.mutable_dimensions_in_what()->add_child()->set_field(1); + + MetricStateLink* stateLink = metric.add_state_link(); + stateLink->set_state_atom_id(UID_PROCESS_STATE_ATOM_ID); + auto fieldsInWhat = stateLink->mutable_fields_in_what(); + *fieldsInWhat = CreateDimensions(tagId, {1 /* uid */}); + auto fieldsInState = stateLink->mutable_fields_in_state(); + *fieldsInState = CreateDimensions(UID_PROCESS_STATE_ATOM_ID, {1 /* uid */}); + + sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); + EXPECT_CALL(*pullerManager, Pull(tagId, _)) + // ValueMetricProducer initialized. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back(CreateTwoValueLogEvent(tagId, bucketStartTimeNs, 2 /*uid*/, 7)); + data->push_back(CreateTwoValueLogEvent(tagId, bucketStartTimeNs, 1 /*uid*/, 3)); + return true; + })) + // Uid 1 process state change from kStateUnknown -> Foreground + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back( + CreateTwoValueLogEvent(tagId, bucketStartTimeNs + 20, 1 /*uid*/, 6)); + + // This event should be skipped. + data->push_back( + CreateTwoValueLogEvent(tagId, bucketStartTimeNs + 20, 2 /*uid*/, 8)); + return true; + })) + // Uid 2 process state change from kStateUnknown -> Background + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back( + CreateTwoValueLogEvent(tagId, bucketStartTimeNs + 40, 2 /*uid*/, 9)); + + // This event should be skipped. + data->push_back( + CreateTwoValueLogEvent(tagId, bucketStartTimeNs + 40, 1 /*uid*/, 12)); + return true; + })) + // Uid 1 process state change from Foreground -> Background + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back( + CreateTwoValueLogEvent(tagId, bucket2StartTimeNs + 20, 1 /*uid*/, 13)); + + // This event should be skipped. + data->push_back( + CreateTwoValueLogEvent(tagId, bucket2StartTimeNs + 20, 2 /*uid*/, 11)); + return true; + })) + // Uid 1 process state change from Background -> Foreground + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back( + CreateTwoValueLogEvent(tagId, bucket2StartTimeNs + 40, 1 /*uid*/, 17)); + + // This event should be skipped. + data->push_back( + CreateTwoValueLogEvent(tagId, bucket2StartTimeNs + 40, 2 /*uid */, 15)); + return true; + })) + // Dump report pull. + .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { + data->clear(); + data->push_back( + CreateTwoValueLogEvent(tagId, bucket2StartTimeNs + 50, 2 /*uid*/, 20)); + data->push_back( + CreateTwoValueLogEvent(tagId, bucket2StartTimeNs + 50, 1 /*uid*/, 21)); + return true; + })); + + sp<ValueMetricProducer> valueProducer = + ValueMetricProducerTestHelper::createValueProducerWithState( + pullerManager, metric, {UID_PROCESS_STATE_ATOM_ID}, {}); + + // Set up StateManager and check that StateTrackers are initialized. + StateManager::getInstance().clear(); + StateManager::getInstance().registerListener(UID_PROCESS_STATE_ATOM_ID, valueProducer); + EXPECT_EQ(1, StateManager::getInstance().getStateTrackersCount()); + EXPECT_EQ(1, StateManager::getInstance().getListenersCount(UID_PROCESS_STATE_ATOM_ID)); + + // Bucket status after metric initialized. + EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {uid 1}. + auto it = valueProducer->mCurrentSlicedBucket.begin(); + EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + auto itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(3, itBase->second[0].base.long_value); + // Value for dimension, state key {{uid 1}, kStateUnknown} + // TODO(tsaichristine): test equality of state values key + // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(false, it->second[0].hasValue); + // Base for dimension key {uid 2} + it++; + EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(7, itBase->second[0].base.long_value); + // Value for dimension, state key {{uid 2}, kStateUnknown} + // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(false, it->second[0].hasValue); + + // Bucket status after uid 1 process state change kStateUnknown -> Foreground. + auto uidProcessEvent = CreateUidProcessStateChangedEvent( + bucketStartTimeNs + 20, 1 /* uid */, android::app::PROCESS_STATE_IMPORTANT_FOREGROUND); + StateManager::getInstance().onLogEvent(*uidProcessEvent); + EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {uid 1}. + it = valueProducer->mCurrentSlicedBucket.begin(); + EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(6, itBase->second[0].base.long_value); + // Value for key {uid 1, kStateUnknown}. + // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(3, it->second[0].value.long_value); + + // Base for dimension key {uid 2} + it++; + EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(7, itBase->second[0].base.long_value); + // Value for key {uid 2, kStateUnknown} + EXPECT_EQ(false, it->second[0].hasValue); + + // Bucket status after uid 2 process state change kStateUnknown -> Background. + uidProcessEvent = CreateUidProcessStateChangedEvent( + bucketStartTimeNs + 40, 2 /* uid */, android::app::PROCESS_STATE_IMPORTANT_BACKGROUND); + StateManager::getInstance().onLogEvent(*uidProcessEvent); + EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); + // Base for dimension key {uid 1}. + it = valueProducer->mCurrentSlicedBucket.begin(); + EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(6, itBase->second[0].base.long_value); + // Value for key {uid 1, kStateUnknown}. + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(3, it->second[0].value.long_value); + + // Base for dimension key {uid 2} + it++; + EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(9, itBase->second[0].base.long_value); + // Value for key {uid 2, kStateUnknown} + // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(2, it->second[0].value.long_value); + + // Pull at end of first bucket. + vector<shared_ptr<LogEvent>> allData; + allData.push_back(CreateTwoValueLogEvent(tagId, bucket2StartTimeNs, 1 /*uid*/, 10)); + allData.push_back(CreateTwoValueLogEvent(tagId, bucket2StartTimeNs, 2 /*uid*/, 15)); + valueProducer->onDataPulled(allData, /** succeeds */ true, bucket2StartTimeNs + 1); + + // Buckets flushed after end of first bucket. + // None of the buckets should have a value. + EXPECT_EQ(4UL, valueProducer->mCurrentSlicedBucket.size()); + EXPECT_EQ(4UL, valueProducer->mPastBuckets.size()); + EXPECT_EQ(2UL, valueProducer->mCurrentBaseInfo.size()); + // Base for dimension key {uid 2}. + it = valueProducer->mCurrentSlicedBucket.begin(); + EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(15, itBase->second[0].base.long_value); + // Value for key {uid 2, BACKGROUND}. + EXPECT_EQ(1, it->first.getStateValuesKey().getValues().size()); + EXPECT_EQ(1006, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(false, it->second[0].hasValue); + + // Base for dimension key {uid 1} + it++; + EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(10, itBase->second[0].base.long_value); + // Value for key {uid 1, kStateUnknown} + EXPECT_EQ(0, it->first.getStateValuesKey().getValues().size()); + // EXPECT_EQ(-1, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(false, it->second[0].hasValue); + + // Value for key {uid 1, FOREGROUND} + it++; + EXPECT_EQ(1, it->first.getStateValuesKey().getValues().size()); + EXPECT_EQ(1005, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(false, it->second[0].hasValue); + + // Value for key {uid 2, kStateUnknown} + it++; + EXPECT_EQ(false, it->second[0].hasValue); + + // Bucket status after uid 1 process state change from Foreground -> Background. + uidProcessEvent = CreateUidProcessStateChangedEvent( + bucket2StartTimeNs + 20, 1 /* uid */, android::app::PROCESS_STATE_IMPORTANT_BACKGROUND); + StateManager::getInstance().onLogEvent(*uidProcessEvent); + + EXPECT_EQ(4UL, valueProducer->mCurrentSlicedBucket.size()); + EXPECT_EQ(4UL, valueProducer->mPastBuckets.size()); + EXPECT_EQ(2UL, valueProducer->mCurrentBaseInfo.size()); + // Base for dimension key {uid 2}. + it = valueProducer->mCurrentSlicedBucket.begin(); + EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(15, itBase->second[0].base.long_value); + // Value for key {uid 2, BACKGROUND}. + EXPECT_EQ(false, it->second[0].hasValue); + // Base for dimension key {uid 1} + it++; + EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(13, itBase->second[0].base.long_value); + // Value for key {uid 1, kStateUnknown} + EXPECT_EQ(false, it->second[0].hasValue); + // Value for key {uid 1, FOREGROUND} + it++; + EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + EXPECT_EQ(1005, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(3, it->second[0].value.long_value); + // Value for key {uid 2, kStateUnknown} + it++; + EXPECT_EQ(false, it->second[0].hasValue); + + // Bucket status after uid 1 process state change Background->Foreground. + uidProcessEvent = CreateUidProcessStateChangedEvent( + bucket2StartTimeNs + 40, 1 /* uid */, android::app::PROCESS_STATE_IMPORTANT_FOREGROUND); + StateManager::getInstance().onLogEvent(*uidProcessEvent); + + EXPECT_EQ(5UL, valueProducer->mCurrentSlicedBucket.size()); + EXPECT_EQ(2UL, valueProducer->mCurrentBaseInfo.size()); + // Base for dimension key {uid 2} + it = valueProducer->mCurrentSlicedBucket.begin(); + EXPECT_EQ(2, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(true, itBase->second[0].hasBase); + EXPECT_EQ(15, itBase->second[0].base.long_value); + EXPECT_EQ(false, it->second[0].hasValue); + + it++; + EXPECT_EQ(false, it->second[0].hasValue); + + // Base for dimension key {uid 1} + it++; + EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); + itBase = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat()); + EXPECT_EQ(17, itBase->second[0].base.long_value); + // Value for key {uid 1, BACKGROUND} + EXPECT_EQ(1006, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(4, it->second[0].value.long_value); + // Value for key {uid 1, FOREGROUND} + it++; + EXPECT_EQ(1005, it->first.getStateValuesKey().getValues()[0].mValue.int_value); + EXPECT_EQ(true, it->second[0].hasValue); + EXPECT_EQ(3, it->second[0].value.long_value); + + // Start dump report and check output. + ProtoOutputStream output; + std::set<string> strSet; + valueProducer->onDumpReport(bucket2StartTimeNs + 50, true /* include recent buckets */, true, + NO_TIME_CONSTRAINTS, &strSet, &output); + + StatsLogReport report = outputStreamToProto(&output); + EXPECT_TRUE(report.has_value_metrics()); + EXPECT_EQ(5, report.value_metrics().data_size()); + + auto data = report.value_metrics().data(0); + EXPECT_EQ(1, data.bucket_info_size()); + EXPECT_EQ(4, report.value_metrics().data(0).bucket_info(0).values(0).value_long()); + EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); + EXPECT_TRUE(data.slice_by_state(0).has_value()); + EXPECT_EQ(android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_BACKGROUND, + data.slice_by_state(0).value()); + + data = report.value_metrics().data(1); + EXPECT_EQ(1, report.value_metrics().data(1).bucket_info_size()); + EXPECT_EQ(2, report.value_metrics().data(1).bucket_info(0).values(0).value_long()); + + data = report.value_metrics().data(2); + EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); + EXPECT_TRUE(data.slice_by_state(0).has_value()); + EXPECT_EQ(android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_FOREGROUND, + data.slice_by_state(0).value()); + EXPECT_EQ(2, report.value_metrics().data(2).bucket_info_size()); + EXPECT_EQ(4, report.value_metrics().data(2).bucket_info(0).values(0).value_long()); + EXPECT_EQ(7, report.value_metrics().data(2).bucket_info(1).values(0).value_long()); + + data = report.value_metrics().data(3); + EXPECT_EQ(1, report.value_metrics().data(3).bucket_info_size()); + EXPECT_EQ(3, report.value_metrics().data(3).bucket_info(0).values(0).value_long()); + + data = report.value_metrics().data(4); + EXPECT_EQ(UID_PROCESS_STATE_ATOM_ID, data.slice_by_state(0).atom_id()); + EXPECT_TRUE(data.slice_by_state(0).has_value()); + EXPECT_EQ(android::app::ProcessStateEnum::PROCESS_STATE_IMPORTANT_BACKGROUND, + data.slice_by_state(0).value()); + EXPECT_EQ(2, report.value_metrics().data(4).bucket_info_size()); + EXPECT_EQ(6, report.value_metrics().data(4).bucket_info(0).values(0).value_long()); + EXPECT_EQ(5, report.value_metrics().data(4).bucket_info(1).values(0).value_long()); +} } // namespace statsd } // namespace os diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index e7036bb7f374..f3759fd611df 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -33,7 +33,6 @@ import android.graphics.ColorSpace; import android.graphics.ParcelableColorSpace; import android.graphics.Region; import android.hardware.HardwareBuffer; -import android.os.Binder; import android.os.Build; import android.os.Handler; import android.os.IBinder; @@ -576,6 +575,46 @@ public abstract class AccessibilityService extends Service { public static final int SHOW_MODE_HARD_KEYBOARD_OVERRIDDEN = 0x40000000; /** + * Annotations for error codes of taking screenshot. + * @hide + */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(prefix = { "TAKE_SCREENSHOT_" }, value = { + ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR, + ERROR_TAKE_SCREENSHOT_NO_ACCESSIBILITY_ACCESS, + ERROR_TAKE_SCREENSHOT_INTERVAL_TIME_SHORT, + ERROR_TAKE_SCREENSHOT_INVALID_DISPLAY + }) + public @interface ScreenshotErrorCode {} + + /** + * The status of taking screenshot is success. + * @hide + */ + public static final int TAKE_SCREENSHOT_SUCCESS = 0; + + /** + * The status of taking screenshot is failure and the reason is internal error. + */ + public static final int ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR = 1; + + /** + * The status of taking screenshot is failure and the reason is no accessibility access. + */ + public static final int ERROR_TAKE_SCREENSHOT_NO_ACCESSIBILITY_ACCESS = 2; + + /** + * The status of taking screenshot is failure and the reason is that too little time has + * elapsed since the last screenshot. + */ + public static final int ERROR_TAKE_SCREENSHOT_INTERVAL_TIME_SHORT = 3; + + /** + * The status of taking screenshot is failure and the reason is invalid display Id. + */ + public static final int ERROR_TAKE_SCREENSHOT_INVALID_DISPLAY = 4; + + /** * The interval time of calling * {@link AccessibilityService#takeScreenshot(int, Executor, Consumer)} API. * @hide @@ -584,6 +623,10 @@ public abstract class AccessibilityService extends Service { public static final int ACCESSIBILITY_TAKE_SCREENSHOT_REQUEST_INTERVAL_TIMES_MS = 1000; /** @hide */ + public static final String KEY_ACCESSIBILITY_SCREENSHOT_STATUS = + "screenshot_status"; + + /** @hide */ public static final String KEY_ACCESSIBILITY_SCREENSHOT_HARDWAREBUFFER = "screenshot_hardwareBuffer"; @@ -1945,14 +1988,13 @@ public abstract class AccessibilityService extends Service { * @param displayId The logic display id, must be {@link Display#DEFAULT_DISPLAY} for * default display. * @param executor Executor on which to run the callback. - * @param callback The callback invoked when the taking screenshot is done. + * @param callback The callback invoked when taking screenshot has succeeded or failed. + * See {@link TakeScreenshotCallback} for details. * - * @return {@code true} if the taking screenshot accepted, {@code false} if too little time - * has elapsed since the last screenshot, invalid display or internal errors. * @throws IllegalArgumentException if displayId is not {@link Display#DEFAULT_DISPLAY}. */ - public boolean takeScreenshot(int displayId, @NonNull @CallbackExecutor Executor executor, - @NonNull Consumer<ScreenshotResult> callback) { + public void takeScreenshot(int displayId, @NonNull @CallbackExecutor Executor executor, + @NonNull TakeScreenshotCallback callback) { Preconditions.checkNotNull(executor, "executor cannot be null"); Preconditions.checkNotNull(callback, "callback cannot be null"); @@ -1964,18 +2006,24 @@ public abstract class AccessibilityService extends Service { AccessibilityInteractionClient.getInstance().getConnection( mConnectionId); if (connection == null) { - return false; + sendScreenshotFailure(ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR, executor, callback); + return; } try { - return connection.takeScreenshot(displayId, new RemoteCallback((result) -> { + connection.takeScreenshot(displayId, new RemoteCallback((result) -> { + final int status = result.getInt(KEY_ACCESSIBILITY_SCREENSHOT_STATUS); + if (status != TAKE_SCREENSHOT_SUCCESS) { + sendScreenshotFailure(status, executor, callback); + return; + } final HardwareBuffer hardwareBuffer = result.getParcelable(KEY_ACCESSIBILITY_SCREENSHOT_HARDWAREBUFFER); final ParcelableColorSpace colorSpace = result.getParcelable(KEY_ACCESSIBILITY_SCREENSHOT_COLORSPACE); - ScreenshotResult screenshot = new ScreenshotResult(hardwareBuffer, + final ScreenshotResult screenshot = new ScreenshotResult(hardwareBuffer, colorSpace.getColorSpace(), result.getLong(KEY_ACCESSIBILITY_SCREENSHOT_TIMESTAMP)); - sendScreenshotResult(executor, callback, screenshot); + sendScreenshotSuccess(screenshot, executor, callback); })); } catch (RemoteException re) { throw new RuntimeException(re); @@ -2374,15 +2422,32 @@ public abstract class AccessibilityService extends Service { } } - private void sendScreenshotResult(Executor executor, Consumer<ScreenshotResult> callback, - ScreenshotResult screenshot) { - final ScreenshotResult result = screenshot; - final long identity = Binder.clearCallingIdentity(); - try { - executor.execute(() -> callback.accept(result)); - } finally { - Binder.restoreCallingIdentity(identity); - } + private void sendScreenshotSuccess(ScreenshotResult screenshot, Executor executor, + TakeScreenshotCallback callback) { + executor.execute(() -> callback.onSuccess(screenshot)); + } + + private void sendScreenshotFailure(@ScreenshotErrorCode int errorCode, Executor executor, + TakeScreenshotCallback callback) { + executor.execute(() -> callback.onFailure(errorCode)); + } + + /** + * Interface used to report status of taking screenshot. + */ + public interface TakeScreenshotCallback { + /** Called when taking screenshot has completed successfully. + * + * @param screenshot The content of screenshot. + */ + void onSuccess(@NonNull ScreenshotResult screenshot); + + /** Called when taking screenshot has failed. {@code errorCode} will identify the + * reason of failure. + * + * @param errorCode The error code of this operation. + */ + void onFailure(@ScreenshotErrorCode int errorCode); } /** diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl index 1b7b4af34a94..0b3b9b2ecae1 100644 --- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl +++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl @@ -110,7 +110,7 @@ interface IAccessibilityServiceConnection { int getWindowIdForLeashToken(IBinder token); - boolean takeScreenshot(int displayId, in RemoteCallback callback); + void takeScreenshot(int displayId, in RemoteCallback callback); void setGestureDetectionPassthroughRegion(int displayId, in Region region); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 37f1a6559bfe..24af5aff67ea 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -11496,7 +11496,11 @@ public class DevicePolicyManager { /** * Deprecated. Use {@code markProfileOwnerOnOrganizationOwnedDevice} instead. - * Throws UnsupportedOperationException when called. + * When called by an app targeting SDK level {@link android.os.Build.VERSION_CODES#Q} or + * below, will behave the same as {@link #markProfileOwnerOnOrganizationOwnedDevice}. + * + * When called by an app targeting SDK level {@link android.os.Build.VERSION_CODES#R} + * or above, will throw an UnsupportedOperationException when called. * * @deprecated Use {@link #markProfileOwnerOnOrganizationOwnedDevice} instead. * @@ -11507,9 +11511,14 @@ public class DevicePolicyManager { @RequiresPermission(value = android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional = true) public void setProfileOwnerCanAccessDeviceIds(@NonNull ComponentName who) { - throw new UnsupportedOperationException( - "This method is deprecated. use markProfileOwnerOnOrganizationOwnedDevice instead" - + "."); + ApplicationInfo ai = mContext.getApplicationInfo(); + if (ai.targetSdkVersion > Build.VERSION_CODES.Q) { + throw new UnsupportedOperationException( + "This method is deprecated. use markProfileOwnerOnOrganizationOwnedDevice" + + " instead."); + } else { + markProfileOwnerOnOrganizationOwnedDevice(who); + } } /** diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 6e5f914c3596..eab7a0394948 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -231,6 +231,13 @@ public final class BluetoothDevice implements Parcelable { public static final int BATTERY_LEVEL_UNKNOWN = -1; /** + * Used as an error value for {@link #getBatteryLevel()} to represent bluetooth is off + * + * @hide + */ + public static final int BATTERY_LEVEL_BLUETOOTH_OFF = -100; + + /** * Used as a Parcelable {@link BluetoothDevice} extra field in every intent * broadcast by this class. It contains the {@link BluetoothDevice} that * the intent applies to. @@ -1112,9 +1119,9 @@ public final class BluetoothDevice implements Parcelable { /** * Get the most recent identified battery level of this Bluetooth device * - * @return Battery level in percents from 0 to 100, or {@link #BATTERY_LEVEL_UNKNOWN} if - * Bluetooth is disabled, or device is disconnected, or does not have any battery reporting - * service, or return value is invalid + * @return Battery level in percents from 0 to 100, {@link #BATTERY_LEVEL_BLUETOOTH_OFF} if + * Bluetooth is disabled or {@link #BATTERY_LEVEL_UNKNOWN} if device is disconnected, or does + * not have any battery reporting service, or return value is invalid * @hide */ @SystemApi @@ -1123,7 +1130,7 @@ public final class BluetoothDevice implements Parcelable { final IBluetooth service = sService; if (service == null) { Log.e(TAG, "Bluetooth disabled. Cannot get remote device battery level"); - return BATTERY_LEVEL_UNKNOWN; + return BATTERY_LEVEL_BLUETOOTH_OFF; } try { return service.getBatteryLevel(this); @@ -1727,7 +1734,9 @@ public final class BluetoothDevice implements Parcelable { /** * Sets whether the message access is allowed to this device. * - * @param value is the value we are setting the message access permission to + * @param value Can be {@link #ACCESS_UNKNOWN} if the device is unbonded, + * {@link #ACCESS_ALLOWED} if the permission is being granted, or {@link #ACCESS_REJECTED} if + * the permission is not being granted. * @return Whether the value has been successfully set. * @hide */ @@ -1774,8 +1783,9 @@ public final class BluetoothDevice implements Parcelable { /** * Sets whether the Sim access is allowed to this device. * - * @param value Can be {@link #ACCESS_UNKNOWN}, {@link #ACCESS_ALLOWED} or {@link - * #ACCESS_REJECTED}. + * @param value Can be {@link #ACCESS_UNKNOWN} if the device is unbonded, + * {@link #ACCESS_ALLOWED} if the permission is being granted, or {@link #ACCESS_REJECTED} if + * the permission is not being granted. * @return Whether the value has been successfully set. * @hide */ diff --git a/core/java/android/bluetooth/BluetoothPan.java b/core/java/android/bluetooth/BluetoothPan.java index ec63fd058b16..7af770e69efe 100644 --- a/core/java/android/bluetooth/BluetoothPan.java +++ b/core/java/android/bluetooth/BluetoothPan.java @@ -174,8 +174,9 @@ public final class BluetoothPan implements BluetoothProfile, AutoCloseable { /** * Closes the connection to the service and unregisters callbacks + * + * @hide */ - @RequiresPermission(Manifest.permission.BLUETOOTH) public void close() { if (VDBG) log("close()"); mProfileConnector.disconnect(); @@ -185,7 +186,7 @@ public final class BluetoothPan implements BluetoothProfile, AutoCloseable { return mProfileConnector.getService(); } - @RequiresPermission(Manifest.permission.BLUETOOTH) + /** @hide */ protected void finalize() { if (mCloseGuard != null) { mCloseGuard.warnIfOpen(); @@ -280,7 +281,7 @@ public final class BluetoothPan implements BluetoothProfile, AutoCloseable { * @hide */ @SystemApi - @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) + @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull BluetoothDevice device, @ConnectionPolicy int connectionPolicy) { if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")"); @@ -304,8 +305,11 @@ public final class BluetoothPan implements BluetoothProfile, AutoCloseable { /** * {@inheritDoc} + * @hide */ + @SystemApi @Override + @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public @NonNull List<BluetoothDevice> getConnectedDevices() { if (VDBG) log("getConnectedDevices()"); final IBluetoothPan service = getService(); @@ -344,9 +348,11 @@ public final class BluetoothPan implements BluetoothProfile, AutoCloseable { /** * {@inheritDoc} + * @hide */ + @SystemApi @Override - @RequiresPermission(Manifest.permission.BLUETOOTH) + @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionState(@Nullable BluetoothDevice device) { if (VDBG) log("getState(" + device + ")"); final IBluetoothPan service = getService(); @@ -366,8 +372,10 @@ public final class BluetoothPan implements BluetoothProfile, AutoCloseable { * Turns on/off bluetooth tethering * * @param value is whether to enable or disable bluetooth tethering + * @hide */ - @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) + @SystemApi + @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public void setBluetoothTethering(boolean value) { String pkgName = mContext.getOpPackageName(); if (DBG) log("setBluetoothTethering(" + value + "), calling package:" + pkgName); @@ -385,8 +393,10 @@ public final class BluetoothPan implements BluetoothProfile, AutoCloseable { * Determines whether tethering is enabled * * @return true if tethering is on, false if not or some error occurred + * @hide */ - @RequiresPermission(Manifest.permission.BLUETOOTH) + @SystemApi + @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isTetheringOn() { if (VDBG) log("isTetheringOn()"); final IBluetoothPan service = getService(); diff --git a/core/java/android/hardware/input/InputManagerInternal.java b/core/java/android/hardware/input/InputManagerInternal.java index d8da548d9bd3..f6cd726dda4a 100644 --- a/core/java/android/hardware/input/InputManagerInternal.java +++ b/core/java/android/hardware/input/InputManagerInternal.java @@ -16,7 +16,9 @@ package android.hardware.input; +import android.annotation.NonNull; import android.hardware.display.DisplayViewport; +import android.os.IBinder; import android.view.InputEvent; import java.util.List; @@ -59,4 +61,21 @@ public abstract class InputManagerInternal { * Set whether the input stack should deliver pulse gesture events when the device is asleep. */ public abstract void setPulseGestureEnabled(boolean enabled); + + /** + * Atomically transfers touch focus from one window to another as identified by + * their input channels. It is possible for multiple windows to have + * touch focus if they support split touch dispatch + * {@link android.view.WindowManager.LayoutParams#FLAG_SPLIT_TOUCH} but this + * method only transfers touch focus of the specified window without affecting + * other windows that may also have touch focus at the same time. + * + * @param fromChannelToken The channel token of a window that currently has touch focus. + * @param toChannelToken The channel token of the window that should receive touch focus in + * place of the first. + * @return {@code true} if the transfer was successful. {@code false} if the window with the + * specified channel did not actually have touch focus at the time of the request. + */ + public abstract boolean transferTouchFocus(@NonNull IBinder fromChannelToken, + @NonNull IBinder toChannelToken); } diff --git a/core/java/android/net/InvalidPacketException.java b/core/java/android/net/InvalidPacketException.java index 909998d4562c..b3b0f11a776b 100644 --- a/core/java/android/net/InvalidPacketException.java +++ b/core/java/android/net/InvalidPacketException.java @@ -28,7 +28,7 @@ import java.lang.annotation.RetentionPolicy; */ @SystemApi public class InvalidPacketException extends Exception { - public final int error; + private final int mError; // Must match SocketKeepalive#ERROR_INVALID_IP_ADDRESS. /** Invalid IP address. */ @@ -56,6 +56,11 @@ public class InvalidPacketException extends Exception { * See the error code for details. */ public InvalidPacketException(@ErrorCode final int error) { - this.error = error; + this.mError = error; + } + + /** Get error code. */ + public int getError() { + return mError; } } diff --git a/core/java/android/net/KeepalivePacketData.java b/core/java/android/net/KeepalivePacketData.java index 6c0ba2f63a80..e21cb44f72d8 100644 --- a/core/java/android/net/KeepalivePacketData.java +++ b/core/java/android/net/KeepalivePacketData.java @@ -19,6 +19,7 @@ package android.net; import static android.net.InvalidPacketException.ERROR_INVALID_IP_ADDRESS; import static android.net.InvalidPacketException.ERROR_INVALID_PORT; +import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; import android.net.util.IpUtils; @@ -37,17 +38,17 @@ public class KeepalivePacketData { /** Source IP address */ @NonNull - public final InetAddress srcAddress; + private final InetAddress mSrcAddress; /** Destination IP address */ @NonNull - public final InetAddress dstAddress; + private final InetAddress mDstAddress; /** Source port */ - public final int srcPort; + private final int mSrcPort; /** Destination port */ - public final int dstPort; + private final int mDstPort; /** Packet data. A raw byte string of packet data, not including the link-layer header. */ private final byte[] mPacket; @@ -60,13 +61,14 @@ public class KeepalivePacketData { /** * A holding class for data necessary to build a keepalive packet. */ - protected KeepalivePacketData(@NonNull InetAddress srcAddress, int srcPort, - @NonNull InetAddress dstAddress, int dstPort, - @NonNull byte[] data) throws InvalidPacketException { - this.srcAddress = srcAddress; - this.dstAddress = dstAddress; - this.srcPort = srcPort; - this.dstPort = dstPort; + protected KeepalivePacketData(@NonNull InetAddress srcAddress, + @IntRange(from = 0, to = 65535) int srcPort, @NonNull InetAddress dstAddress, + @IntRange(from = 0, to = 65535) int dstPort, + @NonNull byte[] data) throws InvalidPacketException { + this.mSrcAddress = srcAddress; + this.mDstAddress = dstAddress; + this.mSrcPort = srcPort; + this.mDstPort = dstPort; this.mPacket = data; // Check we have two IP addresses of the same family. @@ -83,6 +85,31 @@ public class KeepalivePacketData { } } + /** Get source IP address. */ + @NonNull + public InetAddress getSrcAddress() { + return mSrcAddress; + } + + /** Get destination IP address. */ + @NonNull + public InetAddress getDstAddress() { + return mDstAddress; + } + + /** Get source port number. */ + public int getSrcPort() { + return mSrcPort; + } + + /** Get destination port number. */ + public int getDstPort() { + return mDstPort; + } + + /** + * Returns a byte array of the given packet data. + */ @NonNull public byte[] getPacket() { return mPacket.clone(); diff --git a/core/java/android/net/NattKeepalivePacketData.java b/core/java/android/net/NattKeepalivePacketData.java index 29da4952daa5..22288b6205d7 100644 --- a/core/java/android/net/NattKeepalivePacketData.java +++ b/core/java/android/net/NattKeepalivePacketData.java @@ -94,10 +94,10 @@ public final class NattKeepalivePacketData extends KeepalivePacketData implement /** Write to parcel */ public void writeToParcel(@NonNull Parcel out, int flags) { - out.writeString(srcAddress.getHostAddress()); - out.writeString(dstAddress.getHostAddress()); - out.writeInt(srcPort); - out.writeInt(dstPort); + out.writeString(getSrcAddress().getHostAddress()); + out.writeString(getDstAddress().getHostAddress()); + out.writeInt(getSrcPort()); + out.writeInt(getDstPort()); } /** Parcelable Creator */ @@ -115,7 +115,7 @@ public final class NattKeepalivePacketData extends KeepalivePacketData implement dstAddress, dstPort); } catch (InvalidPacketException e) { throw new IllegalArgumentException( - "Invalid NAT-T keepalive data: " + e.error); + "Invalid NAT-T keepalive data: " + e.getError()); } } @@ -128,14 +128,16 @@ public final class NattKeepalivePacketData extends KeepalivePacketData implement public boolean equals(@Nullable final Object o) { if (!(o instanceof NattKeepalivePacketData)) return false; final NattKeepalivePacketData other = (NattKeepalivePacketData) o; - return this.srcAddress.equals(other.srcAddress) - && this.dstAddress.equals(other.dstAddress) - && this.srcPort == other.srcPort - && this.dstPort == other.dstPort; + final InetAddress srcAddress = getSrcAddress(); + final InetAddress dstAddress = getDstAddress(); + return srcAddress.equals(other.getSrcAddress()) + && dstAddress.equals(other.getDstAddress()) + && getSrcPort() == other.getSrcPort() + && getDstPort() == other.getDstPort(); } @Override public int hashCode() { - return Objects.hash(srcAddress, dstAddress, srcPort, dstPort); + return Objects.hash(getSrcAddress(), getDstAddress(), getSrcPort(), getDstPort()); } } diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 6f5471baa7ab..f807a4968d72 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -64,7 +64,7 @@ public class Network implements Parcelable { * The unique id of the network. * @hide */ - @SystemApi + @UnsupportedAppUsage public final int netId; // Objects used to perform per-network operations such as getSocketFactory @@ -170,6 +170,17 @@ public class Network implements Parcelable { } /** + * Get the unique id of the network. + * + * @hide + */ + @TestApi + @SystemApi + public int getNetId() { + return netId; + } + + /** * Returns a netid marked with the Private DNS bypass flag. * * This flag must be kept in sync with the NETID_USE_LOCAL_NAMESERVERS flag diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 7d8df6a8ffb9..fcfcebdf0862 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -19,6 +19,7 @@ package android.net; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; @@ -32,6 +33,7 @@ import android.util.ArraySet; import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.ArrayUtils; import com.android.internal.util.BitUtils; import com.android.internal.util.Preconditions; @@ -86,6 +88,7 @@ public final class NetworkCapabilities implements Parcelable { /** * Completely clears the contents of this object, removing even the capabilities that are set * by default when the object is constructed. + * @hide */ public void clearAll() { mNetworkCapabilities = mTransportTypes = mUnwantedNetworkCapabilities = 0; @@ -413,11 +416,12 @@ public final class NetworkCapabilities implements Parcelable { /** * Adds the given capability to this {@code NetworkCapability} instance. - * Multiple capabilities may be applied sequentially. Note that when searching - * for a network to satisfy a request, all capabilities requested must be satisfied. + * Note that when searching for a network to satisfy a request, all capabilities + * requested must be satisfied. * * @param capability the capability to be added. * @return This NetworkCapabilities instance, to facilitate chaining. + * @hide */ public @NonNull NetworkCapabilities addCapability(@NetCapability int capability) { // If the given capability was previously added to the list of unwanted capabilities @@ -432,9 +436,9 @@ public final class NetworkCapabilities implements Parcelable { /** * Adds the given capability to the list of unwanted capabilities of this - * {@code NetworkCapability} instance. Multiple unwanted capabilities may be applied - * sequentially. Note that when searching for a network to satisfy a request, the network - * must not contain any capability from unwanted capability list. + * {@code NetworkCapability} instance. Note that when searching for a network to + * satisfy a request, the network must not contain any capability from unwanted capability + * list. * <p> * If the capability was previously added to the list of required capabilities (for * example, it was there by default or added using {@link #addCapability(int)} method), then @@ -454,6 +458,7 @@ public final class NetworkCapabilities implements Parcelable { * * @param capability the capability to be removed. * @return This NetworkCapabilities instance, to facilitate chaining. + * @hide */ public @NonNull NetworkCapabilities removeCapability(@NetCapability int capability) { // Note that this method removes capabilities that were added via addCapability(int), @@ -468,7 +473,7 @@ public final class NetworkCapabilities implements Parcelable { /** * Sets (or clears) the given capability on this {@link NetworkCapabilities} * instance. - * + * @hide */ public @NonNull NetworkCapabilities setCapability(@NetCapability int capability, boolean value) { @@ -728,7 +733,7 @@ public final class NetworkCapabilities implements Parcelable { /** * Adds the given transport type to this {@code NetworkCapability} instance. - * Multiple transports may be applied sequentially. Note that when searching + * Multiple transports may be applied. Note that when searching * for a network to satisfy a request, any listed in the request will satisfy the request. * For example {@code TRANSPORT_WIFI} and {@code TRANSPORT_ETHERNET} added to a * {@code NetworkCapabilities} would cause either a Wi-Fi network or an Ethernet network @@ -737,6 +742,7 @@ public final class NetworkCapabilities implements Parcelable { * * @param transportType the transport type to be added. * @return This NetworkCapabilities instance, to facilitate chaining. + * @hide */ public @NonNull NetworkCapabilities addTransportType(@Transport int transportType) { checkValidTransportType(transportType); @@ -849,6 +855,7 @@ public final class NetworkCapabilities implements Parcelable { /** * Set the UID of the owner app. + * @hide */ public @NonNull NetworkCapabilities setOwnerUid(final int uid) { mOwnerUid = uid; @@ -866,6 +873,8 @@ public final class NetworkCapabilities implements Parcelable { * <li>The user's location toggle is on * </ol> * + * Instances of NetworkCapabilities sent to apps without the appropriate permissions will + * have this field cleared out. */ public int getOwnerUid() { return mOwnerUid; @@ -904,7 +913,6 @@ public final class NetworkCapabilities implements Parcelable { * @hide */ @NonNull - @SystemApi public NetworkCapabilities setAdministratorUids(@NonNull final int[] administratorUids) { mAdministratorUids = Arrays.copyOf(administratorUids, administratorUids.length); return this; @@ -918,6 +926,7 @@ public final class NetworkCapabilities implements Parcelable { */ @NonNull @SystemApi + @TestApi public int[] getAdministratorUids() { return Arrays.copyOf(mAdministratorUids, mAdministratorUids.length); } @@ -940,15 +949,10 @@ public final class NetworkCapabilities implements Parcelable { * Sets the upstream bandwidth for this network in Kbps. This always only refers to * the estimated first hop transport bandwidth. * <p> - * Note that when used to request a network, this specifies the minimum acceptable. - * When received as the state of an existing network this specifies the typical - * first hop bandwidth expected. This is never measured, but rather is inferred - * from technology type and other link parameters. It could be used to differentiate - * between very slow 1xRTT cellular links and other faster networks or even between - * 802.11b vs 802.11AC wifi technologies. It should not be used to differentiate between - * fast backhauls and slow backhauls. + * {@see Builder#setLinkUpstreamBandwidthKbps} * * @param upKbps the estimated first hop upstream (device to network) bandwidth. + * @hide */ public @NonNull NetworkCapabilities setLinkUpstreamBandwidthKbps(int upKbps) { mLinkUpBandwidthKbps = upKbps; @@ -969,15 +973,10 @@ public final class NetworkCapabilities implements Parcelable { * Sets the downstream bandwidth for this network in Kbps. This always only refers to * the estimated first hop transport bandwidth. * <p> - * Note that when used to request a network, this specifies the minimum acceptable. - * When received as the state of an existing network this specifies the typical - * first hop bandwidth expected. This is never measured, but rather is inferred - * from technology type and other link parameters. It could be used to differentiate - * between very slow 1xRTT cellular links and other faster networks or even between - * 802.11b vs 802.11AC wifi technologies. It should not be used to differentiate between - * fast backhauls and slow backhauls. + * {@see Builder#setLinkUpstreamBandwidthKbps} * * @param downKbps the estimated first hop downstream (network to device) bandwidth. + * @hide */ public @NonNull NetworkCapabilities setLinkDownstreamBandwidthKbps(int downKbps) { mLinkDownBandwidthKbps = downKbps; @@ -1036,6 +1035,7 @@ public final class NetworkCapabilities implements Parcelable { * @param networkSpecifier A concrete, parcelable framework class that extends * NetworkSpecifier. * @return This NetworkCapabilities instance, to facilitate chaining. + * @hide */ public @NonNull NetworkCapabilities setNetworkSpecifier( @NonNull NetworkSpecifier networkSpecifier) { @@ -1057,7 +1057,6 @@ public final class NetworkCapabilities implements Parcelable { * @return This NetworkCapabilities instance, to facilitate chaining. * @hide */ - @SystemApi public @NonNull NetworkCapabilities setTransportInfo(@NonNull TransportInfo transportInfo) { mTransportInfo = transportInfo; return this; @@ -1067,7 +1066,7 @@ public final class NetworkCapabilities implements Parcelable { * Gets the optional bearer specific network specifier. May be {@code null} if not set. * * @return The optional {@link NetworkSpecifier} specifying the bearer specific network - * specifier or {@code null}. See {@link #setNetworkSpecifier}. + * specifier or {@code null}. */ public @Nullable NetworkSpecifier getNetworkSpecifier() { return mNetworkSpecifier; @@ -1137,6 +1136,7 @@ public final class NetworkCapabilities implements Parcelable { * effect when requesting a callback. * * @param signalStrength the bearer-specific signal strength. + * @hide */ public @NonNull NetworkCapabilities setSignalStrength(int signalStrength) { mSignalStrength = signalStrength; @@ -1363,7 +1363,6 @@ public final class NetworkCapabilities implements Parcelable { * Sets the SSID of this network. * @hide */ - @SystemApi public @NonNull NetworkCapabilities setSSID(@Nullable String ssid) { mSSID = ssid; return this; @@ -1374,7 +1373,8 @@ public final class NetworkCapabilities implements Parcelable { * @hide */ @SystemApi - public @Nullable String getSSID() { + @TestApi + public @Nullable String getSsid() { return mSSID; } @@ -1854,25 +1854,32 @@ public final class NetworkCapabilities implements Parcelable { } /** - * Set the uid of the app making the request. + * Set the UID of the app making the request. * - * Note: This works only for {@link NetworkAgent} instances. Any capabilities passed in - * via the public {@link ConnectivityManager} API's will have this field overwritten. + * For instances of NetworkCapabilities representing a request, sets the + * UID of the app making the request. For a network created by the system, + * sets the UID of the only app whose requests can match this network. + * This can be set to {@link Process#INVALID_UID} if there is no such app, + * or if this instance of NetworkCapabilities is about to be sent to a + * party that should not learn about this. * * @param uid UID of the app. * @hide */ - @SystemApi public @NonNull NetworkCapabilities setRequestorUid(int uid) { mRequestorUid = uid; return this; } /** - * @return the uid of the app making the request. + * Returns the UID of the app making the request. * - * Note: This could return {@link Process#INVALID_UID} if the {@link NetworkRequest} - * object was not obtained from {@link ConnectivityManager}. + * For a NetworkRequest being made by an app, contains the app's UID. For a network + * created by the system, contains the UID of the only app whose requests can match + * this network, or {@link Process#INVALID_UID} if none or if the + * caller does not have permission to learn about this. + * + * @return the uid of the app making the request. * @hide */ public int getRequestorUid() { @@ -1882,23 +1889,29 @@ public final class NetworkCapabilities implements Parcelable { /** * Set the package name of the app making the request. * - * Note: This works only for {@link NetworkAgent} instances. Any capabilities passed in - * via the public {@link ConnectivityManager} API's will have this field overwritten. + * For instances of NetworkCapabilities representing a request, sets the + * package name of the app making the request. For a network created by the system, + * sets the package name of the only app whose requests can match this network. + * This can be set to null if there is no such app, or if this instance of + * NetworkCapabilities is about to be sent to a party that should not learn about this. * * @param packageName package name of the app. * @hide */ - @SystemApi public @NonNull NetworkCapabilities setRequestorPackageName(@NonNull String packageName) { mRequestorPackageName = packageName; return this; } /** - * @return the package name of the app making the request. + * Returns the package name of the app making the request. + * + * For a NetworkRequest being made by an app, contains the app's package name. For a + * network created by the system, contains the package name of the only app whose + * requests can match this network, or null if none or if the caller does not have + * permission to learn about this. * - * Note: This could return {@code null} if the {@link NetworkRequest} object was not obtained - * from {@link ConnectivityManager}. + * @return the package name of the app making the request. * @hide */ @Nullable @@ -1907,9 +1920,9 @@ public final class NetworkCapabilities implements Parcelable { } /** - * Set the uid and package name of the app making the request. + * Set the uid and package name of the app causing this network to exist. * - * Note: This is intended to be only invoked from within connectivitiy service. + * {@see #setRequestorUid} and {@link #setRequestorPackageName} * * @param uid UID of the app. * @param packageName package name of the app. @@ -1968,4 +1981,316 @@ public final class NetworkCapabilities implements Parcelable { return mRequestorUid == nc.mRequestorUid && TextUtils.equals(mRequestorPackageName, nc.mRequestorPackageName); } + + /** + * Builder class for NetworkCapabilities. + * + * This class is mainly for for {@link NetworkAgent} instances to use. Many fields in + * the built class require holding a signature permission to use - mostly + * {@link android.Manifest.permission.NETWORK_FACTORY}, but refer to the specific + * description of each setter. As this class lives entirely in app space it does not + * enforce these restrictions itself but the system server clears out the relevant + * fields when receiving a NetworkCapabilities object from a caller without the + * appropriate permission. + * + * Apps don't use this builder directly. Instead, they use {@link NetworkRequest} via + * its builder object. + * + * @hide + */ + @SystemApi + @TestApi + public static class Builder { + private final NetworkCapabilities mCaps; + + /** + * Creates a new Builder to construct NetworkCapabilities objects. + */ + public Builder() { + mCaps = new NetworkCapabilities(); + } + + /** + * Creates a new Builder of NetworkCapabilities from an existing instance. + */ + public Builder(@NonNull final NetworkCapabilities nc) { + Objects.requireNonNull(nc); + mCaps = new NetworkCapabilities(nc); + } + + /** + * Adds the given transport type. + * + * Multiple transports may be added. Note that when searching for a network to satisfy a + * request, satisfying any of the transports listed in the request will satisfy the request. + * For example {@code TRANSPORT_WIFI} and {@code TRANSPORT_ETHERNET} added to a + * {@code NetworkCapabilities} would cause either a Wi-Fi network or an Ethernet network + * to be selected. This is logically different than + * {@code NetworkCapabilities.NET_CAPABILITY_*}. + * + * @param transportType the transport type to be added or removed. + * @return this builder + */ + @NonNull + public Builder addTransportType(@Transport int transportType) { + checkValidTransportType(transportType); + mCaps.addTransportType(transportType); + return this; + } + + /** + * Removes the given transport type. + * + * {@see #addTransportType}. + * + * @param transportType the transport type to be added or removed. + * @return this builder + */ + @NonNull + public Builder removeTransportType(@Transport int transportType) { + checkValidTransportType(transportType); + mCaps.removeTransportType(transportType); + return this; + } + + /** + * Adds the given capability. + * + * @param capability the capability + * @return this builder + */ + @NonNull + public Builder addCapability(@NetCapability final int capability) { + mCaps.setCapability(capability, true); + return this; + } + + /** + * Removes the given capability. + * + * @param capability the capability + * @return this builder + */ + @NonNull + public Builder removeCapability(@NetCapability final int capability) { + mCaps.setCapability(capability, false); + return this; + } + + /** + * Sets the owner UID. + * + * The default value is {@link Process#INVALID_UID}. Pass this value to reset. + * + * Note: for security the system will clear out this field when received from a + * non-privileged source. + * + * @param ownerUid the owner UID + * @return this builder + */ + @NonNull + @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) + public Builder setOwnerUid(final int ownerUid) { + mCaps.setOwnerUid(ownerUid); + return this; + } + + /** + * Sets the list of UIDs that are administrators of this network. + * + * <p>UIDs included in administratorUids gain administrator privileges over this + * Network. Examples of UIDs that should be included in administratorUids are: + * <ul> + * <li>Carrier apps with privileges for the relevant subscription + * <li>Active VPN apps + * <li>Other application groups with a particular Network-related role + * </ul> + * + * <p>In general, user-supplied networks (such as WiFi networks) do not have + * administrators. + * + * <p>An app is granted owner privileges over Networks that it supplies. The owner + * UID MUST always be included in administratorUids. + * + * The default value is the empty array. Pass an empty array to reset. + * + * Note: for security the system will clear out this field when received from a + * non-privileged source, such as an app using reflection to call this or + * mutate the member in the built object. + * + * @param administratorUids the UIDs to be set as administrators of this Network. + * @return this builder + */ + @NonNull + @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) + public Builder setAdministratorUids(@NonNull final int[] administratorUids) { + Objects.requireNonNull(administratorUids); + mCaps.setAdministratorUids(administratorUids); + return this; + } + + /** + * Sets the upstream bandwidth of the link. + * + * Sets the upstream bandwidth for this network in Kbps. This always only refers to + * the estimated first hop transport bandwidth. + * <p> + * Note that when used to request a network, this specifies the minimum acceptable. + * When received as the state of an existing network this specifies the typical + * first hop bandwidth expected. This is never measured, but rather is inferred + * from technology type and other link parameters. It could be used to differentiate + * between very slow 1xRTT cellular links and other faster networks or even between + * 802.11b vs 802.11AC wifi technologies. It should not be used to differentiate between + * fast backhauls and slow backhauls. + * + * @param upKbps the estimated first hop upstream (device to network) bandwidth. + * @return this builder + */ + @NonNull + public Builder setLinkUpstreamBandwidthKbps(final int upKbps) { + mCaps.setLinkUpstreamBandwidthKbps(upKbps); + return this; + } + + /** + * Sets the downstream bandwidth for this network in Kbps. This always only refers to + * the estimated first hop transport bandwidth. + * <p> + * Note that when used to request a network, this specifies the minimum acceptable. + * When received as the state of an existing network this specifies the typical + * first hop bandwidth expected. This is never measured, but rather is inferred + * from technology type and other link parameters. It could be used to differentiate + * between very slow 1xRTT cellular links and other faster networks or even between + * 802.11b vs 802.11AC wifi technologies. It should not be used to differentiate between + * fast backhauls and slow backhauls. + * + * @param downKbps the estimated first hop downstream (network to device) bandwidth. + * @return this builder + */ + @NonNull + public Builder setLinkDownstreamBandwidthKbps(final int downKbps) { + mCaps.setLinkDownstreamBandwidthKbps(downKbps); + return this; + } + + /** + * Sets the optional bearer specific network specifier. + * This has no meaning if a single transport is also not specified, so calling + * this without a single transport set will generate an exception, as will + * subsequently adding or removing transports after this is set. + * </p> + * + * @param specifier a concrete, parcelable framework class that extends NetworkSpecifier, + * or null to clear it. + * @return this builder + */ + @NonNull + public Builder setNetworkSpecifier(@Nullable final NetworkSpecifier specifier) { + mCaps.setNetworkSpecifier(specifier); + return this; + } + + /** + * Sets the optional transport specific information. + * + * @param info A concrete, parcelable framework class that extends {@link TransportInfo}, + * or null to clear it. + * @return this builder + */ + @NonNull + public Builder setTransportInfo(@Nullable final TransportInfo info) { + mCaps.setTransportInfo(info); + return this; + } + + /** + * Sets the signal strength. This is a signed integer, with higher values indicating a + * stronger signal. The exact units are bearer-dependent. For example, Wi-Fi uses the + * same RSSI units reported by wifi code. + * <p> + * Note that when used to register a network callback, this specifies the minimum + * acceptable signal strength. When received as the state of an existing network it + * specifies the current value. A value of code SIGNAL_STRENGTH_UNSPECIFIED} means + * no value when received and has no effect when requesting a callback. + * + * Note: for security the system will throw if it receives a NetworkRequest where + * the underlying NetworkCapabilities has this member set from a source that does + * not hold the {@link android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP} + * permission. Apps with this permission can use this indirectly through + * {@link android.net.NetworkRequest}. + * + * @param signalStrength the bearer-specific signal strength. + * @return this builder + */ + @NonNull + @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) + public Builder setSignalStrength(final int signalStrength) { + mCaps.setSignalStrength(signalStrength); + return this; + } + + /** + * Sets the SSID of this network. + * + * Note: for security the system will clear out this field when received from a + * non-privileged source, like an app using reflection to set this. + * + * @param ssid the SSID, or null to clear it. + * @return this builder + */ + @NonNull + @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) + public Builder setSsid(@Nullable final String ssid) { + mCaps.setSSID(ssid); + return this; + } + + /** + * Set the uid of the app causing this network to exist. + * + * Note: for security the system will clear out this field when received from a + * non-privileged source. + * + * @param uid UID of the app. + * @return this builder + */ + @NonNull + @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) + public Builder setRequestorUid(final int uid) { + mCaps.setRequestorUid(uid); + return this; + } + + /** + * Set the package name of the app causing this network to exist. + * + * Note: for security the system will clear out this field when received from a + * non-privileged source. + * + * @param packageName package name of the app, or null to clear it. + * @return this builder + */ + @NonNull + @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) + public Builder setRequestorPackageName(@Nullable final String packageName) { + mCaps.setRequestorPackageName(packageName); + return this; + } + + /** + * Builds the instance of the capabilities. + * + * @return the built instance of NetworkCapabilities. + */ + @NonNull + public NetworkCapabilities build() { + if (mCaps.getOwnerUid() != Process.INVALID_UID) { + if (!ArrayUtils.contains(mCaps.getAdministratorUids(), mCaps.getOwnerUid())) { + throw new IllegalStateException("The owner UID must be included in " + + " administrator UIDs."); + } + } + return new NetworkCapabilities(mCaps); + } + } } diff --git a/core/java/android/service/dreams/DreamActivity.java b/core/java/android/service/dreams/DreamActivity.java index 8cdd24e0884d..0a29edc81f2f 100644 --- a/core/java/android/service/dreams/DreamActivity.java +++ b/core/java/android/service/dreams/DreamActivity.java @@ -19,6 +19,7 @@ package android.service.dreams; import android.annotation.Nullable; import android.app.Activity; import android.os.Bundle; +import android.view.WindowInsets; /** * The Activity used by the {@link DreamService} to draw screensaver content @@ -55,5 +56,8 @@ public class DreamActivity extends Activity { if (callback != null) { callback.onActivityCreated(this); } + + // Hide all insets (nav bar, status bar, etc) when the dream is showing + getWindow().getInsetsController().hide(WindowInsets.Type.systemBars()); } } diff --git a/core/java/android/service/dreams/OWNERS b/core/java/android/service/dreams/OWNERS index 426f002ad236..708ab4c4ba79 100644 --- a/core/java/android/service/dreams/OWNERS +++ b/core/java/android/service/dreams/OWNERS @@ -1,3 +1,4 @@ dsandler@android.com michaelwr@google.com roosa@google.com +galinap@google.com diff --git a/core/java/android/text/AndroidBidi.java b/core/java/android/text/AndroidBidi.java index f1e2181a8538..b9811638b28f 100644 --- a/core/java/android/text/AndroidBidi.java +++ b/core/java/android/text/AndroidBidi.java @@ -17,11 +17,7 @@ package android.text; import android.compat.annotation.UnsupportedAppUsage; -import android.icu.lang.UCharacter; -import android.icu.lang.UCharacterDirection; -import android.icu.lang.UProperty; import android.icu.text.Bidi; -import android.icu.text.BidiClassifier; import android.text.Layout.Directions; import com.android.internal.annotations.VisibleForTesting; @@ -34,32 +30,6 @@ import com.android.internal.annotations.VisibleForTesting; public class AndroidBidi { /** - * Overrides ICU {@link BidiClassifier} in order to correctly handle character directions for - * newest emoji that ICU is not aware of. - */ - public static class EmojiBidiOverride extends BidiClassifier { - public EmojiBidiOverride() { - super(null /* No persisting object needed */); - } - - // Tells ICU to use the standard Unicode value. - private static final int NO_OVERRIDE = - UCharacter.getIntPropertyMaxValue(UProperty.BIDI_CLASS) + 1; - - @Override - public int classify(int c) { - if (Emoji.isNewEmoji(c)) { - // All new emoji characters in Unicode 10.0 are of the bidi class ON. - return UCharacterDirection.OTHER_NEUTRAL; - } else { - return NO_OVERRIDE; - } - } - } - - private static final EmojiBidiOverride sEmojiBidiOverride = new EmojiBidiOverride(); - - /** * Runs the bidi algorithm on input text. */ @UnsupportedAppUsage @@ -82,7 +52,6 @@ public class AndroidBidi { default: paraLevel = Bidi.LTR; break; } final Bidi icuBidi = new Bidi(length /* maxLength */, 0 /* maxRunCount */); - icuBidi.setCustomClassifier(sEmojiBidiOverride); icuBidi.setPara(chs, paraLevel, null /* embeddingLevels */); for (int i = 0; i < length; i++) { chInfo[i] = icuBidi.getLevelAt(i); @@ -220,4 +189,5 @@ public class AndroidBidi { } return new Directions(ld); } -}
\ No newline at end of file +} + diff --git a/core/java/android/text/BidiFormatter.java b/core/java/android/text/BidiFormatter.java index 77f17a7d2377..422d3472cb8d 100644 --- a/core/java/android/text/BidiFormatter.java +++ b/core/java/android/text/BidiFormatter.java @@ -604,15 +604,10 @@ public final class BidiFormatter { /** * Return Character directionality. Same as {@link Character#getDirectionality(int)} except - * it overrides values for newest emoji that are not covered by ICU. + * it can override values for newest emoji that are not covered by ICU. */ public static byte getDirectionality(int codePoint) { - if (Emoji.isNewEmoji(codePoint)) { - // TODO: Fix or remove once emoji-data.text 5.0 is in ICU or update to 6.0. - return Character.DIRECTIONALITY_OTHER_NEUTRALS; - } else { - return Character.getDirectionality(codePoint); - } + return Character.getDirectionality(codePoint); } // Internal instance variables. diff --git a/core/java/android/text/Emoji.java b/core/java/android/text/Emoji.java index 04fa1106bab2..cf0e3c26daac 100644 --- a/core/java/android/text/Emoji.java +++ b/core/java/android/text/Emoji.java @@ -60,40 +60,16 @@ public class Emoji { if (c == 0x1F91D || c == 0x1F93C) { return true; } - // Emoji Modifier Base characters new in Unicode emoji 11 - // From https://www.unicode.org/Public/emoji/11.0/emoji-data.txt - // TODO: Remove once emoji-data.text 11 is in ICU or update to 11. - if ((0x1F9B5 <= c && c <= 0x1F9B6) || (0x1F9B8 <= c && c <= 0x1F9B9)) { - return true; - } + // If Android's copy of ICU is behind, check for new codepoints here. + // Consult log for implementation pattern. return UCharacter.hasBinaryProperty(c, UProperty.EMOJI_MODIFIER_BASE); } /** - * Returns true if the character is a new emoji still not supported in our version of ICU. - */ - public static boolean isNewEmoji(int c) { - // Emoji characters new in Unicode emoji 12 - // From https://www.unicode.org/Public/emoji/12.0/emoji-data.txt - // TODO: Remove once emoji-data.text 12 is in ICU or update to 12. - if (c < 0x1F6D5 || c > 0x1FA95) { - // Optimization for characters outside the new emoji range. - return false; - } - return c == 0x1F6D5 || c == 0x1F6FA || c == 0x1F93F || c == 0x1F971 || c == 0x1F97B - || (0x1F7E0 <= c && c <= 0x1F7EB) || (0x1F90D <= c && c <= 0x1F90F) - || (0x1F9A5 <= c && c <= 0x1F9AA) || (0x1F9AE <= c && c <= 0x1F9AF) - || (0x1F9BA <= c && c <= 0x1F9BF) || (0x1F9C3 <= c && c <= 0x1F9CA) - || (0x1F9CD <= c && c <= 0x1F9CF) || (0x1FA70 <= c && c <= 0x1FA73) - || (0x1FA78 <= c && c <= 0x1FA7A) || (0x1FA80 <= c && c <= 0x1FA82) - || (0x1FA90 <= c && c <= 0x1FA95); - } - - /** * Returns true if the character has Emoji property. */ public static boolean isEmoji(int codePoint) { - return isNewEmoji(codePoint) || UCharacter.hasBinaryProperty(codePoint, UProperty.EMOJI); + return UCharacter.hasBinaryProperty(codePoint, UProperty.EMOJI); } // Returns true if the character can be a base character of COMBINING ENCLOSING KEYCAP. diff --git a/core/java/android/view/InsetsAnimationControlImpl.java b/core/java/android/view/InsetsAnimationControlImpl.java index d2e603649655..f827eda07901 100644 --- a/core/java/android/view/InsetsAnimationControlImpl.java +++ b/core/java/android/view/InsetsAnimationControlImpl.java @@ -68,7 +68,6 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll private final @InsetsType int mTypes; private final InsetsAnimationControlCallbacks mController; private final WindowInsetsAnimation mAnimation; - private final boolean mFade; private Insets mCurrentInsets; private Insets mPendingInsets; private float mPendingFraction; @@ -83,11 +82,10 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll InsetsState state, WindowInsetsAnimationControlListener listener, @InsetsType int types, InsetsAnimationControlCallbacks controller, long durationMs, Interpolator interpolator, - boolean fade, @AnimationType int animationType) { + @AnimationType int animationType) { mControls = controls; mListener = listener; mTypes = types; - mFade = fade; mController = controller; mInitialInsetsState = new InsetsState(state, true /* copySources */); mCurrentInsets = getInsetsFromState(mInitialInsetsState, frame, null /* typeSideMap */); @@ -299,8 +297,6 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll // If the system is controlling the insets source, the leash can be null. if (leash != null) { - // TODO: use a better interpolation for fade. - alpha = mFade ? ((float) inset / maxInset * 0.3f + 0.7f) : alpha; SurfaceParams params = new SurfaceParams.Builder(leash) .withAlpha(side == ISIDE_FLOATING ? 1 : alpha) .withMatrix(mTmpMatrix) diff --git a/core/java/android/view/InsetsAnimationThreadControlRunner.java b/core/java/android/view/InsetsAnimationThreadControlRunner.java index 13b4cd83b4df..40ffa7ef48bf 100644 --- a/core/java/android/view/InsetsAnimationThreadControlRunner.java +++ b/core/java/android/view/InsetsAnimationThreadControlRunner.java @@ -88,11 +88,11 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro InsetsState state, WindowInsetsAnimationControlListener listener, @InsetsType int types, InsetsAnimationControlCallbacks controller, long durationMs, Interpolator interpolator, - boolean fade, @AnimationType int animationType, Handler mainThreadHandler) { + @AnimationType int animationType, Handler mainThreadHandler) { mMainThreadHandler = mainThreadHandler; mOuterCallbacks = controller; mControl = new InsetsAnimationControlImpl(copyControls(controls), frame, state, listener, - types, mCallbacks, durationMs, interpolator, fade, animationType); + types, mCallbacks, durationMs, interpolator, animationType); InsetsAnimationThread.getHandler().post(() -> listener.onReady(mControl, types)); } diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java index 96f73409ae0b..048c0e26cdb8 100644 --- a/core/java/android/view/InsetsController.java +++ b/core/java/android/view/InsetsController.java @@ -27,7 +27,9 @@ import android.animation.AnimationHandler; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; +import android.animation.PropertyValuesHolder; import android.animation.TypeEvaluator; +import android.animation.ValueAnimator; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -36,6 +38,7 @@ import android.graphics.Rect; import android.os.CancellationSignal; import android.os.Handler; import android.os.RemoteException; +import android.renderscript.Sampler.Value; import android.util.ArraySet; import android.util.Log; import android.util.Pair; @@ -50,6 +53,7 @@ import android.view.WindowInsets.Type.InsetsType; import android.view.WindowInsetsAnimation.Bounds; import android.view.WindowManager.LayoutParams.SoftInputModeFlags; import android.view.animation.Interpolator; +import android.view.animation.LinearInterpolator; import android.view.animation.PathInterpolator; import com.android.internal.annotations.VisibleForTesting; @@ -72,9 +76,20 @@ 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 ANIMATION_DURATION_SYNC_IME_MS = 285; + private static final int ANIMATION_DURATION_UNSYNC_IME_MS = 200; + private static final int PENDING_CONTROL_TIMEOUT_MS = 2000; - public static final Interpolator INTERPOLATOR = new PathInterpolator(0.4f, 0f, 0.2f, 1f); + public static final Interpolator SYSTEM_BARS_INTERPOLATOR = + new PathInterpolator(0.4f, 0f, 0.2f, 1f); + private static final Interpolator SYNC_IME_INTERPOLATOR = + new PathInterpolator(0.2f, 0f, 0f, 1f); + private static final Interpolator LINEAR_OUT_SLOW_IN_INTERPOLATOR = + new PathInterpolator(0, 0, 0.2f, 1f); + private static final Interpolator FAST_OUT_LINEAR_IN_INTERPOLATOR = + new PathInterpolator(0.4f, 0f, 1f, 1f); /** * Layout mode during insets animation: The views should be laid out as if the changing inset @@ -139,27 +154,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation (int) (startValue.bottom + fraction * (endValue.bottom - startValue.bottom))); /** - * Linear animation property - */ - private static class InsetsProperty extends Property<WindowInsetsAnimationController, Insets> { - InsetsProperty() { - super(Insets.class, "Insets"); - } - - @Override - public Insets get(WindowInsetsAnimationController object) { - return object.getCurrentInsets(); - } - @Override - public void set(WindowInsetsAnimationController controller, Insets value) { - controller.setInsetsAndAlpha( - value, 1f /* alpha */, (((InternalAnimationControlListener) - ((InsetsAnimationControlImpl) controller).getListener()) - .getRawFraction())); - } - } - - /** * The default implementation of listener, to be used by InsetsController and InsetsPolicy to * animate insets. */ @@ -167,9 +161,11 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation implements WindowInsetsAnimationControlListener { private WindowInsetsAnimationController mController; - private ObjectAnimator mAnimator; + private ValueAnimator mAnimator; private final boolean mShow; - private final boolean mUseSfVsync; + private final boolean mHasAnimationCallbacks; + private final @InsetsType int mRequestedTypes; + private final long mDurationMs; private ThreadLocal<AnimationHandler> mSfAnimationHandlerThreadLocal = new ThreadLocal<AnimationHandler>() { @@ -181,24 +177,40 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation } }; - public InternalAnimationControlListener(boolean show, boolean useSfVsync) { + public InternalAnimationControlListener(boolean show, boolean hasAnimationCallbacks, + int requestedTypes) { mShow = show; - mUseSfVsync = useSfVsync; + mHasAnimationCallbacks = hasAnimationCallbacks; + mRequestedTypes = requestedTypes; + mDurationMs = calculateDurationMs(); } @Override public void onReady(WindowInsetsAnimationController controller, int types) { mController = controller; - mAnimator = ObjectAnimator.ofObject( - controller, - new InsetsProperty(), - sEvaluator, - mShow ? controller.getHiddenStateInsets() : controller.getShownStateInsets(), - mShow ? controller.getShownStateInsets() : controller.getHiddenStateInsets() - ); - mAnimator.setDuration(getDurationMs()); - mAnimator.setInterpolator(INTERPOLATOR); + mAnimator = ValueAnimator.ofFloat(0f, 1f); + mAnimator.setDuration(mDurationMs); + mAnimator.setInterpolator(new LinearInterpolator()); + Insets start = mShow + ? controller.getHiddenStateInsets() + : controller.getShownStateInsets(); + Insets end = mShow + ? controller.getShownStateInsets() + : controller.getHiddenStateInsets(); + Interpolator insetsInterpolator = getInterpolator(); + Interpolator alphaInterpolator = getAlphaInterpolator(); + mAnimator.addUpdateListener(animation -> { + float rawFraction = animation.getAnimatedFraction(); + float alphaFraction = mShow + ? rawFraction + : 1 - rawFraction; + float insetsFraction = insetsInterpolator.getInterpolation(rawFraction); + controller.setInsetsAndAlpha( + sEvaluator.evaluate(insetsFraction, start, end), + alphaInterpolator.getInterpolation(alphaFraction), + rawFraction); + }); mAnimator.addListener(new AnimatorListenerAdapter() { @Override @@ -206,7 +218,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation onAnimationFinish(); } }); - if (mUseSfVsync) { + if (!mHasAnimationCallbacks) { mAnimator.setAnimationHandler(mSfAnimationHandlerThreadLocal.get()); } mAnimator.start(); @@ -224,22 +236,57 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation } } - protected void onAnimationFinish() { - mController.finish(mShow); + Interpolator getInterpolator() { + if ((mRequestedTypes & ime()) != 0) { + if (mHasAnimationCallbacks) { + return SYNC_IME_INTERPOLATOR; + } else if (mShow) { + return LINEAR_OUT_SLOW_IN_INTERPOLATOR; + } else { + return FAST_OUT_LINEAR_IN_INTERPOLATOR; + } + } else { + return SYSTEM_BARS_INTERPOLATOR; + } } - protected float getRawFraction() { - return (float) mAnimator.getCurrentPlayTime() / mAnimator.getDuration(); + Interpolator getAlphaInterpolator() { + if ((mRequestedTypes & ime()) != 0) { + if (mHasAnimationCallbacks) { + return input -> 1f; + } else if (mShow) { + + // Alpha animation takes half the time with linear interpolation; + return input -> Math.min(1f, 2 * input); + } else { + return FAST_OUT_LINEAR_IN_INTERPOLATOR; + } + } else { + return input -> 1f; + } + } + + protected void onAnimationFinish() { + mController.finish(mShow); } /** * To get the animation duration in MS. */ public long getDurationMs() { - if (mAnimator != null) { - return mAnimator.getDuration(); + return mDurationMs; + } + + private long calculateDurationMs() { + if ((mRequestedTypes & ime()) != 0) { + if (mHasAnimationCallbacks) { + return ANIMATION_DURATION_SYNC_IME_MS; + } else { + return ANIMATION_DURATION_UNSYNC_IME_MS; + } + } else { + return mShow ? ANIMATION_DURATION_SHOW_MS : ANIMATION_DURATION_HIDE_MS; } - return mShow ? ANIMATION_DURATION_SHOW_MS : ANIMATION_DURATION_HIDE_MS; } } @@ -525,7 +572,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation pendingRequest.types, pendingRequest.cancellationSignal, pendingRequest.listener, mFrame, true /* fromIme */, pendingRequest.durationMs, pendingRequest.interpolator, - false /* fade */, pendingRequest.animationType, + pendingRequest.animationType, pendingRequest.layoutInsetsDuringAnimation, pendingRequest.useInsetsAnimationThread); return; @@ -590,9 +637,9 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation listener.onCancelled(null); return; } + controlAnimationUnchecked(types, cancellationSignal, listener, mFrame, fromIme, durationMs, - interpolator, false /* fade */, animationType, - getLayoutInsetsDuringAnimationMode(types), + interpolator, animationType, getLayoutInsetsDuringAnimationMode(types), false /* useInsetsAnimationThread */); } @@ -606,7 +653,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation private void controlAnimationUnchecked(@InsetsType int types, @Nullable CancellationSignal cancellationSignal, WindowInsetsAnimationControlListener listener, Rect frame, boolean fromIme, - long durationMs, Interpolator interpolator, boolean fade, + long durationMs, Interpolator interpolator, @AnimationType int animationType, @LayoutInsetsDuringAnimation int layoutInsetsDuringAnimation, boolean useInsetsAnimationThread) { @@ -652,10 +699,10 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation final InsetsAnimationControlRunner runner = useInsetsAnimationThread ? new InsetsAnimationThreadControlRunner(controls, - frame, mState, listener, typesReady, this, durationMs, interpolator, fade, + frame, mState, listener, typesReady, this, durationMs, interpolator, animationType, mViewRoot.mHandler) : new InsetsAnimationControlImpl(controls, - frame, mState, listener, typesReady, this, durationMs, interpolator, fade, + frame, mState, listener, typesReady, this, durationMs, interpolator, animationType); mRunningAnimations.add(new RunningAnimation(runner, animationType)); if (cancellationSignal != null) { @@ -921,25 +968,26 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation return; } - boolean useInsetsAnimationThread = canUseInsetsAnimationThread(); + boolean hasAnimationCallbacks = hasAnimationCallbacks(); final InternalAnimationControlListener listener = - new InternalAnimationControlListener(show, useInsetsAnimationThread); + new InternalAnimationControlListener(show, hasAnimationCallbacks, types); + // Show/hide animations always need to be relative to the display frame, in order that shown // and hidden state insets are correct. controlAnimationUnchecked( types, null /* cancellationSignal */, listener, mState.getDisplayFrame(), fromIme, - listener.getDurationMs(), - INTERPOLATOR, true /* fade */, show ? ANIMATION_TYPE_SHOW : ANIMATION_TYPE_HIDE, - show ? LAYOUT_INSETS_DURING_ANIMATION_SHOWN - : LAYOUT_INSETS_DURING_ANIMATION_HIDDEN, - useInsetsAnimationThread); + listener.getDurationMs(), listener.getInterpolator(), + show ? ANIMATION_TYPE_SHOW : ANIMATION_TYPE_HIDE, + show ? LAYOUT_INSETS_DURING_ANIMATION_SHOWN : LAYOUT_INSETS_DURING_ANIMATION_HIDDEN, + !hasAnimationCallbacks /* useInsetsAnimationThread */); + } - private boolean canUseInsetsAnimationThread() { + private boolean hasAnimationCallbacks() { if (mViewRoot.mView == null) { - return true; + return false; } - return !mViewRoot.mView.hasWindowInsetsAnimationCallback(); + return mViewRoot.mView.hasWindowInsetsAnimationCallback(); } private void hideDirectly( @@ -1118,7 +1166,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation // Make sure a frame gets scheduled. mViewRoot.mView.invalidate(); } else { - sc.release(); + sc.release(); } } } diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index d14203381c65..2352180bcba3 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1608,6 +1608,8 @@ public class ResolverActivity extends Activity implements } private void resetTabsHeaderStyle(TabWidget tabWidget) { + String workContentDescription = getString(R.string.resolver_work_tab_accessibility); + String personalContentDescription = getString(R.string.resolver_personal_tab_accessibility); for (int i = 0; i < tabWidget.getChildCount(); i++) { View tabView = tabWidget.getChildAt(i); TextView title = tabView.findViewById(android.R.id.title); @@ -1615,6 +1617,11 @@ public class ResolverActivity extends Activity implements title.setTextColor(getAttrColor(this, android.R.attr.textColorTertiary)); title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.resolver_tab_text_size)); + if (title.getText().equals(getString(R.string.resolver_personal_tab))) { + tabView.setContentDescription(personalContentDescription); + } else if (title.getText().equals(getString(R.string.resolver_work_tab))) { + tabView.setContentDescription(workContentDescription); + } } } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ad984e643745..68c51b9a7811 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -734,7 +734,7 @@ <!-- ====================================================================== --> <eat-comment /> - <!-- @SystemApi Allows accessing the messages on ICC + <!-- Allows accessing the messages on ICC @hide Used internally. --> <permission android:name="android.permission.ACCESS_MESSAGES_ON_ICC" android:protectionLevel="signature" /> @@ -2164,7 +2164,7 @@ <permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION" android:protectionLevel="signature" /> - <!-- @SystemApi Allows listen permission to always reported signal strength. + <!-- Allows listen permission to always reported signal strength. @hide Used internally. --> <permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH" android:protectionLevel="signature" /> diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index deb6afcfa3b4..8f2d6c3e02f4 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -165,7 +165,7 @@ <item>中文 (繁體)</item> </string-array> - <array name="simColors"> + <array name="sim_colors"> <item>@color/Teal_700</item> <item>@color/Blue_700</item> <item>@color/Indigo_700</item> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index d32558f09643..9f4b3441335f 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3068,11 +3068,6 @@ <public name="accessibilityActionImeEnter" /> </public-group> - <public-group type="array" first-id="0x01070006"> - <!-- @hide @SystemApi --> - <public name="simColors" /> - </public-group> - <public-group type="string" first-id="0x0104002c"> <!-- @hide --> <public name="config_customMediaKeyDispatcher" /> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index ddee2e9ab33d..4cc9f735f638 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4348,6 +4348,35 @@ accessibility feature. </string> + <!-- Dialog title for dialog shown when the multiple accessibility shortcut is activated, and we want to confirm that the user understands what's going to happen. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_multiple_service_warning_title">Turn on accessibility features?</string> + + <!-- Message shown in dialog when user is in the process of enabling the multiple accessibility service via the volume buttons shortcut for the first time. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_multiple_service_warning">Holding down both volume keys for a few seconds turns on accessibility features. This may change how your device works.\n\nCurrent features:\n<xliff:g id="service" example="TalkBack">%1$s</xliff:g>\nYou can change selected features in Settings > Accessibility.</string> + + <!-- Used in multiple service warning to list current features. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_multiple_service_list">\t• <xliff:g id="service" example="TalkBack">%1$s</xliff:g>\n</string> + + <!-- Dialog title for dialog shown when the TalkBack shortcut is activated, and we want to confirm that the user understands what's going to happen. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_talkback_warning_title">Turn on TalkBack?</string> + + <!-- Message shown in dialog when user is in the process of enabling the TalkBack via the volume buttons shortcut for the first time. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_talkback_warning">Holding down both volume keys for a few seconds turns on TalkBack, a screen reader that is helpful for people who are blind or have low vision. TalkBack completely changes how your device works.\n\nYou can change this shortcut to another feature in Settings > Accessibility.</string> + + <!-- Dialog title for dialog shown when this accessibility shortcut is activated, and we want to confirm that the user understands what's going to happen. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_single_service_warning_title">Turn on <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string> + + <!-- Message shown in dialog when user is in the process of enabling this accessibility service via the volume buttons shortcut for the first time. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_single_service_warning">Holding down both volume keys for a few seconds turns on <xliff:g id="service" example="TalkBack">%1$s</xliff:g>, an accessibility feature. This may change how your device works.\n\nYou can change this shortcut to another feature in Settings > Accessibility.</string> + + <!-- Text in button that closes the warning dialog about the accessibility shortcut, leaving the + shortcut enabled. [CHAR LIMIT=none]--> + <string name="accessibility_shortcut_on">Turn on</string> + + <!-- Text in button that closes the warning dialog about the accessibility shortcut, leaving the + shortcut enabled. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_off">Don’t turn on</string> + <!-- Title for a warning about security implications of enabling an accessibility service. [CHAR LIMIT=NONE] --> <string name="accessibility_enable_service_title">Allow @@ -4430,33 +4459,29 @@ shown in the warning dialog about the accessibility shortcut. --> <string name="color_correction_feature_name">Color Correction</string> - <!-- Text in toast to alert the user that the accessibility shortcut turned on an accessibility - service.--> - <string name="accessibility_shortcut_enabling_service">Accessibility Shortcut turned - <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g> on</string> + <!-- Text in toast to alert the user that the accessibility shortcut turned on an accessibility service. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_enabling_service">Held volume keys. <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g> turned on.</string> - <!-- Text in toast to alert the user that the accessibility shortcut turned off an accessibility - service.--> - <string name="accessibility_shortcut_disabling_service">Accessibility Shortcut turned - <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g> off</string> + <!-- Text in toast to alert the user that the accessibility shortcut turned off an accessibility service. [CHAR LIMIT=none] --> + <string name="accessibility_shortcut_disabling_service">Held volume keys. <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g> turned off.</string> <!-- Text spoken when accessibility shortcut warning dialog is shown. [CHAR LIMIT=none] --> <string name="accessibility_shortcut_spoken_feedback">Press and hold both volume keys for three seconds to use <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g></string> <!-- Text appearing in a prompt at the top of UI allowing the user to select a target service or feature to be assigned to the Accessibility button in the navigation bar. [CHAR LIMIT=none]--> - <string name="accessibility_button_prompt_text">Choose a app to use when you tap the accessibility button:</string> + <string name="accessibility_button_prompt_text">Choose a feature to use when you tap the accessibility button:</string> <!-- Text appearing in a prompt at the top of UI allowing the user to select a target service or feature to be assigned to the Accessibility button when gesture navigation is enabled [CHAR LIMIT=none] --> - <string name="accessibility_gesture_prompt_text">Choose a app to use with the accessibility gesture (swipe up from the bottom of the screen with two fingers):</string> + <string name="accessibility_gesture_prompt_text">Choose a feature to use with the accessibility gesture (swipe up from the bottom of the screen with two fingers):</string> <!-- Text appearing in a prompt at the top of UI allowing the user to select a target service or feature to be assigned to the Accessibility button when gesture navigation and TalkBack is enabled [CHAR LIMIT=none] --> - <string name="accessibility_gesture_3finger_prompt_text">Choose a app to use with the accessibility gesture (swipe up from the bottom of the screen with three fingers):</string> + <string name="accessibility_gesture_3finger_prompt_text">Choose a feature to use with the accessibility gesture (swipe up from the bottom of the screen with three fingers):</string> <!-- Text describing how to display UI allowing a user to select a target service or feature to be assigned to the Accessibility button in the navigation bar. [CHAR LIMIT=none]--> - <string name="accessibility_button_instructional_text">To switch between apps, touch & hold the accessibility button.</string> + <string name="accessibility_button_instructional_text">To switch between features, touch & hold the accessibility button.</string> <!-- Text describing how to display UI allowing a user to select a target service or feature to be assigned to the Accessibility button when gesture navigation is enabled. [CHAR LIMIT=none] --> - <string name="accessibility_gesture_instructional_text">To switch between apps, swipe up with two fingers and hold.</string> + <string name="accessibility_gesture_instructional_text">To switch between features, swipe up with two fingers and hold.</string> <!-- Text describing how to display UI allowing a user to select a target service or feature to be assigned to the Accessibility button when gesture navigation and TalkBack is enabled. [CHAR LIMIT=none] --> - <string name="accessibility_gesture_3finger_instructional_text">To switch between apps, swipe up with three fingers and hold.</string> + <string name="accessibility_gesture_3finger_instructional_text">To switch between features, swipe up with three fingers and hold.</string> <!-- Text used to describe system navigation features, shown within a UI allowing a user to assign system magnification features to the Accessibility button in the navigation bar. --> <string name="accessibility_magnification_chooser_text">Magnification</string> @@ -5403,6 +5428,11 @@ <!-- Label of a tab on a screen. A user can tap this tab to switch to the 'Work' view (that shows their work content) if they have a work profile on their device. [CHAR LIMIT=NONE] --> <string name="resolver_work_tab">Work</string> + <!-- Accessibility label for the personal tab button. [CHAR LIMIT=NONE] --> + <string name="resolver_personal_tab_accessibility">Personal view</string> + <!-- Accessibility label for the work tab button. [CHAR LIMIT=NONE] --> + <string name="resolver_work_tab_accessibility">Work view</string> + <!-- Title of a screen. This text lets the user know that their IT admin doesn't allow them to share this specific content with work apps. [CHAR LIMIT=NONE] --> <string name="resolver_cant_share_with_work_apps">Can\u2019t share this with work apps</string> <!-- Error message. This text is explaining that the user's IT admin doesn't allow this specific content to be shared with apps in the work profile. [CHAR LIMIT=NONE] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index b460d68a410a..20d943d787e1 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1222,7 +1222,7 @@ <java-symbol type="array" name="preloaded_color_state_lists" /> <java-symbol type="array" name="preloaded_drawables" /> <java-symbol type="array" name="preloaded_freeform_multi_window_drawables" /> - <java-symbol type="array" name="simColors" /> + <java-symbol type="array" name="sim_colors" /> <java-symbol type="array" name="special_locale_codes" /> <java-symbol type="array" name="special_locale_names" /> <java-symbol type="array" name="supported_locales" /> @@ -3885,7 +3885,9 @@ <!-- Intent resolver and share sheet --> <java-symbol type="string" name="resolver_personal_tab" /> + <java-symbol type="string" name="resolver_personal_tab_accessibility" /> <java-symbol type="string" name="resolver_work_tab" /> + <java-symbol type="string" name="resolver_work_tab_accessibility" /> <java-symbol type="id" name="stub" /> <java-symbol type="id" name="resolver_empty_state" /> <java-symbol type="id" name="resolver_empty_state_icon" /> diff --git a/core/tests/coretests/src/android/text/EmojiTest.java b/core/tests/coretests/src/android/text/EmojiTest.java index 7a42731992d1..0aeeb74df466 100644 --- a/core/tests/coretests/src/android/text/EmojiTest.java +++ b/core/tests/coretests/src/android/text/EmojiTest.java @@ -83,12 +83,27 @@ public class EmojiTest { {0x1FA70, 0x1FA73}, {0x1FA78, 0x1FA7A}, {0x1FA80, 0x1FA82}, - {0x1FA90, 0x1FA95} + {0x1FA90, 0x1FA95}, + }, + { // EMOJI 13 + {0x1F6D6, 0x1F6D7}, + {0x1F6FB, 0x1F6FC}, + {0x1F90C, 0x1F90C}, + {0x1F972, 0x1F972}, + {0x1F977, 0x1F978}, + {0x1F9A3, 0x1F9A4}, + {0x1F9AB, 0x1F9AD}, + {0x1F9CB, 0x1F9CB}, + {0x1FA74, 0x1FA74}, + {0x1FA83, 0x1FA86}, + {0x1FA96, 0x1FAA8}, + {0x1FAB0, 0x1FAB6}, + {0x1FAC0, 0x1FAC2}, + {0x1FAD0, 0x1FAD6}, } }; final Bidi icuBidi = new Bidi(0 /* maxLength */, 0 /* maxRunCount */); - icuBidi.setCustomClassifier(new AndroidBidi.EmojiBidiOverride()); for (int version = 0; version < data.length; version++) { for (int row = 0; row < data[version].length; row++) { @@ -125,6 +140,15 @@ public class EmojiTest { { // EMOJI 11 {0x1F9B5, 0x1F9B6}, {0x1F9B8, 0x1F9B9} + }, + { // EMOJI 12 + {0x1F90F, 0x1F90F}, + {0x1F9BB, 0x1F9BB}, + {0x1F9CD, 0x1F9CF}, + }, + { // EMOJI 13 + {0x1F90C, 0x1F90C}, + {0x1F977, 0x1F977} } }; for (int version = 0; version < data.length; version++) { diff --git a/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java b/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java index c87433f247e5..d78746918e65 100644 --- a/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java +++ b/core/tests/coretests/src/android/view/InsetsAnimationControlImplTest.java @@ -20,7 +20,6 @@ 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.systemBars; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -44,8 +43,6 @@ import android.view.SyncRtSurfaceTransactionApplier.SurfaceParams; import android.view.animation.LinearInterpolator; import android.view.test.InsetsModeSession; -import androidx.test.runner.AndroidJUnit4; - import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -57,6 +54,8 @@ import org.mockito.MockitoAnnotations; import java.util.List; +import androidx.test.runner.AndroidJUnit4; + /** * Tests for {@link InsetsAnimationControlImpl}. * @@ -124,7 +123,7 @@ public class InsetsAnimationControlImplTest { mController = new InsetsAnimationControlImpl(controls, new Rect(0, 0, 500, 500), mInsetsState, mMockListener, systemBars(), mMockController, 10 /* durationMs */, new LinearInterpolator(), - false /* fade */, 0 /* animationType */); + 0 /* animationType */); } @Test diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java index 12f67a65920e..75a7504cac2f 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java @@ -156,9 +156,7 @@ public class AccessibilityServiceConnectionImpl extends IAccessibilityServiceCon return -1; } - public boolean takeScreenshot(int displayId, RemoteCallback callback) { - return false; - } + public void takeScreenshot(int displayId, RemoteCallback callback) {} public void setTouchExplorationPassthroughRegion(int displayId, Region region) {} diff --git a/media/java/android/media/session/ISessionManager.aidl b/media/java/android/media/session/ISessionManager.aidl index 6c1b2a6b60db..5fd8f7318543 100644 --- a/media/java/android/media/session/ISessionManager.aidl +++ b/media/java/android/media/session/ISessionManager.aidl @@ -75,4 +75,6 @@ interface ISessionManager { boolean isTrusted(String controllerPackageName, int controllerPid, int controllerUid); void setCustomMediaKeyDispatcherForTesting(String name); void setCustomSessionPolicyProviderForTesting(String name); + int getSessionPolicies(in MediaSession.Token token); + void setSessionPolicies(in MediaSession.Token token, int policies); } diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java index 4d01301859f3..2fd721e6870b 100644 --- a/media/java/android/media/session/MediaSessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -913,6 +913,34 @@ public final class MediaSessionManager { } /** + * Get session policies of the specified {@link MediaSession.Token}. + * + * @hide + */ + @Nullable + public int getSessionPolicies(@NonNull MediaSession.Token token) { + try { + return mService.getSessionPolicies(token); + } catch (RemoteException e) { + Log.e(TAG, "Failed to get session policies", e); + } + return 0; + } + + /** + * Set new session policies to the specified {@link MediaSession.Token}. + * + * @hide + */ + public void setSessionPolicies(@NonNull MediaSession.Token token, @Nullable int policies) { + try { + mService.setSessionPolicies(token, policies); + } catch (RemoteException e) { + Log.e(TAG, "Failed to set session policies", e); + } + } + + /** * Listens for changes to the list of active sessions. This can be added * using {@link #addOnActiveSessionsChangedListener}. */ diff --git a/media/java/android/media/tv/tuner/FrontendSettings.java b/media/java/android/media/tv/tuner/FrontendSettings.java deleted file mode 100644 index 7f9b9826c94b..000000000000 --- a/media/java/android/media/tv/tuner/FrontendSettings.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ - -package android.media.tv.tuner; - -/** - * Frontend settings for tune and scan operations. - * TODO: remove - * @hide - */ -public abstract class FrontendSettings { -} diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java index 73a5b65a186d..894882f07b5b 100644 --- a/media/java/android/media/tv/tuner/Tuner.java +++ b/media/java/android/media/tv/tuner/Tuner.java @@ -222,6 +222,7 @@ public class Tuner implements AutoCloseable { private Integer mDemuxHandle; private Integer mDescramblerHandle; + private Descrambler mDescrambler; private final TunerResourceManager.ResourcesReclaimListener mResourceListener = new TunerResourceManager.ResourcesReclaimListener() { @@ -245,7 +246,11 @@ public class Tuner implements AutoCloseable { mContext = context; mTunerResourceManager = (TunerResourceManager) context.getSystemService(Context.TV_TUNER_RESOURCE_MGR_SERVICE); + if (mHandler == null) { + mHandler = createEventHandler(); + } + mHandler = createEventHandler(); int[] clientId = new int[1]; ResourceClientProfile profile = new ResourceClientProfile(tvInputSessionId, useCase); mTunerResourceManager.registerClientProfile( @@ -283,7 +288,7 @@ public class Tuner implements AutoCloseable { public void shareFrontendFromTuner(@NonNull Tuner tuner) { mTunerResourceManager.shareFrontend(mClientId, tuner.mClientId); mFrontendHandle = tuner.mFrontendHandle; - nativeOpenFrontendByHandle(mFrontendHandle); + mFrontend = nativeOpenFrontendByHandle(mFrontendHandle); } /** @@ -316,6 +321,7 @@ public class Tuner implements AutoCloseable { mTunerResourceManager.releaseLnb(mLnbHandle); mLnb = null; } + nativeClose(); } /** @@ -356,13 +362,16 @@ public class Tuner implements AutoCloseable { private native Lnb nativeOpenLnbByHandle(int handle); private native Lnb nativeOpenLnbByName(String name); - private native Descrambler nativeOpenDescrambler(); + private native Descrambler nativeOpenDescramblerByHandle(int handle); + private native Descrambler nativeOpenDemuxByhandle(int handle); private native DvrRecorder nativeOpenDvrRecorder(long bufferSize); private native DvrPlayback nativeOpenDvrPlayback(long bufferSize); private static native DemuxCapabilities nativeGetDemuxCapabilities(); + private native int nativeClose(); + /** * Listener for resource lost. @@ -450,7 +459,6 @@ public class Tuner implements AutoCloseable { * @see #setOnTuneEventListener(Executor, OnTuneEventListener) */ public void clearOnTuneEventListener() { - TunerUtils.checkTunerPermission(mContext); mOnTuneEventListener = null; mOnTunerEventExecutor = null; @@ -497,7 +505,6 @@ public class Tuner implements AutoCloseable { */ @Result public int cancelTuning() { - TunerUtils.checkTunerPermission(mContext); return nativeStopTune(); } @@ -553,6 +560,7 @@ public class Tuner implements AutoCloseable { boolean granted = mTunerResourceManager.requestFrontend(request, feHandle); if (granted) { mFrontendHandle = feHandle[0]; + mFrontend = nativeOpenFrontendByHandle(mFrontendHandle); } return granted; } @@ -818,7 +826,7 @@ public class Tuner implements AutoCloseable { Objects.requireNonNull(executor, "executor must not be null"); Objects.requireNonNull(cb, "LnbCallback must not be null"); checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_LNB); - return nativeOpenLnbByHandle(mLnbHandle); + return mLnb; } /** @@ -836,7 +844,6 @@ public class Tuner implements AutoCloseable { Objects.requireNonNull(name, "LNB name must not be null"); Objects.requireNonNull(executor, "executor must not be null"); Objects.requireNonNull(cb, "LnbCallback must not be null"); - checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_LNB); return nativeOpenLnbByName(name); } @@ -846,6 +853,7 @@ public class Tuner implements AutoCloseable { boolean granted = mTunerResourceManager.requestLnb(request, lnbHandle); if (granted) { mLnbHandle = lnbHandle[0]; + mLnb = nativeOpenLnbByHandle(mLnbHandle); } return granted; } @@ -876,7 +884,7 @@ public class Tuner implements AutoCloseable { @Nullable public Descrambler openDescrambler() { checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_DESCRAMBLER); - return nativeOpenDescrambler(); + return mDescrambler; } /** @@ -929,6 +937,7 @@ public class Tuner implements AutoCloseable { boolean granted = mTunerResourceManager.requestDemux(request, demuxHandle); if (granted) { mDemuxHandle = demuxHandle[0]; + nativeOpenDemuxByhandle(mDemuxHandle); } return granted; } @@ -939,6 +948,7 @@ public class Tuner implements AutoCloseable { boolean granted = mTunerResourceManager.requestDescrambler(request, descramblerHandle); if (granted) { mDescramblerHandle = descramblerHandle[0]; + nativeOpenDescramblerByHandle(mDescramblerHandle); } return granted; } diff --git a/media/java/android/media/tv/tuner/TunerUtils.java b/media/java/android/media/tv/tuner/TunerUtils.java index a41b39725672..547a4923cf7b 100644 --- a/media/java/android/media/tv/tuner/TunerUtils.java +++ b/media/java/android/media/tv/tuner/TunerUtils.java @@ -17,8 +17,6 @@ package android.media.tv.tuner; import android.annotation.Nullable; -import android.content.Context; -import android.content.pm.PackageManager; import android.hardware.tv.tuner.V1_0.Constants; import android.media.tv.tuner.filter.Filter; @@ -28,44 +26,6 @@ import android.media.tv.tuner.filter.Filter; * @hide */ public final class TunerUtils { - private static final String TUNER_PERMISSION = android.Manifest.permission.ACCESS_TV_TUNER; - private static final String DESCRAMBLER_PERMISSION = - android.Manifest.permission.ACCESS_TV_DESCRAMBLER; - - /** - * Checks whether the caller has permission to access tuner. - * - * @param context context of the caller. - * @throws SecurityException if the caller doesn't have the permission. - */ - public static void checkTunerPermission(Context context) { - checkPermission(context, TUNER_PERMISSION); - } - - /** - * Checks whether the caller has permission to access the descrambler. - * - * @param context context of the caller. - * @throws SecurityException if the caller doesn't have the permission. - */ - public static void checkDescramblerPermission(Context context) { - checkPermission(context, DESCRAMBLER_PERMISSION); - } - - /** - * Checks whether the caller has the given permission. - * - * @param context context of the caller. - * @param permission the given permission. - * @throws SecurityException if the caller doesn't have the permission. - */ - public static void checkPermission(Context context, String permission) { - // TODO: remove checkPermission methods - if (context.checkCallingOrSelfPermission(permission) - != PackageManager.PERMISSION_GRANTED) { - throw new SecurityException("Caller must have " + permission + " permission."); - } - } /** * Gets the corresponding filter subtype constant defined in tuner HAL. diff --git a/media/java/android/media/tv/tuner/dvr/DvrSettings.java b/media/java/android/media/tv/tuner/dvr/DvrSettings.java index 362b108e41fd..3df721cdf18b 100644 --- a/media/java/android/media/tv/tuner/dvr/DvrSettings.java +++ b/media/java/android/media/tv/tuner/dvr/DvrSettings.java @@ -19,11 +19,8 @@ package android.media.tv.tuner.dvr; import android.annotation.BytesLong; import android.annotation.IntDef; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; -import android.media.tv.tuner.TunerUtils; import android.media.tv.tuner.filter.Filter; import java.lang.annotation.Retention; @@ -123,13 +120,9 @@ public class DvrSettings { /** * Creates a builder for {@link DvrSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java index e40b0806feb2..29bc2c9bd9c1 100644 --- a/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java @@ -19,11 +19,8 @@ package android.media.tv.tuner.filter; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -111,13 +108,9 @@ public final class AlpFilterConfiguration extends FilterConfiguration { /** * Creates a builder for {@link AlpFilterConfiguration}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/filter/AvSettings.java b/media/java/android/media/tv/tuner/filter/AvSettings.java index bf11893e4bb3..e9b3660ab12f 100644 --- a/media/java/android/media/tv/tuner/filter/AvSettings.java +++ b/media/java/android/media/tv/tuner/filter/AvSettings.java @@ -17,9 +17,7 @@ package android.media.tv.tuner.filter; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.media.tv.tuner.TunerUtils; /** @@ -50,27 +48,24 @@ public class AvSettings extends Settings { /** * Creates a builder for {@link AvSettings}. * - * @param context the context of the caller. * @param mainType the filter main type. * @param isAudio {@code true} if it's audio settings; {@code false} if it's video settings. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder( - @NonNull Context context, @Filter.Type int mainType, boolean isAudio) { - TunerUtils.checkTunerPermission(context); + public static Builder builder(@Filter.Type int mainType, boolean isAudio) { return new Builder(mainType, isAudio); } /** * Builder for {@link AvSettings}. */ - public static class Builder extends Settings.Builder<Builder> { + public static class Builder { + private final int mMainType; private final boolean mIsAudio; private boolean mIsPassthrough; private Builder(int mainType, boolean isAudio) { - super(mainType); + mMainType = mainType; mIsAudio = isAudio; } @@ -90,10 +85,5 @@ public class AvSettings extends Settings { public AvSettings build() { return new AvSettings(mMainType, mIsAudio, mIsPassthrough); } - - @Override - Builder self() { - return this; - } } } diff --git a/media/java/android/media/tv/tuner/filter/DownloadSettings.java b/media/java/android/media/tv/tuner/filter/DownloadSettings.java index 915ad79ffd5a..7ba923e23c70 100644 --- a/media/java/android/media/tv/tuner/filter/DownloadSettings.java +++ b/media/java/android/media/tv/tuner/filter/DownloadSettings.java @@ -17,9 +17,7 @@ package android.media.tv.tuner.filter; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.media.tv.tuner.TunerUtils; /** @@ -46,24 +44,22 @@ public class DownloadSettings extends Settings { /** * Creates a builder for {@link DownloadSettings}. * - * @param context the context of the caller. * @param mainType the filter main type. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context, @Filter.Type int mainType) { - TunerUtils.checkTunerPermission(context); + public static Builder builder(@Filter.Type int mainType) { return new Builder(mainType); } /** * Builder for {@link DownloadSettings}. */ - public static class Builder extends Settings.Builder<Builder> { + public static class Builder { + private final int mMainType; private int mDownloadId; private Builder(int mainType) { - super(mainType); + mMainType = mainType; } /** @@ -82,10 +78,5 @@ public class DownloadSettings extends Settings { public DownloadSettings build() { return new DownloadSettings(mMainType, mDownloadId); } - - @Override - Builder self() { - return this; - } } } diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java index 8dc062274641..b943fe589270 100644 --- a/media/java/android/media/tv/tuner/filter/Filter.java +++ b/media/java/android/media/tv/tuner/filter/Filter.java @@ -23,7 +23,6 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.hardware.tv.tuner.V1_0.Constants; import android.media.tv.tuner.Tuner.Result; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -239,13 +238,12 @@ public class Filter implements AutoCloseable { */ @Result public int configure(@NonNull FilterConfiguration config) { - // TODO: validate main type, subtype, config, settings - int subType; Settings s = config.getSettings(); - if (s != null) { - subType = s.getType(); - } else { - subType = TunerUtils.getFilterSubtype(mMainType, mSubtype); + int subType = (s == null) ? mSubtype : s.getType(); + if (mMainType != config.getType() || mSubtype != subType) { + throw new IllegalArgumentException("Invalid filter config. filter main type=" + + mMainType + ", filter subtype=" + mSubtype + ". config main type=" + + config.getType() + ", config subtype=" + subType); } return nativeConfigureFilter(config.getType(), subType, config); } diff --git a/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java index de75a4f8e1cf..561e4da59bf5 100644 --- a/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java @@ -18,11 +18,8 @@ package android.media.tv.tuner.filter; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.RequiresPermission; import android.annotation.Size; import android.annotation.SystemApi; -import android.content.Context; -import android.media.tv.tuner.TunerUtils; /** * Filter configuration for a IP filter. @@ -92,13 +89,9 @@ public final class IpFilterConfiguration extends FilterConfiguration { /** * Creates a builder for {@link IpFilterConfiguration}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/filter/MediaEvent.java b/media/java/android/media/tv/tuner/filter/MediaEvent.java index b6bd86befd87..247c1c47560a 100644 --- a/media/java/android/media/tv/tuner/filter/MediaEvent.java +++ b/media/java/android/media/tv/tuner/filter/MediaEvent.java @@ -27,7 +27,9 @@ import android.media.MediaCodec.LinearBlock; * @hide */ @SystemApi -public class MediaEvent extends FilterEvent{ +public class MediaEvent extends FilterEvent { + private native int nativeGetAudioHandle(); + private final int mStreamId; private final boolean mIsPtsPresent; private final long mPts; @@ -134,7 +136,7 @@ public class MediaEvent extends FilterEvent{ * @see android.media.AudioTrack#ENCAPSULATION_MODE_HANDLE */ public long getAudioHandle() { - // TODO: implement + nativeGetAudioHandle(); return mDataId; } diff --git a/media/java/android/media/tv/tuner/filter/MmtpFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/MmtpFilterConfiguration.java index f19edc99d02e..3a45a18855a6 100644 --- a/media/java/android/media/tv/tuner/filter/MmtpFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/MmtpFilterConfiguration.java @@ -18,11 +18,8 @@ package android.media.tv.tuner.filter; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.media.tv.tuner.Tuner; -import android.media.tv.tuner.TunerUtils; /** * Filter configuration for a MMTP filter. @@ -54,13 +51,9 @@ public final class MmtpFilterConfiguration extends FilterConfiguration { /** * Creates a builder for {@link IpFilterConfiguration}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/filter/PesSettings.java b/media/java/android/media/tv/tuner/filter/PesSettings.java index 0f83597ff43f..2f551cc58b6e 100644 --- a/media/java/android/media/tv/tuner/filter/PesSettings.java +++ b/media/java/android/media/tv/tuner/filter/PesSettings.java @@ -17,9 +17,7 @@ package android.media.tv.tuner.filter; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.media.tv.tuner.TunerUtils; /** @@ -59,12 +57,9 @@ public class PesSettings extends Settings { * Creates a builder for {@link PesSettings}. * * @param mainType the filter main type of the settings. - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context, @Filter.Type int mainType) { - TunerUtils.checkTunerPermission(context); + public static Builder builder(@Filter.Type int mainType) { return new Builder(mainType); } diff --git a/media/java/android/media/tv/tuner/filter/RecordSettings.java b/media/java/android/media/tv/tuner/filter/RecordSettings.java index 0c812ab051bd..ec01e44b975c 100644 --- a/media/java/android/media/tv/tuner/filter/RecordSettings.java +++ b/media/java/android/media/tv/tuner/filter/RecordSettings.java @@ -18,9 +18,7 @@ package android.media.tv.tuner.filter; import android.annotation.IntDef; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; import android.media.tv.tuner.TunerUtils; @@ -270,26 +268,24 @@ public class RecordSettings extends Settings { /** * Creates a builder for {@link RecordSettings}. * - * @param context the context of the caller. * @param mainType the filter main type. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context, @Filter.Type int mainType) { - TunerUtils.checkTunerPermission(context); + public static Builder builder(@Filter.Type int mainType) { return new Builder(mainType); } /** * Builder for {@link RecordSettings}. */ - public static class Builder extends Settings.Builder<Builder> { + public static class Builder { + private final int mMainType; private int mTsIndexMask; private int mScIndexType; private int mScIndexMask; private Builder(int mainType) { - super(mainType); + mMainType = mainType; } /** @@ -324,11 +320,6 @@ public class RecordSettings extends Settings { public RecordSettings build() { return new RecordSettings(mMainType, mTsIndexMask, mScIndexType, mScIndexMask); } - - @Override - Builder self() { - return this; - } } } diff --git a/media/java/android/media/tv/tuner/filter/SectionSettings.java b/media/java/android/media/tv/tuner/filter/SectionSettings.java index 947013840bc6..58e22c907639 100644 --- a/media/java/android/media/tv/tuner/filter/SectionSettings.java +++ b/media/java/android/media/tv/tuner/filter/SectionSettings.java @@ -64,14 +64,14 @@ public abstract class SectionSettings extends Settings { * * @param <T> The subclass to be built. */ - public abstract static class Builder<T extends Builder<T>> - extends Settings.Builder<Builder<T>> { + public abstract static class Builder<T extends Builder<T>> { + final int mMainType; boolean mCrcEnabled; boolean mIsRepeat; boolean mIsRaw; Builder(int mainType) { - super(mainType); + mMainType = mainType; } /** diff --git a/media/java/android/media/tv/tuner/filter/SectionSettingsWithSectionBits.java b/media/java/android/media/tv/tuner/filter/SectionSettingsWithSectionBits.java index cb547ec8ae9a..edfe85ede943 100644 --- a/media/java/android/media/tv/tuner/filter/SectionSettingsWithSectionBits.java +++ b/media/java/android/media/tv/tuner/filter/SectionSettingsWithSectionBits.java @@ -17,10 +17,7 @@ package android.media.tv.tuner.filter; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; -import android.media.tv.tuner.TunerUtils; /** * Bits Settings for Section Filters. @@ -74,13 +71,10 @@ public class SectionSettingsWithSectionBits extends SectionSettings { /** * Creates a builder for {@link SectionSettingsWithSectionBits}. * - * @param context the context of the caller. * @param mainType the filter main type. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context, @Filter.Type int mainType) { - TunerUtils.checkTunerPermission(context); + public static Builder builder(@Filter.Type int mainType) { return new Builder(mainType); } @@ -88,9 +82,9 @@ public class SectionSettingsWithSectionBits extends SectionSettings { * Builder for {@link SectionSettingsWithSectionBits}. */ public static class Builder extends SectionSettings.Builder<Builder> { - private byte[] mFilter; - private byte[] mMask; - private byte[] mMode; + private byte[] mFilter = {}; + private byte[] mMask = {}; + private byte[] mMode = {}; private Builder(int mainType) { super(mainType); @@ -98,6 +92,8 @@ public class SectionSettingsWithSectionBits extends SectionSettings { /** * Sets filter bytes. + * + * <p>Default value is an empty byte array. */ @NonNull public Builder setFilter(@NonNull byte[] filter) { @@ -106,6 +102,8 @@ public class SectionSettingsWithSectionBits extends SectionSettings { } /** * Sets bit mask. + * + * <p>Default value is an empty byte array. */ @NonNull public Builder setMask(@NonNull byte[] mask) { @@ -114,6 +112,8 @@ public class SectionSettingsWithSectionBits extends SectionSettings { } /** * Sets mode. + * + * <p>Default value is an empty byte array. */ @NonNull public Builder setMode(@NonNull byte[] mode) { diff --git a/media/java/android/media/tv/tuner/filter/SectionSettingsWithTableInfo.java b/media/java/android/media/tv/tuner/filter/SectionSettingsWithTableInfo.java index 09d1dae971b7..fc6451fd96bc 100644 --- a/media/java/android/media/tv/tuner/filter/SectionSettingsWithTableInfo.java +++ b/media/java/android/media/tv/tuner/filter/SectionSettingsWithTableInfo.java @@ -17,10 +17,7 @@ package android.media.tv.tuner.filter; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; -import android.media.tv.tuner.TunerUtils; /** * Table information for Section Filter. @@ -55,13 +52,10 @@ public class SectionSettingsWithTableInfo extends SectionSettings { /** * Creates a builder for {@link SectionSettingsWithTableInfo}. * - * @param context the context of the caller. * @param mainType the filter main type. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context, @Filter.Type int mainType) { - TunerUtils.checkTunerPermission(context); + public static Builder builder(@Filter.Type int mainType) { return new Builder(mainType); } diff --git a/media/java/android/media/tv/tuner/filter/Settings.java b/media/java/android/media/tv/tuner/filter/Settings.java index fee7f66c1231..f89bc06c1291 100644 --- a/media/java/android/media/tv/tuner/filter/Settings.java +++ b/media/java/android/media/tv/tuner/filter/Settings.java @@ -37,19 +37,4 @@ public abstract class Settings { public int getType() { return mType; } - - - /** - * Builder for {@link Settings}. - * - * @param <T> The subclass to be built. - */ - public abstract static class Builder<T extends Builder<T>> { - /* package */ final int mMainType; - - /* package */ Builder(int mainType) { - mMainType = mainType; - } - /* package */ abstract T self(); - } } diff --git a/media/java/android/media/tv/tuner/filter/TimeFilter.java b/media/java/android/media/tv/tuner/filter/TimeFilter.java index be0a055b41ef..da77b50bc3e5 100644 --- a/media/java/android/media/tv/tuner/filter/TimeFilter.java +++ b/media/java/android/media/tv/tuner/filter/TimeFilter.java @@ -67,8 +67,7 @@ public class TimeFilter implements AutoCloseable { @Result public int setCurrentTimestamp(long timestamp) { int res = nativeSetTimestamp(timestamp); - // TODO: use a constant for SUCCESS - if (res == 0) { + if (res == Tuner.RESULT_SUCCESS) { mEnable = true; } return res; diff --git a/media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java index eb1de52e5b79..9bb408dde8d4 100644 --- a/media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java @@ -18,10 +18,7 @@ package android.media.tv.tuner.filter; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; -import android.media.tv.tuner.TunerUtils; /** * Filter configuration for a TLV filter. @@ -96,13 +93,9 @@ public final class TlvFilterConfiguration extends FilterConfiguration { /** * Creates a builder for {@link TlvFilterConfiguration}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java index 0579269f59d7..d4a18568f7a5 100644 --- a/media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/TsFilterConfiguration.java @@ -18,10 +18,7 @@ package android.media.tv.tuner.filter; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; -import android.media.tv.tuner.TunerUtils; /** * Filter configuration for a TS filter. @@ -51,13 +48,9 @@ public final class TsFilterConfiguration extends FilterConfiguration { /** * Creates a builder for {@link TsFilterConfiguration}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java index e68585d8d0a7..1d36da34429e 100644 --- a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java @@ -19,11 +19,8 @@ package android.media.tv.tuner.frontend; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -195,13 +192,9 @@ public class AnalogFrontendSettings extends FrontendSettings { /** * Creates a builder for {@link AnalogFrontendSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java index bf4f3b250ef4..f9eabc5b50e5 100644 --- a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java @@ -19,11 +19,8 @@ package android.media.tv.tuner.frontend; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -314,12 +311,9 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** * Creates a builder for {@link Atsc3FrontendSettings}. * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/Atsc3PlpSettings.java b/media/java/android/media/tv/tuner/frontend/Atsc3PlpSettings.java index fe61dbc1b86f..f86eccf087d9 100644 --- a/media/java/android/media/tv/tuner/frontend/Atsc3PlpSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Atsc3PlpSettings.java @@ -17,10 +17,7 @@ package android.media.tv.tuner.frontend; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; -import android.media.tv.tuner.TunerUtils; /** * Physical Layer Pipe (PLP) settings for ATSC-3. @@ -80,13 +77,9 @@ public class Atsc3PlpSettings { /** * Creates a builder for {@link Atsc3PlpSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java index 0674f6e6327e..f7244bbdf951 100644 --- a/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java @@ -19,11 +19,8 @@ package android.media.tv.tuner.frontend; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -79,13 +76,9 @@ public class AtscFrontendSettings extends FrontendSettings { /** * Creates a builder for {@link AtscFrontendSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java index 121de5dd6a46..271e91e5cbb8 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java @@ -19,11 +19,8 @@ package android.media.tv.tuner.frontend; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -206,13 +203,9 @@ public class DvbcFrontendSettings extends FrontendSettings { /** * Creates a builder for {@link DvbcFrontendSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/DvbsCodeRate.java b/media/java/android/media/tv/tuner/frontend/DvbsCodeRate.java index 2bdd37985813..dcf15118e9ea 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbsCodeRate.java +++ b/media/java/android/media/tv/tuner/frontend/DvbsCodeRate.java @@ -17,10 +17,7 @@ package android.media.tv.tuner.frontend; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; -import android.media.tv.tuner.TunerUtils; /** * Code rate for DVBS. @@ -69,13 +66,9 @@ public class DvbsCodeRate { /** * Creates a builder for {@link DvbsCodeRate}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java index afc79aba2cd5..60b070fa1fa8 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java @@ -20,12 +20,9 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; import android.media.tv.tuner.Tuner; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -292,13 +289,9 @@ public class DvbsFrontendSettings extends FrontendSettings { /** * Creates a builder for {@link DvbsFrontendSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java index 67a9fdc661b2..5c057de7cfbe 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java @@ -19,11 +19,8 @@ package android.media.tv.tuner.frontend; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -494,13 +491,9 @@ public class DvbtFrontendSettings extends FrontendSettings { /** * Creates a builder for {@link DvbtFrontendSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/FrontendInfo.java b/media/java/android/media/tv/tuner/frontend/FrontendInfo.java index 696d8390fc11..334900ba705a 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendInfo.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendInfo.java @@ -112,7 +112,7 @@ public class FrontendInfo { * Gets frontend capabilities. */ @NonNull - public FrontendCapabilities getFrontendCapability() { + public FrontendCapabilities getFrontendCapabilities() { return mFrontendCap; } } diff --git a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java index ea91ee9250b5..c265bb9e6050 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java @@ -214,7 +214,7 @@ public class FrontendStatus { private Integer mFreqOffset; private Integer mHierarchy; private Boolean mIsRfLocked; - private Atsc3PlpInfo[] mPlpInfo; + private Atsc3PlpTuningInfo[] mPlpInfo; // Constructed and fields set by JNI code. private FrontendStatus() { @@ -419,7 +419,7 @@ public class FrontendStatus { /** * Gets lock status for RF. */ - public boolean isRfLock() { + public boolean isRfLocked() { if (mIsRfLocked == null) { throw new IllegalStateException(); } @@ -429,7 +429,7 @@ public class FrontendStatus { * Gets an array of PLP status for tuned PLPs for ATSC3 frontend. */ @NonNull - public Atsc3PlpInfo[] getAtsc3PlpInfo() { + public Atsc3PlpTuningInfo[] getAtsc3PlpTuningInfo() { if (mPlpInfo == null) { throw new IllegalStateException(); } @@ -439,14 +439,14 @@ public class FrontendStatus { /** * Status for each tuning Physical Layer Pipes. */ - public static class Atsc3PlpInfo { + public static class Atsc3PlpTuningInfo { private final int mPlpId; - private final boolean mIsLock; + private final boolean mIsLocked; private final int mUec; - private Atsc3PlpInfo(int plpId, boolean isLock, int uec) { + private Atsc3PlpTuningInfo(int plpId, boolean isLocked, int uec) { mPlpId = plpId; - mIsLock = isLock; + mIsLocked = isLocked; mUec = uec; } @@ -459,8 +459,8 @@ public class FrontendStatus { /** * Gets Demod Lock/Unlock status of this particular PLP. */ - public boolean isLock() { - return mIsLock; + public boolean isLocked() { + return mIsLocked; } /** * Gets Uncorrectable Error Counts (UEC) of this particular PLP since last tune operation. diff --git a/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java index e0077cac1df5..02cdb96285e3 100644 --- a/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java @@ -19,12 +19,9 @@ package android.media.tv.tuner.frontend; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; import android.media.tv.tuner.Tuner; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -213,13 +210,9 @@ public class Isdbs3FrontendSettings extends FrontendSettings { /** * Creates a builder for {@link Isdbs3FrontendSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java index 8dc591b972bf..3cc1aab6a9a6 100644 --- a/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java @@ -19,12 +19,9 @@ package android.media.tv.tuner.frontend; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; import android.media.tv.tuner.Tuner; -import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -197,13 +194,9 @@ public class IsdbsFrontendSettings extends FrontendSettings { /** * Creates a builder for {@link IsdbsFrontendSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java index 915380e42c11..6a14d08a4248 100644 --- a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java @@ -19,11 +19,8 @@ package android.media.tv.tuner.frontend; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.content.Context; import android.hardware.tv.tuner.V1_0.Constants; -import android.media.tv.tuner.TunerUtils; import android.media.tv.tuner.frontend.DvbtFrontendSettings.CodeRate; import java.lang.annotation.Retention; @@ -190,13 +187,9 @@ public class IsdbtFrontendSettings extends FrontendSettings { /** * Creates a builder for {@link IsdbtFrontendSettings}. - * - * @param context the context of the caller. */ - @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @NonNull - public static Builder builder(@NonNull Context context) { - TunerUtils.checkTunerPermission(context); + public static Builder builder() { return new Builder(); } diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp index bbeb45179c78..95ce07d3c55e 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -2649,7 +2649,7 @@ static int android_media_tv_Tuner_time_filter_close(JNIEnv *env, jobject filter) return (int) r; } -static jobject android_media_tv_Tuner_open_descrambler(JNIEnv *env, jobject thiz) { +static jobject android_media_tv_Tuner_open_descrambler(JNIEnv *env, jobject thiz, jint) { sp<JTuner> tuner = getTuner(env, thiz); return tuner->openDescrambler(); } @@ -2961,7 +2961,7 @@ static const JNINativeMethod gTunerMethods[] = { (void *)android_media_tv_Tuner_open_lnb_by_handle }, { "nativeOpenLnbByName", "(Ljava/lang/String;)Landroid/media/tv/tuner/Lnb;", (void *)android_media_tv_Tuner_open_lnb_by_name }, - { "nativeOpenDescrambler", "()Landroid/media/tv/tuner/Descrambler;", + { "nativeOpenDescramblerByHandle", "(I)Landroid/media/tv/tuner/Descrambler;", (void *)android_media_tv_Tuner_open_descrambler }, { "nativeOpenDvrRecorder", "(J)Landroid/media/tv/tuner/dvr/DvrRecorder;", (void *)android_media_tv_Tuner_open_dvr_recorder }, diff --git a/packages/SettingsLib/res/drawable/ic_help.xml b/packages/SettingsLib/res/drawable/ic_help.xml new file mode 100644 index 000000000000..73681d379e18 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_help.xml @@ -0,0 +1,25 @@ +<!-- + 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M11,18h2v-2h-2V18zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5C16,7.79 14.21,6 12,6z"/> +</vector> diff --git a/packages/SettingsLib/res/layout/preference_access_point.xml b/packages/SettingsLib/res/layout/preference_access_point.xml index 472a6e3d0dd4..fecafa89aeb0 100644 --- a/packages/SettingsLib/res/layout/preference_access_point.xml +++ b/packages/SettingsLib/res/layout/preference_access_point.xml @@ -93,4 +93,14 @@ android:gravity="center" android:orientation="vertical" /> + <ImageButton + android:id="@+id/icon_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="64dp" + android:minHeight="@dimen/min_tap_target_size" + android:layout_gravity="center" + android:background="?android:attr/selectableItemBackground" + android:visibility="gone"> + </ImageButton> </LinearLayout> diff --git a/packages/SettingsLib/res/values/dimens.xml b/packages/SettingsLib/res/values/dimens.xml index d10e034157db..a5ec5e66f242 100644 --- a/packages/SettingsLib/res/values/dimens.xml +++ b/packages/SettingsLib/res/values/dimens.xml @@ -92,4 +92,6 @@ <!-- Size of nearby icon --> <dimen name="bt_nearby_icon_size">24dp</dimen> + <!-- Define minimal size of the tap area --> + <dimen name="min_tap_target_size">48dp</dimen> </resources> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index a7970668124b..1424f9ebdf59 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1066,8 +1066,8 @@ <string name="power_discharge_by_only">Should last until about <xliff:g id="time">%1$s</xliff:g></string> <!-- [CHAR_LIMIT=20] Label for estimated time that phone will run out of battery --> <string name="power_discharge_by_only_short">Until <xliff:g id="time" example="12 PM">%1$s</xliff:g></string> - <!-- [CHAR_LIMIT=100] Extend the battery life past a certain time --> - <string name="power_suggestion_extend_battery">Extend battery life past <xliff:g id="time" example="12 PM">%1$s</xliff:g></string> + <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery --> + <string name="power_suggestion_battery_run_out">Battery may run out by <xliff:g id="time" example="12 PM">%1$s</xliff:g></string> <!-- [CHAR_LIMIT=60] label for estimated remaining duration of battery when under a certain amount --> <string name="power_remaining_less_than_duration_only">Less than <xliff:g id="threshold">%1$s</xliff:g> remaining</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index 5d1e4cbf8b72..db219c9ce74e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -494,7 +494,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> /** * Get battery level from remote device - * @return battery level in percentage [0-100], or {@link BluetoothDevice#BATTERY_LEVEL_UNKNOWN} + * @return battery level in percentage [0-100], + * {@link BluetoothDevice#BATTERY_LEVEL_BLUETOOTH_OFF}, or + * {@link BluetoothDevice#BATTERY_LEVEL_UNKNOWN} */ public int getBatteryLevel() { return mDevice.getBatteryLevel(); @@ -937,12 +939,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> } String batteryLevelPercentageString = null; - // Android framework should only set mBatteryLevel to valid range [0-100] or - // BluetoothDevice.BATTERY_LEVEL_UNKNOWN, any other value should be a framework bug. - // Thus assume here that if value is not BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must - // be valid + // Android framework should only set mBatteryLevel to valid range [0-100], + // BluetoothDevice.BATTERY_LEVEL_BLUETOOTH_OFF, or BluetoothDevice.BATTERY_LEVEL_UNKNOWN, + // any other value should be a framework bug. Thus assume here that if value is greater + // than BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must be valid final int batteryLevel = getBatteryLevel(); - if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { + if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { // TODO: name com.android.settingslib.bluetooth.Utils something different batteryLevelPercentageString = com.android.settingslib.Utils.formatPercentage(batteryLevel); @@ -1050,12 +1052,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> } String batteryLevelPercentageString = null; - // Android framework should only set mBatteryLevel to valid range [0-100] or - // BluetoothDevice.BATTERY_LEVEL_UNKNOWN, any other value should be a framework bug. - // Thus assume here that if value is not BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must - // be valid + // Android framework should only set mBatteryLevel to valid range [0-100], + // BluetoothDevice.BATTERY_LEVEL_BLUETOOTH_OFF, or BluetoothDevice.BATTERY_LEVEL_UNKNOWN, + // any other value should be a framework bug. Thus assume here that if value is greater + // than BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must be valid final int batteryLevel = getBatteryLevel(); - if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { + if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { // TODO: name com.android.settingslib.bluetooth.Utils something different batteryLevelPercentageString = com.android.settingslib.Utils.formatPercentage(batteryLevel); diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java index 7046d234904b..0a70f72518d4 100644 --- a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java @@ -119,7 +119,7 @@ public class PowerUtil { return null; } if (drainTimeMs <= ONE_DAY_MILLIS) { - return context.getString(R.string.power_suggestion_extend_battery, + return context.getString(R.string.power_suggestion_battery_run_out, getDateTimeStringFromMs(context, drainTimeMs)); } else { return getMoreThanOneDayShortString(context, drainTimeMs, diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java index 6a7000eb92c8..c63c34c1b6d1 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java @@ -23,8 +23,10 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.StateListDrawable; import android.text.TextUtils; import android.view.View; +import android.widget.ImageButton; import android.widget.ImageView; +import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -37,7 +39,8 @@ import com.android.wifitrackerlib.WifiEntry; /** * Preference to display a WifiEntry in a wifi picker. */ -public class WifiEntryPreference extends Preference implements WifiEntry.WifiEntryCallback { +public class WifiEntryPreference extends Preference implements WifiEntry.WifiEntryCallback, + View.OnClickListener { private static final int[] STATE_SECURED = { R.attr.state_encrypted @@ -62,6 +65,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt private WifiEntry mWifiEntry; private int mLevel = -1; private CharSequence mContentDescription; + private OnButtonClickListener mOnButtonClickListener; public WifiEntryPreference(@NonNull Context context, @NonNull WifiEntry wifiEntry) { this(context, wifiEntry, new IconInjector(context)); @@ -95,11 +99,32 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt view.itemView.setContentDescription(mContentDescription); - final ImageView frictionImageView = (ImageView) view.findViewById(R.id.friction_icon); - bindFrictionImage(frictionImageView); - // Turn off divider view.findViewById(R.id.two_target_divider).setVisibility(View.INVISIBLE); + + // Enable the icon button when this Entry is a canManageSubscription entry. + final ImageButton imageButton = (ImageButton) view.findViewById(R.id.icon_button); + final ImageView frictionImageView = (ImageView) view.findViewById( + R.id.friction_icon); + if (mWifiEntry.canManageSubscription() && !mWifiEntry.isSaved() + && mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_DISCONNECTED) { + final Drawable drawablehelp = getDrawable(R.drawable.ic_help); + drawablehelp.setTintList( + Utils.getColorAttr(getContext(), android.R.attr.colorControlNormal)); + ((ImageView) imageButton).setImageDrawable(drawablehelp); + imageButton.setVisibility(View.VISIBLE); + imageButton.setOnClickListener(this); + if (frictionImageView != null) { + frictionImageView.setVisibility(View.GONE); + } + } else { + imageButton.setVisibility(View.GONE); + + if (frictionImageView != null) { + frictionImageView.setVisibility(View.VISIBLE); + bindFrictionImage(frictionImageView); + } + } } /** @@ -236,4 +261,44 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt return mContext.getDrawable(Utils.getWifiIconResource(level)); } } + + /** + * Set listeners, who want to listen the button client event. + */ + public void setOnButtonClickListener(OnButtonClickListener listener) { + mOnButtonClickListener = listener; + notifyChanged(); + } + + @Override + public void onClick(View view) { + if (view.getId() == R.id.icon_button) { + if (mOnButtonClickListener != null) { + mOnButtonClickListener.onButtonClick(this); + } + } + } + + /** + * Callback to inform the caller that the icon button is clicked. + */ + public interface OnButtonClickListener { + + /** + * Register to listen the button click event. + */ + void onButtonClick(WifiEntryPreference preference); + } + + private Drawable getDrawable(@DrawableRes int iconResId) { + Drawable buttonIcon = null; + + try { + buttonIcon = getContext().getDrawable(iconResId); + } catch (Resources.NotFoundException exception) { + // Do nothing + } + return buttonIcon; + } + } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java index ed308c8d6f6a..342d127abd03 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java @@ -42,7 +42,7 @@ public class PowerUtilTest { private static final long THIRTY_HOURS_MILLIS = Duration.ofHours(30).toMillis(); private static final String NORMAL_CASE_EXPECTED_PREFIX = "Should last until about"; private static final String ENHANCED_SUFFIX = " based on your usage"; - private static final String EXTEND_PREFIX = "Extend battery life past"; + private static final String BATTERY_RUN_OUT_PREFIX = "Battery may run out by"; // matches a time (ex: '1:15 PM', '2 AM', '23:00') private static final String TIME_OF_DAY_REGEX = " (\\d)+:?(\\d)* ((AM)*)|((PM)*)"; // matches a percentage with parenthesis (ex: '(10%)') @@ -189,9 +189,9 @@ public class PowerUtilTest { String info = PowerUtil.getBatteryTipStringFormatted(mContext, SEVENTEEN_MIN_MILLIS); - // ex: Extend battery life past 1:15 PM + // ex: Battery may run out by 1:15 PM assertThat(info).containsMatch(Pattern.compile( - EXTEND_PREFIX + TIME_OF_DAY_REGEX)); + BATTERY_RUN_OUT_PREFIX + TIME_OF_DAY_REGEX)); } @Test diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiEntryPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiEntryPreferenceTest.java index 0f1e0ff60e37..47836c022d38 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiEntryPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiEntryPreferenceTest.java @@ -21,7 +21,13 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.drawable.Drawable; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.LinearLayout; +import androidx.preference.PreferenceViewHolder; + +import com.android.settingslib.R; import com.android.wifitrackerlib.WifiEntry; import org.junit.Before; @@ -147,4 +153,18 @@ public class WifiEntryPreferenceTest { assertThat(iconList).containsExactly(mMockDrawable0, mMockDrawable1, mMockDrawable2, mMockDrawable3, mMockDrawable4, null); } + + @Test + public void canManageSubscription_shouldSetImageButtonVisible() { + when(mMockWifiEntry.canManageSubscription()).thenReturn(true); + final WifiEntryPreference pref = + new WifiEntryPreference(mContext, mMockWifiEntry, mMockIconInjector); + final LayoutInflater inflater = LayoutInflater.from(mContext); + final View view = inflater.inflate(pref.getLayoutResource(), new LinearLayout(mContext), + false); + final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(view); + pref.onBindViewHolder(holder); + + assertThat(view.findViewById(R.id.icon_button).getVisibility()).isEqualTo(View.VISIBLE); + } } diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index fbbe74e4bc75..0fb641581735 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Kry jou aandag met klank of vibrasie."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Hou jou aandag met \'n swewende kortpad na hierdie inhoud toe."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Geen onlangse borrels nie"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Onlangse borrels en borrels wat toegemaak is, sal hier verskyn."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Hierdie kennisgewings kan nie gewysig word nie."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Hierdie groep kennisgewings kan nie hier opgestel word nie"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Instaanbediener-kennisgewing"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Toesteldienste"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Titelloos"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tik om hierdie program te herbegin en maak volskerm oop."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Maak <xliff:g id="APP_NAME">%1$s</xliff:g> oop"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Instellings vir <xliff:g id="APP_NAME">%1$s</xliff:g>-borrels"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Laat borrels vanaf <xliff:g id="APP_NAME">%1$s</xliff:g> toe?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Bestuur"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Weier"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Laat toe"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Vra my later"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> vanaf <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> van <xliff:g id="APP_NAME">%2$s</xliff:g> en <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> meer af"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Beweeg"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Beweeg na links onder"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Beweeg na regs onder"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Maak toe"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Hou kletse prominent"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nuwe kletse van <xliff:g id="APP_NAME">%1$s</xliff:g> af sal as borrels verskyn. Tik op \'n borrel om dit oop te maak. Sleep om dit te skuif.\n\nTik op die borrel"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tik op Bestuur om borrels vanaf hierdie program af te skakel"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Stelselnavigasie is opgedateer. Gaan na Instellings toe om veranderinge te maak."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gaan na Instellings toe om stelselnavigasie op te dateer"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Bystandmodus"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Swiep om ander strukture te sien"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 30b8a878519d..56df206cac8c 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ከድምፅ ወይም ንዝረት ጋር የእርስዎን ትኩረት ይስባል።"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ለዚህ ይዞታ ከተንሳፋፊ አቋራጭ ጋር የእርስዎን ትኩረት ያቆያል።"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"ምንም የቅርብ ጊዜ አረፋዎች የሉም"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"የቅርብ ጊዜ አረፋዎች እና የተሰናበቱ አረፋዎች እዚህ ይመጣሉ።"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"እነዚህ ማሳወቂያዎች ሊሻሻሉ አይችሉም።"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"የማሳወቂያዎች ይህ ቡድን እዚህ ላይ ሊዋቀር አይችልም"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ተኪ ማሳወቂያ"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"የመሣሪያ አገልግሎቶች"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"ርዕስ የለም"</string> <string name="restart_button_description" msgid="6916116576177456480">"ይህን መተግበሪያ እንደገና ለማስጀመር መታ ያድርጉ እና ወደ ሙሉ ማያ ገጽ ይሂዱ።"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> ክፈት"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"ቅንብሮች ለ <xliff:g id="APP_NAME">%1$s</xliff:g> አረፋዎች"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"ከ <xliff:g id="APP_NAME">%1$s</xliff:g> አረፋዎች ይፈቀዱ?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"ያቀናብሩ"</string> - <string name="no_bubbles" msgid="1187859094003006292">"ከልክል"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"ፍቀድ"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"በኋላ ጠይቀኝ"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ከ<xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ከ <xliff:g id="APP_NAME">%2$s</xliff:g> እና <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ተጨማሪ"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"አንቀሳቅስ"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"የግርጌውን ግራ አንቀሳቅስ"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ታችኛውን ቀኝ ያንቀሳቅሱ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"አሰናብት"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"ውይይቶችን ከፊት ያድርጓቸው"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"ከ<xliff:g id="APP_NAME">%1$s</xliff:g> የመጡ አዲስ ውይይቶች እንደ አረፋዎች ሆነው ይታያሉ። አንድ አረፋን ለመክፈት መታ ያድርጉት። እሱን ለማንቀሳቀስ ይጎትቱት።\n\nአረፋውን መታ ያድርጉት"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"የዚህ መተግበሪያ አረፋዎችን ለማጥፋት አቀናብርን መታ ያድርጉ"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"የስርዓት ዳሰሳ ተዘምኗል። ለውጦችን ለማድረግ ወደ ቅንብሮች ይሂዱ።"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"የስርዓት ዳሰሳን ለማዘመን ወደ ቅንብሮች ይሂዱ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ተጠባባቂ"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"ሌሎች መዋቅሮችን ለማየት በጣት ይጥረጉ"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index e3bc9fc97d6b..e0c945ff155a 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -711,7 +711,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"يلفت هذا الإشعار انتباهك باستخدام الصوت والاهتزاز."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"يلفِت هذا الإشعار انتباهك لهذا المحتوى باستخدام اختصار عائم."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"ليس هناك فقاعات حديثة"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"ستظهر هنا أحدث الفقاعات والفقاعات التي تم إغلاقها."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"يتعذّر تعديل هذه الإشعارات."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"يتعذّر ضبط مجموعة الإشعارات هذه هنا."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"إشعار مستند إلى خادم وكيل"</string> @@ -989,13 +990,8 @@ <string name="device_services" msgid="1549944177856658705">"خدمات الأجهزة"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"بلا عنوان"</string> <string name="restart_button_description" msgid="6916116576177456480">"انقر لإعادة تشغيل هذا التطبيق والانتقال إلى وضع ملء الشاشة."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"فتح <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"إعداد الفقاعات التفسيرية على <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"هل تريد السماح بالفقاعات التفسيرية من <xliff:g id="APP_NAME">%1$s</xliff:g>؟"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"إدارة"</string> - <string name="no_bubbles" msgid="1187859094003006292">"رفض"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"سماح"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"اسألني لاحقًا"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> من <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> من <xliff:g id="APP_NAME">%2$s</xliff:g> و<xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> أيضًا"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"نقل"</string> @@ -1004,9 +1000,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"نقل إلى أسفل يمين الشاشة"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"نقل إلى أسفل اليسار"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"تجاهل"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"الاحتفاظ بالمحادثات في المقدمة"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"ستظهر المحادثات الجديدة من <xliff:g id="APP_NAME">%1$s</xliff:g> كفقاقيع. انقر على فقعة لفتحها. اسحبها لنقلها.\n\nانقر على الفقاعة."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"انقر على \"إدارة\" لإيقاف الفقاعات من هذا التطبيق."</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"تم تحديث التنقل داخل النظام. لإجراء التغييرات، يُرجى الانتقال إلى \"الإعدادات\"."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"الانتقال إلى \"الإعدادات\" لتعديل التنقل داخل النظام"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"وضع الاستعداد"</string> @@ -1037,4 +1041,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"مرّر سريعًا لعرض البُنى الأخرى."</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index 266af09a365f..b2934a405370 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ধ্বনি অথবা কম্পনৰ জৰিয়তে আপোনাৰ মনোযোগ আকৰ্ষণ কৰে।"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"উপঙি থকা এটা শ্বৰ্টকাটৰ জৰিয়তে এই সমলখিনিৰ প্ৰতি আপোনাক মনোযোগী কৰি ৰাখে।"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"কোনো শেহতীয়া বাবল নাই"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"শেহতীয়া বাবলসমূহ আৰু অগ্ৰাহ্য কৰা বাবলসমূহ ইয়াত প্ৰদর্শিত হ\'ব।"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"এই জাননীসমূহ সংশোধন কৰিব নোৱাৰি।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"এই ধৰণৰ জাননীবোৰ ইয়াত কনফিগাৰ কৰিব পৰা নাযায়"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"প্ৰক্সি হিচাপে পঠিওৱা জাননী"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"ডিভাইচ সেৱা"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"কোনো শিৰোনাম নাই"</string> <string name="restart_button_description" msgid="6916116576177456480">"এপ্টো ৰিষ্টাৰ্ট কৰক আৰু পূৰ্ণ স্ক্ৰীণ ব্যৱহাৰ কৰক।"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> খোলক"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবলৰ ছেটিংসমূহ"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বাবলসমূহক অনুমতি দিয়ক?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"পৰিচালনা কৰক"</string> - <string name="no_bubbles" msgid="1187859094003006292">"অস্বীকাৰ কৰক"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"অনুমতি দিয়ক"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"মোক পিছত সুধিব"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g>ৰ পৰা <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> আৰু<xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>টাৰ পৰা <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"আঁতৰাওক"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"বুটামটো বাওঁফালে নিয়ক"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"তলৰ সোঁফালে নিয়ক"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"অগ্ৰাহ্য কৰক"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"চাটসমূহ সন্মুখত ৰাখক"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ নতুন চাটসমূহ বাবল হিচাপে দেখা পোৱা যাব। এইটো খুলিবলৈ এটা বাবলত টিপক। এইটোক আঁতৰাবলৈ টানি আনক।\n\nবাবলটোত টিপক"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"এই এপ্টোৰ পৰা বাবল অফ কৰিবলৈ পৰিচালনা কৰকত টিপক"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"ছিষ্টেম নেভিগেশ্বন আপডে’ট কৰা হ’ল। সলনি কৰিবলৈ ছেটিংসমূহ-লৈ যাওক।"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ছিষ্টেম নেভিগেশ্বন আপডে’ট কৰিবলৈ ছেটিংসমূহ-লৈ যাওক"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ষ্টেণ্ডবাই"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"আন সজ্জাসমূহ চাবলৈ ছোৱাইপ কৰক"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 955fda9a8a94..66fbc2d057f8 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Səs və ya vibrasiya ilə diqqətinizi çəkir."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Bu məzmuna üzən qısayol ilə diqqətinizi cəlb edir."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Qabarcıq yoxdur"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Son qabaqcıqlar və buraxılmış qabarcıqlar burada görünəcək."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirişlər dəyişdirilə bilməz."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Bu bildiriş qrupunu burada konfiqurasiya etmək olmaz"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proksi bildirişi"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Cihaz Xidmətləri"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Başlıq yoxdur"</string> <string name="restart_button_description" msgid="6916116576177456480">"Bu tətbiqi sıfırlayaraq tam ekrana keçmək üçün klikləyin."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqini açın"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> qabarcıqları üçün ayarlar"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> qabarcıqlarına icazə verilsin?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"İdarə edin"</string> - <string name="no_bubbles" msgid="1187859094003006292">"İmtina edin"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"İcazə verin"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Sonra soruşun"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> tətbiqindən <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> tətbiqindən <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> və daha <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> qabarcıq"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Hərəkət etdirin"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Aşağıya sola köçürün"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Aşağıya sağa köçürün"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Kənarlaşdırın"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Söhbətləri öndə saxlayın"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Yeni <xliff:g id="APP_NAME">%1$s</xliff:g> söhbətləri qabarcıq şəklində görünəcək. Açmaq üçün qabarcığa toxunun. Hərəkət etdirmək üçün onu sürüşdürün.\n\nQabarcığa toxunun"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Bu tətbiqdə qabarcıqları deaktiv etmək üçün \"İdarə edin\" seçiminə toxunun"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Sistem naviqasiyası yeniləndi. Dəyişiklik etmək üçün Ayarlara daxil olun."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Sistem naviqasiyasını yeniləmək üçün Ayarlara keçin"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Gözləmə rejimi"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Digər strukturları görmək üçün çəkin"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 1d2bc2b0e1a9..5839f73ce824 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -702,7 +702,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Privlači vam pažnju pomoću zvuka ili vibracije."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Privlači vam pažnju pomoću plutajuće prečice do ovog sadržaja."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nema nedavnih oblačića"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Ovde se prikazuju nedavni i odbačeni oblačići."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ova obaveštenja ne mogu da se menjaju."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ova grupa obaveštenja ne može da se konfiguriše ovde"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Obaveštenje preko proksija"</string> @@ -974,13 +975,8 @@ <string name="device_services" msgid="1549944177856658705">"Usluge za uređaje"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Bez naslova"</string> <string name="restart_button_description" msgid="6916116576177456480">"Dodirnite da biste restartovali aplikaciju i prešli u režim celog ekrana."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Otvorite <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Podešavanja za <xliff:g id="APP_NAME">%1$s</xliff:g> oblačiće"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Želite li da omogućite oblačiće iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Upravljajte"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Odbij"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Dozvoli"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Pitaj me kasnije"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> iz aplikacije <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> iz aplikacije <xliff:g id="APP_NAME">%2$s</xliff:g> i još <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Premesti"</string> @@ -989,9 +985,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Premesti dole levo"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Premesti dole desno"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Odbaci"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Neka poruke ćaskanja ostanu u prvom planu"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nove poruke ćaskanja iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g> će se prikazati kao oblačići. Dodirnite oblačić da biste ga otvorili. Prevucite da biste ga premestili.\n\nDodirnite oblačić"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Dodirnite Upravljajte da biste isključili oblačiće iz ove aplikacije"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigacija sistema je ažurirana. Da biste uneli izmene, idite u Podešavanja."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Idite u Podešavanja da biste ažurirali navigaciju sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje pripravnosti"</string> @@ -1019,4 +1023,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Prevucite da biste videli druge strukture"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 98e851cb5825..b71e87edb2cb 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -707,7 +707,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Прыцягвае ўвагу гукам і вібрацыяй."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Прыцягвае ўвагу да гэтага змесціва ўсплывальнай кнопкай."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Няма нядаўніх усплывальных апавяшчэнняў"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Нядаўнія і адхіленыя ўсплывальныя апавяшчэнні будуць паказаны тут."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Гэтыя апавяшчэнні нельга змяніць."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Тут канфігурыраваць гэту групу апавяшчэнняў забаронена"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Праксіраванае апавяшчэнне"</string> @@ -981,13 +982,8 @@ <string name="device_services" msgid="1549944177856658705">"Сэрвісы прылады"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Без назвы"</string> <string name="restart_button_description" msgid="6916116576177456480">"Націсніце, каб перазапусціць гэту праграму і перайсці ў поўнаэкранны рэжым."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Адкрыць праграму \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Налады дыялогаў у праграме \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Дазволіць дыялогі з праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Кіраваць"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Адмовіць"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Дазволіць"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Спытаць пазней"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ад праграмы \"<xliff:g id="APP_NAME">%2$s</xliff:g>\""</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ад праграмы \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" і яшчэ <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Перамясціць"</string> @@ -996,9 +992,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Перамясціць лявей і ніжэй"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Перамясціць правей і ніжэй"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Адхіліць"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Пакідаць чаты на экране"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Новыя чаты з праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" будуць паказвацца ў выглядзе ўсплывальных апавяшчэнняў. Каб адкрыць усплывальнае апавяшчэнне, націсніце на яго. Каб перамясціць – перацягніце.\n\nНацісніце на ўсплывальнае апавяшчэнне"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Каб выключыць усплывальная апавяшчэнні з гэтай праграмы, націсніце \"Кіраваць\""</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Навігацыя ў сістэме абноўлена. Каб унесці змяненні, перайдзіце ў Налады."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Перайдзіце ў Налады, каб абнавіць параметры навігацыі ў сістэме"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Рэжым чакання"</string> @@ -1027,4 +1031,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Прагартайце, каб убачыць іншыя структуры"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index ed399b702648..9a6d9c6c5450 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Привлича вниманието ви със звук или вибриране."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Задържа вниманието ви посредством плаващ пряк път към това съдържание."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Няма скорошни балончета"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Скорошните и отхвърлените балончета ще се показват тук."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Тези известия не могат да бъдат променяни."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Тази група от известия не може да бъде конфигурирана тук"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Известие, получено чрез делегиране"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Услуги за устройството"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Няма заглавие"</string> <string name="restart_button_description" msgid="6916116576177456480">"Докоснете, за да рестартирате това приложение в режим на цял екран."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Отваряне на „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Настройки за балончетата за <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Да се разрешат ли балончетата от <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Управление"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Отказ"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Разрешаване"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Попитайте ме по-късно"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> от <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"„<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>“ от<xliff:g id="APP_NAME">%2$s</xliff:g> и още <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Преместване"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Преместване долу вляво"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Преместване долу вдясно"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Отхвърляне"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Задръжте чатовете на екрана"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Новите чатове от <xliff:g id="APP_NAME">%1$s</xliff:g> ще се показват като балончета. Докоснете някое, за да го отворите. Плъзнете, за да го преместите.\n\nДокоснете балончето"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Докоснете „Управление“, за да изключите балончетата от това приложение"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Режимът за навигиране в системата е актуализиран. За да извършите промени, отворете настройките."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Отворете настройките, за да актуализирате режима за навигиране в системата"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Режим на готовност"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Прекарайте пръст, за да видите други елементи"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index f2495f125c43..437abe8a4653 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"সাউন্ড বা ভাইব্রেশনের সাহায্যে দৃষ্টি আকর্ষণ করে।"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ফ্লোটিং শর্টকাট ব্যবহার করে এই কন্টেন্টে আপনার দৃষ্টি আকর্ষণ করে রাখে।"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"কোনও সাম্প্রতিক বাবল নেই"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"সাম্প্রতিক বাবল এবং বাতিল করা বাবল এখানে দেখানো হবে।"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"এই বিজ্ঞপ্তিগুলি পরিবর্তন করা যাবে না।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"এই সমস্ত বিজ্ঞপ্তিকে এখানে কনফিগার করা যাবে না"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"প্রক্সি করা বিজ্ঞপ্তি"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"ডিভাইস সংক্রান্ত পরিষেবা"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"কোনও শীর্ষক নেই"</string> <string name="restart_button_description" msgid="6916116576177456480">"এই অ্যাপ রিস্টার্ট করতে ট্যাপ করুন ও ফুল-স্ক্রিন ব্যবহার করুন।"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> খুলুন"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> বাবলের জন্য সেটিংস"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> অ্যাপের বাবল চালু করবেন?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"ম্যানেজ করা"</string> - <string name="no_bubbles" msgid="1187859094003006292">"খারিজ করুন"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"অনুমতি দিন"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"আমাকে পরে জিজ্ঞাসা করুন"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> অ্যাপ থেকে <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> অ্যাপ এবং আরও <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>টি থেকে <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"সরান"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"নিচে বাঁদিকে সরান"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"নিচে ডান দিকে সরান"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"খারিজ করুন"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"চ্যাটগুলি সামনে রাখুন"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর তরফ থেকে নতুন চ্যাট বাবল হিসেবে দেখানো হবে। এটি খোলার জন্য বাবল ট্যাপ করুন। এটি সরানোর জন্য টেনে আনুন।\n\nবাবল ট্যাপ করুন"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"এই অ্যাপ থেকে বাবল বন্ধ করতে ম্যানেজ করুন বিকল্প ট্যাপ করুন"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"সিস্টেম নেভিগেশন আপডেট হয়েছে। পরিবর্তন করার জন্য সেটিংসে যান।"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"সিস্টেম নেভিগেশন আপডেট করতে সেটিংসে যান"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"স্ট্যান্ডবাই"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"অন্য স্ট্রাকচার দেখতে সোয়াইপ করুন"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index e846b86b9506..655adb6b25da 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -704,7 +704,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Privlači vašu pažnju pomoću zvuka ili vibracije."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Privlači vašu pažnju pomoću plutajuće prečice do ovog sadržaja."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nema nedavnih oblačića"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Nedavni oblačići i odbačeni oblačići će se pojaviti ovdje."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ta obavještenja se ne mogu izmijeniti."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ovdje nije moguće konfigurirati ovu grupu obavještenja"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Obavještenje preko proksi servera"</string> @@ -976,13 +977,8 @@ <string name="device_services" msgid="1549944177856658705">"Usluge uređaja"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Bez naslova"</string> <string name="restart_button_description" msgid="6916116576177456480">"Dodirnite da ponovo pokrenete ovu aplikaciju i aktivirate prikaz preko cijelog ekrana."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Otvori aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Postavke za oblačiće aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Dozvoliti oblačiće iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Upravljaj"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Odbij"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Dozvoli"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Pitaj me kasnije"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> od aplikacije <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"Obavještenje <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> aplikacije <xliff:g id="APP_NAME">%2$s</xliff:g> i još <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Pomjeri"</string> @@ -991,9 +987,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Pomjeri dolje lijevo"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Pomjerite dolje desno"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Odbaci"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Zadržite chatove u prvom planu"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Novi chatovi iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g> će se prikazati u oblačićima. Dodirnite oblačić da ga otvorite. Prevucite da ga premjestite.\n\nDodirnite oblačić"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Dodirnite Upravljaj da isključite oblačiće iz ove aplikacije"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigiranje sistemom je ažurirano. Da izvršite promjene, idite u Postavke."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Idite u Postavke da ažurirate navigiranje sistemom"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje mirovanja"</string> @@ -1021,4 +1025,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Prevucite da vidite druge strukture"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 3d8f00c12da0..4bb912310cb2 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Atrau la teva atenció amb so i vibració."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Atrau la teva atenció amb una drecera flotant a aquest contingut."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"No hi ha bombolles recents"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Les bombolles recents i les ignorades es mostraran aquí."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Aquestes notificacions no es poden modificar."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Aquest grup de notificacions no es pot configurar aquí"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificació mitjançant aplicació intermediària"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Serveis per a dispositius"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Sense títol"</string> <string name="restart_button_description" msgid="6916116576177456480">"Toca per reiniciar l\'aplicació i passar a pantalla completa."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Obre <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Configuració de les bombolles: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Vols permetre les bombolles de l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Gestiona"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Denega"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Permet"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Pregunta-m\'ho més tard"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de: <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (<xliff:g id="APP_NAME">%2$s</xliff:g>) i <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> més"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Mou"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Mou a baix a l\'esquerra"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Mou a baix a la dreta"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Omet"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Mantén els xats a la vista"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Els xats nous de l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> es mostraran en forma de bombolles. Toca una bombolla per obrir-la. Arrossega-la per moure-la.\n\nToca la bombolla"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Toca Gestiona per desactivar les bombolles d\'aquesta aplicació"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"S\'ha actualitzat el sistema de navegació. Per fer canvis, ves a Configuració."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Ves a Configuració per actualitzar el sistema de navegació"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"En espera"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Llisca per veure altres estructures"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 9779bd1dbf45..3b108980e16e 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -705,7 +705,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Upozorňuje vás pomocí zvuku a vibrací."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Přitahuje pozornost pomocí plovoucí zkratky k tomuto obsahu."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Žádné nedávné bubliny"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Zde se budou zobrazovat nedávné bubliny a zavřené bubliny."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tato oznámení nelze upravit."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Tuto skupinu oznámení tady nelze nakonfigurovat"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Zprostředkované oznámení"</string> @@ -979,13 +980,8 @@ <string name="device_services" msgid="1549944177856658705">"Služby zařízení"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Bez názvu"</string> <string name="restart_button_description" msgid="6916116576177456480">"Klepnutím aplikaci restartujete a přejdete na režim celé obrazovky"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Otevřít <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Nastavení bublin aplikace <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Povolit bubliny z aplikace <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Spravovat"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Zakázat"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Povolit"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Zeptat se později"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"Oznámení <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> z aplikace <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> z aplikace <xliff:g id="APP_NAME">%2$s</xliff:g> a dalších (<xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>)"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Přesunout"</string> @@ -994,9 +990,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Přesunout vlevo dolů"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Přesunout vpravo dolů"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Zavřít"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Zobrazovat chaty v popředí"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nové chaty z aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> se budou zobrazovat jako bubliny. Bublinu otevřete klepnutím. Přetažením ji přemístíte.\n\nKlepnout na bublinu"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Bubliny pro tuto aplikaci můžete vypnout klepnutím na Spravovat"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Systémová navigace byla aktualizována. Chcete-li provést změny, přejděte do Nastavení."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Přejděte do Nastavení a aktualizujte systémovou navigaci"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Pohotovostní režim"</string> @@ -1025,4 +1029,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Přejetím zobrazíte další budovy"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index c3592d309746..d46c0501bc2e 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Fanger din opmærksomhed med lyd eller vibration."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Fastholder din opmærksomhed med en svævende genvej til indholdet."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Ingen seneste bobler"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Nye bobler og afviste bobler vises her."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Disse notifikationer kan ikke redigeres."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Du kan ikke konfigurere denne gruppe notifikationer her"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxyforbundet notifikation"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Enhedstjenester"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Ingen titel"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tryk for at genstarte denne app, og gå til fuld skærm."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Åbn <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Indstillinger for <xliff:g id="APP_NAME">%1$s</xliff:g>-bobler"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Vil du tillade bobler fra <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Administrer"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Afvis"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Tillad"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Spørg mig senere"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> fra <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> fra <xliff:g id="APP_NAME">%2$s</xliff:g> og <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> andre"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Flyt"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Flyt ned til venstre"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Flyt ned til højre"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Afvis"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Hold chatsamtaler i forgrunden"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nye chatsamtaler fra <xliff:g id="APP_NAME">%1$s</xliff:g> vises som bobler. Tryk på en boble for at åbne samtalen. Træk boblen for at flytte den.\n\nTryk på boblen"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tryk på Administrer for at deaktivere bobler fra denne app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Systemnavigationen blev opdateret. Gå til Indstillinger for at foretage ændringer."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gå til Indstillinger for at opdatere systemnavigationen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Stryg for at se andre strukturer"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 9f5207e4c355..9feae05a69ed 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -225,13 +225,9 @@ <string name="accessibility_no_sims" msgid="5711270400476534667">"Keine SIM-Karte"</string> <string name="carrier_network_change_mode" msgid="5174141476991149918">"Mobilfunknetzwerk wird gewechselt"</string> <string name="accessibility_battery_details" msgid="6184390274150865789">"Akkudetails öffnen"</string> - <!-- String.format failed for translation --> - <!-- no translation found for accessibility_battery_level (5143715405241138822) --> - <skip /> + <string name="accessibility_battery_level" msgid="5143715405241138822">"Akku bei <xliff:g id="NUMBER">%d</xliff:g> Prozent."</string> <string name="accessibility_battery_level_with_estimate" msgid="4843119982547599452">"Akku bei <xliff:g id="PERCENTAGE">%1$s</xliff:g> Prozent. Bei deinem Nutzungsmuster hast du noch Strom für etwa <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- String.format failed for translation --> - <!-- no translation found for accessibility_battery_level_charging (8892191177774027364) --> - <skip /> + <string name="accessibility_battery_level_charging" msgid="8892191177774027364">"Akku wird aufgeladen, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> Prozent."</string> <string name="accessibility_settings_button" msgid="2197034218538913880">"Systemeinstellungen"</string> <string name="accessibility_notifications_button" msgid="3960913924189228831">"Benachrichtigungen"</string> <string name="accessibility_overflow_action" msgid="8555835828182509104">"Alle Benachrichtigungen ansehen"</string> @@ -703,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Benachrichtigungen werden mit einem Ton oder einer Vibration angekündigt."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Du wirst mit einer unverankerten Verknüpfung darauf aufmerksam gemacht."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Keine kürzlich geschlossenen Bubbles"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Hier werden aktuelle und geschlossene Bubbles angezeigt."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Diese Benachrichtigungen können nicht geändert werden."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Die Benachrichtigungsgruppe kann hier nicht konfiguriert werden"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Weitergeleitete Benachrichtigung"</string> @@ -973,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Gerätedienste"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Kein Titel"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tippe, um die App im Vollbildmodus neu zu starten."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> öffnen"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Einstellungen für <xliff:g id="APP_NAME">%1$s</xliff:g>-Bubbles"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g>-Bubbles zulassen?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Verwalten"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Ablehnen"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Zulassen"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Später fragen"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> von <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> aus <xliff:g id="APP_NAME">%2$s</xliff:g> und <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> weiteren"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Verschieben"</string> @@ -988,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Nach unten links verschieben"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Nach unten rechts verschieben"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Schließen"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Chats im Vordergrund behalten"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Neue <xliff:g id="APP_NAME">%1$s</xliff:g>-Chats werden als Bubbles angezeigt. Wenn du eine Bubble öffnen möchtest, tippe sie an. Wenn du sie verschieben möchtest, ziehe an ihr.\n\nTippe die Bubble an."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tippe auf \"Verwalten\", um Bubbles für diese App zu deaktivieren"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Systemsteuerungseinstellungen wurden angepasst. Änderungen kannst du in den Einstellungen vornehmen."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gehe zu den Einstellungen, um die Systemsteuerung anzupassen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> @@ -1017,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Wischen, um andere Strukturen anzuzeigen"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 27db49e86adc..5aaa991ffa3a 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Τραβά την προσοχή σας με ήχο ή δόνηση."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Κρατάει την προσοχή σας με μια κινούμενη συντόμευση προς αυτό το περιεχόμενο."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Δεν υπάρχουν πρόσφατες φούσκες"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Τα πρόσφατα συννεφάκια και τα συννεφάκια που παραβλέψατε θα εμφανίζονται εδώ."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Δεν είναι δυνατή η τροποποίηση αυτών των ειδοποιήσεων"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Δεν είναι δυνατή η διαμόρφωση αυτής της ομάδας ειδοποιήσεων εδώ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Ειδοποίηση μέσω διακομιστή μεσολάβησης"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Υπηρεσίες συσκευής"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Χωρίς τίτλο"</string> <string name="restart_button_description" msgid="6916116576177456480">"Πατήστε για επανεκκίνηση αυτής της εφαρμογής και ενεργοποίηση πλήρους οθόνης."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Άνοιγμα <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Ρυθμίσεις για συννεφάκια <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Να επιτρέπονται συννεφάκια από την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>;"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Διαχείριση"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Όχι"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Να επιτρέπεται"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Να ερωτηθώ αργότερα"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> από <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> από την εφαρμογή <xliff:g id="APP_NAME">%2$s</xliff:g> και <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ακόμη"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Μετακίνηση"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Μετακίνηση κάτω αριστερά"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Μετακίνηση κάτω δεξιά"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Παράβλεψη"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Διατήρηση συζητήσεων στο προσκήνιο"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Οι νέες συζητήσεις από την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> θα εμφανίζονται ως συννεφάκια. Πατήστε ένα συννεφάκι για άνοιγμα. Σύρετε για μετακίνηση.\n\nΠατήστε το συννεφάκι."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Πατήστε Διαχείριση για να απενεργοποιήσετε τα συννεφάκια από αυτήν την εφαρμογή."</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Η πλοήγηση συστήματος ενημερώθηκε. Για να κάνετε αλλαγές, μεταβείτε στις Ρυθμίσεις."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Μεταβείτε στις Ρυθμίσεις για να ενημερώσετε την πλοήγηση συστήματος"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Κατάσταση αναμονής"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Σύρετε για να δείτε άλλες δομές"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 66abdf07fbb0..c6ee70736c0e 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -86,10 +86,8 @@ <string name="screenshot_failed_to_save_unknown_text" msgid="1506621600548684129">"Try taking screenshot again"</string> <string name="screenshot_failed_to_save_text" msgid="8344173457344027501">"Can\'t save screenshot due to limited storage space"</string> <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"Taking screenshots isn\'t allowed by the app or your organisation"</string> - <!-- no translation found for screenshot_dismiss_ui_description (934736855340147968) --> - <skip /> - <!-- no translation found for screenshot_preview_description (669177537416980449) --> - <skip /> + <string name="screenshot_dismiss_ui_description" msgid="934736855340147968">"Dismiss screenshot"</string> + <string name="screenshot_preview_description" msgid="669177537416980449">"Open screenshot"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen recorder"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> <string name="screenrecord_start_label" msgid="1750350278888217473">"Start recording?"</string> @@ -699,7 +697,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Gets your attention with sound or vibration."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Keeps your attention with a floating shortcut to this content."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"No recent bubbles"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Recent bubbles and dismissed bubbles will appear here."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"This group of notifications cannot be configured here"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxied notification"</string> @@ -969,13 +968,8 @@ <string name="device_services" msgid="1549944177856658705">"Device Services"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"No title"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tap to restart this app and go full screen."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Open <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Settings for <xliff:g id="APP_NAME">%1$s</xliff:g> bubbles"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Allow bubbles from <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Manage"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Deny"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Allow"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Ask me later"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g> and <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> more"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Move"</string> @@ -984,9 +978,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Move bottom left"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Move bottom right"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Dismiss"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Keep chats up front"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"New chats from <xliff:g id="APP_NAME">%1$s</xliff:g> will appear as bubbles. Tap a bubble to open it. Drag to move it.\n\nTap the bubble"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tap Manage to turn off bubbles from this app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"System navigation updated. To make changes, go to Settings."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Go to Settings to update system navigation"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> @@ -1011,6 +1013,7 @@ <string name="controls_pin_verify" msgid="414043854030774349">"Verify device PIN"</string> <string name="controls_pin_instructions" msgid="6363309783822475238">"Enter PIN"</string> <string name="controls_structure_tooltip" msgid="1392966215435667434">"Swipe to see other structures"</string> - <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> + <string name="controls_seeding_in_progress" msgid="3033855341410264148">"Loading recommendations"</string> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 6166209ad86a..6e349d6dfc7b 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -86,10 +86,8 @@ <string name="screenshot_failed_to_save_unknown_text" msgid="1506621600548684129">"Try taking screenshot again"</string> <string name="screenshot_failed_to_save_text" msgid="8344173457344027501">"Can\'t save screenshot due to limited storage space"</string> <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"Taking screenshots isn\'t allowed by the app or your organisation"</string> - <!-- no translation found for screenshot_dismiss_ui_description (934736855340147968) --> - <skip /> - <!-- no translation found for screenshot_preview_description (669177537416980449) --> - <skip /> + <string name="screenshot_dismiss_ui_description" msgid="934736855340147968">"Dismiss screenshot"</string> + <string name="screenshot_preview_description" msgid="669177537416980449">"Open screenshot"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen recorder"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> <string name="screenrecord_start_label" msgid="1750350278888217473">"Start recording?"</string> @@ -699,7 +697,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Gets your attention with sound or vibration."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Keeps your attention with a floating shortcut to this content."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"No recent bubbles"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Recent bubbles and dismissed bubbles will appear here."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"This group of notifications cannot be configured here"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxied notification"</string> @@ -969,13 +968,8 @@ <string name="device_services" msgid="1549944177856658705">"Device Services"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"No title"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tap to restart this app and go full screen."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Open <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Settings for <xliff:g id="APP_NAME">%1$s</xliff:g> bubbles"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Allow bubbles from <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Manage"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Deny"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Allow"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Ask me later"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g> and <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> more"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Move"</string> @@ -984,9 +978,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Move bottom left"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Move bottom right"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Dismiss"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Keep chats up front"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"New chats from <xliff:g id="APP_NAME">%1$s</xliff:g> will appear as bubbles. Tap a bubble to open it. Drag to move it.\n\nTap the bubble"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tap Manage to turn off bubbles from this app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"System navigation updated. To make changes, go to Settings."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Go to Settings to update system navigation"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> @@ -1011,6 +1013,7 @@ <string name="controls_pin_verify" msgid="414043854030774349">"Verify device PIN"</string> <string name="controls_pin_instructions" msgid="6363309783822475238">"Enter PIN"</string> <string name="controls_structure_tooltip" msgid="1392966215435667434">"Swipe to see other structures"</string> - <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> + <string name="controls_seeding_in_progress" msgid="3033855341410264148">"Loading recommendations"</string> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 66abdf07fbb0..c6ee70736c0e 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -86,10 +86,8 @@ <string name="screenshot_failed_to_save_unknown_text" msgid="1506621600548684129">"Try taking screenshot again"</string> <string name="screenshot_failed_to_save_text" msgid="8344173457344027501">"Can\'t save screenshot due to limited storage space"</string> <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"Taking screenshots isn\'t allowed by the app or your organisation"</string> - <!-- no translation found for screenshot_dismiss_ui_description (934736855340147968) --> - <skip /> - <!-- no translation found for screenshot_preview_description (669177537416980449) --> - <skip /> + <string name="screenshot_dismiss_ui_description" msgid="934736855340147968">"Dismiss screenshot"</string> + <string name="screenshot_preview_description" msgid="669177537416980449">"Open screenshot"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen recorder"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> <string name="screenrecord_start_label" msgid="1750350278888217473">"Start recording?"</string> @@ -699,7 +697,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Gets your attention with sound or vibration."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Keeps your attention with a floating shortcut to this content."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"No recent bubbles"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Recent bubbles and dismissed bubbles will appear here."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"This group of notifications cannot be configured here"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxied notification"</string> @@ -969,13 +968,8 @@ <string name="device_services" msgid="1549944177856658705">"Device Services"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"No title"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tap to restart this app and go full screen."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Open <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Settings for <xliff:g id="APP_NAME">%1$s</xliff:g> bubbles"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Allow bubbles from <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Manage"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Deny"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Allow"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Ask me later"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g> and <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> more"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Move"</string> @@ -984,9 +978,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Move bottom left"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Move bottom right"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Dismiss"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Keep chats up front"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"New chats from <xliff:g id="APP_NAME">%1$s</xliff:g> will appear as bubbles. Tap a bubble to open it. Drag to move it.\n\nTap the bubble"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tap Manage to turn off bubbles from this app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"System navigation updated. To make changes, go to Settings."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Go to Settings to update system navigation"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> @@ -1011,6 +1013,7 @@ <string name="controls_pin_verify" msgid="414043854030774349">"Verify device PIN"</string> <string name="controls_pin_instructions" msgid="6363309783822475238">"Enter PIN"</string> <string name="controls_structure_tooltip" msgid="1392966215435667434">"Swipe to see other structures"</string> - <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> + <string name="controls_seeding_in_progress" msgid="3033855341410264148">"Loading recommendations"</string> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 66abdf07fbb0..c6ee70736c0e 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -86,10 +86,8 @@ <string name="screenshot_failed_to_save_unknown_text" msgid="1506621600548684129">"Try taking screenshot again"</string> <string name="screenshot_failed_to_save_text" msgid="8344173457344027501">"Can\'t save screenshot due to limited storage space"</string> <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"Taking screenshots isn\'t allowed by the app or your organisation"</string> - <!-- no translation found for screenshot_dismiss_ui_description (934736855340147968) --> - <skip /> - <!-- no translation found for screenshot_preview_description (669177537416980449) --> - <skip /> + <string name="screenshot_dismiss_ui_description" msgid="934736855340147968">"Dismiss screenshot"</string> + <string name="screenshot_preview_description" msgid="669177537416980449">"Open screenshot"</string> <string name="screenrecord_name" msgid="2596401223859996572">"Screen recorder"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"Ongoing notification for a screen record session"</string> <string name="screenrecord_start_label" msgid="1750350278888217473">"Start recording?"</string> @@ -699,7 +697,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Gets your attention with sound or vibration."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Keeps your attention with a floating shortcut to this content."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"No recent bubbles"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Recent bubbles and dismissed bubbles will appear here."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"This group of notifications cannot be configured here"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxied notification"</string> @@ -969,13 +968,8 @@ <string name="device_services" msgid="1549944177856658705">"Device Services"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"No title"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tap to restart this app and go full screen."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Open <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Settings for <xliff:g id="APP_NAME">%1$s</xliff:g> bubbles"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Allow bubbles from <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Manage"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Deny"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Allow"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Ask me later"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g> and <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> more"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Move"</string> @@ -984,9 +978,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Move bottom left"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Move bottom right"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Dismiss"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Keep chats up front"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"New chats from <xliff:g id="APP_NAME">%1$s</xliff:g> will appear as bubbles. Tap a bubble to open it. Drag to move it.\n\nTap the bubble"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tap Manage to turn off bubbles from this app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"System navigation updated. To make changes, go to Settings."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Go to Settings to update system navigation"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> @@ -1011,6 +1013,7 @@ <string name="controls_pin_verify" msgid="414043854030774349">"Verify device PIN"</string> <string name="controls_pin_instructions" msgid="6363309783822475238">"Enter PIN"</string> <string name="controls_structure_tooltip" msgid="1392966215435667434">"Swipe to see other structures"</string> - <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> + <string name="controls_seeding_in_progress" msgid="3033855341410264148">"Loading recommendations"</string> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 7c2920bffa83..ffee3d3852fb 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -697,7 +697,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Gets your attention with sound or vibration."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Keeps your attention with a floating shortcut to this content."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"No recent bubbles"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Recent bubbles and dismissed bubbles will appear here."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"These notifications can\'t be modified."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"This group of notifications cannot be configured here"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxied notification"</string> @@ -967,13 +968,8 @@ <string name="device_services" msgid="1549944177856658705">"Device Services"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"No title"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tap to restart this app and go full screen."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Open <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Settings for <xliff:g id="APP_NAME">%1$s</xliff:g> bubbles"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Allow bubbles from <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Manage"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Deny"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Allow"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Ask me later"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> from <xliff:g id="APP_NAME">%2$s</xliff:g> and <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> more"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Move"</string> @@ -982,9 +978,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Move bottom left"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Move bottom right"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Dismiss"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Keep chats up front"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"New chats from <xliff:g id="APP_NAME">%1$s</xliff:g> will appear as bubbles. Tap a bubble to open it. Drag to move it.\n\nTap the bubble"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tap Manage to turn off bubbles from this app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"System navigation updated. To make changes, go to Settings."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Go to Settings to update system navigation"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> @@ -1010,4 +1014,6 @@ <string name="controls_pin_instructions" msgid="6363309783822475238">"Enter PIN"</string> <string name="controls_structure_tooltip" msgid="1392966215435667434">"Swipe to see other structures"</string> <string name="controls_seeding_in_progress" msgid="3033855341410264148">"Loading recommendations"</string> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 4d56baf56e39..b97125c227a0 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Capta tu atención con sonido o vibración."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Retiene tu atención con un acceso directo flotante a este contenido."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"No hay burbujas recientes"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Las burbujas recientes y las descartadas aparecerán aquí."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"No se pueden modificar estas notificaciones."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"No se puede configurar aquí este grupo de notificaciones"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificación almacenada en proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Servicios del dispositivo"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Sin título"</string> <string name="restart_button_description" msgid="6916116576177456480">"Presiona para reiniciar esta app y acceder al modo de pantalla completa."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Abrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Configuración para cuadros de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"¿Quieres permitir cuadros de <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Administrar"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Denegar"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Permitir"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Preguntarme más tarde"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g> y <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> más"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Mover"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Ubicar abajo a la izquierda"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Ubicar abajo a la derecha"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Ignorar"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Mantener los chats a la vista"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Los chats nuevos de <xliff:g id="APP_NAME">%1$s</xliff:g> se mostrarán como burbujas. Presiona una burbuja para abrirla. Arrástrala para moverla.\n\nPresiona la burbuja"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Presiona Administrar para desactivar las burbujas de esta app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Se actualizó el sistema de navegación. Para hacer cambios, ve a Configuración."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Ve a Configuración para actualizar la navegación del sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"En espera"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Desliza el dedo para ver otras estructuras"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 3e35691e0020..a9a7be25a23c 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Llama tu atención con sonido o vibración."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Llama tu atención con un acceso directo flotante a este contenido."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"No hay burbujas recientes"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Las burbujas recientes y las descartadas aparecerán aquí."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Estas notificaciones no se pueden modificar."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Este grupo de notificaciones no se puede configurar aquí"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificación mediante proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Servicios del dispositivo"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Sin título"</string> <string name="restart_button_description" msgid="6916116576177456480">"Toca para reiniciar esta aplicación e ir a la pantalla completa."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Abrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Ajustes de las burbujas de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"¿Quieres permitir las burbujas de <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Gestionar"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Denegar"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Permitir"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Preguntarme más tarde"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g> y <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> más"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Mover"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Mover abajo a la izquierda."</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Mover abajo a la derecha"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Cerrar"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Mantén los chats a la vista"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Los nuevos chats de <xliff:g id="APP_NAME">%1$s</xliff:g> se mostrarán como burbujas. Toca una burbuja para abrirla. Arrástrala para moverla.\n\nToca la burbuja"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Toca Gestionar para desactivar las burbujas de esta aplicación"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Se ha actualizado la navegación del sistema. Para hacer cambios, ve a Ajustes."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Ve a Ajustes para actualizar la navegación del sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"En espera"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Desliza el dedo para ver otras estructuras"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 47f76f58963e..5c4c16250e67 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Haarab heli või vibreerimisega teie tähelepanu."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Hoiab teie tähelepanu hõljuva otseteega selle sisu juurde."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Hiljutisi mulle pole"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Siin kuvatakse hiljutised mullid ja mullid, millest loobuti."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Neid märguandeid ei saa muuta."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Seda märguannete rühma ei saa siin seadistada"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Puhvriga märguanne"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Seadme teenused"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Pealkiri puudub"</string> <string name="restart_button_description" msgid="6916116576177456480">"Puudutage rakenduse taaskäivitamiseks ja täisekraanrežiimi aktiveerimiseks."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Ava <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> mullide seaded"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Kas soovite rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> mullid lubada?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Halda"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Keela"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Luba"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Küsi hiljem"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> rakendusest <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> rakenduselt <xliff:g id="APP_NAME">%2$s</xliff:g> ja veel <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Teisalda"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Teisalda alla vasakule"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Teisalda alla paremale"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Loobu"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Hoia vestlused esiplaanil"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Uued vestlused rakendusest <xliff:g id="APP_NAME">%1$s</xliff:g> kuvatakse mullidena. Selle avamiseks puudutage mulli. Teisaldamiseks lohistage.\n\nPuudutage mulli"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Selle rakenduse puhul mullide väljalülitamiseks puudutage valikut Haldamine"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Süsteemis navigeerimine on värskendatud. Muutmiseks avage jaotis Seaded."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Süsteemi navigeerimise värskendamiseks avage jaotis Seaded"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Ooterežiim"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Pühkige muude üksuste nägemiseks"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 05c6069c850b..5024e3c4b1ae 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Arreta erakartzen du soinua eta dardara eginda."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Eduki honetarako lasterbide gainerakor bat eskaintzen dizu, arretarik gal ez dezazun."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Ez dago azkenaldiko burbuilarik"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Azken burbuilak eta baztertutakoak agertuko dira hemen."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Jakinarazpen horiek ezin dira aldatu."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Jakinarazpen talde hau ezin da konfiguratu hemen"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxy bidezko jakinarazpena"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Gailuetarako zerbitzuak"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Ez du izenik"</string> <string name="restart_button_description" msgid="6916116576177456480">"Berrabiarazi aplikazio hau eta ezarri pantaila osoko modua."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Ireki <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioaren ezarpenen burbuilak"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioaren burbuilak erabiltzeko baimena eman nahi duzu?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Kudeatu"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Ukatu"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Baimendu"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Galdetu geroago"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (<xliff:g id="APP_NAME">%2$s</xliff:g>)"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> aplikazioaren \"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>\" jakinarazpena, eta beste <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Eraman"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Eraman behealdera, ezkerretara"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Eraman behealdera, eskuinetara"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Baztertu"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Utzi txatak aurrealdean"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioaren txat berriak burbuila gisa agertuko dira. Burbuilak irekitzeko, saka itzazu. Mugitzeko, berriz, arrasta itzazu.\n\nSakatu burbuila"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Aplikazioaren burbuilak desaktibatzeko, sakatu Kudeatu"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Eguneratu da sistemaren nabigazioa. Aldaketak egiteko, joan Ezarpenak atalera."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Sistemaren nabigazioa eguneratzeko, joan Ezarpenak atalera"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Egonean"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Pasatu hatza beste egitura batzuk ikusteko"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 4e9ed5708798..edd844af03ee 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"با صدا یا لرزش توجه شما را جلب میکند."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"با میانبری شناور به این محتوا، توجهتان را جلب میکند."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"هیچ ابزارک اعلان جدیدی وجود ندارد"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"ابزارکهای اعلان اخیر و ابزارکهای اعلان ردشده اینجا ظاهر خواهند شد."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"این اعلانها قابل اصلاح نیستند."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"نمیتوانید این گروه اعلانها را در اینجا پیکربندی کنید"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"اعلانهای دارای پراکسی"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"سرویسهای دستگاه"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"بدون عنوان"</string> <string name="restart_button_description" msgid="6916116576177456480">"برای بازراهاندازی این برنامه و تغییر به حالت تمامصفحه، ضربه بزنید."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"باز کردن <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"تنظیم برای ابزارکهای اعلان <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"برای <xliff:g id="APP_NAME">%1$s</xliff:g>، ابزارکهای اعلان مجاز شوند؟"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"مدیریت"</string> - <string name="no_bubbles" msgid="1187859094003006292">"رد کردن"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"اجازه دادن"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"بعداً پرسیده شود"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> از <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> از <xliff:g id="APP_NAME">%2$s</xliff:g> و <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> مورد بیشتر"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"انتقال"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"انتقال به پایین سمت راست"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"انتقال به پایین سمت چپ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"رد کردن"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"نگه داشتن گپها در جلو"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"گپهای جدید از <xliff:g id="APP_NAME">%1$s</xliff:g> بهصورت «حباب» نمایش داده میشوند. روی «حباب» ضربه بزنید تا باز شود. آن را بکشید تا جابهجا شود.\n\nروی «حباب» ضربه بزنید"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"برای خاموش کردن «حبابها» از این برنامه، روی «مدیریت» ضربه بزنید"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"پیمایش سیستم بهروزرسانی شد. برای انجام تغییرات به «تنظیمات» بروید."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"برای بهروزرسانی پیمایش سیستم، به «تنظیمات» بروید"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"آمادهبهکار"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"برای مشاهده سایر ساختارها تند بکشید"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 0eb5e541d4f9..c8165ab1b33e 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Kiinnittää huomion äänellä tai värinällä"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Kelluva sisällön pikakuvake säilyttää huomiosi"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Ei viimeaikaisia ohjekuplia"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Viimeaikaiset ja äskettäin ohitetut ohjekuplat näkyvät täällä."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Näitä ilmoituksia ei voi muokata"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Tätä ilmoitusryhmää ei voi määrittää tässä"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Välitetty ilmoitus"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Laitepalvelut"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Ei nimeä"</string> <string name="restart_button_description" msgid="6916116576177456480">"Napauta, niin sovellus käynnistyy uudelleen ja siirtyy koko näytön tilaan."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Avaa <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Kuplien asetukset: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Sallitaanko kuplat (<xliff:g id="APP_NAME">%1$s</xliff:g>)?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Ylläpidä"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Estä"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Salli"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Kysy myöhemmin"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g>: <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (<xliff:g id="APP_NAME">%2$s</xliff:g>) ja <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> muuta"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Siirrä"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Siirrä vasempaan alareunaan"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Siirrä oikeaan alareunaan"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Ohita"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Säilytä chatit etualalla"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Sovelluksen <xliff:g id="APP_NAME">%1$s</xliff:g> uudet chatit näkyvät ohjekuplina. Kosketa ohjekuplaa avataksesi sen. Siirrä sitä vetämällä.\n\n Kosketa ohjekuplaa."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Valitse Hallinnoi, jos haluat poistaa ohjekuplat käytöstä tästä sovelluksesta"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Järjestelmän navigointitapa vaihdettu. Voit muuttaa sitä asetuksista."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Vaihda järjestelmän navigointitapaa asetuksista"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Virransäästötila"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Pyyhkäise, niin näet muut rakennukset"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 4f943dc3ad1c..47e1d6dc136a 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Attire votre attention à l\'aide de sons et de vibrations."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Garde votre attention à l\'aide d\'un raccourci flottant vers ce contenu."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Aucune bulle récente"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Les bulles récentes et les bulles ignorées s\'afficheront ici."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ces notifications ne peuvent pas être modifiées"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ce groupe de notifications ne peut pas être configuré ici"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notification par mandataire"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Services de l\'appareil"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Sans titre"</string> <string name="restart_button_description" msgid="6916116576177456480">"Touchez pour redémarrer cette application et passer en plein écran."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Ouvrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Paramètres pour les bulles de l\'application <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Autoriser les bulles de l\'application <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Gérer"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Refuser"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Autoriser"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Me demander plus tard"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g> et <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> autres"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Déplacer"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Déplacer dans coin inf. gauche"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Déplacer dans coin inf. droit"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Fermer"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Garder les messages de clavardage à l\'avant"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Les nouveaux messages de clavardage de <xliff:g id="APP_NAME">%1$s</xliff:g> s\'afficheront sous forme de bulles. Pour ouvrir une bulle, touchez-la. Pour la déplacer, faites-la glisser.\n\nTouchez la bulle"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Toucher Gérer pour désactiver les bulles de cette application"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"La navigation système a été mise à jour. Pour apporter des modifications, accédez au menu Paramètres."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Accédez au menu Paramètres pour mettre à jour la navigation système"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Veille"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Balayez l\'écran pour voir d\'autres structures"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index c7717a325bf7..cbc7705723c1 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Attire votre attention à l\'aide de sons ou de vibrations."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Attire votre attention à l\'aide d\'un raccourci flottant vers ce contenu."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Aucune bulle récente"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Les bulles récentes et fermées s\'afficheront ici."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Impossible de modifier ces notifications."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Vous ne pouvez pas configurer ce groupe de notifications ici"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notification de proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Services pour l\'appareil"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Sans titre"</string> <string name="restart_button_description" msgid="6916116576177456480">"Appuyez pour redémarrer cette application et activer le mode plein écran."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Ouvrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Paramètres des bulles de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Autoriser les bulles pour <xliff:g id="APP_NAME">%1$s</xliff:g> ?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Gérer"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Refuser"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Autoriser"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Me demander plus tard"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de l\'application <xliff:g id="APP_NAME">%2$s</xliff:g> et <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> autres"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Déplacer"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Déplacer en bas à gauche"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Déplacer en bas à droite"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Ignorer"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Accédez rapidement à vos chats"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Les nouveaux chats <xliff:g id="APP_NAME">%1$s</xliff:g> s\'afficheront sous forme de bulles. Appuyez sur une bulle pour l\'ouvrir. Faites-la glisser pour la déplacer.\n\nAppuyez sur la bulle"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Appuyez sur \"Gérer\" pour désactiver les bulles pour cette application"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigation système mise à jour. Pour apporter des modifications, accédez aux paramètres."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Accédez aux paramètres pour mettre à jour la navigation système"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Mode Veille imminent"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Balayer l\'écran pour voir d\'autres structures"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 08f1e8adedc8..3463be88c6b1 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Chama a túa atención con son ou vibración."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Mantén a túa atención cun atallo flotante a este contido."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Non hai burbullas recentes"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"As burbullas recentes e rexeitadas aparecerán aquí."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Estas notificacións non se poden modificar."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Aquí non se pode configurar este grupo de notificacións"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificación mediante proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Servizos do dispositivo"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Sen título"</string> <string name="restart_button_description" msgid="6916116576177456480">"Toca o botón para reiniciar esta aplicación e abrila en pantalla completa."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Abre a aplicación <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Configuración das burbullas de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Queres permitir que se mostren as burbullas de <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Xestionar"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Denegar"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Permitir"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Preguntarme máis tarde"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g> e <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> máis"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Mover"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Mover á parte infer. esquerda"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Mover á parte inferior dereita"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Ignorar"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Manter os chats á vista"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Os chats novos de <xliff:g id="APP_NAME">%1$s</xliff:g> mostraranse como burbullas. Toca unha para abrila ou arrástraa para movela.\n\nToca a burbulla"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Para desactivar as burbullas nesta aplicación, toca Xestionar"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Actualizouse a navegación do sistema. Para facer cambios, vai a Configuración."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Para actualizar a navegación do sistema, vai a Configuración"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Modo de espera"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Pasar o dedo para ver outras estruturas"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 791de2432e57..835e395a10b4 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"સાઉન્ડ અથવા વાઇબ્રેશન વિના તમારું ધ્યાન દોરે છે."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ફ્લોટિંગ શૉર્ટકટથી આ કન્ટેન્ટ પર તમારું ધ્યાન દોરી રાખે છે."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"તાજેતરના કોઈ બબલ નથી"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"એકદમ નવા બબલ અને છોડી દીધેલા બબલ અહીં દેખાશે."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"આ નોટિફિકેશનમાં કોઈ ફેરફાર થઈ શકશે નહીં."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"નોટિફિકેશનના આ ગ્રૂપની ગોઠવણી અહીં કરી શકાશે નહીં"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"પ્રૉક્સી નોટિફિકેશન"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"ડિવાઇસ સેવાઓ"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"કોઈ શીર્ષક નથી"</string> <string name="restart_button_description" msgid="6916116576177456480">"આ ઍપ ફરીથી ચાલુ કરવા માટે ટૅપ કરીને પૂર્ણ સ્ક્રીન કરો."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> ખોલો"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> બબલ માટેનાં સેટિંગ"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> પરના બબલને મંજૂરી આપીએ?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"મેનેજ કરો"</string> - <string name="no_bubbles" msgid="1187859094003006292">"નકારો"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"મંજૂરી આપો"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"મને થોડા સમય પછી પૂછશો"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> તરફથી <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> અને વધુ <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> તરફથી <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ખસેડો"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"નીચે ડાબે ખસેડો"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"નીચે જમણે ખસેડો"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"છોડી દો"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"ચૅટને સૌથી પહેલાં રાખો"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g>ની નવી ચૅટ બબલ તરીકે દેખાશે. બબલને ખોલવા માટે તેને ટૅપ કરો. તેને ખસેડવા માટે ખેંચો.\n\nબબલને ટૅપ કરો"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"આ ઍપમાંથી બબલને બંધ કરવા માટે મેનેજ કરો પર ટૅપ કરો"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"સિસ્ટમ નૅવિગેશન અપડેટ કર્યું. ફેરફારો કરવા માટે, સેટિંગ પર જાઓ."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"સિસ્ટમ નૅવિગેશનને અપડેટ કરવા માટે સેટિંગ પર જાઓ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"સ્ટૅન્ડબાય"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"અન્ય માળખા જોવા માટે સ્વાઇપ કરો"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index c2f5c23df9d9..f06c06046f48 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -562,8 +562,7 @@ <string name="monitoring_description_app_personal_work" msgid="6175816356939166101">"आपकी वर्क प्रोफ़ाइल का प्रबंधन <xliff:g id="ORGANIZATION">%1$s</xliff:g> करता है. प्रोफ़ाइल <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> से कनेक्ट है, जो ईमेल, ऐप्लिकेशन और वेबसाइटों सहित आपकी नेटवर्क गतिविधि की निगरानी कर सकता है.\n\nआप <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> से भी कनेक्ट हैं, जो आपकी व्यक्तिगत नेटवर्क गतिविधि की निगरानी कर सकता है."</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent की वजह से अनलॉक रखा गया है"</string> <string name="keyguard_indication_trust_disabled" msgid="6820793704816727918">"जब तक कि आप मैन्युअल रूप से अनलॉक नहीं करते तब तक डिवाइस लॉक रहेगा"</string> - <!-- no translation found for keyguard_indication_trust_unlocked_plugged_in (2323452175329362855) --> - <skip /> + <string name="keyguard_indication_trust_unlocked_plugged_in" msgid="2323452175329362855">"<xliff:g id="KEYGUARD_INDICATION">%1$s</xliff:g>\n<xliff:g id="POWER_INDICATION">%2$s</xliff:g>"</string> <string name="hidden_notifications_title" msgid="1782412844777612795">"सूचनाएं ज़्यादा तेज़ी से पाएं"</string> <string name="hidden_notifications_text" msgid="5899627470450792578">" उन्हें अनलॉक किए जाने से पहले देखें"</string> <string name="hidden_notifications_cancel" msgid="4805370226181001278">"रहने दें"</string> @@ -700,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"आवाज़ या वाइब्रेशन होने की वजह से आपका ध्यान सूचनाओं पर जाता है."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"फ़्लोट करने वाले शॉर्टकट की मदद से इस सामग्री पर आपका ध्यान बना रहता है."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"हाल ही के बबल्स मौजूद नहीं हैं"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"हाल ही के बबल्स और हटाए गए बबल्स यहां दिखेंगे."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ये सूचनाएं नहीं बदली जा सकती हैं."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"सूचनाओं के इस समूह को यहां कॉन्फ़िगर नहीं किया जा सकता"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"प्रॉक्सी सूचना"</string> @@ -970,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"डिवाइस सेवाएं"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"कोई शीर्षक नहीं"</string> <string name="restart_button_description" msgid="6916116576177456480">"इस ऐप्लिकेशन को रीस्टार्ट करने और फ़ुल स्क्रीन चालू करने के लिए टैप करें."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> खोलें"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> बबल की सेटिंग"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> से बबल की अनुमति दें?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"प्रबंधित करें"</string> - <string name="no_bubbles" msgid="1187859094003006292">"अनुमति न दें"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"अनुमति दें"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"मुझसे बाद में पूछें"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> से <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> और <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> अन्य ऐप्लिकेशन से <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ले जाएं"</string> @@ -985,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"बाईं ओर सबसे नीचे ले जाएं"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"सबसे नीचे दाईं ओर ले जाएं"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"खारिज करें"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"चैट को पहले से तैयार रखें"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> की नई चैट बबल्स की तरह दिखेंगी. इसे खोलने के लिए किसी बबल पर टैप करें. इसे एक जगह से दूसरी जगह ले जाने के लिए, खींचें और छोड़ें.\n\nबबल पर टैप करें"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"इस ऐप्लिकेशन पर बबल्स को बंद करने के लिए \'प्रबंधित करें\' पर टैप करें"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"सिस्टम नेविगेशन अपडेट हो गया. बदलाव करने के लिए \'सेटिंग\' पर जाएं."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"सिस्टम नेविगेशन अपडेट करने के लिए \'सेटिंग\' में जाएं"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"स्टैंडबाई"</string> @@ -1005,12 +1008,9 @@ <string name="controls_favorite_subtitle" msgid="4049644994401173949">"झटपट ऐक्सेस पाने के लिए कंट्राेल चुनें"</string> <string name="controls_favorite_load_error" msgid="2533215155804455348">"सभी कंट्रोल की सूची लोड नहीं हो सकी."</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"अन्य"</string> - <!-- no translation found for controls_dialog_title (8806193219278278442) --> - <skip /> - <!-- no translation found for controls_dialog_ok (7011816381344485651) --> - <skip /> - <!-- no translation found for controls_dialog_message (6292099631702047540) --> - <skip /> + <string name="controls_dialog_title" msgid="8806193219278278442">"फटाफट कंट्रोल में जोड़ें"</string> + <string name="controls_dialog_ok" msgid="7011816381344485651">"पसंदीदा में जोड़ें"</string> + <string name="controls_dialog_message" msgid="6292099631702047540">"<xliff:g id="APP">%s</xliff:g> आपको इस कंट्रोल को अपनी पसंदीदा में जोड़ने का सुझाव देता है."</string> <!-- no translation found for controls_pin_use_alphanumeric (8478371861023048414) --> <skip /> <!-- no translation found for controls_pin_verify (414043854030774349) --> @@ -1020,4 +1020,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"दूसरे स्ट्रक्चर देखने के लिए स्वाइप करें"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 4cbccd7fd0b1..09b838432e55 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -702,7 +702,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Privlači vašu pažnju zvučnim signalima ili vibracijama."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Održava vam pozornost pomoću plutajućeg prečaca ovom sadržaju."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nema nedavnih oblačića"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Ovdje će se prikazivati nedavni i odbačeni oblačići."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Te se obavijesti ne mogu izmijeniti."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ta se grupa obavijesti ne može konfigurirati ovdje"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Obavijest poslana putem proxyja"</string> @@ -974,13 +975,8 @@ <string name="device_services" msgid="1549944177856658705">"Usluge uređaja"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Bez naslova"</string> <string name="restart_button_description" msgid="6916116576177456480">"Dodirnite da biste ponovo pokrenuli tu aplikaciju i prikazali je na cijelom zaslonu."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Otvorite aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Postavke za oblačiće za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Želite li dopustiti oblačiće iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Upravljanje"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Odbij"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Dopusti"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Pitaj me kasnije"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> iz aplikacije <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> iz aplikacije <xliff:g id="APP_NAME">%2$s</xliff:g> i još <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Premjesti"</string> @@ -989,9 +985,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Premjesti u donji lijevi kut"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Premjestite u donji desni kut"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Odbaci"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Isticanje chatova"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Novi chatovi iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g> prikazat će se kao oblačići. Dodirnite oblačić da biste ga otvorili. Povucite da biste ga premjestili.\n\nDodirnite oblačić"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Dodirnite Upravljanje da biste isključili oblačiće iz ove aplikacije"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Ažurirana je navigacija sustavom. Možete je promijeniti u Postavkama."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Navigaciju sustavom možete ažurirati u Postavkama"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje mirovanja"</string> @@ -1019,4 +1023,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Prijeđite prstom da biste vidjeli druge strukture"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 15fb3d120225..5f526fd3338a 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Figyelemfelkeltő a hangjelzésnek és rezgésnek köszönhetően."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"A tartalomra mutató lebegő parancsikon segítségével tartja fenn az Ön figyelmét."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nincsenek buborékok a közelmúltból"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"A legutóbbi és az elvetett buborékok itt jelennek majd meg."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ezeket az értesítéseket nem lehet módosítani."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Az értesítések jelen csoportját itt nem lehet beállítani"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Továbbított értesítés"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Eszközszolgáltatások"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Nincs cím"</string> <string name="restart_button_description" msgid="6916116576177456480">"Koppintson az alkalmazás újraindításához és a teljes képernyős mód elindításához."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> megnyitása"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g>-buborékok beállításai"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Engedélyezi a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazásból származó buborékokat?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Kezelés"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Tiltás"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Engedélyezés"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Kérdezzen rá később"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> a(z) <xliff:g id="APP_NAME">%2$s</xliff:g> alkalmazásból és <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> további"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Áthelyezés"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Áthelyezés le és balra"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Áthelyezés le és jobbra"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Elvetés"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"A csevegések előtérben tartása"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazásból származó új csevegőüzenetek buborékként jelennek meg. A csevegés megnyitásához koppintson a buborékra. Az áthelyezéséhez húzza a buborékot a kívánt helyre.\n\nKoppintson a buborékra"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"A Kezelés gombra koppintva kapcsolhatja ki az alkalmazásból származó buborékokat"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"A rendszer-navigáció módja megváltozott. Módosításához nyissa meg a Beállításokat."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"A rendszer-navigációs lehetőségeket a Beállításokban módosíthatja"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Készenléti mód"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Csúsztasson további struktúrák megtekintéséhez"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 830f5777755e..ef90f55f3930 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Ծանուցումները գալիս են ձայնով կամ թրթռոցով։"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Լողացող դյուրանցման միջոցով ձեր ուշադրությունն է գրավում բովանդակության նկատմամբ"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Վերջին ամպիկներ չկան"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Այստեղ կցուցադրվեն վերջերս օգտագործված և փակված ամպիկները, որոնք կկարողանաք հեշտությամբ վերաբացել։"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Այս ծանուցումները չեն կարող փոփոխվել:"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ծանուցումների տվյալ խումբը հնարավոր չէ կարգավորել այստեղ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Ծանուցումն ուղարկվել է պրոքսի սերվերի միջոցով"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Սարքի ծառայություններ"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Անանուն"</string> <string name="restart_button_description" msgid="6916116576177456480">"Հպեք՝ հավելվածը վերագործարկելու և լիաէկրան ռեժիմին անցնելու համար։"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Բացել <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ի ամպիկների կարգավորումներ"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Թույլատրե՞լ ամպիկներ <xliff:g id="APP_NAME">%1$s</xliff:g>-ից։"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Կառավարել"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Մերժել"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Թույլատրել"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Հարցնել ավելի ուշ"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>՝ <xliff:g id="APP_NAME">%2$s</xliff:g>-ից"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>` <xliff:g id="APP_NAME">%2$s</xliff:g>-ից ու ևս <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ամպիկ"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Տեղափոխել"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Տեղափոխել ներքև՝ ձախ"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Տեղափոխել ներքև՝ աջ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Փակել"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Ցուցադրել զրույցները առջևում"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածի նոր զրույցները կհայտնվեն ամպիկների տեսքով։ Հպեք ամպիկին՝ այն բացելու համար։ Քաշեք՝ այն տեղափոխելու համար։\n\nՀպեք ամպիկին"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Հպեք «Կառավարել» կոճակին՝ այս հավելվածի ամպիկներն անջատելու համար։"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Համակարգի նավիգացիան թարմացվեց: Փոփոխություններ անելու համար անցեք կարգավորումներ:"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Թարմացրեք համակարգի նավիգացիան կարգավորումներում"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Սպասման ռեժիմ"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Սահեցրեք մատը՝ այլ կառուցվածքներ տեսնելու համար"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 1cdcc187a0e4..b648d5cac8e0 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Menarik perhatian Anda dengan suara atau getaran."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Menjaga perhatian dengan pintasan floating ke konten ini."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Tidak ada balon baru-baru ini"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Balon baru-baru ini dan balon yang ditutup akan muncul di sini."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Notifikasi ini tidak dapat diubah."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Grup notifikasi ini tidak dapat dikonfigurasi di sini"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notifikasi proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Layanan Perangkat"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Tanpa judul"</string> <string name="restart_button_description" msgid="6916116576177456480">"Ketuk untuk memulai ulang aplikasi ini dan membuka layar penuh."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Buka <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Setelan untuk balon <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Izinkan balon dari <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Kelola"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Tolak"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Izinkan"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Nanti saja"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> dari <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> dari <xliff:g id="APP_NAME">%2$s</xliff:g> dan <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> lainnya"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Pindahkan"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Pindahkan ke kiri bawah"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Pindahkan ke kanan bawah"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Tutup"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Tampilkan chat di depan"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Chat baru dari <xliff:g id="APP_NAME">%1$s</xliff:g> akan muncul sebagai balon. Ketuk balon untuk membukanya. Tarik untuk memindahkannya.\n\nKetuk balon"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Ketuk Kelola untuk menonaktifkan balon dari aplikasi ini"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigasi sistem diupdate. Untuk melakukan perubahan, buka Setelan."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Buka Setelan untuk mengupdate navigasi sistem"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Siaga"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Geser untuk melihat struktur lainnya"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 241521c23758..bf347d3b1d39 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Fangar athygli þína með hljóði eða titringi."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Fangar athygli þína með fljótandi flýtileið á þetta efni."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Engar nýlegar blöðrur"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Nýlegar blöðrur og blöðrur sem þú hefur hunsað birtast hér."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ekki er hægt að breyta þessum tilkynningum."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ekki er hægt að stilla þessar tilkynningar hér"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Staðgengilstilkynning"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Tækjaþjónusta"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Enginn titill"</string> <string name="restart_button_description" msgid="6916116576177456480">"Ýttu til að endurræsa forritið og sýna það á öllum skjánum."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Opna <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Stillingar fyrir blöðrur frá <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Leyfa blöðrur frá <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Stjórna"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Hafna"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Leyfa"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Spyrja mig síðar"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> frá <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"„<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>“ frá <xliff:g id="APP_NAME">%2$s</xliff:g> og <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> í viðbót"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Færa"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Færa neðst til vinstri"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Færðu neðst til hægri"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Hunsa"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Halda spjalli fyrir framan"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nýtt spjall úr <xliff:g id="APP_NAME">%1$s</xliff:g> birtist sem blöðrur. Ýttu á blöðru til að opna hana. Dragðu hana til að færa hana.\n\nÝttu á blöðruna"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Ýttu á „Stjórna“ til að slökkva á blöðrum frá þessu forriti"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Kerfisstjórnun uppfærð. Þú getur breytt þessu í stillingunum."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Farðu í stillingar til að uppfæra kerfisstjórnun"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Biðstaða"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Strjúktu til að sjá önnur kerfi"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 8bcd9c69f471..6cfd4228baf6 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Richiama la tua attenzione con suono o vibrazione."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Mantiene la tua attenzione con una scorciatoia mobile a questi contenuti."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nessuna bolla recente"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Le bolle recenti e ignorate verranno visualizzate qui."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Impossibile modificare queste notifiche."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Qui non è possibile configurare questo gruppo di notifiche"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notifica inviata al proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Servizi del dispositivo"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Senza titolo"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tocca per riavviare l\'app e passare a schermo intero."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Apri <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Impostazioni per fumetti <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Consentire fumetti da <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Gestisci"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Rifiuta"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Consenti"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Ricordamelo più tardi"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> da <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> da <xliff:g id="APP_NAME">%2$s</xliff:g> e altre <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Sposta"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Sposta in basso a sinistra"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Sposta in basso a destra"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Ignora"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Tieni davanti le chat"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Le nuove chat da <xliff:g id="APP_NAME">%1$s</xliff:g> verranno visualizzate come bolle. Tocca una bolla per aprirla. Trascinala per spostarla.\n\nTocca la bolla"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tocca Gestisci per disattivare le bolle dall\'app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigazione del sistema aggiornata. Per apportare modifiche, usa le Impostazioni."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Usa le Impostazioni per aggiornare la navigazione del sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Scorri per vedere altre strutture"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index bfb73e17625f..ee43515d68a3 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -705,7 +705,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"מעוררת תשומת לב באמצעות צלילים או רטט."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"מעוררת תשומת לב באמצעות קיצור דרך צף לתוכן הזה."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"אין בועות מהזמן האחרון"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"בועות אחרונות ובועות שנסגרו יופיעו כאן."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"לא ניתן לשנות את ההתראות האלה."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"לא ניתן להגדיר כאן את קבוצת ההתראות הזו"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"התראה דרך שרת proxy"</string> @@ -979,13 +980,8 @@ <string name="device_services" msgid="1549944177856658705">"שירותים למכשיר"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"ללא שם"</string> <string name="restart_button_description" msgid="6916116576177456480">"צריך להקיש כדי להפעיל מחדש את האפליקציה הזו ולעבור למסך מלא."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"לפתיחת <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"הגדרות בשביל בועות של <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"להתיר ל-<xliff:g id="APP_NAME">%1$s</xliff:g> להציג בועות?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"ניהול"</string> - <string name="no_bubbles" msgid="1187859094003006292">"אני לא מרשה"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"כן, זה בסדר"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"אחליט מאוחר יותר"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> מהאפליקציה <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> מ-<xliff:g id="APP_NAME">%2$s</xliff:g> ועוד <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"העברה"</string> @@ -994,9 +990,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"העברה לפינה השמאלית התחתונה"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"העברה לפינה הימנית התחתונה"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"סגירה"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"הצ\'אטים תמיד יוצגו מלפנים"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"צ\'אטים חדשים מאפליקציית <xliff:g id="APP_NAME">%1$s</xliff:g> יוצגו כבועות. יש להקיש על בועה כדי לפתוח אותה. יש לגרור אותה כדי להזיז אותה.\n\nיש להקיש על הבועה"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"יש להקיש על \'ניהול\' כדי להשבית את הבועות מהאפליקציה הזו"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"הניווט במערכת עודכן. אפשר לערוך שינויים דרך ההגדרות."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"יש לעבור להגדרות כדי לעדכן את הניווט במערכת"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"המתנה"</string> @@ -1025,4 +1029,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"יש להחליק כדי לראות מבנים אחרים"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 77349538f45a..92870ee33414 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"音やバイブレーションで通知をお知らせします。"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"このコンテンツのフローティング ショートカットで通知をお知らせします。"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"最近閉じたふきだしはありません"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"最近表示されたふきだしや閉じたふきだしが、ここに表示されます。"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"これらの通知は変更できません。"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"このグループの通知はここでは設定できません"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"代理通知"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"デバイス サービス"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"タイトルなし"</string> <string name="restart_button_description" msgid="6916116576177456480">"タップしてこのアプリを再起動すると、全画面表示になります。"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> を開く"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> のふきだしの設定"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> のふきだしを許可しますか？"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"管理"</string> - <string name="no_bubbles" msgid="1187859094003006292">"拒否"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"許可"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"後で確認"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>（<xliff:g id="APP_NAME">%2$s</xliff:g>）"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>（<xliff:g id="APP_NAME">%2$s</xliff:g>）、他 <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> 件"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"移動"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"左下に移動"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"右下に移動"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"閉じる"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"チャットを常に前面に表示"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> からの新しいチャットがバブルとして表示されます。バブルをタップするとチャットが表示されます。ドラッグすると移動します。\n\nバブルをタップしてください"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"このアプリからのバブルをオフにするには、[管理] をタップしてください"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"システム ナビゲーションを更新しました。変更するには [設定] に移動してください。"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"システム ナビゲーションを更新するには [設定] に移動してください"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"スタンバイ"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"スワイプすると他の構造が表示されます"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 68201a18af79..35fd7486047e 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"იპყრობს თქვენს ყურადღებას ხმით ან ვიბრაციით."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"იპყრობს თქვენს ყურადღებას ამ კონტენტის მოლივლივე მალსახმობით."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"ბოლო დროს გამოყენებული ბუშტები არ არის"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"აქ გამოჩნდება ბოლოდროინდელი ბუშტები და უარყოფილი ბუშტები."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ამ შეტყობინებების შეცვლა შეუძლებელია."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"შეტყობინებების ამ ჯგუფის კონფიგურირება აქ შეუძლებელია"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"პროქსირებული შეტყობინება"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"მოწყობილობის სერვისები"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"უსათაურო"</string> <string name="restart_button_description" msgid="6916116576177456480">"შეეხეთ ამ აპის გადასატვირთად და გადადით სრულ ეკრანზე."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ის გახსნა"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"პარამეტრები <xliff:g id="APP_NAME">%1$s</xliff:g> ბუშტებისთვის"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"დაიშვას ბუშტები <xliff:g id="APP_NAME">%1$s</xliff:g>-დან?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"მართვა"</string> - <string name="no_bubbles" msgid="1187859094003006292">"უარყოფა"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"დაშვება"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"მოგვიანებით მკითხეთ"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> <xliff:g id="APP_NAME">%2$s</xliff:g>-ისგან"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> <xliff:g id="APP_NAME">%2$s</xliff:g>-დან და კიდევ <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"გადატანა"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ქვევით და მარცხნივ გადატანა"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"გადაანაცვ. ქვემოთ და მარჯვნივ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"დახურვა"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"ჩეთები წინ იყოს"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ის ახალი ჩეთები ბუშტების სახით გამოჩნდება. გასახსნელად შეეხეთ ბუშტს. გადასატანად ჩაავლეთ.\n\nშეეხეთ ბუშტს"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ამ აპის ბუშტების გამოსართავად შეეხეთ „მართვას“"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"სისტემური ნავიგაცია განახლდა. ცვლილებების შესატანად გადადით პარამეტრებზე."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"სისტემური ნავიგაციის გასაახლებლად გადადით პარამეტრებზე"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"მოლოდინის რეჟიმი"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"გადაფურცლეთ სხვა სტრუქტურების სანახავად"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 206bfa120365..394902b1c111 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Хабарландырулар келгенде, дыбыс шығады не дірілдейді"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Осы мазмұнға бекітілген қалқымалы таңбашамен назарыңызды өзіне тартады."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Жақындағы қалқымалы анықтамалар жоқ"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Жақында ашылған және жабылған қалқымалы анықтамалар осы жерде пайда болады."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Бұл хабарландыруларды өзгерту мүмкін емес."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Мұндай хабарландырулар бұл жерде конфигурацияланбайды."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Прокси-сервер арқылы жіберілген хабарландыру"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Құрылғы қызметтері"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Атауы жоқ"</string> <string name="restart_button_description" msgid="6916116576177456480">"Бұл қолданбаны қайта қосып, толық экранға өту үшін түртіңіз."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасын ашу"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> қалқымалы анықтамаларының параметрлері"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасының қалқымалы анықтамаларына рұқсат етілсін бе?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Басқару"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Тыйым салу"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Рұқсат беру"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Кейінірек сұралсын"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> жіберген хабарландыру: <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> қолданбасы жіберген <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> және тағы <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Жылжыту"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Төменгі сол жаққа жылжыту"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Төменгі оң жаққа жылжыту"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Жабу"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Чаттарды жоғары жақтан көрсету"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасындағы жаңа чаттар қалқымалы анықтамалар түрінде шығады. Қалқымалы анықтаманы ашу үшін оны түртіңіз. Оны сүйреп жылжытыңыз.\n\nҚалқымалы анықтаманы түртіңіз."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Бұл қолданбадан қалқымалы анықтамаларды өшіру үшін \"Басқару\" түймесін түртіңіз."</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Жүйе навигациясы жаңартылды. Өзгерту енгізу үшін \"Параметрлер\" бөліміне өтіңіз."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Жүйе навигациясын жаңарту үшін \"Параметрлер\" бөліміне өтіңіз."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Күту режимі"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Басқа құрылғыларды көру үшін экранды сырғытыңыз."</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 673aac3cb9ea..ecb5ffa91abe 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ធ្វើឱ្យអ្នកចាប់អារម្មណ៍តាមរយៈសំឡេង ឬការញ័រ។"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ធ្វើឱ្យអ្នកចាប់អារម្មណ៍ដោយប្រើផ្លូវកាត់អណ្ដែតសម្រាប់ខ្លឹមសារនេះ។"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"មិនមានសារលេចឡើងថ្មីៗទេ"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"សារលេចឡើងដែលបានច្រានចោល និងសារលេចឡើងថ្មីៗនឹងបង្ហាញនៅទីនេះ។"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"មិនអាចកែប្រែការជូនដំណឹងទាំងនេះបានទេ។"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"មិនអាចកំណត់រចនាសម្ព័ន្ធក្រុមការជូនដំណឹងនេះនៅទីនេះបានទេ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ការជូនដំណឹងជាប្រូកស៊ី"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"សេវាកម្មឧបករណ៍"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"គ្មានចំណងជើង"</string> <string name="restart_button_description" msgid="6916116576177456480">"ចុចដើម្បីចាប់ផ្ដើមកម្មវិធីនេះឡើងវិញ រួចចូលប្រើពេញអេក្រង់។"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"បើក <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"ការកំណត់សម្រាប់សារលេចឡើង <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"អនុញ្ញាតសារលេចឡើងពី <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"គ្រប់គ្រង"</string> - <string name="no_bubbles" msgid="1187859094003006292">"បដិសេធ"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"អនុញ្ញាត"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"សួរខ្ញុំនៅពេលក្រោយ"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ពី <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ពី <xliff:g id="APP_NAME">%2$s</xliff:g> និង <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ទៀត"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ផ្លាស់ទី"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ផ្លាស់ទីទៅផ្នែកខាងក្រោមខាងឆ្វេង"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ផ្លាស់ទីទៅផ្នែកខាងក្រោមខាងស្ដាំ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"ច្រានចោល"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"រក្សាទុកការជជែកនៅផ្នែកខាងមុខ"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"ការជជែកថ្មីៗពី <xliff:g id="APP_NAME">%1$s</xliff:g> នឹងបង្ហាញជាសារលេចឡើង។ ចុចសារលេចឡើង ដើម្បីបើកវា។ អូសដើម្បីផ្លាស់ទីសារលេចឡើងនេះ។\n\nចុចសារលេចឡើងនេះ"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ចុច \"គ្រប់គ្រង\" ដើម្បីបិទសារលេចឡើងពីកម្មវិធីនេះ"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"បានធ្វើបច្ចុប្បន្នភាពការរុករកក្នុងប្រព័ន្ធ។ ដើម្បីធ្វើការផ្លាស់ប្ដូរ សូមចូលទៅកាន់ការកំណត់។"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ចូលទៅកាន់ការកំណត់ ដើម្បីធ្វើបច្ចុប្បន្នភាពការរុករកក្នុងប្រព័ន្ធ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ផ្អាកដំណើរការ"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"អូសដើម្បីមើលរចនាសម្ព័ន្ធផ្សេងទៀត"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 81b6d997d6d6..8bc6fbb72529 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ಧ್ವನಿ ಅಥವಾ ವೈಬ್ರೇಷನ್ ಮೂಲಕ ನಿಮ್ಮ ಗಮನವನ್ನು ಸೆಳೆಯುತ್ತದೆ."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ಈ ವಿಷಯಕ್ಕೆ ಲಿಂಕ್ ಮಾಡಿ ಕೊಂಡೊಯ್ಯುವ ಶಾರ್ಟ್ಕಟ್ ಕಡೆಗೆ ಗಮನ ಇರಿಸಿ."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"ಯಾವುದೇ ಇತ್ತೀಚಿನ ಬಬಲ್ಗಳಿಲ್ಲ"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"ಇತ್ತೀಚಿನ ಬಬಲ್ಗಳು ಮತ್ತು ವಜಾಗೊಳಿಸಿದ ಬಬಲ್ಗಳು ಇಲ್ಲಿ ಗೋಚರಿಸುತ್ತವೆ."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ಈ ಗುಂಪಿನ ಅಧಿಸೂಚನೆಗಳನ್ನು ಇಲ್ಲಿ ಕಾನ್ಫಿಗರ್ ಮಾಡಲಾಗಿರುವುದಿಲ್ಲ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ಪ್ರಾಕ್ಸಿ ಮಾಡಿದ ಅಧಿಸೂಚನೆಗಳು"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"ಸಾಧನ ಸೇವೆಗಳು"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"ಯಾವುದೇ ಶೀರ್ಷಿಕೆಯಿಲ್ಲ"</string> <string name="restart_button_description" msgid="6916116576177456480">"ಈ ಆ್ಯಪ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಲು ಮತ್ತು ಪೂರ್ಣ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ ನೋಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಅನ್ನು ತೆರೆಯಿರಿ"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಬಬಲ್ಗಳಿಗಾಗಿ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಆ್ಯಪ್ನ ಬಬಲ್ಗಳನ್ನು ಅನುಮತಿಸುವುದೇ?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"ನಿರ್ವಹಿಸಿ"</string> - <string name="no_bubbles" msgid="1187859094003006292">"ನಿರಾಕರಿಸಿ"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"ಅನುಮತಿಸಿ"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"ನನ್ನನ್ನು ಆನಂತರ ಕೇಳಿ"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> ಆ್ಯಪ್ನ <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> ಮತ್ತು <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ಹೆಚ್ಚಿನವುಗಳ <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ಸರಿಸಿ"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ಸ್ಕ್ರೀನ್ನ ಎಡ ಕೆಳಭಾಗಕ್ಕೆ ಸರಿಸಿ"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ಕೆಳಗಿನ ಬಲಭಾಗಕ್ಕೆ ಸರಿಸಿ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"ವಜಾಗೊಳಿಸಿ"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"ಚಾಟ್ಗಳನ್ನು ಮುಂಚೂಣಿಯಲ್ಲಿಡಿ"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> ನಿಂದ ಹೊಸ ಚಾಟ್ಗಳು ಬಬಲ್ಗಳಾಗಿ ಕಾಣಿಸುತ್ತದೆ. ಅದನ್ನು ತೆರೆಯಲು ಬಬಲ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ. ಅದನ್ನು ಸರಿಸಲು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ.\n\nಬಬಲ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ಈ ಆ್ಯಪ್ನಿಂದ ಬಬಲ್ಗಳನ್ನು ಆಫ್ ಮಾಡಲು ನಿರ್ವಹಿಸಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"ಸಿಸ್ಟಂ ನ್ಯಾವಿಗೇಷನ ಅಪ್ಡೇಟ್ ಮಾಡಲಾಗಿದೆ ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಲು, ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಹೋಗಿ."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ಸಿಸ್ಟಂ ನ್ಯಾವಿಗೇಷನ್ ಅಪ್ಡೇಟ್ ಮಾಡಲು ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಹೋಗಿ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ಸ್ಟ್ಯಾಂಡ್ಬೈ"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"ಇತರ ರಚನೆಗಳನ್ನು ನೋಡಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 0abe5e0a7527..73cdbf45d178 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"소리나 진동으로 알립니다."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"이 콘텐츠로 연결되는 플로팅 바로가기로 사용자의 주의를 끕니다."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"최근에 닫은 도움말 풍선 없음"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"최근 버블과 내가 닫은 버블이 여기 표시됩니다."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"이 알림은 수정할 수 없습니다."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"이 알림 그룹은 여기에서 설정할 수 없습니다."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"프록시를 통한 알림"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"기기 서비스"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"제목 없음"</string> <string name="restart_button_description" msgid="6916116576177456480">"탭하여 이 앱을 다시 시작하고 전체 화면으로 이동합니다."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> 열기"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> 알림 풍선 설정"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g>의 알림 풍선을 허용하시겠습니까?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"관리"</string> - <string name="no_bubbles" msgid="1187859094003006292">"거부"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"허용"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"나중에 알림"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g>의 <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> 외 <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>개의 <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"이동"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"왼쪽 하단으로 이동"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"오른쪽 하단으로 이동"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"닫기"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"채팅을 항상 상단에 표시"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g>의 새로운 채팅이 버블로 표시됩니다. 버블을 열려면 탭하세요. 버블을 이동하려면 드래그하세요.\n\n버블을 탭하세요."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"이 앱에서 버블을 사용 중지하려면 관리를 탭하세요."</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"시스템 탐색이 업데이트되었습니다. 변경하려면 설정으로 이동하세요."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"설정으로 이동하여 시스템 탐색을 업데이트하세요."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"대기"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"다른 구조를 보려면 스와이프하세요."</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 7ab9680bf326..074063bc7864 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Билдирүүдөн үн чыгат же дирилдейт."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Калкыма ыкчам баскыч менен көңүлүңүздү бул мазмунга буруп турат."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Акыркы калкып чыкма билдирмелер жок"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Кайра жөнөтүлгөн жана жабылган калкып чыкма билдирмелер ушул жерде көрүнөт."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Бул билдирмелерди өзгөртүүгө болбойт."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Бул билдирмелердин тобун бул жерде конфигурациялоого болбойт"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Прокси билдирмеси"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Түзмөк кызматтары"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Аталышы жок"</string> <string name="restart_button_description" msgid="6916116576177456480">"Бул колдонмону өчүрүп күйгүзүп, толук экранга өтүү үчүн таптап коюңуз."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосун ачуу"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> көбүктөрүнүн жөндөөлөрү"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосунун калкып чыкма билдирмелерине уруксат бересизби?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Башкаруу"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Тыюу салынат"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Уруксат берүү"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Кийинчерээк суралсын"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> колдонмосунан <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> жана дагы <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> колдонмодон <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Жылдыруу"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Төмөнкү сол жакка жылдыруу"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Төмөнкү оң жакка жылдырыңыз"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Жабуу"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Маектерди ар дайым көрүп туруңуз"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосундагы жаңы маектер калкып чыкма билдирмелер түрүндө көрүнөт. Аны ачуу үчүн калкып чыкма билдирмени таптап коюңуз. Аны сүйрөп жылдырыңыз.\n\nКалкып чыкма билдирмени таптап коюңуз"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Бул колдонмодогу калкып чыкма билдирмелерди өчүрүү үчүн \"Башкарууну\" басыңыз"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Тутум чабыттоосу жаңырды. Өзгөртүү үчүн, Жөндөөлөргө өтүңүз."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Тутум чабыттоосун жаңыртуу үчүн Жөндөөлөргө өтүңүз"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Көшүү режими"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Башка структураларды көрүү үчүн экранды сүрүңүз"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 81245857da7c..64632dc52d08 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ດຶງຄວາມສົນໃຈຂອງທ່ານດ້ວຍສຽງ ຫຼື ການສັ່ນເຕືອນ."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ເອົາໃຈໃສ່ທາງລັດແບບລອຍໄປຫາເນື້ອຫານີ້."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"ບໍ່ມີ bubble ຫຼ້າສຸດ"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Bubbles ຫຼ້າສຸດ ແລະ Bubbles ທີ່ປິດໄປຈະປາກົດຢູ່ບ່ອນນີ້."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ບໍ່ສາມາດແກ້ໄຂການແຈ້ງເຕືອນເຫຼົ່ານີ້ໄດ້."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ບໍ່ສາມາດຕັ້ງຄ່າກຸ່ມການແຈ້ງເຕືອນນີ້ຢູ່ບ່ອນນີ້ໄດ້"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ການແຈ້ງເຕືອນແບບພຣັອກຊີ"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"ບໍລິການອຸປະກອນ"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"ບໍ່ມີຊື່"</string> <string name="restart_button_description" msgid="6916116576177456480">"ແຕະເພື່ອຣີສະຕາດແອັບນີ້ ແລະ ໃຊ້ແບບເຕັມຈໍ."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"ເປີດ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"ການຕັ້ງຄ່າສຳລັບ bubble <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"ອະນຸຍາດໃຫ້ມີ bubbles ຈາກ <xliff:g id="APP_NAME">%1$s</xliff:g> ບໍ?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"ຈັດການ"</string> - <string name="no_bubbles" msgid="1187859094003006292">"ປະຕິເສດ"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"ອະນຸຍາດ"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"ຖາມຂ້ອຍໃນພາຍຫຼັງ"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ຈາກ <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ຈາກ <xliff:g id="APP_NAME">%2$s</xliff:g> ແລະ ອີກ <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ຍ້າຍ"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ຍ້າຍຊ້າຍລຸ່ມ"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ຍ້າຍຂວາລຸ່ມ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"ປິດໄວ້"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"ສະແດງການສົນທະນາໄວ້ໜ້າສະເໝີ"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"ການສົນທະນາໃໝ່ຈາກ <xliff:g id="APP_NAME">%1$s</xliff:g> ຈະປາກົດເປັນ bubble. ແຕະໃສ່ bubble ເພື່ອເປີດມັນ ລາກເພື່ອເປີດມັນ.\n\nແຕະໃສ່ bubble"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ແຕະຈັດການເພື່ອປິດ bubble ຈາກແອັບນີ້"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"ອັບເດດການນຳທາງລະບົບແລ້ວ. ເພື່ອປ່ຽນແປງ, ກະລຸນາໄປທີ່ການຕັ້ງຄ່າ."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ໄປທີ່ການຕັ້ງຄ່າເພື່ອອັບເດດການນຳທາງລະບົບ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ສະແຕນບາຍ"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"ປັດເພື່ອເບິ່ງໂຄງສ້າງອື່ນ"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index d5f166b13970..5f22d160acc3 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -705,7 +705,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Atkreipia dėmesį garsu arba vibravimu."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Naudojant slankųjį spartųjį klavišą lengviau sutelkti dėmesį į šį turinį."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nėra naujausių debesėlių"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Naujausi ir atmesti debesėliai bus rodomi čia."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Šių pranešimų keisti negalima."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Šios grupės pranešimai čia nekonfigūruojami"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Per tarpinį serverį gautas pranešimas"</string> @@ -979,13 +980,8 @@ <string name="device_services" msgid="1549944177856658705">"Įrenginio paslaugos"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Nėra pavadinimo"</string> <string name="restart_button_description" msgid="6916116576177456480">"Palieskite, kad paleistumėte iš naujo šią programą arba įjungtumėte viso ekrano režimą."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Atidaryti „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ debesėlių nustatymai"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Leisti programos „<xliff:g id="APP_NAME">%1$s</xliff:g>“ debesėlius?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Tvarkyti"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Atmesti"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Leisti"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Paklausti vėliau"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"„<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>“ iš „<xliff:g id="APP_NAME">%2$s</xliff:g>“"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"„<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>“ iš „<xliff:g id="APP_NAME">%2$s</xliff:g>“ ir dar <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Perkelti"</string> @@ -994,9 +990,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Perkelti į apačią kairėje"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Perkelti į apačią dešinėje"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Atmesti"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Rodyti pokalbius priekyje"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nauji pokalbiai iš programos „<xliff:g id="APP_NAME">%1$s</xliff:g>“ bus rodomi kaip debesėliai. Palieskite debesėlį, kad jį atidarytumėte. Nuvilkite, kad perkeltumėte.\n\nPalieskite debesėlį"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Palieskite „Tvarkyti“, kad išjungtumėte debesėlius šioje programoje"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Sistemos naršymo funkcijos atnaujintos. Jei norite pakeisti, eikite į skiltį „Nustatymai“."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Eikite į skiltį „Nustatymai“, kad atnaujintumėte sistemos naršymo funkcijas"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Budėjimo laikas"</string> @@ -1025,4 +1029,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Perbraukite, kad peržiūrėtumėte kitas struktūras"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 2235796835df..2dd750095b11 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -702,7 +702,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Jūsu uzmanība tiek piesaistīta ar skaņas vai vibrācijas signālu."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Piesaista jūsu uzmanību, rādot peldošu saīsni uz šo saturu."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nav nesen aizvērtu burbuļu"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Šeit būs redzami nesen rādītie burbuļi un aizvērtie burbuļi."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Šos paziņojumus nevar modificēt."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Šeit nevar konfigurēt šo paziņojumu grupu."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Starpniekservera paziņojums"</string> @@ -974,13 +975,8 @@ <string name="device_services" msgid="1549944177856658705">"Ierīces pakalpojumi"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Nav nosaukuma"</string> <string name="restart_button_description" msgid="6916116576177456480">"Pieskarieties, lai restartētu šo lietotni un pārietu pilnekrāna režīmā."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Atvērt lietotni <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Lietotnes <xliff:g id="APP_NAME">%1$s</xliff:g> burbuļu iestatījumi"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Vai atļaut burbuļus no lietotnes <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Pārvaldīt"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Neatļaut"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Atļaut"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Pajautāt vēlāk"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> no: <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> no lietotnes “<xliff:g id="APP_NAME">%2$s</xliff:g>” un vēl <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Pārvietot"</string> @@ -989,9 +985,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Pārvietot apakšpusē pa kreisi"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Pārvietot apakšpusē pa labi"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Nerādīt"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Sarunas priekšplānā"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Jaunas sarunas no lietotnes <xliff:g id="APP_NAME">%1$s</xliff:g> tiks parādītas kā burbuļi. Pieskarieties kādam burbulim, lai to atvērtu. Velciet, lai to pārvietotu.\n\nPieskarieties burbulim."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Pieskarieties pogai “Pārvaldīt”, lai izslēgtu burbuļus no šīs lietotnes."</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Sistēmas navigācija ir atjaunināta. Lai veiktu izmaiņas, atveriet iestatījumus."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Atveriet iestatījumus, lai atjauninātu sistēmas navigāciju"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Gaidstāve"</string> @@ -1019,4 +1023,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Velciet, lai skatītu citas struktūras"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 4a67a195725b..02eadae1093d 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Ви го привлекува вниманието со звук или вибрации."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Ви го задржува вниманието со лебдечка кратенка на содржинава."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Нема неодамнешни балончиња"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Неодамнешните и отфрлените балончиња ќе се појавуваат тука."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Овие известувања не може да се изменат"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Оваа група известувања не може да се конфигурира тука"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Известување преку прокси"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Услуги за уредот"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Без наслов"</string> <string name="restart_button_description" msgid="6916116576177456480">"Допрете за да ја рестартирате апликацијава и да ја отворите на цел екран."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Отворете ја <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Поставки за баланчињата на <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Да се дозволат балончиња од <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Управување"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Одбиј"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Дозволи"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Прашај ме подоцна"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> од <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> од <xliff:g id="APP_NAME">%2$s</xliff:g> и уште <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Премести"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Премести долу лево"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Премести долу десно"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Отфрли"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Разговорите нека ви бидат во преден план"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Новите разговори од <xliff:g id="APP_NAME">%1$s</xliff:g> ќе се појавуваат како балончиња. Допрете балонче за да го отворите. Повлечете за да го преместите.\n\nДопрете на балончето"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Допрете „Управувајте“ за да ги исклучите балончињата од апликацијава"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Навигацијата на системот е ажурирана. За да извршите промени, одете во „Поставки“."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Одете во „Поставки“ за да ја ажурирате навигацијата на системот"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Подготвеност"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Повлечете за да видите други структури"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 7311242471bc..c4f75c5407c3 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ശബ്ദമോ വെെബ്രേഷനോ ഉപയോഗിച്ച് നിങ്ങളുടെ ശ്രദ്ധ ക്ഷണിക്കുന്നു."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ഈ ഉള്ളടക്കത്തിലേക്ക് ഒരു ഫ്ലോട്ടിംഗ് കുറുക്കുവഴി ഉപയോഗിച്ച് നിങ്ങളുടെ ശ്രദ്ധ നിലനിർത്തുന്നു."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"അടുത്തിടെയുള്ള ബബിളുകൾ ഒന്നുമില്ല"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"അടുത്തിടെയുള്ള Bubbles-ഉം ഡിസ്മിസ് ചെയ്ത Bubbles-ഉം ഇവിടെ ദൃശ്യമാവും."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ഈ അറിയിപ്പുകൾ പരിഷ്ക്കരിക്കാനാവില്ല."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"അറിയിപ്പുകളുടെ ഈ ഗ്രൂപ്പ് ഇവിടെ കോണ്ഫിഗര് ചെയ്യാൻ കഴിയില്ല"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"പ്രോക്സി അറിയിപ്പ്"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"ഉപകരണ സേവനങ്ങള്"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"പേരില്ല"</string> <string name="restart_button_description" msgid="6916116576177456480">"ഈ ആപ്പ് റീസ്റ്റാർട്ട് ചെയ്യാനും പൂർണ്ണ സ്ക്രീനാവാനും ടാപ്പ് ചെയ്യുക."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> തുറക്കുക"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനുള്ള ബബിളുകളുടെ ക്രമീകരണം"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ൽ നിന്നും ബബിളുകളെ അനുവദിക്കണോ?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"മാനേജ് ചെയ്യുക"</string> - <string name="no_bubbles" msgid="1187859094003006292">"നിരസിക്കുക"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"അനുവദിക്കുക"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"എന്നോട് പിന്നീട് ചോദിക്കുക"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g>-ൽ നിന്നുള്ള <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> എന്നതിൽ നിന്നുള്ള <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> കൂടുതലും"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"നീക്കുക"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ചുവടെ ഇടതുഭാഗത്തേക്ക് നീക്കുക"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ചുവടെ വലതുഭാഗത്തേക്ക് നീക്കുക"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"ഡിസ്മിസ് ചെയ്യുക"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"ചാറ്റുകൾ ഏറ്റവും ആദ്യം കാണുന്ന രീതിയിൽ വയ്ക്കുക"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിൽ നിന്നുള്ള പുതിയ ചാറ്റുകൾ ബബിളുകളായി ദൃശ്യമാവും. ഇത് തുറക്കാൻ ബബിൾ ടാപ്പ് ചെയ്യുക. ഇത് നീക്കാൻ വലിച്ചിടുക.\n\nബബിൾ ടാപ്പ് ചെയ്യുക"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ഈ ആപ്പിൽ നിന്നുള്ള ബബിളുകൾ ഓഫാക്കാൻ \'മാനേജ് ചെയ്യുക\' ടാപ്പ് ചെയ്യുക"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"സിസ്റ്റം നാവിഗേഷൻ അപ്ഡേറ്റ് ചെയ്തു. മാറ്റങ്ങൾ വരുത്താൻ ക്രമീകരണത്തിലേക്ക് പോവുക."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"സിസ്റ്റം നാവിഗേഷൻ അപ്ഡേറ്റ് ചെയ്യാൻ ക്രമീകരണത്തിലേക്ക് പോവുക"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"സ്റ്റാൻഡ്ബൈ"</string> @@ -1010,8 +1014,9 @@ <string name="controls_pin_use_alphanumeric" msgid="8478371861023048414">"പിന്നിൽ അക്ഷരങ്ങളോ ചിഹ്നങ്ങളോ അടങ്ങിയിരിക്കുന്നു"</string> <string name="controls_pin_verify" msgid="414043854030774349">"ഉപകരണ പിൻ പരിശോധിച്ചുറപ്പിക്കൂ"</string> <string name="controls_pin_instructions" msgid="6363309783822475238">"പിൻ നൽകുക"</string> - <!-- no translation found for controls_structure_tooltip (1392966215435667434) --> - <skip /> + <string name="controls_structure_tooltip" msgid="1392966215435667434">"മറ്റ് ഘടനകൾ കാണാൻ സ്വൈപ്പ് ചെയ്യുക"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index eaf782c0d1a5..3e0db6b210d7 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Дуу эсвэл чичиргээгүйгээр таны анхаарлыг татна."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Энэ контентын хөвөн гарч ирэх товчлолтойгоор таны анхаарлыг татдаг."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Саяхны бөмбөлөг алга байна"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Саяхны бөмбөлгүүд болон үл хэрэгссэн бөмбөлгүүд энд харагдана."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Эдгээр мэдэгдлийг өөрчлөх боломжгүй."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Энэ бүлэг мэдэгдлийг энд тохируулах боломжгүй байна"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Прокси хийсэн мэдэгдэл"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Төхөөрөмжийн үйлчилгээ"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Гарчиггүй"</string> <string name="restart_button_description" msgid="6916116576177456480">"Энэ аппыг дахин эхлүүлж, бүтэн дэлгэцэд орохын тулд товшино уу."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g>-г нээх"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g>-н хөөсний тохиргоо"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g>-н хөөсийг зөвшөөрөх үү?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Удирдах"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Татгалзах"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Зөвшөөрөх"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Надаас дараа асуу"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g>-н <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g>-н <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> болон бусад <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Зөөх"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Зүүн доош зөөх"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Баруун доош зөөх"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Үл хэрэгсэх"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Чатуудыг дэлгэцийн дээд талд байлгах"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g>-н шинэ чатууд нь бөмбөлөг маягаар харагдана. Бөмбөлгийг нээхийн тулд түүнийг товшино уу. Түүнийг зөөхийн тулд чирнэ үү.\n\nБөмбөлгийг товшино уу"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Энэ аппын бөмбөлгүүдийг унтраахын тулд Удирдах дээр товшино уу"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Системийн навигацыг шинэчиллээ. Өөрчлөхийн тулд Тохиргоо руу очно уу."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Системийн навигацыг шинэчлэхийн тулд Тохиргоо руу очно уу"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Зогсолтын горим"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Бусад бүтцийг харахын тулд шударна уу"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index d9deb3512fad..115ff9a9cac6 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"आवाज किंवा व्हायब्रेशनने तुमचे लक्ष वेधून घेते."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"या आशयाच्या फ्लोटिंग शॉर्टकटसह तुमचे लक्ष केंद्रित करते."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"अलीकडील कोणतेही बबल नाहीत"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"अलीकडील बबल आणि डिसमिस केलेले बबल येथे दिसतील."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"या सूचनांमध्ये सुधारणा केली जाऊ शकत नाही."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"या सूचनांचा संच येथे कॉन्फिगर केला जाऊ शकत नाही"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"प्रॉक्सी केलेल्या सूचना"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"डिव्हाइस सेवा"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"शीर्षक नाही"</string> <string name="restart_button_description" msgid="6916116576177456480">"हे अॅप रीस्टार्ट करण्यासाठी आणि फुल स्क्रीन करण्यासाठी टॅप करा."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> उघडा"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> बबलसाठी सेटिंग्ज"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> वरील बबलना अनुमती द्यायची?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"व्यवस्थापित करा"</string> - <string name="no_bubbles" msgid="1187859094003006292">"नाकारा"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"अनुमती द्या"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"मला नंतर विचारा"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> कडून <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> आणि आणखी <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> कडून <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"हलवा"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"तळाशी डावीकडे हलवा"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"तळाशी उजवीकडे हलवा"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"डिसमिस करा"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"चॅट दिसतील असे ठेवा"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> वरील नवीन चॅट बुडबुडे म्हणून दिसतील. बुडबुडे उघडण्यासाठी त्यावर टॅप करा. तो हलवण्यासाठी ड्रॅग करा.\n\nबुडबुड्यावर टॅप करा"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"या अॅपमधून बुडबुडे बंद करण्यासाठी व्यवस्थापित करा वर टॅप करा"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"सिस्टम नेव्हिगेशन अपडेट केले. बदल करण्यासाठी, सेटिंग्जवर जा."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"सिस्टम नेव्हिगेशन अपडेट करण्यासाठी सेटिंग्जवर जा"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"स्टँडबाय"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"इतर संरचना पाहण्यासाठी स्वाइप करा"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 9e4d442b7a31..5c55090406a0 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Menarik perhatian anda dengan bunyi atau getaran."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Memastikan anda memberikan perhatian dengan pintasan terapung ke kandungan ini."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Tiada gelembung terbaharu"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Gelembung baharu dan gelembung yang diketepikan akan dipaparkan di sini."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Pemberitahuan ini tidak boleh diubah suai."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Kumpulan pemberitahuan ini tidak boleh dikonfigurasikan di sini"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Pemberitahuan berproksi"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Perkhidmatan Peranti"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Tiada tajuk"</string> <string name="restart_button_description" msgid="6916116576177456480">"Ketik untuk memulakan semula apl ini dan menggunakan skrin penuh."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Buka <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Tetapan untuk gelembung <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Benarkan gelembung daripada <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Urus"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Tolak"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Benarkan"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Tanya saya kemudian"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> daripada <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> daripada <xliff:g id="APP_NAME">%2$s</xliff:g> dan <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> lagi"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Alih"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Alihkan ke bawah sebelah kiri"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Alihkan ke bawah sebelah kanan"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Ketepikan"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Pastikan sembang sentiasa di hadapan"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Sembang baharu daripada <xliff:g id="APP_NAME">%1$s</xliff:g> akan dipaparkan sebagai gelembung. Ketik gelembung untuk membuka. Seret untuk mengalihkan gelembung.\n\nKetik gelembung itu"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Ketik Urus untuk mematikan gelembung daripada apl ini"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigasi sistem dikemas kini. Untuk membuat perubahan, pergi ke Tetapan."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Pergi ke Tetapan untuk mengemas kini navigasi sistem"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Tunggu sedia"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Leret untuk melihat struktur lain"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index d814b1c59572..34f7a46a7860 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"အသံ သို့မဟုတ် တုန်ခါမှုဖြင့် အာရုံစိုက်လာအောင် ပြုလုပ်သည်။"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"အကြောင်းအရာကို floating shortcut ကိုသုံး၍ အာရုံစိုက်လာအောင်လုပ်ပါ။"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"မကြာမီက ပူဖောင်းကွက်များ မရှိပါ"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"လတ်တလော ပူဖောင်းကွက်များနှင့် ပိတ်လိုက်သော ပူဖောင်းကွက်များသည် ဤနေရာတွင် ပေါ်ပါမည်။"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ဤအကြောင်းကြားချက်များကို ပြုပြင်၍ မရပါ။"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ဤအကြောင်းကြားချက်အုပ်စုကို ဤနေရာတွင် စီစဉ်သတ်မှတ်၍ မရပါ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ပရောက်စီထည့်ထားသော အကြောင်းကြားချက်"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"စက်ပစ္စည်းဝန်ဆောင်မှုများ"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"ခေါင်းစဉ် မရှိပါ"</string> <string name="restart_button_description" msgid="6916116576177456480">"ဤအက်ပ်ကို ပြန်စတင်ပြီး မျက်နှာပြင်အပြည့်လုပ်ရန် တို့ပါ။"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> ကိုဖွင့်ရန်"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> ပူဖောင်းကွက်များအတွက် ဆက်တင်များ"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> မှ ပူဖောင်းကွက်များကို ခွင့်ပြုလိုပါသလား။"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"စီမံရန်"</string> - <string name="no_bubbles" msgid="1187859094003006292">"ငြင်းပယ်ရန်"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"ခွင့်ပြုရန်"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"နောက်မှ မေးရန်"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> မှ <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> နှင့် နောက်ထပ် <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ခုမှ <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ရွှေ့ရန်"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ဘယ်အောက်ခြေသို့ ရွှေ့ရန်"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ညာအောက်ခြေသို့ ရွှေ့ပါ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"ပယ်ရန်"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"ချတ်များကို အရှေ့တွင်ထားခြင်း"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> မှ ချတ်အသစ်များသည် ပူဖောင်းများအဖြစ် ပေါ်လာပါမည်။ ဖွင့်ရန် ပူဖောင်းကို တို့ပါ။ ၎င်းကို ဖိဆွဲ၍ ရွှေ့ပါ။\n\nပူဖောင်းကို တို့ပါ"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ဤအက်ပ်မှနေ၍ ပူဖောင်းများကို ပိတ်ရန်အတွက် \'စီမံရန်\' ကို တို့ပါ"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"စနစ်လမ်းညွှန်ခြင်း အပ်ဒိတ်လုပ်ပြီးပါပြီ။ အပြောင်းအလဲများ ပြုလုပ်ရန် \'ဆက်တင်များ\' သို့သွားပါ။"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"စနစ်လမ်းညွှန်ခြင်း အပ်ဒိတ်လုပ်ရန် \'ဆက်တင်များ\' သို့သွားပါ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"အသင့်အနေအထား"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"အခြားတည်ဆောက်ပုံများကို ကြည့်ရန် ပွတ်ဆွဲပါ"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 407832384ec8..667301624466 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Får oppmerksomheten din med lyd eller vibrering."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Holder deg oppmerksom med en svevende snarvei til dette innholdet."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Ingen nylige bobler"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Nylige bobler og avviste bobler vises her."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Disse varslene kan ikke endres."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Denne varselgruppen kan ikke konfigureres her"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Omdirigert varsel"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Enhetstjenester"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Ingen tittel"</string> <string name="restart_button_description" msgid="6916116576177456480">"Trykk for å starte denne appen på nytt og vise den i fullskjerm."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Åpne <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Innstillinger for <xliff:g id="APP_NAME">%1$s</xliff:g>-bobler"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Vil du tillate bobler fra <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Administrer"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Avvis"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Tillat"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Spør meg senere"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> fra <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> fra <xliff:g id="APP_NAME">%2$s</xliff:g> og <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> flere"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Flytt"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Flytt til nederst til venstre"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Flytt til nederst til høyre"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Avvis"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Ha chatter i forgrunnen"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nye chatter fra <xliff:g id="APP_NAME">%1$s</xliff:g> vises som bobler. Trykk på en boble for å åpne den. Dra for å flytte den.\n\nTrykk på boblen"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Trykk på Administrer for å slå av bobler for denne appen"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Systemnavigeringen er oppdatert. For å gjøre endringer, gå til Innstillinger."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gå til Innstillinger for å oppdatere systemnavigeringen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Ventemodus"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Sveip for å se andre strukturer"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 8de4badd56ec..d314e09ae27a 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ध्वनि वा कम्पनमार्फत तपाईंको ध्यान आकर्षित गर्छ।"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"फ्लोटिङ सर्टकटमार्फत यो सामग्रीतर्फ तपाईंको ध्यान आकर्षित गर्दछ।"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"हालसालै खारेज गरिएको कुनै पनि बबल छैन"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"हालैका बबल र खारेज गरिएका बबलहरू यहाँ देखिने छन्।"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"यी सूचनाहरू परिमार्जन गर्न मिल्दैन।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"यहाँबाट सूचनाहरूको यो समूह कन्फिगर गर्न सकिँदैन"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"प्रोक्सीमार्फत आउने सूचना"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"यन्त्रका सेवाहरू"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"शीर्षक छैन"</string> <string name="restart_button_description" msgid="6916116576177456480">"यो अनुप्रयोग पुनः सुरु गर्न ट्याप गर्नुहोस् र पूर्ण स्क्रिन मोडमा जानुहोस्।"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> खोल्नुहोस्"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> का बबलसम्बन्धी सेटिङहरू"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> का बबलहरूलाई अनुमति दिने हो?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"व्यवस्थापन गर्नुहोस्"</string> - <string name="no_bubbles" msgid="1187859094003006292">"अस्वीकार गर्नुहोस्"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"अनुमति दिनुहोस्"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"मलाई पछि सोध्नुहोस्"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> को <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> का <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> र थप <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"सार्नुहोस्"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"पुछारमा बायाँतिर सार्नुहोस्"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"पुछारमा दायाँतिर सार्नुहोस्"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"हटाउनुहोस्"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"कुराकानीलाई अग्रभूमिमा राख्नुहोस्"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> का नयाँ कुराकानीहरू बबलका रूपमा देखा पर्ने छन्। बबल खोल्न त्यसमा ट्याप गर्नुहोस्। बबल सार्न त्यसलाई घिसार्नुहोस्।\n\nबबलमा ट्याप गर्नुहोस्"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"यो अनुप्रयोगमा बबल निष्क्रिय पार्न व्यवस्थापन गर्नुहोस् नामक बटन ट्याप गर्नुहोस्"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"प्रणालीको नेभिगेसन अद्यावधिक गरियो। परिवर्तन गर्न सेटिङमा जानुहोस्।"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"प्रणालीको नेभिगेसन अद्यावधिक गर्न सेटिङमा जानुहोस्"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"स्ट्यान्डबाई"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"अन्य संरचनाहरू हेर्न स्वाइप गर्नुहोस्"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 37a45782c991..8b77c5745f5f 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Trekt je aandacht met geluid of trillingen."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Trekt de aandacht met een zwevende snelkoppeling naar deze content."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Geen recente ballonnen"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Recente bubbels en gesloten bubbels worden hier weergegeven."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Deze meldingen kunnen niet worden aangepast."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Deze groep meldingen kan hier niet worden geconfigureerd"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Melding via proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Apparaatservices"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Geen titel"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tik om deze app opnieuw te starten en te openen op het volledige scherm."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> openen"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Instellingen voor <xliff:g id="APP_NAME">%1$s</xliff:g>-ballonnen"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Ballonnen van <xliff:g id="APP_NAME">%1$s</xliff:g> toestaan?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Beheren"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Weigeren"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Toestaan"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Later vragen"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> van <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> van <xliff:g id="APP_NAME">%2$s</xliff:g> en nog <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Verplaatsen"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Naar linksonder verplaatsen"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Naar rechtsonder verplaatsen"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Sluiten"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Chats op de voorgrond houden"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nieuwe chats van <xliff:g id="APP_NAME">%1$s</xliff:g> worden weergegeven als bubbels. Tik op een bubbel om deze te openen. Sleep om deze te verplaatsen.\n\nTik op de bubbel"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tik op Beheren om bubbels van deze app uit te schakelen"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Systeemnavigatie geüpdatet. Als je wijzigingen wilt aanbrengen, ga je naar Instellingen."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Ga naar Instellingen om de systeemnavigatie te updaten"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stand-by"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Swipe om andere gebouwen te bekijken"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index 849d796115a9..204c3d19be66 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେସନ୍ ମାଧ୍ୟମରେ ଆପଣଙ୍କର ଧ୍ୟାନ ଆକର୍ଷିତ କରିଥାଏ।"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ଏହି ବିଷୟବସ୍ତୁ ପାଇଁ ଏକ ଭାସମାନ ସର୍ଟକଟ୍ ସହ ଆପଣଙ୍କର ଧ୍ୟାନ ଦିଅନ୍ତୁ।"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"ବର୍ତ୍ତମାନ କୌଣସି ବବଲ୍ ନାହିଁ"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"ବର୍ତ୍ତମାନର ବୁଦବୁଦଗୁଡ଼ିକ ଏବଂ ଖାରଜ କରାଯାଇଥିବା ବୁଦବୁଦଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯିବ।"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ଏହି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପରିବର୍ତ୍ତନ କରିହେବ ନାହିଁ।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ଏଠାରେ ଏହି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକର ଗ୍ରୁପ୍ କନଫ୍ୟୁଗର୍ କରାଯାଇପାରିବ ନାହିଁ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ବିଜ୍ଞପ୍ତି ପ୍ରକ୍ସୀ ହୋଇଛି"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"ଡିଭାଇସ୍ ସେବାଗୁଡିକ"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"କୌଣସି ଶୀର୍ଷକ ନାହିଁ"</string> <string name="restart_button_description" msgid="6916116576177456480">"ଏହି ଆପ୍କୁ ରିଷ୍ଟାର୍ଟ କରିବାକୁ ଟାପ୍ କରନ୍ତୁ ଏବଂ ଫୁଲ୍ସ୍କ୍ରିନ୍କୁ ଯାଆନ୍ତୁ।"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଖୋଲନ୍ତୁ"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> ବବଲ୍ଗୁଡ଼ିକ ପାଇଁ ସେଟିଂସ୍"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g>ରୁ ବବ୍ଲ୍ଗୁଡ଼ିକୁ ଅନୁମତି ଦିଅନ୍ତୁ?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"ପରିଚାଳନା କରନ୍ତୁ"</string> - <string name="no_bubbles" msgid="1187859094003006292">"ପ୍ରତ୍ୟାଖ୍ୟାନ କରନ୍ତୁ"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"ଅନୁମତି ଦିଅନ୍ତୁ"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"ମୋତେ ପରେ ପଚାରନ୍ତୁ"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g>ରୁ <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> ଏବଂ ଅଧିକ <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>ଟିରୁ <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ନିଅନ୍ତୁ"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ତଳ ବାମକୁ ନିଅନ୍ତୁ"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ତଳ ଡାହାଣକୁ ନିଅନ୍ତୁ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"ଖାରଜ କରନ୍ତୁ"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"ଚାଟଗୁଡ଼ିକ ଆଗ ପଟେ ରଖନ୍ତୁ"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g>ର ନୂଆ ଚାଟଗୁଡ଼ିକ ବବଲ୍ ଭାବରେ ଦେଖାଯିବ। ଏହାକୁ ଖୋଲିବା ପାଇଁ ଏକ ବବଲରେ ଟାପ୍ କରନ୍ତୁ। ଏହାକୁ ମୁଭ୍ କରିବା ପାଇଁ ଟାଣନ୍ତୁ। \n\nବବଲରେ ଟାପ୍ କରନ୍ତୁ"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ଏହି ଆପର ବବଲଗୁଡ଼ିକ ବନ୍ଦ କରିବା ପାଇଁ \'ପରିଚାଳନା କରନ୍ତୁ\' ବଟନରେ ଟାପ୍ କରନ୍ତୁ"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"ସିଷ୍ଟମ୍ ନାଭିଗେସନ୍ ଅପ୍ଡେଟ୍ ହୋଇଛି। ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ, ସେଟିଂସ୍କୁ ଯାଆନ୍ତୁ।"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ସିଷ୍ଟମ୍ ନାଭିଗେସନ୍ ଅପ୍ଡେଟ୍ କରିବା ପାଇଁ ସେଟିଂସ୍କୁ ଯାଆନ୍ତୁ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ଷ୍ଟାଣ୍ଡବାଏ"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"ଅନ୍ୟ ଷ୍ଟ୍ରକଚରଗୁଡ଼ିକ ଦେଖିବାକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 3a43f0fa135e..e071db5d5b6a 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -86,6 +86,10 @@ <string name="screenshot_failed_to_save_unknown_text" msgid="1506621600548684129">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੁਬਾਰਾ ਲੈ ਕੇ ਦੇਖੋ"</string> <string name="screenshot_failed_to_save_text" msgid="8344173457344027501">"ਸੀਮਿਤ ਸਟੋਰੇਜ ਹੋਣ ਕਾਰਨ ਸਕ੍ਰੀਨਸ਼ਾਟ ਰੱਖਿਅਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string> <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"ਐਪ ਜਾਂ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਲੈਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਹੈ"</string> + <!-- no translation found for screenshot_dismiss_ui_description (934736855340147968) --> + <skip /> + <!-- no translation found for screenshot_preview_description (669177537416980449) --> + <skip /> <string name="screenrecord_name" msgid="2596401223859996572">"ਸਕ੍ਰੀਨ ਰਿਕਾਰਡਰ"</string> <string name="screenrecord_channel_description" msgid="4147077128486138351">"ਕਿਸੇ ਸਕ੍ਰੀਨ ਰਿਕਾਰਡ ਸੈਸ਼ਨ ਲਈ ਚੱਲ ਰਹੀ ਸੂਚਨਾ"</string> <string name="screenrecord_start_label" msgid="1750350278888217473">"ਕੀ ਰਿਕਾਰਡਿੰਗ ਸ਼ੁਰੂ ਕਰਨੀ ਹੈ?"</string> @@ -558,8 +562,7 @@ <string name="monitoring_description_app_personal_work" msgid="6175816356939166101">"ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION">%1$s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਪ੍ਰੋਫਾਈਲ <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਕਾਰਜ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।\n\nਤੁਸੀਂ <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> ਨਾਲ ਵੀ ਕਨੈਕਟ ਹੋਂ, ਜੋ ਤੁਹਾਡੀ ਨਿੱਜੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"ਟਰੱਸਟ-ਏਜੰਟ ਵੱਲੋਂ ਅਣਲਾਕ ਰੱਖਿਆ ਗਿਆ"</string> <string name="keyguard_indication_trust_disabled" msgid="6820793704816727918">"ਡੀਵਾਈਸ ਲਾਕ ਰਹੇਗਾ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਮੈਨੂਅਲੀ ਅਣਲਾਕ ਨਹੀਂ ਕਰਦੇ"</string> - <!-- no translation found for keyguard_indication_trust_unlocked_plugged_in (2323452175329362855) --> - <skip /> + <string name="keyguard_indication_trust_unlocked_plugged_in" msgid="2323452175329362855">"<xliff:g id="KEYGUARD_INDICATION">%1$s</xliff:g>\n<xliff:g id="POWER_INDICATION">%2$s</xliff:g>"</string> <string name="hidden_notifications_title" msgid="1782412844777612795">"ਤੇਜ਼ੀ ਨਾਲ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string> <string name="hidden_notifications_text" msgid="5899627470450792578">"ਅਣਲਾਕ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਉਹਨਾਂ ਨੂੰ ਦੇਖੋ"</string> <string name="hidden_notifications_cancel" msgid="4805370226181001278">"ਨਹੀਂ ਧੰਨਵਾਦ"</string> @@ -696,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ਧੁਨੀ ਅਤੇ ਥਰਥਰਾਹਟ ਨਾਲ ਤੁਹਾਡਾ ਧਿਆਨ ਖਿੱਚਦੀ ਹੈ।"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ਇਸ ਸਮੱਗਰੀ ਦੇ ਅਸਥਿਰ ਸ਼ਾਰਟਕੱਟ ਨਾਲ ਆਪਣਾ ਧਿਆਨ ਕੇਂਦਰਿਤ ਰੱਖੋ।"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"ਕੋਈ ਹਾਲੀਆ ਬੁਲਬੁਲਾ ਨਹੀਂ"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"ਹਾਲੀਆ ਬੁਲਬੁਲੇ ਅਤੇ ਖਾਰਜ ਕੀਤੇ ਬੁਲਬੁਲੇ ਇੱਥੇ ਦਿਸਣਗੇ।"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ਇਹ ਸੂਚਨਾਵਾਂ ਦਾ ਗਰੁੱਪ ਇੱਥੇ ਸੰਰੂਪਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ਇੱਕ ਐਪ ਦੀ ਥਾਂ \'ਤੇ ਦੂਜੀ ਐਪ ਰਾਹੀਂ ਦਿੱਤੀ ਗਈ ਸੂਚਨਾ"</string> @@ -966,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"ਡੀਵਾਈਸ ਸੇਵਾਵਾਂ"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"ਕੋਈ ਸਿਰਲੇਖ ਨਹੀਂ"</string> <string name="restart_button_description" msgid="6916116576177456480">"ਇਸ ਐਪ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ ਅਤੇ ਪੂਰੀ-ਸਕ੍ਰੀਨ ਮੋਡ \'ਤੇ ਜਾਓ।"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਖੋਲ੍ਹੋ"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬੁਲਬੁਲਿਆਂ ਲਈ ਸੈਟਿੰਗਾਂ"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਤੋਂ ਬੁਲਬੁਲੇ ਆਉਣ ਦਿਓ?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"ਪ੍ਰਬੰਧਨ ਕਰੋ"</string> - <string name="no_bubbles" msgid="1187859094003006292">"ਮਨ੍ਹਾ ਕਰੋ"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"ਕਰਨ ਦਿਓ"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"ਮੈਨੂੰ ਬਾਅਦ ਵਿੱਚ ਪੁੱਛੋ"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> ਤੋਂ <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> ਅਤੇ <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ਹੋਰਾਂ ਤੋਂ <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ਲਿਜਾਓ"</string> @@ -981,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ਹੇਠਾਂ ਵੱਲ ਖੱਬੇ ਲਿਜਾਓ"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ਹੇਠਾਂ ਵੱਲ ਸੱਜੇ ਲਿਜਾਓ"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"ਖਾਰਜ ਕਰੋ"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"ਚੈਟਾਂ ਨੂੰ ਪਹਿਲਾਂ ਤੋਂ ਤਿਆਰ ਰੱਖੋ"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਦੀਆਂ ਨਵੀਆਂ ਚੈਟਾਂ ਬੁਲਬੁਲਿਆਂ ਵਾਂਗ ਦਿਸਣਗੀਆਂ। ਇਸ ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਕਿਸੇ ਬੁਲਬੁਲੇ \'ਤੇ ਟੈਪ ਕਰੋ। ਇਸ ਨੂੰ ਇੱਕ ਥਾਂ ਤੋਂ ਦੂਜੀ ਥਾਂ \'ਤੇ ਲਿਜਾਣ ਲਈ ਘਸੀਟੋ।\n\nਬੁਲਬੁਲੇ \'ਤੇ ਟੈਪ ਕਰੋ"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ਇਸ ਐਪ \'ਤੇ ਬੁਲਬੁਲੇ ਬੰਦ ਕਰਨ ਲਈ \'ਪ੍ਰਬੰਧਨ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"ਸਿਸਟਮ ਨੈਵੀਗੇਸ਼ਨ ਅੱਪਡੇਟ ਹੋ ਗਿਆ। ਤਬਦੀਲੀਆਂ ਕਰਨ ਲਈ, ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ਸਿਸਟਮ ਨੈਵੀਗੇਸ਼ਨ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ਸਟੈਂਡਬਾਈ"</string> @@ -999,14 +1006,17 @@ </plurals> <string name="controls_favorite_default_title" msgid="967742178688938137">"ਕੰਟਰੋਲ"</string> <string name="controls_favorite_subtitle" msgid="4049644994401173949">"ਤਤਕਾਲ ਪਹੁੰਚ ਲਈ ਕੰਟਰੋਲ ਚੁਣੋ"</string> - <string name="controls_favorite_header_favorites" msgid="3118600046217493471">"ਮਨਪਸੰਦ"</string> - <string name="controls_favorite_header_all" msgid="7507855973418969992">"ਸਭ"</string> <string name="controls_favorite_load_error" msgid="2533215155804455348">"ਸਾਰੇ ਕੰਟਰੋਲਾਂ ਦੀ ਸੂਚੀ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"ਹੋਰ"</string> - <!-- no translation found for controls_dialog_title (8806193219278278442) --> - <skip /> - <!-- no translation found for controls_dialog_ok (7011816381344485651) --> + <string name="controls_dialog_title" msgid="8806193219278278442">"ਤਤਕਾਲ ਕੰਟਰੋਲ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string> + <string name="controls_dialog_ok" msgid="7011816381344485651">"ਮਨਪਸੰਦ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string> + <string name="controls_dialog_message" msgid="6292099631702047540">"<xliff:g id="APP">%s</xliff:g> ਨੇ ਇਸ ਕੰਟਰੋਲ ਨੂੰ ਤੁਹਾਡੇ ਮਨਪਸੰਦ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਸੁਝਾਅ ਦਿੱਤਾ ਹੈ।"</string> + <string name="controls_pin_use_alphanumeric" msgid="8478371861023048414">"ਪਿੰਨ ਵਿੱਚ ਅੱਖਰ ਜਾਂ ਚਿੰਨ੍ਹ ਸ਼ਾਮਲ ਹਨ"</string> + <string name="controls_pin_verify" msgid="414043854030774349">"ਡੀਵਾਈਸ ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string> + <string name="controls_pin_instructions" msgid="6363309783822475238">"ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string> + <string name="controls_structure_tooltip" msgid="1392966215435667434">"ਹੋਰ ਬਣਤਰਾਂ ਦੇਖਣ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string> + <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> - <!-- no translation found for controls_dialog_message (6292099631702047540) --> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index cb6d7537baa0..116d2b2053b3 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -705,7 +705,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Przyciąga uwagę dźwiękiem lub wibracjami."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Przyciąga uwagę dzięki pływającym skrótom do treści."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Brak ostatnich dymków"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Tutaj będą pojawiać się ostatnie i odrzucone dymki."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tych powiadomień nie można zmodyfikować."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Tej grupy powiadomień nie można tu skonfigurować"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Powiadomienie w zastępstwie"</string> @@ -979,13 +980,8 @@ <string name="device_services" msgid="1549944177856658705">"Usługi urządzenia"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Bez tytułu"</string> <string name="restart_button_description" msgid="6916116576177456480">"Kliknij, by uruchomić tę aplikację ponownie i przejść w tryb pełnoekranowy."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Otwórz: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Ustawienia dymków aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Zezwolić na dymki z aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Zarządzaj"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Odmów"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Zezwól"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Zapytaj później"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> z aplikacji <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> z aplikacji <xliff:g id="APP_NAME">%2$s</xliff:g> i jeszcze <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Przenieś"</string> @@ -994,9 +990,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Przenieś w lewy dolny róg"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Przenieś w prawy dolny róg"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Zamknij"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Wyświetlaj czaty na wierzchu"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nowe czaty z aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> będą pojawiać się jako dymki. Kliknij dymek, aby go otworzyć. Przeciągnij dymek, jeśli chcesz go przenieść.\n\nKliknij dymek"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Kliknij Zarządzaj, aby wyłączyć dymki z tej aplikacji"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Nawigacja w systemie została zaktualizowana. Aby wprowadzić zmiany, otwórz Ustawienia."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Otwórz Ustawienia, by zaktualizować nawigację w systemie"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Tryb gotowości"</string> @@ -1025,4 +1029,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Przesuń, by zobaczyć inne struktury"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 55fc2ecd0819..6d6c8d907230 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Chama sua atenção com som ou vibração."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Mantém sua atenção com um atalho flutuante para esse conteúdo."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nenhum balão recente"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Os balões recentes e dispensados aparecerão aqui."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar essas notificações."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Não é possível configurar esse grupo de notificações aqui"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificação salva no proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Serviços do dispositivo"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Sem título"</string> <string name="restart_button_description" msgid="6916116576177456480">"Toque para reiniciar o app e usar tela cheia."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Abrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Configurações de balões do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Permitir balões de <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Gerenciar"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Negar"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Permitir"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Perguntar depois"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g> mais <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Mover"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Mover para canto inferior esquerdo"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Mover para canto inferior direito"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Dispensar"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Manter chats em primeiro plano"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Novos chats do app <xliff:g id="APP_NAME">%1$s</xliff:g> aparecerão como balões. Toque em um balão para abrir o chat. Arraste para mover.\n\nToque no balão"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Toque em \"Gerenciar\" para desativar os balões desse app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navegação no sistema atualizada. Se quiser alterá-la, acesse as configurações."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Acesse as configurações para atualizar a navegação no sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Em espera"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Deslize para ver outras estruturas"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index fbae3a143b86..1a67e9c0bbf6 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Chama a sua atenção com som ou vibração."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Mantém a sua atenção com um atalho flutuante para este conteúdo."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nenhum balão recente"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Os balões recentes e os balões ignorados vão aparecer aqui."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar estas notificações."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Não é possível configurar este grupo de notificações aqui."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificação de aplicação proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Serviços do dispositivo"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Sem título"</string> <string name="restart_button_description" msgid="6916116576177456480">"Toque para reiniciar esta aplicação e ficar em ecrã inteiro."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Abrir a aplicação <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Definições dos balões da aplicação <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Pretende permitir balões da aplicação <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Gerir"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Recusar"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Permitir"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Perguntar depois"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> do <xliff:g id="APP_NAME">%2$s</xliff:g> e mais<xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>."</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Mover"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Mover p/ parte infer. esquerda"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Mover parte inferior direita"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Ignorar"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Mantenha os chats em primeiro plano"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Os novos chats da app <xliff:g id="APP_NAME">%1$s</xliff:g> serão apresentados como balões. Toque num balão para o abrir. Arraste para o mover.\n\nToque no balão."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Toque em Gerir para desativar os balões desta app."</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"A navegação no sistema foi atualizada. Para efetuar alterações, aceda às Definições."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Aceda às Definições para atualizar a navegação no sistema."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Modo de espera"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Deslize rapidamente para ver outras estruturas."</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 55fc2ecd0819..6d6c8d907230 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Chama sua atenção com som ou vibração."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Mantém sua atenção com um atalho flutuante para esse conteúdo."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nenhum balão recente"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Os balões recentes e dispensados aparecerão aqui."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar essas notificações."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Não é possível configurar esse grupo de notificações aqui"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificação salva no proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Serviços do dispositivo"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Sem título"</string> <string name="restart_button_description" msgid="6916116576177456480">"Toque para reiniciar o app e usar tela cheia."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Abrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Configurações de balões do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Permitir balões de <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Gerenciar"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Negar"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Permitir"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Perguntar depois"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de <xliff:g id="APP_NAME">%2$s</xliff:g> mais <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Mover"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Mover para canto inferior esquerdo"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Mover para canto inferior direito"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Dispensar"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Manter chats em primeiro plano"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Novos chats do app <xliff:g id="APP_NAME">%1$s</xliff:g> aparecerão como balões. Toque em um balão para abrir o chat. Arraste para mover.\n\nToque no balão"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Toque em \"Gerenciar\" para desativar os balões desse app"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navegação no sistema atualizada. Se quiser alterá-la, acesse as configurações."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Acesse as configurações para atualizar a navegação no sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Em espera"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Deslize para ver outras estruturas"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 9cada502c7be..350e31ff4d69 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -702,7 +702,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Vă atrage atenția fără sunet sau vibrare."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Vă atrage atenția printr-o comandă rapidă flotantă la acest conținut."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nu există baloane recente"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Baloanele recente și baloanele respinse vor apărea aici."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Aceste notificări nu pot fi modificate."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Acest grup de notificări nu poate fi configurat aici"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificare prin proxy"</string> @@ -974,13 +975,8 @@ <string name="device_services" msgid="1549944177856658705">"Servicii pentru dispozitiv"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Fără titlu"</string> <string name="restart_button_description" msgid="6916116576177456480">"Atingeți ca să reporniți aplicația și să treceți în modul ecran complet."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Accesați <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Setări pentru baloanele <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Permiteți baloanele de la <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Gestionați"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Refuzați"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Permiteți"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Întreabă-mă mai târziu"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de la <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> de la <xliff:g id="APP_NAME">%2$s</xliff:g> și încă <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Mutați"</string> @@ -989,9 +985,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Mutați în stânga jos"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Mutați în dreapta jos"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Închideți"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Mențineți conversațiile prin chat în prim-plan"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Conversațiile noi prin chat din <xliff:g id="APP_NAME">%1$s</xliff:g> vor apărea sub forma unor baloane. Atingeți un balon pentru a deschide o conversație. Trageți-l pentru a-l muta.\n\nAtingeți balonul."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Atingeți Gestionați pentru a dezactiva baloanele din această aplicație"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigarea în sistem a fost actualizată. Pentru a face modificări, accesați Setările."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Accesați Setările pentru a actualiza navigarea în sistem"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> @@ -1019,4 +1023,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Glisați pentru a vedea alte structuri"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index bba74b164c40..7b494db31d9d 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -705,7 +705,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Уведомления приходят со звуком или вибрацией"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Привлекает ваше внимание к контенту с помощью плавающего ярлыка"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Нет недавних подсказок"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Здесь будут появляться недавние и закрытые всплывающие уведомления."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Эти уведомления нельзя изменить."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Эту группу уведомлений нельзя настроить здесь."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Уведомление отправлено через прокси-сервер."</string> @@ -979,13 +980,8 @@ <string name="device_services" msgid="1549944177856658705">"Сервисы устройства"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Без названия"</string> <string name="restart_button_description" msgid="6916116576177456480">"Нажмите, чтобы перезапустить приложение и перейти в полноэкранный режим."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Открыть приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"."</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Настройки всплывающих уведомлений от приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"."</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Разрешить всплывающие уведомления от приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\"?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Настроить"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Запретить"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Разрешить"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Напомнить позже"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> из приложения \"<xliff:g id="APP_NAME">%2$s</xliff:g>\""</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> от приложения \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" и ещё <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Перенести"</string> @@ -994,9 +990,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Перенести в левый нижний угол"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Перенести в правый нижний угол"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Закрыть"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Чаты на первом плане"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Новые чаты из приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" будут появляться в виде всплывающих уведомлений. Чтобы открыть такое уведомление, нажмите на него. Чтобы переместить всплывающее уведомление, перетащите его.\n\nНажмите на всплывающее уведомление"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Чтобы отключить всплывающие уведомления от приложения, нажмите \"Настроить\"."</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Параметры навигации в системе обновлены. Чтобы изменить их, перейдите в настройки."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Чтобы обновить параметры навигации в системе, перейдите в настройки."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Переход в режим ожидания"</string> @@ -1025,4 +1029,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Чтобы увидеть другие строения, проведите по экрану"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 8ec1486aa134..d9cef3843ff3 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ශබ්දය හෝ කම්පනය සමඟ ඔබේ අවධානය ලබා ගනී."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"පාවෙන කෙටිමගක් සමග ඔබේ අවධානය මෙම අන්තර්ගතය වෙත තබා ගන්න."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"මෑත බුබුලු නැත"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"මෑත බුබුලු සහ ඉවත ලූ බුබුලු මෙහි දිස් වනු ඇත."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"මෙම දැනුම්දීම් වෙනස් කළ නොහැක."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"මෙම දැනුම්දීම් සමූහය මෙහි වින්යාස කළ නොහැක"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ප්රොක්සි කළ දැනුම්දීම"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"උපාංග සේවා"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"මාතෘකාවක් නැත"</string> <string name="restart_button_description" msgid="6916116576177456480">"මෙම යෙදුම යළි ඇරඹීමට සහ පූර්ණ තිරයට යාමට තට්ටු කරන්න"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> විවෘත කරන්න"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> බුබුළු සඳහා සැකසීම්"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> වෙතින් බුබුළුවලට ඉඩ දෙන්නේද?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"කළමනා කරන්න"</string> - <string name="no_bubbles" msgid="1187859094003006292">"ප්රතික්ෂේප කරන්න"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"ඉඩ දෙන්න"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"පසුව මගෙන් අසන්න"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> වෙතින් <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> වෙතින් <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> සහ තවත් <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ක්"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ගෙන යන්න"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"පහළ වමට ගෙන යන්න"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"පහළ දකුණට ගෙන යන්න"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"ඉවතලන්න"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"කල් තියා කතාබස් කර ගෙන යන්න"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> වෙතින් නව කතාබස් බුබුලු ලෙස දිස් වනු ඇත. බුබුලක් විවෘත කිරීමට එය තට්ටු කරන්න. එය ගෙන යාමට අදින්න.\n\nබුබුල තට්ටු කරන්න"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"මෙම යෙදුමෙන් බුබුලු ක්රියාවිරහිත කිරීමට කළමනාකරණය කරන්න තට්ටු කරන්න"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"පද්ධති සංචලනය යාවත්කාලීන කළා. වෙනස්කම් සිදු කිරීමට, සැකසීම් වෙත යන්න."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"පද්ධති සංචලනය යාවත්කාලීන කිරීමට සැකසීම් වෙත යන්න"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"පොරොත්තු"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"අනෙක් ආකෘති බැලීමට ස්වයිප් කරන්න"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 84ab602adff6..e14ea222efec 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -705,7 +705,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Upúta vás zvukom alebo vibráciami."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Upúta vás plávajúcim odkazom na tento obsah."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Žiadne nedávne bubliny"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Tu sa budú zobrazovať nedávne a zavreté bubliny."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tieto upozornenia sa nedajú upraviť."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Túto skupinu upozornení nejde na tomto mieste konfigurovať"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Približné upozornenie"</string> @@ -979,13 +980,8 @@ <string name="device_services" msgid="1549944177856658705">"Služby zariadenia"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Bez názvu"</string> <string name="restart_button_description" msgid="6916116576177456480">"Klepnutím reštartujete túto aplikáciu a prejdete do režimu celej obrazovky."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Otvoriť <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Nastavenia bublín aplikácie <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Povoliť bubliny z aplikácie <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Spravovať"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Zamietnuť"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Povoliť"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Spýtať sa neskôr"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> z aplikácie <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> z aplikácie <xliff:g id="APP_NAME">%2$s</xliff:g> a ďalšie (<xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>)"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Presunúť"</string> @@ -994,9 +990,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Presunúť doľava nadol"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Presunúť doprava nadol"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Zavrieť"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Zobrazovať čety na popredí"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nové čety z aplikácie <xliff:g id="APP_NAME">%1$s</xliff:g> sa budú zobrazovať ako bubliny. Bubliny otvoríte klepnutím na ne. Premiestnite ich presunutím.\n\nKlepnite na bublinu."</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Klepnutím na Spravovať vypnite bubliny z tejto aplikácie"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigácia v systéme bola aktualizovaná. Ak chcete vykonať zmeny, prejdite do Nastavení."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Prejdite do Nastavení a aktualizujte navigáciu v systéme"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Pohotovostný režim"</string> @@ -1025,4 +1029,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Potiahnutím zobrazíte ďalšie budovy"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 0bf5efc5314d..4ba3488a3bdb 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -705,7 +705,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Pritegne vašo pozornost z zvokom ali vibriranjem"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Zadrži vašo pozornost z lebdečo bližnjico do te vsebine."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Ni nedavnih oblačkov"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Tukaj bodo prikazani tako nedavni kot opuščeni oblački."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Za ta obvestila ni mogoče spremeniti nastavitev."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Te skupine obvestil ni mogoče konfigurirati tukaj"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Posredovano obvestilo"</string> @@ -979,13 +980,8 @@ <string name="device_services" msgid="1549944177856658705">"Storitve naprave"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Brez naslova"</string> <string name="restart_button_description" msgid="6916116576177456480">"Dotaknite se za vnovični zagon te aplikacije in preklop v celozaslonski način."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Odpri aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Nastavitve za oblačke aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Želite dovoliti oblačke iz aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Upravljanje"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Zavrni"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Dovoli"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Vprašaj me pozneje"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> (<xliff:g id="APP_NAME">%2$s</xliff:g>)"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> iz aplikacije <xliff:g id="APP_NAME">%2$s</xliff:g> in toliko drugih: <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Premakni"</string> @@ -994,9 +990,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Premakni spodaj levo"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Premakni spodaj desno"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Opusti"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Klepete obdrži v ospredju"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Novi klepeti v aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> bodo prikazani kot oblački. Dotaknite se oblačka, da ga odprete. Povlecite, da ga premaknete.\n\nDotaknite se oblačka"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Dotaknite se »Upravljanje«, da izklopite oblačke iz te aplikacije"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Krmarjenje po sistemu je posodobljeno. Če želite opraviti spremembe, odprite nastavitve."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Če želite posodobiti krmarjenje po sistemu, odprite nastavitve"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje pripravljenosti"</string> @@ -1025,4 +1029,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Povlecite za ogled drugih struktur"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 518bfffcca7d..d763fe597692 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Të tërheq vëmendjen me tinguj ose dridhje."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Mban vëmendjen tënde me një shkurtore pluskuese te kjo përmbajtje."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Nuk ka flluska të fundit"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Flluskat e fundit dhe flluskat e hequra do të shfaqen këtu."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Këto njoftime nuk mund të modifikohen."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ky grup njoftimesh nuk mund të konfigurohet këtu"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Njoftim i dërguar me përfaqësues"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Shërbimet e pajisjes"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Pa titull"</string> <string name="restart_button_description" msgid="6916116576177456480">"Trokit për ta rinisur këtë aplikacion dhe për të kaluar në ekranin e plotë."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Hap <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Cilësimet për flluskat e <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Të lejohen flluskat nga <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Menaxho"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Refuzo"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Lejo"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Më pyet më vonë"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> nga <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> nga <xliff:g id="APP_NAME">%2$s</xliff:g> dhe <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> të tjera"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Zhvendos"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Zhvendos poshtë majtas"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Lëvize poshtë djathtas"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Hiq"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Mbaji bisedat në plan të parë"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Bisedat e reja nga <xliff:g id="APP_NAME">%1$s</xliff:g> do të shfaqen si flluska. Trokit mbi një flluskë për ta hapur atë. Zvarrit për ta zhvendosur atë.\n\nTrokit mbi flluskë"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Trokit \"Menaxho\" për të çaktivizuar flluskat nga ky aplikacion"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigimi i sistemit u përditësua. Për të bërë ndryshime, shko te \"Cilësimet\"."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Shko te \"Cilësimet\" për të përditësuar navigimin e sistemit"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Në gatishmëri"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Rrëshqit për të parë strukturat e tjera"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 2adb5cfda403..e84321957c3b 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -702,7 +702,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Привлачи вам пажњу помоћу звука или вибрације."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Привлачи вам пажњу помоћу плутајуће пречице до овог садржаја."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Нема недавних облачића"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Овде се приказују недавни и одбачени облачићи."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ова обавештења не могу да се мењају."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ова група обавештења не може да се конфигурише овде"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Обавештење преко проксија"</string> @@ -974,13 +975,8 @@ <string name="device_services" msgid="1549944177856658705">"Услуге за уређаје"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Без наслова"</string> <string name="restart_button_description" msgid="6916116576177456480">"Додирните да бисте рестартовали апликацију и прешли у режим целог екрана."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Отворите <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Подешавања за <xliff:g id="APP_NAME">%1$s</xliff:g> облачиће"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Желите ли да омогућите облачиће из апликације <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Управљајте"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Одбиј"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Дозволи"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Питај ме касније"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> из апликације <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> из апликације <xliff:g id="APP_NAME">%2$s</xliff:g> и још <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Премести"</string> @@ -989,9 +985,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Премести доле лево"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Премести доле десно"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Одбаци"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Нека поруке ћаскања остану у првом плану"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Нове поруке ћаскања из апликације <xliff:g id="APP_NAME">%1$s</xliff:g> ће се приказати као облачићи. Додирните облачић да бисте га отворили. Превуците да бисте га преместили.\n\nДодирните облачић"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Додирните Управљајте да бисте искључили облачиће из ове апликације"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Навигација система је ажурирана. Да бисте унели измене, идите у Подешавања."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Идите у Подешавања да бисте ажурирали навигацију система"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Стање приправности"</string> @@ -1019,4 +1023,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Превуците да бисте видели друге структуре"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 28a7cff043a2..b3e46acd1f4e 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Påkallar uppmärksamhet med ljud eller vibrationer."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Behåller din uppmärksamhet med en flytande genväg till innehållet."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Inga senaste bubblor"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"De senaste bubblorna och ignorerade bubblor visas här."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Det går inte att ändra de här aviseringarna."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Den här aviseringsgruppen kan inte konfigureras här"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Avisering via proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Enhetstjänster"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Ingen titel"</string> <string name="restart_button_description" msgid="6916116576177456480">"Tryck för att starta om appen i helskärmsläge."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Öppna <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Inställningar för <xliff:g id="APP_NAME">%1$s</xliff:g>-bubblor"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Vill du tillåta bubblor från <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Hantera"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Neka"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Tillåt"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Fråga senare"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> från <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> från <xliff:g id="APP_NAME">%2$s</xliff:g> och <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> fler"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Flytta"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Flytta längst ned till vänster"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Flytta längst ned till höger"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Stäng"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Håll chattar i förgrunden"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Nya chattar från <xliff:g id="APP_NAME">%1$s</xliff:g> visas som bubblor. Tryck på en bubbla som du vill öppna. Flytta den genom att dra.\n\nTryck på bubblan"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tryck på Hantera för att stänga av bubblor från den här appen"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Systemnavigeringen har uppdaterats. Öppna inställningarna om du vill ändra något."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Öppna inställningarna och uppdatera systemnavigeringen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Viloläge"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Svep för att se andra strukturer"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 2e4564589de7..962be9ca241b 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Hupata umakinifu wako kwa sauti na mtetemo."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Huweka umakinifu wako kwenye maudhui haya kwa kutumia njia ya mkato ya kuelea."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Hakuna viputo vya hivi majuzi"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Viputo vya hivi karibuni na viputo vilivyoondolewa vitaonekana hapa."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Arifa hizi haziwezi kubadilishwa."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Kikundi hiki cha arifa hakiwezi kuwekewa mipangilio hapa"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Arifa wakilishi"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Huduma za Kifaa"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Wimbo hauna jina"</string> <string name="restart_button_description" msgid="6916116576177456480">"Gusa ili uzime na uwashe upya programu hii kisha nenda kwenye skrini nzima."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Fungua <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Mipangilio ya viputo vya <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Je, ungependa kuruhusu viputo kutoka <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Dhibiti"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Kataa"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Ruhusu"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Niulize baadaye"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> kutoka kwa <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> kutoka kwa <xliff:g id="APP_NAME">%2$s</xliff:g> na nyingine<xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Sogeza"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Sogeza chini kushoto"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Sogeza chini kulia"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Ondoa"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Zipe gumzo kipaumbele"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Gumzo mpya kutoka <xliff:g id="APP_NAME">%1$s</xliff:g> zitaonekana kama viputo. Gusa kiputo ili ukifungue. Buruta ili ukisogeze.\n\nGusa kiputo"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Gusa Dhibiti ili uzime viputo kwenye programu hii"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Umesasisha usogezaji kwenye mfumo. Ili ubadilishe, nenda kwenye Mipangilio."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Nenda kwenye mipangilio ili usasishe usogezaji kwenye mfumo"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Hali tuli"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Telezesha kidole ili uone miundo mingine"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 30743ea09399..b225a6671abc 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"శబ్దం లేదా వైబ్రేషన్తో మీరు దృష్టి సారించేలా చేస్తుంది."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ఫ్లోటింగ్ షార్ట్కట్తో మీ దృష్టిని ఈ కంటెంట్పై నిలిపి ఉంచుతుంది."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"ఇటీవల బబుల్లు ఏవీ లేవు"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"ఇటీవలి బబుల్లు, తీసివేసిన బబుల్లు ఇక్కడ కనిపిస్తాయి."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ఈ నోటిఫికేషన్లను సవరించడం వీలుపడదు."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ఈ నోటిఫికేషన్ల సమూహాన్ని ఇక్కడ కాన్ఫిగర్ చేయలేము"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ప్రాక్సీ చేయబడిన నోటిఫికేషన్"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"పరికర సేవలు"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"శీర్షిక లేదు"</string> <string name="restart_button_description" msgid="6916116576177456480">"ఈ యాప్ను పునఃప్రారంభించేలా నొక్కి, ఆపై పూర్తి స్క్రీన్లోకి వెళ్లండి."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g>ని తెరువు"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> బబుల్ల సెట్టింగ్లు"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> నుండి బబుల్లను అనుమతించాలా?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"నిర్వహించండి"</string> - <string name="no_bubbles" msgid="1187859094003006292">"తిరస్కరించు"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"అనుమతించు"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"నన్ను తర్వాత అడగు"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> నుండి <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> నుండి <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> మరియు మరో <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"తరలించు"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"దిగువ ఎడమవైపునకు తరలించు"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"దిగవు కుడివైపునకు జరుపు"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"విస్మరించు"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"చాట్లను ముందుగా ఉంచండి"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> నుండి వచ్చే కొత్త చాట్లు బబుల్లుగా కనిపిస్తాయి. దానిని తెరవడానికి బబుల్ను ట్యాప్ చేయండి. దానిని తరలించడానికి లాగండి.\n\nబబుల్ను ట్యాప్ చేయండి"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ఈ యాప్ నుండి వచ్చే బబుల్లను ఆఫ్ చేయడానికి మేనేజ్ బటన్ను ట్యాప్ చేయండి"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"సిస్టమ్ నావిగేషన్ అప్డేట్ చేయబడింది. మార్పులు చేయడానికి, సెట్టింగ్లకు వెళ్లండి."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"సిస్టమ్ నావిగేషన్ను అప్డేట్ చేయడానికి సెట్టింగ్లకు వెళ్లండి"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"స్టాండ్బై"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"ఇతర నిర్మాణాలను చూడటానికి స్వైప్ చేయండి"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 1e1d9632510e..e1a4a7941537 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"ดึงความสนใจของคุณด้วยเสียงและการสั่น"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ดึงดูดความสนใจของคุณไว้เสมอด้วยทางลัดแบบลอยที่มายังเนื้อหานี้"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"ไม่มีบับเบิลเมื่อเร็วๆ นี้"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"บับเบิลที่แสดงและที่ปิดไปเมื่อเร็วๆ นี้จะปรากฏที่นี่"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"แก้ไขการแจ้งเตือนเหล่านี้ไม่ได้"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"การแจ้งเตือนกลุ่มนี้กำหนดค่าที่นี่ไม่ได้"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"การแจ้งเตือนที่ผ่านพร็อกซี"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"บริการของอุปกรณ์"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"ไม่มีชื่อ"</string> <string name="restart_button_description" msgid="6916116576177456480">"แตะเพื่อรีสตาร์ทแอปนี้และแสดงแบบเต็มหน้าจอ"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"เปิด <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"การตั้งค่าลูกโป่ง <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"อนุญาตลูกโป่งจาก <xliff:g id="APP_NAME">%1$s</xliff:g> ไหม"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"จัดการ"</string> - <string name="no_bubbles" msgid="1187859094003006292">"ปฏิเสธ"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"อนุญาต"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"ถามฉันทีหลัง"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> จาก <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> จาก <xliff:g id="APP_NAME">%2$s</xliff:g> และอีก <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> รายการ"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"ย้าย"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ย้ายไปด้านซ้ายล่าง"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ย้ายไปด้านขาวล่าง"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"ปิด"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"เข้าถึงแชทได้ง่ายๆ"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"แชทใหม่จาก <xliff:g id="APP_NAME">%1$s</xliff:g> จะปรากฏเป็นบับเบิล แตะบับเบิลเพื่อเปิดแชท ลากเพื่อย้ายตำแหน่ง\n\nแตะบับเบิล"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"แตะ \"จัดการ\" เพื่อปิดบับเบิลจากแอปนี้"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"อัปเดตการไปยังส่วนต่างๆ ของระบบแล้ว หากต้องการเปลี่ยนแปลง ให้ไปที่การตั้งค่า"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ไปที่การตั้งค่าเพื่ออัปเดตการไปยังส่วนต่างๆ ของระบบ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"สแตนด์บาย"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"เลื่อนเพื่อดูโครงสร้างอื่นๆ"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index e2fe93b3bb91..3a19c52b978c 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Kinukuha ang iyong atensyon sa pamamagitan ng tunog o pag-vibrate."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Pinapanatili ang iyong atensyon sa pamamagitan ng lumulutang na shortcut sa content na ito."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Walang kamakailang bubble"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Lalabas dito ang kamakailang bubbles at na-dismiss na bubbles."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Hindi puwedeng baguhin ang mga notification na ito."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Hindi mako-configure dito ang pangkat na ito ng mga notification"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Na-proxy na notification"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Mga Serbisyo ng Device"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Walang pamagat"</string> <string name="restart_button_description" msgid="6916116576177456480">"I-tap para i-restart ang app na ito at mag-full screen."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Buksan ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Mga setting para sa mga bubble ng <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Payagan ang mga bubble mula sa <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Pamahalaan"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Tanggihan"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Payagan"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Tanungin ako sa ibang pagkakataon"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> mula sa <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> mula sa <xliff:g id="APP_NAME">%2$s</xliff:g> at <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> pa"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Ilipat"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Ilipat sa kaliwa sa ibaba"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Ilipat sa kanan sa ibaba"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"I-dismiss"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Panatilihing nasa harap ang mga chat"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Lalabas ang mga bagong chat mula sa <xliff:g id="APP_NAME">%1$s</xliff:g> bilang mga bubble. I-tap ang isang bubble para buksan ito. I-drag ito para ilipat ito.\n\nI-tap ang bubble"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"I-tap ang Pamahalaan para i-off ang mga bubble mula sa app na ito"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Na-update na ang pag-navigate ng system. Para gumawa ng mga pagbabago, pumunta sa Mga Setting."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Pumunta sa Mga Setting para i-update ang pag-navigate sa system"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Naka-standby"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Mag-swipe para makita iba pang istraktura"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index be2a30bcfe66..24d8c5f7b000 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Ses veya titreşimle dikkatinizi çeker."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Kayan kısayolla dikkatinizi bu içerik üzerinde tutar."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Son kapatılan baloncuk yok"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Son baloncuklar ve kapattığınız baloncuklar burada görünür."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirimler değiştirilemez."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Bu bildirim grubu burada yapılandırılamaz"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxy uygulanan bildirim"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Cihaz Hizmetleri"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Başlıksız"</string> <string name="restart_button_description" msgid="6916116576177456480">"Bu uygulamayı yeniden başlatmak ve tam ekrana geçmek için dokunun."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> öğesini açın."</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> baloncukları için ayarlar"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> baloncuklarına izin verilsin mi?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Yönet"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Reddet"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"İzin Ver"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Daha sonra yeniden sor"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> uygulamasından <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> uygulamasından <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ve diğer <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Taşı"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Sol alta taşı"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Sağ alta taşı"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Kapat"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Sohbetleri önde tutma"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> adlı kişi ile yeni sohbetler balon olarak görünür. Açmak için balona dokunun. Taşımak için sürükleyin.\n\nBalona dokunun"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Bu uygulamanın balonlarını kapatmak için Yönet\'e dokunun"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Sistemde gezinme yöntemi güncellendi. Değişiklik yapmak için Ayarlar\'a gidin."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Sistemde gezinme yöntemini güncellemek için Ayarlar\'a gidin"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Beklemeye alınıyor"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Diğer yapıları görmek için kaydırın"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index ea19b6ce3fbd..baf730983b04 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -705,7 +705,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Привертає увагу звуковим сигналом або вібрацією."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Привертає увагу до контенту плаваючим ярликом."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Немає нещодавніх спливаючих сповіщень"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Тут з\'являтимуться нещодавні й відхилені спливаючі сповіщення."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ці сповіщення не можна змінити."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Цю групу сповіщень не можна налаштувати тут"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Проксі-сповіщення"</string> @@ -966,7 +967,7 @@ <string name="slice_permission_text_2" msgid="6758906940360746983">"- Може виконувати дії в додатку <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="slice_permission_checkbox" msgid="4242888137592298523">"Дозволити додатку <xliff:g id="APP">%1$s</xliff:g> показувати фрагменти будь-якого додатка"</string> <string name="slice_permission_allow" msgid="6340449521277951123">"Дозволити"</string> - <string name="slice_permission_deny" msgid="6870256451658176895">"Відмовити"</string> + <string name="slice_permission_deny" msgid="6870256451658176895">"Заборонити"</string> <string name="auto_saver_title" msgid="6873691178754086596">"Торкніться, щоб увімкнути автоматичний режим економії заряду акумулятора"</string> <string name="auto_saver_text" msgid="3214960308353838764">"Вмикати, коли заряд акумулятора закінчується"</string> <string name="no_auto_saver_action" msgid="7467924389609773835">"Ні, дякую"</string> @@ -979,13 +980,8 @@ <string name="device_services" msgid="1549944177856658705">"Сервіси на пристрої"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Без назви"</string> <string name="restart_button_description" msgid="6916116576177456480">"Натисніть, щоб перезапустити додаток і перейти в повноекранний режим."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Відкрити додаток <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Налаштування спливаючих підказок від додатка <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Дозволити спливаючі підказки від додатка <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Керувати"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Заборонити"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Дозволити"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Запитати пізніше"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"Cповіщення \"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>\" від додатка <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"Сповіщення \"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>\" від додатка <xliff:g id="APP_NAME">%2$s</xliff:g> (і ще <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>)"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Перемістити"</string> @@ -994,9 +990,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Перемістити ліворуч униз"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Перемістити праворуч униз"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Закрити"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Чати завжди під рукою"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Нові чати з додатка <xliff:g id="APP_NAME">%1$s</xliff:g> з\'являтимуться як спливаючі сповіщення. Щоб відкрити чат, натисніть сповіщення. Щоб перемістити сповіщення, потягніть його.\n\nНатисніть спливаюче сповіщення"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Натисніть \"Керувати\", щоб вимкнути спливаючі сповіщення для цього додатка"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Навігацію в системі оновлено. Щоб внести зміни, перейдіть у налаштування."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Перейдіть у налаштування, щоб оновити навігацію в системі"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Режим очікування"</string> @@ -1025,4 +1029,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Щоб переглянути інші структури, проведіть пальцем"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index 0dd726ef035a..2d5ea2adccca 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"آواز اور وائبریشن کے ذریعے آپ کی توجہ حاصل کرتا ہے۔"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"اس مواد کے فلوٹنگ شارٹ کٹ کے ساتھ آپ کی توجہ دیتی ہے۔"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"کوئی حالیہ بلبلہ نہیں"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"حالیہ بلبلے اور برخاست بلبلے یہاں ظاہر ہوں گے۔"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ان اطلاعات کی ترمیم نہیں کی جا سکتی۔"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"اطلاعات کے اس گروپ کو یہاں کنفیگر نہیں کیا جا سکتا"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"پراکسی اطلاع"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"آلہ کی سروس"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"کوئی عنوان نہیں ہے"</string> <string name="restart_button_description" msgid="6916116576177456480">"یہ ایپ دوبارہ شروع کرنے کے لیے تھپتھپائیں اور پوری اسکرین پر جائیں۔"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"<xliff:g id="APP_NAME">%1$s</xliff:g> کھولیں"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> بلبلوں کے لیے ترتیبات"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> کی جانب سے بلبلوں کو اجازت دیں؟"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"نظم کریں"</string> - <string name="no_bubbles" msgid="1187859094003006292">"مسترد کریں"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"اجازت دیں"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"مجھ سے بعد میں پوچھیں"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> کی جانب سے <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> اور <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> مزید سے <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"منتقل کریں"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"نیچے بائیں جانب لے جائیں"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"نیچے دائیں جانب لے جائیں"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"برخاست کریں"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"چیٹس سامنے رکھیں"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> کی نئی چیٹس بلبلوں کے طور پر ظاہر ہوں گی۔ اسے کھولنے کے لیے کسی بلبلہ کو تھپتھپائیں۔ اسے منتقل کرنے کے لیے گھسیٹیں۔\n\nبلبلہ کو تھپتھپائیں"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"اس ایپ سے بلبلوں کو آف کرنے کے لیے نظم کریں پر تھپتھپائیں"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"سسٹم نیویگیشن اپ ڈیٹ کیا گیا۔ تبدیلیاں کرنے کے لیے، ترتیبات پر جائیں۔"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"سسٹم نیویگیشن اپ ڈیٹ کرنے کے لیے ترتیبات پر جائیں"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"اسٹینڈ بائی"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"دوسری ساختیں دیکھنے کے لیے سوائپ کریں"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 26fe9fc251b5..679a67f497ac 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Bildirishnomalar tovush va tebranish bilan keladi."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Bu kontentni ochuvchi erkin yorliq diqqatingizda boʻladi."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Avvalgi pufakchalar topilmadi"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Bu yerda oxirgi va yopilgan qalqib chiquvchi bildirishnomalar chiqadi."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirishnomalarni tahrirlash imkonsiz."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ushbu bildirishnomalar guruhi bu yerda sozlanmaydi"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Ishonchli bildirishnoma"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Qurilma xizmatlari"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Nomsiz"</string> <string name="restart_button_description" msgid="6916116576177456480">"Bu ilovani qaytadan ishga tushirish va butun ekranga ochish uchun bosing."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Ochish: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> pufakchalari uchun sozlamalar"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"<xliff:g id="APP_NAME">%1$s</xliff:g> pufakchalariga ruxsat berilsinmi?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Boshqarish"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Rad etish"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Ruxsat"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Keyinroq soʻralsin"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> ilovasidan <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> va yana <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ta bildirishnoma"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Surish"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Quyi chapga surish"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Quyi oʻngga surish"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Yopish"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Chatlar asosiy planda"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasidan yangi chatlar bulutchalar shaklida chiqadi. Uni ochish uchun bulutchani bosing. Uni surish uchun torting.\n\nBulutchani bosing"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Bu ilova bulutchalarini faolsizlantirish uchun Boshqarish tugmasini bosing"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Tizim navigatsiyasi yangilandi. Buni Sozlamalar orqali oʻzgartirishingiz mumkin."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Tizim navigatsiyasini yangilash uchun Sozlamalarni oching"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Kutib turing"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Boshqa tuzilmalarni koʻrish uchun suring"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index b2118d29e15c..cce3a7c5be13 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Thu hút sự chú ý của bạn bằng cách bật tiếng hoặc rung."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Luôn chú ý vào nội dung này bằng phím tắt nổi."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Không có bong bóng nào gần đây"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Bong bóng đã tắt và bong bóng gần đây sẽ xuất hiện ở đây."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Không thể sửa đổi các thông báo này."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Không thể định cấu hình nhóm thông báo này tại đây"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Thông báo đã xử lý qua máy chủ proxy"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Dịch vụ cho thiết bị"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Không có tiêu đề"</string> <string name="restart_button_description" msgid="6916116576177456480">"Nhấn để khởi động lại ứng dụng này và xem ở chế độ toàn màn hình."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Mở <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Tùy chọn cài đặt cho bong bóng <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Bạn muốn cho phép bong bóng của <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Quản lý"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Từ chối"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Cho phép"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Hỏi tôi sau"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> của <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> từ <xliff:g id="APP_NAME">%2$s</xliff:g> và <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> bong bóng khác"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Di chuyển"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Chuyển tới dưới cùng bên trái"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Chuyển tới dưới cùng bên phải"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Loại bỏ"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Giữ cuộc trò chuyện trên nền trước"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Các cuộc trò chuyện mới từ ứng dụng <xliff:g id="APP_NAME">%1$s</xliff:g> sẽ hiển thị dưới dạng bong bóng. Hãy nhấn vào bong bóng để mở. Kéo để di chuyển cuộc trò chuyện.\n\nNhấn vào bong bóng"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Nhấn vào nút Quản lý để tắt bong bóng từ ứng dụng này"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Đã cập nhật chế độ di chuyển trên hệ thống. Để thay đổi, hãy chuyển đến phần Cài đặt."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Chuyển đến phần Cài đặt để cập nhật chế độ di chuyển trên hệ thống"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Chế độ chờ"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Vuốt để xem các cấu trúc khác"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 518ad188fa8d..503f16ed4d98 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"通过提示音或振动吸引您的注意。"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"通过可链接到这项内容的浮动快捷方式吸引您的注意。"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"最近没有气泡"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"此处会显示最近的气泡和已关闭的气泡。"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"无法修改这些通知。"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"您无法在此处配置这组通知"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"代理通知"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"设备服务"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"无标题"</string> <string name="restart_button_description" msgid="6916116576177456480">"点按即可重启此应用并进入全屏模式。"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"打开<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g>气泡的相关设置"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"要允许来自<xliff:g id="APP_NAME">%1$s</xliff:g>的气泡吗？"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"管理"</string> - <string name="no_bubbles" msgid="1187859094003006292">"拒绝"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"允许"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"以后再说"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g>：<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g>和另外 <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> 个应用：<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"移动"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"移至左下角"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"移至右下角"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"关闭"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"让聊天在前台运行"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"来自<xliff:g id="APP_NAME">%1$s</xliff:g>的新聊天消息会显示为气泡。点按某个气泡可将其打开。拖动即可移动气泡。\n\n点按该气泡"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"点按“管理”按钮，可关闭来自此应用的气泡"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"系统导航已更新。要进行更改，请转到“设置”。"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"转到“设置”即可更新系统导航"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"待机"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"滑动即可查看其他结构"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index e39d2c12cde4..6bf793852941 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"發出聲音或震動來吸引您的注意。"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"為此內容建立浮動捷徑以保持注意力。"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"沒有最近曾使用的小視窗"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"最近曾使用和關閉的小視窗會在這裡顯示。"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"無法修改這些通知。"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"無法在此設定這組通知"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"代理通知"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"裝置服務"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"無標題"</string> <string name="restart_button_description" msgid="6916116576177456480">"輕按即可重新開啟此應用程式並放大至全螢幕。"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"開啟「<xliff:g id="APP_NAME">%1$s</xliff:g>」"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」小視窗設定"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"要允許開啟「<xliff:g id="APP_NAME">%1$s</xliff:g>」的小視窗嗎？"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"管理"</string> - <string name="no_bubbles" msgid="1187859094003006292">"拒絕"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"允許"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"稍後再詢問我"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"來自「<xliff:g id="APP_NAME">%2$s</xliff:g>」的 <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"來自「<xliff:g id="APP_NAME">%2$s</xliff:g>」及另外 <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> 個應用程式的<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"移動"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"移去左下角"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"移去右下角"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"關閉"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"保持即時通訊在最前面"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」的新即時通訊將以小視窗形式顯示。輕按小視窗即可開啟。拖曳即可移動。\n\n輕按小視窗"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"輕按「管理」即可關閉此應用程式的小視窗"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"系統導覽已更新。如需變更，請前往「設定」。"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"前往「設定」更新系統導覽"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"待機"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"滑動即可查看其他結構"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 30f17fc78e19..a90086a33732 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"發出音效或震動吸引你的注意力。"</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"利用浮動式捷徑快速存取這項內容。"</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"最近沒有任何泡泡"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"最近的泡泡和已關閉的泡泡會顯示在這裡。"</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"無法修改這些通知。"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"無法在這裡設定這個通知群組"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"經過 Proxy 處理的通知"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"裝置服務"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"無標題"</string> <string name="restart_button_description" msgid="6916116576177456480">"輕觸即可重新啟動這個應用程式並進入全螢幕模式。"</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"開啟「<xliff:g id="APP_NAME">%1$s</xliff:g>」"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」泡泡的設定"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"要允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」顯示泡泡嗎？"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"管理"</string> - <string name="no_bubbles" msgid="1187859094003006292">"拒絕"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"允許"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"稍後再詢問我"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g>：<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"「<xliff:g id="APP_NAME">%2$s</xliff:g>」和其他 <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> 個應用程式：<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"移動"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"移至左下方"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"移至右下方"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"關閉"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"讓即時通訊繼續在前景執行"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"系統會以泡泡形式顯示來自「<xliff:g id="APP_NAME">%1$s</xliff:g>」的新即時通訊。輕觸泡泡即可開啟，拖曳則可移動泡泡。\n\n輕觸泡泡"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"輕觸 [管理] 即可關閉來自這個應用程式的泡泡"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"系統操作機制已更新。如要進行變更，請前往「設定」。"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"請前往「設定」更新系統操作機制"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"待機"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"滑動即可查看其他結構"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 01c31909c37c..9b91ae8a5f0d 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -699,7 +699,8 @@ <string name="notification_channel_summary_default" msgid="3539949463907902037">"Ithola ukunaka kwakho ngomsindo noma ukudlidliza."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Igcina ukunaka kwakho ngesinqamuleli esintantayo kulokhu okuqukethwe."</string> <string name="bubble_overflow_empty_title" msgid="3120029421991510842">"Awekho amabhamuza akamuva"</string> - <string name="bubble_overflow_empty_subtitle" msgid="198257239740933131">"Amabhamuza akamuva namabhamuza asusiwe azobonakala lapha."</string> + <!-- no translation found for bubble_overflow_empty_subtitle (2030874469510497397) --> + <skip /> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Lezi zaziso azikwazi ukushintshwa."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Leli qembu lezaziso alikwazi ukulungiselelwa lapha"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Isaziso sommeli"</string> @@ -969,13 +970,8 @@ <string name="device_services" msgid="1549944177856658705">"Amasevisi edivayisi"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Asikho isihloko"</string> <string name="restart_button_description" msgid="6916116576177456480">"Thepha ukuze uqale kabusha lolu hlelo lokusebenza uphinde uye kusikrini esigcwele."</string> - <string name="bubbles_deep_link_button_description" msgid="3532375322003698792">"Vula i-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Izilungiselelo zamabhamuza e-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="bubbles_prompt" msgid="8172381116778530318">"Vumela amabhamuza kusukela ku-<xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="manage_bubbles_text" msgid="6856830436329494850">"Phatha"</string> - <string name="no_bubbles" msgid="1187859094003006292">"Yenqaba"</string> - <string name="yes_bubbles" msgid="3014008797151197346">"Vumela"</string> - <string name="ask_me_later_bubbles" msgid="2666199914636253557">"Ngibuze ngesinye isikhathi"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"I-<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> kusuka ku-<xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"I-<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> kusukela ku-<xliff:g id="APP_NAME">%2$s</xliff:g> nokungu-<xliff:g id="BUBBLE_COUNT">%3$d</xliff:g> ngaphezulu"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Hambisa"</string> @@ -984,9 +980,17 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Hambisa inkinobho ngakwesokunxele"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Hambisa inkinobho ngakwesokudla"</string> <string name="bubble_dismiss_text" msgid="7071770411580452911">"Cashisa"</string> - <string name="bubbles_user_education_title" msgid="3385222165904578710">"Gcina izingxoxo ziphambili"</string> - <string name="bubbles_user_education_description" msgid="6663205638091146934">"Izingxoxo ezintsha kusuka ku-<xliff:g id="APP_NAME">%1$s</xliff:g>zizovela njengamabhamuza. Thepha ibhamuza ukuze ulivule. Hudula ukuze ulisuse.\n\nThepha ibhamuza"</string> + <!-- no translation found for bubbles_dont_bubble_conversation (1033040343437428822) --> + <skip /> + <!-- no translation found for bubbles_user_education_title (5547017089271445797) --> + <skip /> + <!-- no translation found for bubbles_user_education_description (1160281719576715211) --> + <skip /> + <!-- no translation found for bubbles_user_education_manage_title (2848511858160342320) --> + <skip /> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Thepha okuthi Phatha ukuvala amabhamuza kusuka kulolu hlelo lokusebenza"</string> + <!-- no translation found for bubbles_user_education_got_it (8282812431953161143) --> + <skip /> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Ukuzulazula kwesistimu kubuyekeziwe. Ukuze wenze ushintsho, hamba kokuthi Izilungiselelo."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Hamba kuzilungiselelo ukuze ubuyekeze ukuzulazula kwesistimu"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Ilindile"</string> @@ -1013,4 +1017,6 @@ <string name="controls_structure_tooltip" msgid="1392966215435667434">"Swayipha ukubona ezinye izakhiwo"</string> <!-- no translation found for controls_seeding_in_progress (3033855341410264148) --> <skip /> + <!-- no translation found for controls_media_close_session (9023534788828414585) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 366287768cdc..ae38e34ce2c3 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -374,6 +374,17 @@ <string name="biometric_dialog_wrong_password">Wrong password</string> <!-- Error string shown when the user enters too many incorrect attempts [CHAR LIMIT=120]--> <string name="biometric_dialog_credential_too_many_attempts">Too many incorrect attempts.\nTry again in <xliff:g id="number">%d</xliff:g> seconds.</string> + <!-- Error string shown when the user enters an incorrect PIN/pattern/password and it counts towards the max attempts before the data on the device is wiped. [CHAR LIMIT=NONE]--> + <string name="biometric_dialog_credential_attempts_before_wipe">Try again. Attempt <xliff:g id="attempts" example="1">%1$d</xliff:g> of <xliff:g id="max_attempts" example="3">%2$d</xliff:g>.</string> + + <!-- Content of a dialog shown when the user has failed to provide the device lock too many times and the device is wiped. [CHAR LIMIT=NONE] --> + <string name="biometric_dialog_failed_attempts_now_wiping_device">Too many incorrect attempts. This device\u2019s data will be deleted.</string> + <!-- Content of a dialog shown when the user has failed to provide the user lock too many times and the user is removed. [CHAR LIMIT=NONE] --> + <string name="biometric_dialog_failed_attempts_now_wiping_user">Too many incorrect attempts. This user will be deleted.</string> + <!-- Content of a dialog shown when the user has failed to provide the work lock too many times and the work profile is removed. [CHAR LIMIT=NONE] --> + <string name="biometric_dialog_failed_attempts_now_wiping_profile">Too many incorrect attempts. This work profile and its data will be deleted.</string> + <!-- Button label to dismiss the dialog telling the user the device, user, or work profile has been wiped. [CHAR LIMIT=40] --> + <string name="biometric_dialog_now_wiping_dialog_dismiss">Dismiss</string> <!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication --> <string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string> diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java index 0d9d4269230f..13f3c0fce5c2 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java @@ -16,8 +16,10 @@ package com.android.systemui.biometrics; -import android.annotation.NonNull; +import android.app.AlertDialog; +import android.app.admin.DevicePolicyManager; import android.content.Context; +import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.hardware.biometrics.BiometricPrompt; import android.os.AsyncTask; @@ -26,32 +28,49 @@ import android.os.CountDownTimer; import android.os.Handler; import android.os.Looper; import android.os.SystemClock; +import android.os.UserManager; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; +import android.view.WindowManager; import android.view.accessibility.AccessibilityManager; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import com.android.internal.widget.LockPatternUtils; import com.android.systemui.Interpolators; import com.android.systemui.R; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + /** * Abstract base class for Pin, Pattern, or Password authentication, for * {@link BiometricPrompt.Builder#setAllowedAuthenticators(int)}} */ public abstract class AuthCredentialView extends LinearLayout { - private static final String TAG = "BiometricPrompt/AuthCredentialView"; private static final int ERROR_DURATION_MS = 3000; - private final AccessibilityManager mAccessibilityManager; + static final int USER_TYPE_PRIMARY = 1; + static final int USER_TYPE_MANAGED_PROFILE = 2; + static final int USER_TYPE_SECONDARY = 3; + @Retention(RetentionPolicy.SOURCE) + @IntDef({USER_TYPE_PRIMARY, USER_TYPE_MANAGED_PROFILE, USER_TYPE_SECONDARY}) + private @interface UserType {} protected final Handler mHandler; + protected final LockPatternUtils mLockPatternUtils; + + private final AccessibilityManager mAccessibilityManager; + private final UserManager mUserManager; + private final DevicePolicyManager mDevicePolicyManager; private Bundle mBiometricPromptBundle; private AuthPanelController mPanelController; @@ -65,7 +84,6 @@ public abstract class AuthCredentialView extends LinearLayout { protected TextView mErrorView; protected @Utils.CredentialType int mCredentialType; - protected final LockPatternUtils mLockPatternUtils; protected AuthContainerView mContainerView; protected Callback mCallback; protected AsyncTask<?, ?, ?> mPendingLockCheck; @@ -106,14 +124,18 @@ public abstract class AuthCredentialView extends LinearLayout { @Override public void onFinish() { - mErrorView.setText(""); + if (mErrorView != null) { + mErrorView.setText(""); + } } } protected final Runnable mClearErrorRunnable = new Runnable() { @Override public void run() { - mErrorView.setText(""); + if (mErrorView != null) { + mErrorView.setText(""); + } } }; @@ -123,12 +145,18 @@ public abstract class AuthCredentialView extends LinearLayout { mLockPatternUtils = new LockPatternUtils(mContext); mHandler = new Handler(Looper.getMainLooper()); mAccessibilityManager = mContext.getSystemService(AccessibilityManager.class); + mUserManager = mContext.getSystemService(UserManager.class); + mDevicePolicyManager = mContext.getSystemService(DevicePolicyManager.class); } protected void showError(String error) { - mHandler.removeCallbacks(mClearErrorRunnable); - mErrorView.setText(error); - mHandler.postDelayed(mClearErrorRunnable, ERROR_DURATION_MS); + if (mHandler != null) { + mHandler.removeCallbacks(mClearErrorRunnable); + mHandler.postDelayed(mClearErrorRunnable, ERROR_DURATION_MS); + } + if (mErrorView != null) { + mErrorView.setText(error); + } } private void setTextOrHide(TextView view, CharSequence text) { @@ -274,26 +302,94 @@ public abstract class AuthCredentialView extends LinearLayout { }; mErrorTimer.start(); } else { - final int error; - switch (mCredentialType) { - case Utils.CREDENTIAL_PIN: - error = R.string.biometric_dialog_wrong_pin; - break; - case Utils.CREDENTIAL_PATTERN: - error = R.string.biometric_dialog_wrong_pattern; - break; - case Utils.CREDENTIAL_PASSWORD: - error = R.string.biometric_dialog_wrong_password; - break; - default: - error = R.string.biometric_dialog_wrong_password; - break; + final boolean didUpdateErrorText = reportFailedAttempt(); + if (!didUpdateErrorText) { + final @StringRes int errorRes; + switch (mCredentialType) { + case Utils.CREDENTIAL_PIN: + errorRes = R.string.biometric_dialog_wrong_pin; + break; + case Utils.CREDENTIAL_PATTERN: + errorRes = R.string.biometric_dialog_wrong_pattern; + break; + case Utils.CREDENTIAL_PASSWORD: + default: + errorRes = R.string.biometric_dialog_wrong_password; + break; + } + showError(getResources().getString(errorRes)); } - showError(getResources().getString(error)); } } } + private boolean reportFailedAttempt() { + boolean result = updateErrorMessage( + mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId) + 1); + mLockPatternUtils.reportFailedPasswordAttempt(mEffectiveUserId); + return result; + } + + private boolean updateErrorMessage(int numAttempts) { + // Don't show any message if there's no maximum number of attempts. + final int maxAttempts = mLockPatternUtils.getMaximumFailedPasswordsForWipe( + mEffectiveUserId); + if (maxAttempts <= 0 || numAttempts <= 0) { + return false; + } + + // Update the on-screen error string. + if (mErrorView != null) { + final String message = getResources().getString( + R.string.biometric_dialog_credential_attempts_before_wipe, + numAttempts, + maxAttempts); + showError(message); + } + + // Only show popup dialog before wipe. + final int remainingAttempts = maxAttempts - numAttempts; + if (remainingAttempts <= 0) { + showNowWipingMessage(); + mContainerView.animateAway(AuthDialogCallback.DISMISSED_ERROR); + } + return true; + } + + private void showNowWipingMessage() { + final AlertDialog alertDialog = new AlertDialog.Builder(mContext) + .setMessage(getNowWipingMessageRes(getUserTypeForWipe())) + .setPositiveButton(R.string.biometric_dialog_now_wiping_dialog_dismiss, null) + .create(); + alertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); + alertDialog.show(); + } + + private @UserType int getUserTypeForWipe() { + final UserInfo userToBeWiped = mUserManager.getUserInfo( + mDevicePolicyManager.getProfileWithMinimumFailedPasswordsForWipe(mEffectiveUserId)); + if (userToBeWiped == null || userToBeWiped.isPrimary()) { + return USER_TYPE_PRIMARY; + } else if (userToBeWiped.isManagedProfile()) { + return USER_TYPE_MANAGED_PROFILE; + } else { + return USER_TYPE_SECONDARY; + } + } + + private static @StringRes int getNowWipingMessageRes(@UserType int userType) { + switch (userType) { + case USER_TYPE_PRIMARY: + return R.string.biometric_dialog_failed_attempts_now_wiping_device; + case USER_TYPE_MANAGED_PROFILE: + return R.string.biometric_dialog_failed_attempts_now_wiping_profile; + case USER_TYPE_SECONDARY: + return R.string.biometric_dialog_failed_attempts_now_wiping_user; + default: + throw new IllegalArgumentException("Unrecognized user type:" + userType); + } + } + @Nullable private static CharSequence getTitle(@NonNull Bundle bundle) { final CharSequence credentialTitle = diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java index 4240209c4f1b..7c4e61c0c175 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java @@ -216,11 +216,20 @@ class Bubble implements BubbleViewProvider { return mInflated; } + void stopInflation() { + if (mInflationTask == null) { + return; + } + mInflationTask.cancel(/* mayInterruptIfRunning */ true); + mIconView = null; + mExpandedView = null; + mInflated = false; + } + void setViewInfo(BubbleViewInfoTask.BubbleViewInfo info) { if (!isInflated()) { mIconView = info.imageView; mExpandedView = info.expandedView; - mInflated = true; } mShortcutInfo = info.shortcutInfo; @@ -231,8 +240,15 @@ class Bubble implements BubbleViewProvider { mDotColor = info.dotColor; mDotPath = info.dotPath; - mExpandedView.update(this); - mIconView.update(this); + if (mExpandedView != null && mIconView != null) { + mInflated = true; + } + if (mExpandedView != null) { + mExpandedView.update(/* bubble */ this); + } + if (mIconView != null) { + mIconView.update(/* bubble */ this); + } } void setInflated(boolean inflated) { diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java index ff5e13c25859..fcbd9121fcda 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java @@ -203,10 +203,7 @@ public class BubbleData { if (DEBUG_BUBBLE_DATA) { Log.d(TAG, "promoteBubbleFromOverflow: " + bubble); } - - // Preserve new order for next repack, which sorts by last updated time. - bubble.markUpdatedAt(mTimeSource.currentTimeMillis()); - mOverflowBubbles.remove(bubble); + moveOverflowBubbleToPending(bubble); bubble.inflate( b -> { notificationEntryUpdated(bubble, /* suppressFlyout */ @@ -217,6 +214,13 @@ public class BubbleData { dispatchPendingChanges(); } + private void moveOverflowBubbleToPending(Bubble b) { + // Preserve new order for next repack, which sorts by last updated time. + b.markUpdatedAt(mTimeSource.currentTimeMillis()); + mOverflowBubbles.remove(b); + mPendingBubbles.add(b); + } + /** * Constructs a new bubble or returns an existing one. Does not add new bubbles to * bubble data, must go through {@link #notificationEntryUpdated(Bubble, boolean, boolean)} @@ -228,8 +232,7 @@ public class BubbleData { for (int i = 0; i < mOverflowBubbles.size(); i++) { Bubble b = mOverflowBubbles.get(i); if (b.getKey().equals(entry.getKey())) { - mOverflowBubbles.remove(b); - mPendingBubbles.add(b); + moveOverflowBubbleToPending(b); return b; } } @@ -445,6 +448,7 @@ public class BubbleData { Log.d(TAG, "overflowing bubble: " + bubble); } mOverflowBubbles.add(0, bubble); + bubble.stopInflation(); if (mOverflowBubbles.size() == mMaxOverflowBubbles + 1) { // Remove oldest bubble. diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipAnimationController.java b/packages/SystemUI/src/com/android/systemui/pip/PipAnimationController.java index 4bfcf2229e3e..232c23dc14f0 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipAnimationController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipAnimationController.java @@ -110,10 +110,6 @@ public class PipAnimationController { return mCurrentAnimator; } - PipTransitionAnimator getCurrentAnimator() { - return mCurrentAnimator; - } - private PipTransitionAnimator setupPipTransitionAnimator(PipTransitionAnimator animator) { animator.setSurfaceTransactionHelper(mSurfaceTransactionHelper); animator.setInterpolator(mFastOutSlowInInterpolator); @@ -178,7 +174,7 @@ public class PipAnimationController { @Override public void onAnimationStart(Animator animation) { mCurrentValue = mStartValue; - applySurfaceControlTransaction(mLeash, newSurfaceControlTransaction(), FRACTION_START); + onStartTransaction(mLeash, newSurfaceControlTransaction()); if (mPipAnimationCallback != null) { mPipAnimationCallback.onPipAnimationStart(this); } @@ -194,7 +190,7 @@ public class PipAnimationController { public void onAnimationEnd(Animator animation) { mCurrentValue = mEndValue; final SurfaceControl.Transaction tx = newSurfaceControlTransaction(); - applySurfaceControlTransaction(mLeash, tx, FRACTION_END); + onEndTransaction(mLeash, tx); if (mPipAnimationCallback != null) { mPipAnimationCallback.onPipAnimationEnd(tx, this); } @@ -253,6 +249,13 @@ public class PipAnimationController { return mTransitionDirection != TRANSITION_DIRECTION_TO_FULLSCREEN; } + boolean inScaleTransition() { + if (mAnimationType != ANIM_TYPE_BOUNDS) return false; + final int direction = getTransitionDirection(); + return direction != TRANSITION_DIRECTION_TO_FULLSCREEN + && direction != TRANSITION_DIRECTION_TO_PIP; + } + /** * Updates the {@link #mEndValue}. * @@ -284,6 +287,10 @@ public class PipAnimationController { mSurfaceTransactionHelper = helper; } + void onStartTransaction(SurfaceControl leash, SurfaceControl.Transaction tx) {} + + void onEndTransaction(SurfaceControl leash, SurfaceControl.Transaction tx) {} + abstract void applySurfaceControlTransaction(SurfaceControl leash, SurfaceControl.Transaction tx, float fraction); @@ -297,11 +304,14 @@ public class PipAnimationController { final float alpha = getStartValue() * (1 - fraction) + getEndValue() * fraction; setCurrentValue(alpha); getSurfaceTransactionHelper().alpha(tx, leash, alpha); - if (Float.compare(fraction, FRACTION_START) == 0) { - getSurfaceTransactionHelper() - .crop(tx, leash, getDestinationBounds()) - .round(tx, leash, shouldApplyCornerRadius()); - } + tx.apply(); + } + + @Override + void onStartTransaction(SurfaceControl leash, SurfaceControl.Transaction tx) { + getSurfaceTransactionHelper() + .crop(tx, leash, getDestinationBounds()) + .round(tx, leash, shouldApplyCornerRadius()); tx.apply(); } }; @@ -329,15 +339,30 @@ public class PipAnimationController { getCastedFractionValue(start.right, end.right, fraction), getCastedFractionValue(start.bottom, end.bottom, fraction)); setCurrentValue(mTmpRect); - getSurfaceTransactionHelper().crop(tx, leash, mTmpRect); - if (Float.compare(fraction, FRACTION_START) == 0) { - // Ensure the start condition - getSurfaceTransactionHelper() - .alpha(tx, leash, 1f) - .round(tx, leash, shouldApplyCornerRadius()); + if (inScaleTransition()) { + getSurfaceTransactionHelper().scale(tx, leash, start, mTmpRect); + } else { + getSurfaceTransactionHelper().crop(tx, leash, mTmpRect); } tx.apply(); } + + @Override + void onStartTransaction(SurfaceControl leash, SurfaceControl.Transaction tx) { + getSurfaceTransactionHelper() + .alpha(tx, leash, 1f) + .round(tx, leash, shouldApplyCornerRadius()); + tx.apply(); + } + + @Override + void onEndTransaction(SurfaceControl leash, SurfaceControl.Transaction tx) { + if (!inScaleTransition()) return; + // NOTE: intentionally does not apply the transaction here. + // this end transaction should get executed synchronously with the final + // WindowContainerTransaction in task organizer + getSurfaceTransactionHelper().resetScale(tx, leash, getDestinationBounds()); + } }; } } diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipSurfaceTransactionHelper.java b/packages/SystemUI/src/com/android/systemui/pip/PipSurfaceTransactionHelper.java index 21f9301fe794..8001e497794a 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipSurfaceTransactionHelper.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipSurfaceTransactionHelper.java @@ -18,7 +18,9 @@ package com.android.systemui.pip; import android.content.Context; import android.content.res.Resources; +import android.graphics.Matrix; import android.graphics.Rect; +import android.graphics.RectF; import android.view.SurfaceControl; import com.android.systemui.R; @@ -35,6 +37,12 @@ public class PipSurfaceTransactionHelper { private final boolean mEnableCornerRadius; private final int mCornerRadius; + /** for {@link #scale(SurfaceControl.Transaction, SurfaceControl, Rect, Rect)} operation */ + private final Matrix mTmpTransform = new Matrix(); + private final float[] mTmpFloat9 = new float[9]; + private final RectF mTmpSourceRectF = new RectF(); + private final RectF mTmpDestinationRectF = new RectF(); + @Inject public PipSurfaceTransactionHelper(Context context) { final Resources res = context.getResources(); @@ -64,6 +72,31 @@ public class PipSurfaceTransactionHelper { } /** + * Operates the scale (setMatrix) on a given transaction and leash + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + PipSurfaceTransactionHelper scale(SurfaceControl.Transaction tx, SurfaceControl leash, + Rect sourceBounds, Rect destinationBounds) { + mTmpSourceRectF.set(sourceBounds); + mTmpDestinationRectF.set(destinationBounds); + mTmpTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL); + tx.setMatrix(leash, mTmpTransform, mTmpFloat9) + .setPosition(leash, destinationBounds.left, destinationBounds.top); + return this; + } + + /** + * Resets the scale (setMatrix) on a given transaction and leash if there's any + * @return same {@link PipSurfaceTransactionHelper} instance for method chaining + */ + PipSurfaceTransactionHelper resetScale(SurfaceControl.Transaction tx, SurfaceControl leash, + Rect destinationBounds) { + tx.setMatrix(leash, Matrix.IDENTITY_MATRIX, mTmpFloat9) + .setPosition(leash, destinationBounds.left, destinationBounds.top); + return this; + } + + /** * Operates the round corner radius on a given transaction and leash * @return same {@link PipSurfaceTransactionHelper} instance for method chaining */ 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 cc7aaea9f38c..888c7ab2c312 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -197,7 +197,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { CachedBluetoothDevice lastDevice = connectedDevices.get(0); final int batteryLevel = lastDevice.getBatteryLevel(); - if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { + if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { return mContext.getString( R.string.quick_settings_bluetooth_secondary_label_battery_level, Utils.formatPercentage(batteryLevel)); @@ -390,7 +390,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { if (state == BluetoothProfile.STATE_CONNECTED) { item.iconResId = R.drawable.ic_bluetooth_connected; int batteryLevel = device.getBatteryLevel(); - if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { + if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { item.icon = new BluetoothBatteryTileIcon(batteryLevel,1 /* iconScale */); item.line2 = mContext.getString( R.string.quick_settings_connected_battery_level, diff --git a/packages/SystemUI/tests/src/com/android/systemui/pip/PipAnimationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/pip/PipAnimationControllerTest.java index b863f143056f..0d66340a3917 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/pip/PipAnimationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/pip/PipAnimationControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; +import android.graphics.Matrix; import android.graphics.Rect; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; @@ -179,6 +180,12 @@ public class PipAnimationControllerTest extends SysuiTestCase { } @Override + public SurfaceControl.Transaction setMatrix(SurfaceControl leash, Matrix matrix, + float[] float9) { + return this; + } + + @Override public void apply() {} } } diff --git a/packages/Tethering/res/values-mcc204-mnc04/strings.xml b/packages/Tethering/res/values-mcc204-mnc04/strings.xml index 6bc2e2aa9205..a996b4247a0e 100644 --- a/packages/Tethering/res/values-mcc204-mnc04/strings.xml +++ b/packages/Tethering/res/values-mcc204-mnc04/strings.xml @@ -15,12 +15,16 @@ --> <resources> <!-- String for no upstream notification title [CHAR LIMIT=200] --> - <string name="no_upstream_notification_title">Tethering & Mobile Hotspot has no internet access</string> + <string name="no_upstream_notification_title">Hotspot has no internet</string> + <!-- String for no upstream notification title [CHAR LIMIT=200] --> + <string name="no_upstream_notification_message">Devices can\u2019t connect to internet</string> + <!-- String for cellular roaming notification disable button [CHAR LIMIT=200] --> + <string name="no_upstream_notification_disable_button">Turn off hotspot</string> <!-- String for cellular roaming notification title [CHAR LIMIT=200] --> - <string name="upstream_roaming_notification_title">Roaming</string> + <string name="upstream_roaming_notification_title">Hotspot is on</string> <!-- String for cellular roaming notification message [CHAR LIMIT=500] --> - <string name="upstream_roaming_notification_message">You will be charged on a per MB basis for all data sent or received while using this service outside the Verizon Network. Please check our website for current international rates. To minimize charges, visit My Verizon periodically to monitor your usage, check your device settings to confirm which devices are connected, and consider using alternate data connections when available</string> + <string name="upstream_roaming_notification_message">Additional charges may apply while roaming</string> <!-- String for cellular roaming notification continue button [CHAR LIMIT=200] --> <string name="upstream_roaming_notification_continue_button">Continue</string> -</resources>
\ No newline at end of file +</resources> diff --git a/packages/Tethering/res/values-mcc310-mnc004/strings.xml b/packages/Tethering/res/values-mcc310-mnc004/strings.xml index 6bc2e2aa9205..a996b4247a0e 100644 --- a/packages/Tethering/res/values-mcc310-mnc004/strings.xml +++ b/packages/Tethering/res/values-mcc310-mnc004/strings.xml @@ -15,12 +15,16 @@ --> <resources> <!-- String for no upstream notification title [CHAR LIMIT=200] --> - <string name="no_upstream_notification_title">Tethering & Mobile Hotspot has no internet access</string> + <string name="no_upstream_notification_title">Hotspot has no internet</string> + <!-- String for no upstream notification title [CHAR LIMIT=200] --> + <string name="no_upstream_notification_message">Devices can\u2019t connect to internet</string> + <!-- String for cellular roaming notification disable button [CHAR LIMIT=200] --> + <string name="no_upstream_notification_disable_button">Turn off hotspot</string> <!-- String for cellular roaming notification title [CHAR LIMIT=200] --> - <string name="upstream_roaming_notification_title">Roaming</string> + <string name="upstream_roaming_notification_title">Hotspot is on</string> <!-- String for cellular roaming notification message [CHAR LIMIT=500] --> - <string name="upstream_roaming_notification_message">You will be charged on a per MB basis for all data sent or received while using this service outside the Verizon Network. Please check our website for current international rates. To minimize charges, visit My Verizon periodically to monitor your usage, check your device settings to confirm which devices are connected, and consider using alternate data connections when available</string> + <string name="upstream_roaming_notification_message">Additional charges may apply while roaming</string> <!-- String for cellular roaming notification continue button [CHAR LIMIT=200] --> <string name="upstream_roaming_notification_continue_button">Continue</string> -</resources>
\ No newline at end of file +</resources> diff --git a/packages/Tethering/res/values-mcc310-mnc120/strings.xml b/packages/Tethering/res/values-mcc310-mnc120/strings.xml new file mode 100644 index 000000000000..618df90c7105 --- /dev/null +++ b/packages/Tethering/res/values-mcc310-mnc120/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- String for tethered notification title with client number info. --> + <plurals name="tethered_notification_title_with_client_number"> + <item quantity="one"><xliff:g>%1$d</xliff:g> device connected.</item> + <item quantity="other"><xliff:g>%1$d</xliff:g> devices connected.</item> + </plurals> +</resources>
\ No newline at end of file diff --git a/packages/Tethering/res/values-mcc311-mnc480/strings.xml b/packages/Tethering/res/values-mcc311-mnc480/strings.xml index 6bc2e2aa9205..a996b4247a0e 100644 --- a/packages/Tethering/res/values-mcc311-mnc480/strings.xml +++ b/packages/Tethering/res/values-mcc311-mnc480/strings.xml @@ -15,12 +15,16 @@ --> <resources> <!-- String for no upstream notification title [CHAR LIMIT=200] --> - <string name="no_upstream_notification_title">Tethering & Mobile Hotspot has no internet access</string> + <string name="no_upstream_notification_title">Hotspot has no internet</string> + <!-- String for no upstream notification title [CHAR LIMIT=200] --> + <string name="no_upstream_notification_message">Devices can\u2019t connect to internet</string> + <!-- String for cellular roaming notification disable button [CHAR LIMIT=200] --> + <string name="no_upstream_notification_disable_button">Turn off hotspot</string> <!-- String for cellular roaming notification title [CHAR LIMIT=200] --> - <string name="upstream_roaming_notification_title">Roaming</string> + <string name="upstream_roaming_notification_title">Hotspot is on</string> <!-- String for cellular roaming notification message [CHAR LIMIT=500] --> - <string name="upstream_roaming_notification_message">You will be charged on a per MB basis for all data sent or received while using this service outside the Verizon Network. Please check our website for current international rates. To minimize charges, visit My Verizon periodically to monitor your usage, check your device settings to confirm which devices are connected, and consider using alternate data connections when available</string> + <string name="upstream_roaming_notification_message">Additional charges may apply while roaming</string> <!-- String for cellular roaming notification continue button [CHAR LIMIT=200] --> <string name="upstream_roaming_notification_continue_button">Continue</string> -</resources>
\ No newline at end of file +</resources> diff --git a/packages/Tethering/res/values-mcc311-mnc490/strings.xml b/packages/Tethering/res/values-mcc311-mnc490/strings.xml new file mode 100644 index 000000000000..618df90c7105 --- /dev/null +++ b/packages/Tethering/res/values-mcc311-mnc490/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- String for tethered notification title with client number info. --> + <plurals name="tethered_notification_title_with_client_number"> + <item quantity="one"><xliff:g>%1$d</xliff:g> device connected.</item> + <item quantity="other"><xliff:g>%1$d</xliff:g> devices connected.</item> + </plurals> +</resources>
\ No newline at end of file diff --git a/packages/Tethering/res/values-mcc312-mnc530/strings.xml b/packages/Tethering/res/values-mcc312-mnc530/strings.xml new file mode 100644 index 000000000000..618df90c7105 --- /dev/null +++ b/packages/Tethering/res/values-mcc312-mnc530/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- String for tethered notification title with client number info. --> + <plurals name="tethered_notification_title_with_client_number"> + <item quantity="one"><xliff:g>%1$d</xliff:g> device connected.</item> + <item quantity="other"><xliff:g>%1$d</xliff:g> devices connected.</item> + </plurals> +</resources>
\ No newline at end of file diff --git a/packages/Tethering/res/values/strings.xml b/packages/Tethering/res/values/strings.xml index d50884b2a7b0..52a16545c22f 100644 --- a/packages/Tethering/res/values/strings.xml +++ b/packages/Tethering/res/values/strings.xml @@ -13,12 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Shown when the device is tethered --> <!-- String for tethered notification title [CHAR LIMIT=200] --> <string name="tethered_notification_title">Tethering or hotspot active</string> <!-- String for tethered notification message [CHAR LIMIT=200] --> <string name="tethered_notification_message">Tap to set up.</string> + <!-- String for tethered notification title with client number info. --> + <plurals name="tethered_notification_title_with_client_number"> + </plurals> <!-- This notification is shown when tethering has been disabled on a user's device. The device is managed by the user's employer. Tethering can't be turned on unless the @@ -35,6 +38,10 @@ <!-- String for no upstream notification title [CHAR LIMIT=200] --> <string name="no_upstream_notification_title"></string> + <!-- String for no upstream notification message [CHAR LIMIT=200] --> + <string name="no_upstream_notification_message"></string> + <!-- String for cellular roaming notification disable button [CHAR LIMIT=200] --> + <string name="no_upstream_notification_disable_button"></string> <!-- String for cellular roaming notification title [CHAR LIMIT=200] --> <string name="upstream_roaming_notification_title"></string> @@ -42,4 +49,4 @@ <string name="upstream_roaming_notification_message"></string> <!-- String for cellular roaming notification continue button [CHAR LIMIT=200] --> <string name="upstream_roaming_notification_continue_button"></string> -</resources>
\ No newline at end of file +</resources> diff --git a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java index 039143df64fe..36113acf97d3 100644 --- a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java @@ -1494,7 +1494,7 @@ public class Tethering { } else { dnsServers = mConfig.defaultIPv4DNS; } - final int netId = (network != null) ? network.netId : NETID_UNSET; + final int netId = (network != null) ? network.getNetId() : NETID_UNSET; try { mNetd.tetherDnsSet(netId, dnsServers); mLog.log(String.format( diff --git a/packages/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java b/packages/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java index 7ac7f5f06e50..45bb4ab6e5f7 100644 --- a/packages/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java @@ -586,21 +586,21 @@ public class UpstreamNetworkMonitor { */ @VisibleForTesting public static NetworkCapabilities networkCapabilitiesForType(int type) { - final NetworkCapabilities nc = new NetworkCapabilities(); + final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder(); // Map from type to transports. final int notFound = -1; final int transport = sLegacyTypeToTransport.get(type, notFound); Preconditions.checkArgument(transport != notFound, "unknown legacy type: " + type); - nc.addTransportType(transport); + builder.addTransportType(transport); if (type == TYPE_MOBILE_DUN) { - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN); + builder.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN); // DUN is restricted network, see NetworkCapabilities#FORCE_RESTRICTED_CAPABILITIES. - nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED); + builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED); } else { - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); + builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); } - return nc; + return builder.build(); } } diff --git a/packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml b/packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml index 9d20c6b6f82c..22411a234fe6 100644 --- a/packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml +++ b/packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml @@ -19,6 +19,7 @@ android:versionName="1.0"> <overlay android:targetPackage="android" + android:targetName="IconShapeCustomization" android:category="android.theme.customization.adaptive_icon_shape" android:priority="1"/> diff --git a/packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml b/packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml index bf408fd62569..384d5b36e576 100644 --- a/packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml +++ b/packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml @@ -20,6 +20,7 @@ android:versionName="1.0"> <overlay android:targetPackage="android" + android:targetName="IconShapeCustomization" android:category="android.theme.customization.adaptive_icon_shape" android:priority="1"/> diff --git a/services/Android.bp b/services/Android.bp index c4be0032ade8..490481c7e5a2 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -116,6 +116,7 @@ droidstubs { name: "services-stubs.sources", srcs: [":services-all-sources"], installable: false, + api_tag_name: "SYSTEM_SERVER", args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" + " --hide-annotation android.annotation.Hide" + " --hide InternalClasses" + // com.android.* classes are okay in this interface @@ -144,7 +145,8 @@ droidstubs { } java_library { - name: "services-stubs", + name: "android_system_server_stubs_current", srcs: [":services-stubs.sources"], installable: false, + static_libs: ["android_module_lib_stubs_current"], } diff --git a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java index 4052942626cb..c8b6d8dfd1b7 100644 --- a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java +++ b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java @@ -18,6 +18,7 @@ package com.android.server.accessibility; import static android.accessibilityservice.AccessibilityService.KEY_ACCESSIBILITY_SCREENSHOT_COLORSPACE; import static android.accessibilityservice.AccessibilityService.KEY_ACCESSIBILITY_SCREENSHOT_HARDWAREBUFFER; +import static android.accessibilityservice.AccessibilityService.KEY_ACCESSIBILITY_SCREENSHOT_STATUS; import static android.accessibilityservice.AccessibilityService.KEY_ACCESSIBILITY_SCREENSHOT_TIMESTAMP; import static android.accessibilityservice.AccessibilityServiceInfo.DEFAULT; import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY; @@ -66,6 +67,7 @@ import android.view.Display; import android.view.KeyEvent; import android.view.MagnificationSpec; import android.view.SurfaceControl; +import android.view.SurfaceControl.ScreenshotGraphicBuffer; import android.view.View; import android.view.WindowInfo; import android.view.accessibility.AccessibilityCache; @@ -977,18 +979,22 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ } @Override - public boolean takeScreenshot(int displayId, RemoteCallback callback) { + public void takeScreenshot(int displayId, RemoteCallback callback) { final long currentTimestamp = SystemClock.uptimeMillis(); if (mRequestTakeScreenshotTimestampMs != 0 && (currentTimestamp - mRequestTakeScreenshotTimestampMs) <= AccessibilityService.ACCESSIBILITY_TAKE_SCREENSHOT_REQUEST_INTERVAL_TIMES_MS) { - return false; + sendScreenshotFailure(AccessibilityService.ERROR_TAKE_SCREENSHOT_INTERVAL_TIME_SHORT, + callback); + return; } mRequestTakeScreenshotTimestampMs = currentTimestamp; synchronized (mLock) { if (!hasRightsToCurrentUserLocked()) { - return false; + sendScreenshotFailure(AccessibilityService.ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR, + callback); + return; } if (!mSecurityPolicy.canTakeScreenshotLocked(this)) { @@ -998,43 +1004,57 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ } if (!mSecurityPolicy.checkAccessibilityAccess(this)) { - return false; + sendScreenshotFailure( + AccessibilityService.ERROR_TAKE_SCREENSHOT_NO_ACCESSIBILITY_ACCESS, + callback); + return; } final Display display = DisplayManagerGlobal.getInstance() .getRealDisplay(displayId); if (display == null) { - return false; + sendScreenshotFailure(AccessibilityService.ERROR_TAKE_SCREENSHOT_INVALID_DISPLAY, + callback); + return; } + sendScreenshotSuccess(display, callback); + } + + private ScreenshotGraphicBuffer takeScreenshotBuffer(Display display) { + final Point displaySize = new Point(); + // TODO (b/145893483): calling new API with the display as a parameter + // when surface control supported. + final IBinder token = SurfaceControl.getInternalDisplayToken(); + final Rect crop = new Rect(0, 0, displaySize.x, displaySize.y); + final int rotation = display.getRotation(); + display.getRealSize(displaySize); + + return SurfaceControl.screenshotToBuffer(token, crop, displaySize.x, displaySize.y, + false, rotation); + } + + private void sendScreenshotSuccess(Display display, RemoteCallback callback) { final long identity = Binder.clearCallingIdentity(); try { mMainHandler.post(PooledLambda.obtainRunnable((nonArg) -> { - final Point displaySize = new Point(); - // TODO (b/145893483): calling new API with the display as a parameter - // when surface control supported. - final IBinder token = SurfaceControl.getInternalDisplayToken(); - final Rect crop = new Rect(0, 0, displaySize.x, displaySize.y); - final int rotation = display.getRotation(); - display.getRealSize(displaySize); - - final SurfaceControl.ScreenshotGraphicBuffer screenshotBuffer = - SurfaceControl.screenshotToBufferWithSecureLayersUnsafe(token, crop, - displaySize.x, displaySize.y, false, - rotation); + final ScreenshotGraphicBuffer screenshotBuffer = takeScreenshotBuffer(display); final GraphicBuffer graphicBuffer = screenshotBuffer.getGraphicBuffer(); try (HardwareBuffer hardwareBuffer = - HardwareBuffer.createFromGraphicBuffer(graphicBuffer)) { + HardwareBuffer.createFromGraphicBuffer(graphicBuffer)) { final ParcelableColorSpace colorSpace = new ParcelableColorSpace(screenshotBuffer.getColorSpace()); - // Send back the result. final Bundle payload = new Bundle(); + payload.putInt(KEY_ACCESSIBILITY_SCREENSHOT_STATUS, + AccessibilityService.TAKE_SCREENSHOT_SUCCESS); payload.putParcelable(KEY_ACCESSIBILITY_SCREENSHOT_HARDWAREBUFFER, hardwareBuffer); payload.putParcelable(KEY_ACCESSIBILITY_SCREENSHOT_COLORSPACE, colorSpace); payload.putLong(KEY_ACCESSIBILITY_SCREENSHOT_TIMESTAMP, SystemClock.uptimeMillis()); + + // Send back the result. callback.sendResult(payload); hardwareBuffer.close(); } @@ -1042,8 +1062,16 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ } finally { Binder.restoreCallingIdentity(identity); } + } - return true; + private void sendScreenshotFailure(@AccessibilityService.ScreenshotErrorCode int errorCode, + RemoteCallback callback) { + mMainHandler.post(PooledLambda.obtainRunnable((nonArg) -> { + final Bundle payload = new Bundle(); + payload.putInt(KEY_ACCESSIBILITY_SCREENSHOT_STATUS, errorCode); + // Send back the result. + callback.sendResult(payload); + }, null).recycleOnUse()); } @Override diff --git a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java index 4f5b9ed00ee2..d1c3a02c6761 100644 --- a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java +++ b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java @@ -328,8 +328,6 @@ class UiAutomationManager { public void onFingerprintGesture(int gesture) {} @Override - public boolean takeScreenshot(int displayId, RemoteCallback callback) { - return false; - } + public void takeScreenshot(int displayId, RemoteCallback callback) {} } } diff --git a/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java b/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java index 71d4acec7c6a..c26d7eea8351 100644 --- a/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java +++ b/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java @@ -44,7 +44,7 @@ import com.android.internal.view.inline.IInlineContentProvider; import com.android.server.LocalServices; import com.android.server.UiThread; import com.android.server.autofill.RemoteInlineSuggestionRenderService; -import com.android.server.wm.WindowManagerInternal; +import com.android.server.inputmethod.InputMethodManagerInternal; import java.util.ArrayList; import java.util.List; @@ -312,10 +312,9 @@ public final class InlineSuggestionFactory { @Override public void onTransferTouchFocusToImeWindow(IBinder sourceInputToken, int displayId) throws RemoteException { - //TODO(b/149574510): Move logic to IMMS - final WindowManagerInternal windowManagerInternal = LocalServices.getService( - WindowManagerInternal.class); - if (!windowManagerInternal.transferTouchFocusToImeWindow(sourceInputToken, + final InputMethodManagerInternal inputMethodManagerInternal = + LocalServices.getService(InputMethodManagerInternal.class); + if (!inputMethodManagerInternal.transferTouchFocusToImeWindow(sourceInputToken, displayId)) { Slog.e(TAG, "Cannot transfer touch focus from suggestion to IME"); onErrorCallback.run(); diff --git a/services/core/Android.bp b/services/core/Android.bp index 9e19ad2aecf4..723c6b1e8d40 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -91,7 +91,7 @@ java_library_static { ], libs: [ - "services-stubs", + "android_system_server_stubs_current", "services.net", "android.hardware.light-V2.0-java", "android.hardware.power-java", diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 75e073ac362d..4d504e742301 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -5331,7 +5331,7 @@ public class ConnectivityService extends IConnectivityManager.Stub // specific SSID/SignalStrength, or the calling app has permission to do so. private void ensureSufficientPermissionsForRequest(NetworkCapabilities nc, int callerPid, int callerUid, String callerPackageName) { - if (null != nc.getSSID() && !checkSettingsPermission(callerPid, callerUid)) { + if (null != nc.getSsid() && !checkSettingsPermission(callerPid, callerUid)) { throw new SecurityException("Insufficient permissions to request a specific SSID"); } @@ -5794,7 +5794,7 @@ public class ConnectivityService extends IConnectivityManager.Stub nai.getAndSetNetworkCapabilities(mixInCapabilities(nai, nc)); final String extraInfo = networkInfo.getExtraInfo(); final String name = TextUtils.isEmpty(extraInfo) - ? nai.networkCapabilities.getSSID() : extraInfo; + ? nai.networkCapabilities.getSsid() : extraInfo; if (DBG) log("registerNetworkAgent " + nai); final long token = Binder.clearCallingIdentity(); try { diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS index 76e0c137d2f5..8099f8f37bc7 100644 --- a/services/core/java/com/android/server/OWNERS +++ b/services/core/java/com/android/server/OWNERS @@ -1,5 +1,5 @@ # Connectivity / Networking -per-file ConnectivityService.java,NetworkManagementService.java,NsdService.java = codewiz@google.com, ek@google.com, jchalard@google.com, lorenzo@google.com, reminv@google.com, satk@google.com +per-file ConnectivityService.java,NetworkManagementService.java,NsdService.java = codewiz@google.com, ek@google.com, jchalard@google.com, junyulai@google.com, lorenzo@google.com, reminv@google.com, satk@google.com # Vibrator / Threads per-file VibratorService.java, DisplayThread.java = michaelwr@google.com diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java index 42fbfec17720..50ec0400a729 100644 --- a/services/core/java/com/android/server/attention/AttentionManagerService.java +++ b/services/core/java/com/android/server/attention/AttentionManagerService.java @@ -16,6 +16,9 @@ package com.android.server.attention; +import static android.content.Context.BIND_AUTO_CREATE; +import static android.content.Context.BIND_FOREGROUND_SERVICE; +import static android.content.Context.BIND_INCLUDE_CAPABILITIES; import static android.provider.DeviceConfig.NAMESPACE_ATTENTION_MANAGER_SERVICE; import static android.service.attention.AttentionService.ATTENTION_FAILURE_CANCELLED; import static android.service.attention.AttentionService.ATTENTION_FAILURE_UNKNOWN; @@ -583,8 +586,8 @@ public class AttentionManagerService extends SystemService { mComponentName); // Note: no reason to clear the calling identity, we won't have one in a handler. mContext.bindServiceAsUser(serviceIntent, mConnection, - Context.BIND_AUTO_CREATE, UserHandle.CURRENT); - + BIND_AUTO_CREATE | BIND_FOREGROUND_SERVICE | BIND_INCLUDE_CAPABILITIES, + UserHandle.CURRENT); }); } diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java index 5059a4861a7b..7c8fb5aefd1e 100644 --- a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java +++ b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java @@ -220,9 +220,9 @@ public class KeepaliveTracker { + " network=" + mNai.network + " startedState=" + startedStateString(mStartedState) + " " - + IpUtils.addressAndPortToString(mPacket.srcAddress, mPacket.srcPort) + + IpUtils.addressAndPortToString(mPacket.getSrcAddress(), mPacket.getSrcPort()) + "->" - + IpUtils.addressAndPortToString(mPacket.dstAddress, mPacket.dstPort) + + IpUtils.addressAndPortToString(mPacket.getDstAddress(), mPacket.getDstPort()) + " interval=" + mInterval + " uid=" + mUid + " pid=" + mPid + " privileged=" + mPrivileged + " packetData=" + HexDump.toHexString(mPacket.getPacket()) @@ -250,7 +250,7 @@ public class KeepaliveTracker { private int checkSourceAddress() { // Check that we have the source address. for (InetAddress address : mNai.linkProperties.getAddresses()) { - if (address.equals(mPacket.srcAddress)) { + if (address.equals(mPacket.getSrcAddress())) { return SUCCESS; } } @@ -619,7 +619,7 @@ public class KeepaliveTracker { packet = NattKeepalivePacketData.nattKeepalivePacket( srcAddress, srcPort, dstAddress, NATT_PORT); } catch (InvalidPacketException e) { - notifyErrorCallback(cb, e.error); + notifyErrorCallback(cb, e.getError()); return; } KeepaliveInfo ki = null; @@ -662,7 +662,7 @@ public class KeepaliveTracker { notifyErrorCallback(cb, e.error); return; } catch (InvalidPacketException e) { - notifyErrorCallback(cb, e.error); + notifyErrorCallback(cb, e.getError()); return; } KeepaliveInfo ki = null; diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java index 0925de8f9577..34b0aa246433 100644 --- a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java +++ b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java @@ -150,7 +150,7 @@ public class NetworkNotificationManager { if (nai != null) { transportType = approximateTransportType(nai); final String extraInfo = nai.networkInfo.getExtraInfo(); - name = TextUtils.isEmpty(extraInfo) ? nai.networkCapabilities.getSSID() : extraInfo; + name = TextUtils.isEmpty(extraInfo) ? nai.networkCapabilities.getSsid() : extraInfo; // Only notify for Internet-capable networks. if (!nai.networkCapabilities.hasCapability(NET_CAPABILITY_INTERNET)) return; } else { @@ -183,14 +183,14 @@ public class NetworkNotificationManager { int icon = getIcon(transportType); if (notifyType == NotificationType.NO_INTERNET && transportType == TRANSPORT_WIFI) { title = r.getString(R.string.wifi_no_internet, - WifiInfo.sanitizeSsid(nai.networkCapabilities.getSSID())); + WifiInfo.sanitizeSsid(nai.networkCapabilities.getSsid())); details = r.getString(R.string.wifi_no_internet_detailed); } else if (notifyType == NotificationType.PRIVATE_DNS_BROKEN) { if (transportType == TRANSPORT_CELLULAR) { title = r.getString(R.string.mobile_no_internet); } else if (transportType == TRANSPORT_WIFI) { title = r.getString(R.string.wifi_no_internet, - WifiInfo.sanitizeSsid(nai.networkCapabilities.getSSID())); + WifiInfo.sanitizeSsid(nai.networkCapabilities.getSsid())); } else { title = r.getString(R.string.other_networks_no_internet); } @@ -198,19 +198,19 @@ public class NetworkNotificationManager { } else if (notifyType == NotificationType.PARTIAL_CONNECTIVITY && transportType == TRANSPORT_WIFI) { title = r.getString(R.string.network_partial_connectivity, - WifiInfo.sanitizeSsid(nai.networkCapabilities.getSSID())); + WifiInfo.sanitizeSsid(nai.networkCapabilities.getSsid())); details = r.getString(R.string.network_partial_connectivity_detailed); } else if (notifyType == NotificationType.LOST_INTERNET && transportType == TRANSPORT_WIFI) { title = r.getString(R.string.wifi_no_internet, - WifiInfo.sanitizeSsid(nai.networkCapabilities.getSSID())); + WifiInfo.sanitizeSsid(nai.networkCapabilities.getSsid())); details = r.getString(R.string.wifi_no_internet_detailed); } else if (notifyType == NotificationType.SIGN_IN) { switch (transportType) { case TRANSPORT_WIFI: title = r.getString(R.string.wifi_available_sign_in, 0); details = r.getString(R.string.network_available_sign_in_detailed, - WifiInfo.sanitizeSsid(nai.networkCapabilities.getSSID())); + WifiInfo.sanitizeSsid(nai.networkCapabilities.getSsid())); break; case TRANSPORT_CELLULAR: title = r.getString(R.string.network_available_sign_in, 0); diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index ca06b47a6e80..065e0c3e45c8 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -2465,5 +2465,11 @@ public class InputManagerService extends IInputManager.Stub } } } + + @Override + public boolean transferTouchFocus(@NonNull IBinder fromChannelToken, + @NonNull IBinder toChannelToken) { + return InputManagerService.this.transferTouchFocus(fromChannelToken, toChannelToken); + } } } diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java index 68e6c1885ec2..d49d4b2c3278 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java @@ -18,6 +18,7 @@ package com.android.server.inputmethod; import android.annotation.NonNull; import android.annotation.UserIdInt; +import android.os.IBinder; import android.view.inputmethod.InlineSuggestionsRequest; import android.view.inputmethod.InputMethodInfo; @@ -92,6 +93,16 @@ public abstract class InputMethodManagerInternal { public abstract void registerInputMethodListListener(InputMethodListListener listener); /** + * Transfers input focus from a given input token to that of the IME window. + * + * @param sourceInputToken The source token. + * @param displayId The display hosting the IME window. + * @return {@code true} if the transfer is successful. + */ + public abstract boolean transferTouchFocusToImeWindow(@NonNull IBinder sourceInputToken, + int displayId); + + /** * Fake implementation of {@link InputMethodManagerInternal}. All the methods do nothing. */ private static final InputMethodManagerInternal NOP = @@ -124,6 +135,12 @@ public abstract class InputMethodManagerInternal { @Override public void registerInputMethodListListener(InputMethodListListener listener) { } + + @Override + public boolean transferTouchFocusToImeWindow(@NonNull IBinder sourceInputToken, + int displayId) { + return false; + } }; /** diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 868631cc2543..37c0edc5f115 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -65,6 +65,7 @@ import android.database.ContentObserver; import android.graphics.Matrix; import android.graphics.drawable.Drawable; import android.hardware.display.DisplayManagerInternal; +import android.hardware.input.InputManagerInternal; import android.inputmethodservice.InputMethodService; import android.net.Uri; import android.os.Binder; @@ -307,6 +308,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub final SettingsObserver mSettingsObserver; final IWindowManager mIWindowManager; final WindowManagerInternal mWindowManagerInternal; + final InputManagerInternal mInputManagerInternal; private final DisplayManagerInternal mDisplayManagerInternal; final HandlerCaller mCaller; final boolean mHasFeature; @@ -620,6 +622,13 @@ public class InputMethodManagerService extends IInputMethodManager.Stub int mCurTokenDisplayId = INVALID_DISPLAY; /** + * The host input token of the current active input method. + */ + @GuardedBy("mMethodMap") + @Nullable + private IBinder mCurHostInputToken; + + /** * The display ID of the input method indicates the fallback display which returned by * {@link #computeImeDisplayIdForTarget}. */ @@ -1615,6 +1624,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub mIWindowManager = IWindowManager.Stub.asInterface( ServiceManager.getService(Context.WINDOW_SERVICE)); mWindowManagerInternal = LocalServices.getService(WindowManagerInternal.class); + mInputManagerInternal = LocalServices.getService(InputManagerInternal.class); mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class); mImeDisplayValidator = displayId -> mWindowManagerInternal.shouldShowIme(displayId); mCaller = new HandlerCaller(context, null, new HandlerCaller.Callback() { @@ -1987,7 +1997,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub executeOrSendMessage(mCurMethod, mCaller.obtainMessageOOO(MSG_INLINE_SUGGESTIONS_REQUEST, mCurMethod, requestInfo, new InlineSuggestionsRequestCallbackDecorator(callback, - imi.getPackageName(), mCurTokenDisplayId))); + imi.getPackageName(), mCurTokenDisplayId, mCurToken, + this))); } else { callback.onInlineSuggestionsUnsupported(); } @@ -2009,12 +2020,19 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private final int mImeDisplayId; + @NonNull + private final IBinder mImeToken; + @NonNull + private final InputMethodManagerService mImms; + InlineSuggestionsRequestCallbackDecorator( - @NonNull IInlineSuggestionsRequestCallback callback, - @NonNull String imePackageName, int displayId) { + @NonNull IInlineSuggestionsRequestCallback callback, @NonNull String imePackageName, + int displayId, @NonNull IBinder imeToken, @NonNull InputMethodManagerService imms) { mCallback = callback; mImePackageName = imePackageName; mImeDisplayId = displayId; + mImeToken = imeToken; + mImms = imms; } @Override @@ -2034,6 +2052,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub + "]."); } request.setHostDisplayId(mImeDisplayId); + mImms.setCurHostInputToken(mImeToken, request.getHostInputToken()); mCallback.onInlineSuggestionsRequest(request, callback, imeFieldId, inputViewStarted); } @@ -2049,6 +2068,21 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } /** + * Sets current host input token. + * + * @param callerImeToken the token has been made for the current active input method + * @param hostInputToken the host input token of the current active input method + */ + void setCurHostInputToken(@NonNull IBinder callerImeToken, @Nullable IBinder hostInputToken) { + synchronized (mMethodMap) { + if (!calledWithValidTokenLocked(callerImeToken)) { + return; + } + mCurHostInputToken = hostInputToken; + } + } + + /** * @param imiId if null, returns enabled subtypes for the current imi * @return enabled subtypes of the specified imi */ @@ -2549,6 +2583,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub updateSystemUiLocked(mImeWindowVis, mBackDisposition); mCurToken = null; mCurTokenDisplayId = INVALID_DISPLAY; + mCurHostInputToken = null; } mCurId = null; @@ -4813,6 +4848,19 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } + private boolean transferTouchFocusToImeWindow(@NonNull IBinder sourceInputToken, + int displayId) { + //TODO(b/150843766): Check if Input Token is valid. + final IBinder curHostInputToken; + synchronized (mMethodMap) { + if (displayId != mCurTokenDisplayId || mCurHostInputToken == null) { + return false; + } + curHostInputToken = mCurHostInputToken; + } + return mInputManagerInternal.transferTouchFocus(sourceInputToken, curHostInputToken); + } + private static final class LocalServiceImpl extends InputMethodManagerInternal { @NonNull private final InputMethodManagerService mService; @@ -4852,6 +4900,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub public void registerInputMethodListListener(InputMethodListListener listener) { mService.mInputMethodListListeners.addIfAbsent(listener); } + + @Override + public boolean transferTouchFocusToImeWindow(@NonNull IBinder sourceInputToken, + int displayId) { + return mService.transferTouchFocusToImeWindow(sourceInputToken, displayId); + } } @BinderThread @@ -4963,6 +5017,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub + " mBoundToMethod=" + mBoundToMethod + " mVisibleBound=" + mVisibleBound); p.println(" mCurToken=" + mCurToken); p.println(" mCurTokenDisplayId=" + mCurTokenDisplayId); + p.println(" mCurHostInputToken=" + mCurHostInputToken); p.println(" mCurIntent=" + mCurIntent); method = mCurMethod; p.println(" mCurMethod=" + mCurMethod); diff --git a/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java index 0e6c0dbbca2d..0d16ee0e1d5a 100644 --- a/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java @@ -25,6 +25,7 @@ import android.annotation.AnyThread; import android.annotation.BinderThread; import android.annotation.IntDef; import android.annotation.MainThread; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; import android.annotation.WorkerThread; @@ -209,6 +210,13 @@ public final class MultiClientInputMethodManagerService { InputMethodListListener listener) { reportNotSupported(); } + + @Override + public boolean transferTouchFocusToImeWindow( + @NonNull IBinder sourceInputToken, int displayId) { + reportNotSupported(); + return false; + } }); } diff --git a/services/core/java/com/android/server/media/AudioPlayerStateMonitor.java b/services/core/java/com/android/server/media/AudioPlayerStateMonitor.java index b0bccb8eb38b..55e0795f8b50 100644 --- a/services/core/java/com/android/server/media/AudioPlayerStateMonitor.java +++ b/services/core/java/com/android/server/media/AudioPlayerStateMonitor.java @@ -166,7 +166,7 @@ class AudioPlayerStateMonitor { * Cleans up the sorted list of audio playback client UIDs with given {@param * mediaButtonSessionUid}. * <p>UIDs whose audio playback are inactive and have started before the media button session's - * audio playback cannot be the lastly played media app. So they won't needed anymore. + * audio playback cannot be the lastly played media app. So they won't be needed anymore. * * @param mediaButtonSessionUid UID of the media button session. */ diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index a6930dd30337..5757b1a9697b 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -1973,6 +1973,34 @@ public class MediaSessionService extends SystemService implements Monitor { instantiateCustomProvider(name); } + @Override + public int getSessionPolicies(MediaSession.Token token) { + synchronized (mLock) { + MediaSessionRecord record = getMediaSessionRecordLocked(token); + if (record != null) { + return record.getSessionPolicies(); + } + } + return 0; + } + + @Override + public void setSessionPolicies(MediaSession.Token token, int policies) { + final long callingIdentityToken = Binder.clearCallingIdentity(); + try { + synchronized (mLock) { + MediaSessionRecord record = getMediaSessionRecordLocked(token); + FullUserRecord user = getFullUserRecordLocked(record.getUserId()); + if (record != null && user != null) { + record.setSessionPolicies(policies); + user.mPriorityStack.updateMediaButtonSessionIfNeeded(); + } + } + } finally { + Binder.restoreCallingIdentity(callingIdentityToken); + } + } + // For MediaSession private int verifySessionsRequest(ComponentName componentName, int userId, final int pid, final int uid) { diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java index 367f131a39bb..bd98b9cb64b2 100644 --- a/services/core/java/com/android/server/media/MediaSessionStack.java +++ b/services/core/java/com/android/server/media/MediaSessionStack.java @@ -156,7 +156,11 @@ class MediaSessionStack { if (mMediaButtonSession != null && mMediaButtonSession.getUid() == record.getUid()) { MediaSessionRecordImpl newMediaButtonSession = findMediaButtonSession(mMediaButtonSession.getUid()); - if (newMediaButtonSession != mMediaButtonSession) { + if (newMediaButtonSession != mMediaButtonSession + && (newMediaButtonSession.getSessionPolicies() + & SessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_SESSION) == 0) { + // Check if the policy states that this session should not be updated as a media + // button session. updateMediaButtonSession(newMediaButtonSession); } } @@ -187,14 +191,15 @@ class MediaSessionStack { for (int i = 0; i < audioPlaybackUids.size(); i++) { MediaSessionRecordImpl mediaButtonSession = findMediaButtonSession(audioPlaybackUids.get(i)); - if (mediaButtonSession != null - && (mediaButtonSession.getSessionPolicies() - & SessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_SESSION) == 0) { - // Found the media button session. - mAudioPlayerStateMonitor.cleanUpAudioPlaybackUids(mediaButtonSession.getUid()); - if (mMediaButtonSession != mediaButtonSession) { - updateMediaButtonSession(mediaButtonSession); - } + if (mediaButtonSession == null) continue; + boolean ignoreButtonSession = (mediaButtonSession.getSessionPolicies() + & SessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_SESSION) != 0; + if (mediaButtonSession == mMediaButtonSession && ignoreButtonSession) { + updateMediaButtonSession(null); + return; + } + if (mediaButtonSession != mMediaButtonSession && !ignoreButtonSession) { + updateMediaButtonSession(mediaButtonSession); return; } } @@ -276,15 +281,6 @@ class MediaSessionStack { } private void updateMediaButtonSession(MediaSessionRecordImpl newMediaButtonSession) { - // Check if the policy states that this session should not be updated as a media button - // session. - if (newMediaButtonSession != null) { - int policies = newMediaButtonSession.getSessionPolicies(); - if ((policies & SessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_SESSION) != 0) { - return; - } - } - MediaSessionRecordImpl oldMediaButtonSession = mMediaButtonSession; mMediaButtonSession = newMediaButtonSession; mOnMediaButtonSessionChangedListener.onMediaButtonSessionChanged( diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 20ad87a096a0..e2ff0ad5c0c1 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -261,6 +261,7 @@ import com.android.server.pm.PackageManagerService; import com.android.server.policy.PhoneWindowManager; import com.android.server.statusbar.StatusBarManagerInternal; import com.android.server.uri.UriGrantsManagerInternal; +import com.android.server.wm.ActivityTaskManagerInternal; import com.android.server.wm.WindowManagerInternal; import libcore.io.IoUtils; @@ -391,6 +392,7 @@ public class NotificationManagerService extends SystemService { private static final long CHANGE_BACKGROUND_CUSTOM_TOAST_BLOCK = 128611929L; private IActivityManager mAm; + private ActivityTaskManagerInternal mAtm; private ActivityManager mActivityManager; private IPackageManager mPackageManager; private PackageManager mPackageManagerClient; @@ -1858,10 +1860,10 @@ public class NotificationManagerService extends SystemService { ICompanionDeviceManager companionManager, SnoozeHelper snoozeHelper, NotificationUsageStats usageStats, AtomicFile policyFile, ActivityManager activityManager, GroupHelper groupHelper, IActivityManager am, - UsageStatsManagerInternal appUsageStats, DevicePolicyManagerInternal dpm, - IUriGrantsManager ugm, UriGrantsManagerInternal ugmInternal, AppOpsManager appOps, - UserManager userManager, NotificationHistoryManager historyManager, - StatsManager statsManager) { + ActivityTaskManagerInternal atm, UsageStatsManagerInternal appUsageStats, + DevicePolicyManagerInternal dpm, IUriGrantsManager ugm, + UriGrantsManagerInternal ugmInternal, AppOpsManager appOps, UserManager userManager, + NotificationHistoryManager historyManager, StatsManager statsManager) { mHandler = handler; Resources resources = getContext().getResources(); mMaxPackageEnqueueRate = Settings.Global.getFloat(getContext().getContentResolver(), @@ -1871,6 +1873,7 @@ public class NotificationManagerService extends SystemService { mAccessibilityManager = (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE); mAm = am; + mAtm = atm; mUgm = ugm; mUgmInternal = ugmInternal; mPackageManager = packageManager; @@ -2057,6 +2060,7 @@ public class NotificationManagerService extends SystemService { systemDir, "notification_policy.xml"), "notification-policy"), (ActivityManager) getContext().getSystemService(Context.ACTIVITY_SERVICE), getGroupHelper(), ActivityManager.getService(), + LocalServices.getService(ActivityTaskManagerInternal.class), LocalServices.getService(UsageStatsManagerInternal.class), LocalServices.getService(DevicePolicyManagerInternal.class), UriGrantsManager.getService(), @@ -2793,7 +2797,9 @@ public class NotificationManagerService extends SystemService { return; } - if (callback != null && !appIsForeground && !isSystemToast && isCustom) { + boolean isAppRenderedToast = (callback != null); + if (isAppRenderedToast && isCustom && !isSystemToast + && !isPackageInForegroundForToast(pkg, callingUid)) { boolean block; long id = Binder.clearCallingIdentity(); try { @@ -2871,6 +2877,28 @@ public class NotificationManagerService extends SystemService { } } + /** + * Implementation note: Our definition of foreground for toasts is an implementation matter + * and should strike a balance between functionality and anti-abuse effectiveness. We + * currently worry about the following cases: + * <ol> + * <li>App with fullscreen activity: Allow toasts + * <li>App behind translucent activity from other app: Block toasts + * <li>App in multi-window: Allow toasts + * <li>App with expanded bubble: Allow toasts + * <li>App posting toasts on onCreate(), onStart(), onResume(): Allow toasts + * <li>App posting toasts on onPause(), onStop(), onDestroy(): Block toasts + * </ol> + * Checking if the UID has any resumed activities satisfy use-cases above. + * + * <p>Checking if {@code mActivityManager.getUidImportance(callingUid) == + * IMPORTANCE_FOREGROUND} does not work because it considers the app in foreground if it has + * any visible activities, failing case 2 in list above. + */ + private boolean isPackageInForegroundForToast(String pkg, int callingUid) { + return mAtm.hasResumedActivity(callingUid); + } + @Override public void cancelToast(String pkg, IBinder token) { Slog.i(TAG, "cancelToast pkg=" + pkg + " token=" + token); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 09e4e602bbd7..89e245cd8568 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -7238,8 +7238,8 @@ public class PackageManagerService extends IPackageManager.Stub resolveInfos.set(i, installerInfo); continue; } - // caller is a full app if (ephemeralPkgName == null) { + // caller is a full app SettingBase callingSetting = mSettings.getSettingLPr(UserHandle.getAppId(filterCallingUid)); PackageSetting resolvedSetting = @@ -7259,11 +7259,9 @@ public class PackageManagerService extends IPackageManager.Stub && intent.getComponent() == null) { // ephemeral apps can launch other ephemeral apps indirectly continue; - } - // allow activities that have been explicitly exposed to ephemeral apps - final boolean isEphemeralApp = info.activityInfo.applicationInfo.isInstantApp(); - if (!isEphemeralApp - && ((info.activityInfo.flags & ActivityInfo.FLAG_VISIBLE_TO_INSTANT_APP) != 0)) { + } else if (((info.activityInfo.flags & ActivityInfo.FLAG_VISIBLE_TO_INSTANT_APP) != 0) + && !info.activityInfo.applicationInfo.isInstantApp()) { + // allow activities that have been explicitly exposed to ephemeral apps continue; } resolveInfos.remove(i); diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING index 764eec18cd96..3d9466a1fbf6 100644 --- a/services/core/java/com/android/server/pm/TEST_MAPPING +++ b/services/core/java/com/android/server/pm/TEST_MAPPING @@ -47,6 +47,14 @@ "include-filter": "com.google.android.security.gts.PackageVerifierTest" } ] + }, + { + "name": "CtsAppSecurityHostTestCases", + "options": [ + { + "include-filter": "android.appsecurity.cts.PrivilegedUpdateTests" + } + ] } ], "postsubmit": [ @@ -59,6 +67,9 @@ ] }, { + "name": "CtsAppSecurityHostTestCases" + }, + { "name": "FrameworksServicesTests", "options": [ { diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 4bc95aebfbc6..1fc9594d8613 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -781,6 +781,11 @@ public final class PowerManagerService extends SystemService batterySaverPolicy, batterySavingStats); } + BatterySaverStateMachine createBatterySaverStateMachine(Object lock, Context context, + BatterySaverController batterySaverController) { + return new BatterySaverStateMachine(lock, context, batterySaverController); + } + NativeWrapper createNativeWrapper() { return new NativeWrapper(); } @@ -865,8 +870,8 @@ public final class PowerManagerService extends SystemService mInjector.createBatterySaverPolicy(mLock, mContext, mBatterySavingStats); mBatterySaverController = mInjector.createBatterySaverController(mLock, mContext, mBatterySaverPolicy, mBatterySavingStats); - mBatterySaverStateMachine = new BatterySaverStateMachine( - mLock, mContext, mBatterySaverController); + mBatterySaverStateMachine = mInjector.createBatterySaverStateMachine(mLock, mContext, + mBatterySaverController); mInattentiveSleepWarningOverlayController = mInjector.createInattentiveSleepWarningController(); diff --git a/services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java b/services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java index 7047a9eb6e5f..28c5a2857aa6 100644 --- a/services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java +++ b/services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java @@ -653,16 +653,16 @@ public class TunerResourceManagerService extends SystemService { private void enforceTrmAccessPermission(String apiName) { getContext().enforceCallingPermission("android.permission.TUNER_RESOURCE_ACCESS", - TAG + ": " + "apiName"); + TAG + ": " + apiName); } private void enforceTunerAccessPermission(String apiName) { getContext().enforceCallingPermission("android.Manifest.permission.ACCESS_TV_TUNER", - TAG + ": " + "apiName"); + TAG + ": " + apiName); } private void enforceDescramblerAccessPermission(String apiName) { getContext().enforceCallingPermission("android.Manifest.permission.ACCESS_TV_DESCRAMBLER", - TAG + ": " + "apiName"); + TAG + ": " + apiName); } } diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java index ca856ca7c1e6..edc87e5a4d88 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java @@ -169,6 +169,11 @@ public abstract class ActivityTaskManagerInternal { public abstract List<IBinder> getTopVisibleActivities(); /** + * Returns whether {@code uid} has any resumed activity. + */ + public abstract boolean hasResumedActivity(int uid); + + /** * Notify listeners that contents are drawn for the first time on a single task display. * * @param displayId An ID of the display on which contents are drawn. diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 7bacc427feb8..890b9454e6b6 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -6172,6 +6172,20 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } @Override + public boolean hasResumedActivity(int uid) { + synchronized (mGlobalLock) { + final ArraySet<WindowProcessController> processes = mProcessMap.getProcesses(uid); + for (int i = 0, n = processes.size(); i < n; i++) { + final WindowProcessController process = processes.valueAt(i); + if (process.hasResumedActivity()) { + return true; + } + } + } + return false; + } + + @Override public int startActivitiesAsPackage(String packageName, @Nullable String featureId, int userId, Intent[] intents, Bundle bOptions) { Objects.requireNonNull(intents, "intents"); diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index 30912e55f908..bb0278964f85 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -22,8 +22,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.view.InsetsController.ANIMATION_TYPE_HIDE; import static android.view.InsetsController.ANIMATION_TYPE_SHOW; -import static android.view.InsetsController.LAYOUT_INSETS_DURING_ANIMATION_HIDDEN; -import static android.view.InsetsController.LAYOUT_INSETS_DURING_ANIMATION_SHOWN; import static android.view.InsetsState.ITYPE_NAVIGATION_BAR; import static android.view.InsetsState.ITYPE_STATUS_BAR; import static android.view.SyncRtSurfaceTransactionApplier.applyParams; @@ -299,7 +297,7 @@ class InsetsPolicy { private void controlAnimationUnchecked(int typesReady, SparseArray<InsetsSourceControl> controls, boolean show, Runnable callback) { InsetsPolicyAnimationControlListener listener = - new InsetsPolicyAnimationControlListener(show, callback); + new InsetsPolicyAnimationControlListener(show, callback, typesReady); listener.mControlCallbacks.controlAnimationUnchecked(typesReady, controls, show); } @@ -328,8 +326,8 @@ class InsetsPolicy { Runnable mFinishCallback; InsetsPolicyAnimationControlCallbacks mControlCallbacks; - InsetsPolicyAnimationControlListener(boolean show, Runnable finishCallback) { - super(show, true /* useSfVsync */); + InsetsPolicyAnimationControlListener(boolean show, Runnable finishCallback, int types) { + super(show, false /* hasCallbacks */, types); mFinishCallback = finishCallback; mControlCallbacks = new InsetsPolicyAnimationControlCallbacks(this); } @@ -361,7 +359,7 @@ class InsetsPolicy { mAnimationControl = new InsetsAnimationControlImpl(controls, mFocusedWin.getDisplayContent().getBounds(), getState(), mListener, typesReady, this, mListener.getDurationMs(), - InsetsController.INTERPOLATOR, true, + InsetsController.SYSTEM_BARS_INTERPOLATOR, show ? ANIMATION_TYPE_SHOW : ANIMATION_TYPE_HIDE); SurfaceAnimationThread.getHandler().post( () -> mListener.onReady(mAnimationControl, typesReady)); diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java index 0661cb981975..e011c7945882 100644 --- a/services/core/java/com/android/server/wm/WindowManagerInternal.java +++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java @@ -569,16 +569,6 @@ public abstract class WindowManagerInternal { IBinder windowToken, int accessibilityWindowId); /** - * Transfers input focus from a given input token to that of the IME window. - * - * @param sourceInputToken The source token. - * @param displayId The display hosting the IME window. - * @return Whether transfer was successful. - */ - public abstract boolean transferTouchFocusToImeWindow(@NonNull IBinder sourceInputToken, - int displayId); - - /** * * Returns the window name associated to the given binder. * diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 22e7ce7d97f1..23ba528b6aee 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -7566,29 +7566,6 @@ public class WindowManagerService extends IWindowManager.Stub } @Override - public boolean transferTouchFocusToImeWindow(@NonNull IBinder sourceInputToken, - int displayId) { - final IBinder destinationInputToken; - - synchronized (mGlobalLock) { - final DisplayContent displayContent = mRoot.getDisplayContent(displayId); - if (displayContent == null) { - return false; - } - final WindowState imeWindow = displayContent.mInputMethodWindow; - if (imeWindow == null) { - return false; - } - if (imeWindow.mInputChannel == null) { - return false; - } - destinationInputToken = imeWindow.mInputChannel.getToken(); - } - - return mInputManager.transferTouchFocus(sourceInputToken, destinationInputToken); - } - - @Override public String getWindowName(@NonNull IBinder binder) { synchronized (mGlobalLock) { final WindowState w = mWindowMap.get(binder); diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java index f356329cbefb..194ed3ec3b0e 100644 --- a/services/core/java/com/android/server/wm/WindowProcessController.java +++ b/services/core/java/com/android/server/wm/WindowProcessController.java @@ -751,6 +751,16 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio return false; } + boolean hasResumedActivity() { + for (int i = mActivities.size() - 1; i >= 0; --i) { + final ActivityRecord activity = mActivities.get(i); + if (activity.isState(RESUMED)) { + return true; + } + } + return false; + } + void updateIntentForHeavyWeightActivity(Intent intent) { if (mActivities.isEmpty()) { diff --git a/services/net/java/android/net/TcpKeepalivePacketData.java b/services/net/java/android/net/TcpKeepalivePacketData.java index fcf3a56de448..c0c386b3046e 100644 --- a/services/net/java/android/net/TcpKeepalivePacketData.java +++ b/services/net/java/android/net/TcpKeepalivePacketData.java @@ -152,10 +152,12 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce public boolean equals(@Nullable final Object o) { if (!(o instanceof TcpKeepalivePacketData)) return false; final TcpKeepalivePacketData other = (TcpKeepalivePacketData) o; - return this.srcAddress.equals(other.srcAddress) - && this.dstAddress.equals(other.dstAddress) - && this.srcPort == other.srcPort - && this.dstPort == other.dstPort + final InetAddress srcAddress = getSrcAddress(); + final InetAddress dstAddress = getDstAddress(); + return srcAddress.equals(other.getSrcAddress()) + && dstAddress.equals(other.getDstAddress()) + && getSrcPort() == other.getSrcPort() + && getDstPort() == other.getDstPort() && this.tcpAck == other.tcpAck && this.tcpSeq == other.tcpSeq && this.tcpWnd == other.tcpWnd @@ -166,8 +168,8 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce @Override public int hashCode() { - return Objects.hash(srcAddress, dstAddress, srcPort, dstPort, tcpAck, tcpSeq, tcpWnd, - tcpWndScale, ipTos, ipTtl); + return Objects.hash(getSrcAddress(), getDstAddress(), getSrcPort(), getDstPort(), + tcpAck, tcpSeq, tcpWnd, tcpWndScale, ipTos, ipTtl); } /** @@ -182,10 +184,10 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce /** Write to parcel. */ public void writeToParcel(Parcel out, int flags) { - out.writeString(srcAddress.getHostAddress()); - out.writeString(dstAddress.getHostAddress()); - out.writeInt(srcPort); - out.writeInt(dstPort); + out.writeString(getSrcAddress().getHostAddress()); + out.writeString(getDstAddress().getHostAddress()); + out.writeInt(getSrcPort()); + out.writeInt(getDstPort()); out.writeByteArray(getPacket()); out.writeInt(tcpSeq); out.writeInt(tcpAck); @@ -219,7 +221,7 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce return readFromParcel(in); } catch (InvalidPacketException e) { throw new IllegalArgumentException( - "Invalid NAT-T keepalive data: " + e.error); + "Invalid NAT-T keepalive data: " + e.getError()); } } @@ -234,10 +236,12 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce @NonNull public TcpKeepalivePacketDataParcelable toStableParcelable() { final TcpKeepalivePacketDataParcelable parcel = new TcpKeepalivePacketDataParcelable(); + final InetAddress srcAddress = getSrcAddress(); + final InetAddress dstAddress = getDstAddress(); parcel.srcAddress = srcAddress.getAddress(); - parcel.srcPort = srcPort; + parcel.srcPort = getSrcPort(); parcel.dstAddress = dstAddress.getAddress(); - parcel.dstPort = dstPort; + parcel.dstPort = getDstPort(); parcel.seq = tcpSeq; parcel.ack = tcpAck; parcel.rcvWnd = tcpWnd; @@ -249,10 +253,10 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce @Override public String toString() { - return "saddr: " + srcAddress - + " daddr: " + dstAddress - + " sport: " + srcPort - + " dport: " + dstPort + return "saddr: " + getSrcAddress() + + " daddr: " + getDstAddress() + + " sport: " + getSrcPort() + + " dport: " + getDstPort() + " seq: " + tcpSeq + " ack: " + tcpAck + " wnd: " + tcpWnd diff --git a/services/net/java/android/net/util/KeepalivePacketDataUtil.java b/services/net/java/android/net/util/KeepalivePacketDataUtil.java index 9a51729212f7..4466ea0abe0e 100644 --- a/services/net/java/android/net/util/KeepalivePacketDataUtil.java +++ b/services/net/java/android/net/util/KeepalivePacketDataUtil.java @@ -20,6 +20,8 @@ import android.annotation.NonNull; import android.net.NattKeepalivePacketData; import android.net.NattKeepalivePacketDataParcelable; +import java.net.InetAddress; + /** @hide */ public final class KeepalivePacketDataUtil { /** @@ -29,11 +31,12 @@ public final class KeepalivePacketDataUtil { public static NattKeepalivePacketDataParcelable toStableParcelable( NattKeepalivePacketData pkt) { final NattKeepalivePacketDataParcelable parcel = new NattKeepalivePacketDataParcelable(); - - parcel.srcAddress = pkt.srcAddress.getAddress(); - parcel.srcPort = pkt.srcPort; - parcel.dstAddress = pkt.dstAddress.getAddress(); - parcel.dstPort = pkt.dstPort; + final InetAddress srcAddress = pkt.getSrcAddress(); + final InetAddress dstAddress = pkt.getDstAddress(); + parcel.srcAddress = srcAddress.getAddress(); + parcel.srcPort = pkt.getSrcPort(); + parcel.dstAddress = dstAddress.getAddress(); + parcel.dstPort = pkt.getDstPort(); return parcel; } } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java index ae8d5545e069..7bf1d98d9a3f 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java @@ -47,7 +47,6 @@ import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -698,18 +697,8 @@ public class AbstractAccessibilityServiceConnectionTest { assertThat(result, is(false)); } - @Test - public void takeScreenshot_returnNull() { - // no checkAccessibilityAccess, should return null. - when(mMockSecurityPolicy.canTakeScreenshotLocked(mServiceConnection)).thenReturn(true); - when(mMockSecurityPolicy.checkAccessibilityAccess(mServiceConnection)).thenReturn(false); - mServiceConnection.takeScreenshot(Display.DEFAULT_DISPLAY, new RemoteCallback((result) -> { - assertNull(result); - })); - } - @Test (expected = SecurityException.class) - public void takeScreenshot_throwSecurityException() { + public void takeScreenshot_withoutCapability_throwSecurityException() { // no canTakeScreenshot, should throw security exception. when(mMockSecurityPolicy.canTakeScreenshotLocked(mServiceConnection)).thenReturn(false); mServiceConnection.takeScreenshot(Display.DEFAULT_DISPLAY, new RemoteCallback((result) -> { diff --git a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java index 5e8de42f8ce0..1a4ce8aa97f8 100644 --- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java @@ -83,6 +83,7 @@ import com.android.server.power.PowerManagerService.NativeWrapper; import com.android.server.power.PowerManagerService.UserSwitchedReceiver; import com.android.server.power.batterysaver.BatterySaverController; import com.android.server.power.batterysaver.BatterySaverPolicy; +import com.android.server.power.batterysaver.BatterySaverStateMachine; import com.android.server.power.batterysaver.BatterySavingStats; import org.junit.After; @@ -109,6 +110,7 @@ public class PowerManagerServiceTest { @Mock private BatterySaverController mBatterySaverControllerMock; @Mock private BatterySaverPolicy mBatterySaverPolicyMock; + @Mock private BatterySaverStateMachine mBatterySaverStateMachineMock; @Mock private LightsManager mLightsManagerMock; @Mock private DisplayManagerInternal mDisplayManagerInternalMock; @Mock private BatteryManagerInternal mBatteryManagerInternalMock; @@ -216,6 +218,12 @@ public class PowerManagerServiceTest { } @Override + BatterySaverStateMachine createBatterySaverStateMachine(Object lock, Context context, + BatterySaverController batterySaverController) { + return mBatterySaverStateMachineMock; + } + + @Override NativeWrapper createNativeWrapper() { return mNativeWrapperMock; } 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 f179840fba11..2b8ce782fe16 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -17,7 +17,6 @@ package com.android.server.notification; import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND; -import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE; import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE; import static android.app.Notification.CATEGORY_CALL; import static android.app.Notification.FLAG_AUTO_CANCEL; @@ -165,6 +164,7 @@ import com.android.server.notification.NotificationManagerService.NotificationAs import com.android.server.notification.NotificationManagerService.NotificationListeners; import com.android.server.statusbar.StatusBarManagerInternal; import com.android.server.uri.UriGrantsManagerInternal; +import com.android.server.wm.ActivityTaskManagerInternal; import com.android.server.wm.WindowManagerInternal; import org.junit.After; @@ -253,6 +253,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Mock IActivityManager mAm; @Mock + ActivityTaskManagerInternal mAtm; + @Mock IUriGrantsManager mUgm; @Mock UriGrantsManagerInternal mUgmInternal; @@ -454,7 +456,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mRankingHandler, mPackageManager, mPackageManagerClient, mockLightsManager, mListeners, mAssistants, mConditionProviders, mCompanionMgr, mSnoozeHelper, mUsageStats, mPolicyFile, mActivityManager, - mGroupHelper, mAm, mAppUsageStats, + mGroupHelper, mAm, mAtm, mAppUsageStats, mock(DevicePolicyManagerInternal.class), mUgm, mUgmInternal, mAppOpsManager, mUm, mHistoryManager, mStatsManager); mService.onBootPhase(SystemService.PHASE_SYSTEM_SERVICES_READY); @@ -4704,8 +4706,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.setPreferencesHelper(mPreferencesHelper); when(mPreferencesHelper.getImportance(testPackage, mUid)).thenReturn(IMPORTANCE_NONE); - // this app is in the foreground - when(mActivityManager.getUidImportance(mUid)).thenReturn(IMPORTANCE_FOREGROUND); + setAppInForegroundForToasts(mUid, true); // enqueue toast -> toast should still enqueue ((INotificationManager) mService.mService).enqueueToast(testPackage, new Binder(), @@ -4723,8 +4724,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mPackageManager.isPackageSuspendedForUser(testPackage, UserHandle.getUserId(mUid))) .thenReturn(false); - // this app is NOT in the foreground - when(mActivityManager.getUidImportance(mUid)).thenReturn(IMPORTANCE_NONE); + setAppInForegroundForToasts(mUid, false); // enqueue toast -> no toasts enqueued ((INotificationManager) mService.mService).enqueueToast(testPackage, new Binder(), @@ -4742,8 +4742,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mPackageManager.isPackageSuspendedForUser(testPackage, UserHandle.getUserId(mUid))) .thenReturn(false); - // this app is in the foreground - when(mActivityManager.getUidImportance(mUid)).thenReturn(IMPORTANCE_FOREGROUND); + setAppInForegroundForToasts(mUid, true); // enqueue toast -> toast should still enqueue ((INotificationManager) mService.mService).enqueueTextToast(testPackage, new Binder(), @@ -4761,8 +4760,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mPackageManager.isPackageSuspendedForUser(testPackage, UserHandle.getUserId(mUid))) .thenReturn(false); - // this app is NOT in the foreground - when(mActivityManager.getUidImportance(mUid)).thenReturn(IMPORTANCE_NONE); + setAppInForegroundForToasts(mUid, false); // enqueue toast -> toast should still enqueue ((INotificationManager) mService.mService).enqueueTextToast(testPackage, new Binder(), @@ -4820,8 +4818,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.setPreferencesHelper(mPreferencesHelper); when(mPreferencesHelper.getImportance(testPackage, mUid)).thenReturn(IMPORTANCE_NONE); - // this app is NOT in the foreground - when(mActivityManager.getUidImportance(mUid)).thenReturn(IMPORTANCE_GONE); + setAppInForegroundForToasts(mUid, false); // enqueue toast -> no toasts enqueued ((INotificationManager) mService.mService).enqueueToast(testPackage, new Binder(), @@ -4843,8 +4840,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.setPreferencesHelper(mPreferencesHelper); when(mPreferencesHelper.getImportance(testPackage, mUid)).thenReturn(IMPORTANCE_NONE); - // this app is NOT in the foreground - when(mActivityManager.getUidImportance(mUid)).thenReturn(IMPORTANCE_GONE); + setAppInForegroundForToasts(mUid, false); // enqueue toast -> system toast can still be enqueued ((INotificationManager) mService.mService).enqueueToast(testPackage, new Binder(), @@ -4852,6 +4848,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertEquals(1, mService.mToastQueue.size()); } + private void setAppInForegroundForToasts(int uid, boolean inForeground) { + int importance = (inForeground) ? IMPORTANCE_FOREGROUND : IMPORTANCE_NONE; + when(mActivityManager.getUidImportance(mUid)).thenReturn(importance); + when(mAtm.hasResumedActivity(uid)).thenReturn(inForeground); + } + @Test public void testOnPanelRevealedAndHidden() { int items = 5; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java index e4d50c0e1786..19ff683a46a1 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java @@ -65,6 +65,7 @@ import com.android.server.lights.LightsManager; import com.android.server.notification.NotificationManagerService.NotificationAssistants; import com.android.server.notification.NotificationManagerService.NotificationListeners; import com.android.server.uri.UriGrantsManagerInternal; +import com.android.server.wm.ActivityTaskManagerInternal; import com.android.server.wm.WindowManagerInternal; import org.junit.After; @@ -147,6 +148,7 @@ public class RoleObserverTest extends UiServiceTestCase { mock(SnoozeHelper.class), mock(NotificationUsageStats.class), mock(AtomicFile.class), mock(ActivityManager.class), mock(GroupHelper.class), mock(IActivityManager.class), + mock(ActivityTaskManagerInternal.class), mock(UsageStatsManagerInternal.class), mock(DevicePolicyManagerInternal.class), mock(IUriGrantsManager.class), mock(UriGrantsManagerInternal.class), diff --git a/telephony/api/system-current.txt b/telephony/api/system-current.txt index 8fc02bf25a8f..9d1fa37c2a2a 100644 --- a/telephony/api/system-current.txt +++ b/telephony/api/system-current.txt @@ -660,11 +660,8 @@ package android.telephony { } public final class SmsManager { - method @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public boolean copyMessageToIcc(@Nullable byte[], @NonNull byte[], int); - method @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public boolean deleteMessageFromIcc(int); method public boolean disableCellBroadcastRange(int, int, int); method public boolean enableCellBroadcastRange(int, int, int); - method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public java.util.List<android.telephony.SmsMessage> getMessagesFromIcc(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getPremiumSmsConsent(@NonNull String); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getSmsCapacityOnIcc(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void sendMultipartTextMessageWithoutPersisting(String, String, java.util.List<java.lang.String>, java.util.List<android.app.PendingIntent>, java.util.List<android.app.PendingIntent>); @@ -703,8 +700,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultDataSubId(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultSmsSubId(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setDisplayName(@Nullable String, int, int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIconTint(int, int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPreferredDataSubscriptionId(int, boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setSubscriptionEnabled(int, boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUiccApplicationsEnabled(int, boolean); @@ -838,7 +833,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings(); method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAlwaysAllowMmsData(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int); diff --git a/telephony/java/android/telephony/CellInfo.java b/telephony/java/android/telephony/CellInfo.java index bfa209bd31f5..b381ccecde47 100644 --- a/telephony/java/android/telephony/CellInfo.java +++ b/telephony/java/android/telephony/CellInfo.java @@ -21,6 +21,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.radio.V1_4.CellInfo.Info; +import android.hardware.radio.V1_5.CellInfo.CellInfoRatSpecificInfo; import android.os.Parcel; import android.os.Parcelable; @@ -28,6 +29,7 @@ import com.android.internal.annotations.VisibleForTesting; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Objects; /** * Immutable cell information from a point in time. @@ -152,7 +154,7 @@ public abstract class CellInfo implements Parcelable { protected CellInfo() { this.mRegistered = false; this.mTimeStamp = Long.MAX_VALUE; - mCellConnectionStatus = CONNECTION_NONE; + this.mCellConnectionStatus = CONNECTION_NONE; } /** @hide */ @@ -240,27 +242,17 @@ public abstract class CellInfo implements Parcelable { @Override public int hashCode() { - int primeNum = 31; - return ((mRegistered ? 0 : 1) * primeNum) + ((int)(mTimeStamp / 1000) * primeNum) - + (mCellConnectionStatus * primeNum); + return Objects.hash(mCellConnectionStatus, mRegistered, mTimeStamp); } @Override - public boolean equals(Object other) { - if (other == null) { - return false; - } - if (this == other) { - return true; - } - try { - CellInfo o = (CellInfo) other; - return mRegistered == o.mRegistered - && mTimeStamp == o.mTimeStamp - && mCellConnectionStatus == o.mCellConnectionStatus; - } catch (ClassCastException e) { - return false; - } + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof CellInfo)) return false; + CellInfo cellInfo = (CellInfo) o; + return mCellConnectionStatus == cellInfo.mCellConnectionStatus + && mRegistered == cellInfo.mRegistered + && mTimeStamp == cellInfo.mTimeStamp; } @Override @@ -353,6 +345,13 @@ public abstract class CellInfo implements Parcelable { } /** @hide */ + protected CellInfo(android.hardware.radio.V1_5.CellInfo ci, long timeStamp) { + this.mRegistered = ci.registered; + this.mTimeStamp = timeStamp; + this.mCellConnectionStatus = ci.connectionStatus; + } + + /** @hide */ public static CellInfo create(android.hardware.radio.V1_0.CellInfo ci) { if (ci == null) return null; switch(ci.cellInfoType) { @@ -391,4 +390,24 @@ public abstract class CellInfo implements Parcelable { default: return null; } } + + /** @hide */ + public static CellInfo create(android.hardware.radio.V1_5.CellInfo ci, long timeStamp) { + if (ci == null) return null; + switch (ci.ratSpecificInfo.getDiscriminator()) { + case CellInfoRatSpecificInfo.hidl_discriminator.gsm: + return new CellInfoGsm(ci, timeStamp); + case CellInfoRatSpecificInfo.hidl_discriminator.cdma: + return new CellInfoCdma(ci, timeStamp); + case CellInfoRatSpecificInfo.hidl_discriminator.lte: + return new CellInfoLte(ci, timeStamp); + case CellInfoRatSpecificInfo.hidl_discriminator.wcdma: + return new CellInfoWcdma(ci, timeStamp); + case CellInfoRatSpecificInfo.hidl_discriminator.tdscdma: + return new CellInfoTdscdma(ci, timeStamp); + case CellInfoRatSpecificInfo.hidl_discriminator.nr: + return new CellInfoNr(ci, timeStamp); + default: return null; + } + } } diff --git a/telephony/java/android/telephony/CellInfoCdma.java b/telephony/java/android/telephony/CellInfoCdma.java index 0edb4a4eed9b..1bef681619ed 100644 --- a/telephony/java/android/telephony/CellInfoCdma.java +++ b/telephony/java/android/telephony/CellInfoCdma.java @@ -78,6 +78,15 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { new CellSignalStrengthCdma(cic.signalStrengthCdma, cic.signalStrengthEvdo); } + /** @hide */ + public CellInfoCdma(android.hardware.radio.V1_5.CellInfo ci, long timeStamp) { + super(ci, timeStamp); + final android.hardware.radio.V1_2.CellInfoCdma cic = ci.ratSpecificInfo.cdma(); + mCellIdentityCdma = new CellIdentityCdma(cic.cellIdentityCdma); + mCellSignalStrengthCdma = + new CellSignalStrengthCdma(cic.signalStrengthCdma, cic.signalStrengthEvdo); + } + /** * @return a {@link CellIdentityCdma} instance. */ diff --git a/telephony/java/android/telephony/CellInfoGsm.java b/telephony/java/android/telephony/CellInfoGsm.java index 2dddd3f935cd..c19521fdfa99 100644 --- a/telephony/java/android/telephony/CellInfoGsm.java +++ b/telephony/java/android/telephony/CellInfoGsm.java @@ -73,6 +73,14 @@ public final class CellInfoGsm extends CellInfo implements Parcelable { mCellSignalStrengthGsm = new CellSignalStrengthGsm(cig.signalStrengthGsm); } + /** @hide */ + public CellInfoGsm(android.hardware.radio.V1_5.CellInfo ci, long timeStamp) { + super(ci, timeStamp); + final android.hardware.radio.V1_5.CellInfoGsm cig = ci.ratSpecificInfo.gsm(); + mCellIdentityGsm = new CellIdentityGsm(cig.cellIdentityGsm); + mCellSignalStrengthGsm = new CellSignalStrengthGsm(cig.signalStrengthGsm); + } + /** * @return a {@link CellIdentityGsm} instance. */ diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index a57c7cd136db..320925ea63ae 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/telephony/java/android/telephony/CellInfoLte.java @@ -82,6 +82,15 @@ public final class CellInfoLte extends CellInfo implements Parcelable { mCellConfig = new CellConfigLte(cil.cellConfig); } + /** @hide */ + public CellInfoLte(android.hardware.radio.V1_5.CellInfo ci, long timeStamp) { + super(ci, timeStamp); + final android.hardware.radio.V1_5.CellInfoLte cil = ci.ratSpecificInfo.lte(); + mCellIdentityLte = new CellIdentityLte(cil.cellIdentityLte); + mCellSignalStrengthLte = new CellSignalStrengthLte(cil.signalStrengthLte); + mCellConfig = new CellConfigLte(); + } + /** * @return a {@link CellIdentityLte} instance. */ diff --git a/telephony/java/android/telephony/CellInfoNr.java b/telephony/java/android/telephony/CellInfoNr.java index 8b41b8be7137..a7e79f93ae89 100644 --- a/telephony/java/android/telephony/CellInfoNr.java +++ b/telephony/java/android/telephony/CellInfoNr.java @@ -53,6 +53,14 @@ public final class CellInfoNr extends CellInfo { mCellSignalStrength = new CellSignalStrengthNr(cil.signalStrength); } + /** @hide */ + public CellInfoNr(android.hardware.radio.V1_5.CellInfo ci, long timeStamp) { + super(ci, timeStamp); + final android.hardware.radio.V1_5.CellInfoNr cil = ci.ratSpecificInfo.nr(); + mCellIdentity = new CellIdentityNr(cil.cellIdentityNr); + mCellSignalStrength = new CellSignalStrengthNr(cil.signalStrengthNr); + } + /** * @return a {@link CellIdentityNr} instance. */ diff --git a/telephony/java/android/telephony/CellInfoTdscdma.java b/telephony/java/android/telephony/CellInfoTdscdma.java index d2cc9c6ce422..038c49ac37ee 100644 --- a/telephony/java/android/telephony/CellInfoTdscdma.java +++ b/telephony/java/android/telephony/CellInfoTdscdma.java @@ -77,6 +77,14 @@ public final class CellInfoTdscdma extends CellInfo implements Parcelable { mCellSignalStrengthTdscdma = new CellSignalStrengthTdscdma(cit.signalStrengthTdscdma); } + /** @hide */ + public CellInfoTdscdma(android.hardware.radio.V1_5.CellInfo ci, long timeStamp) { + super(ci, timeStamp); + final android.hardware.radio.V1_5.CellInfoTdscdma cit = ci.ratSpecificInfo.tdscdma(); + mCellIdentityTdscdma = new CellIdentityTdscdma(cit.cellIdentityTdscdma); + mCellSignalStrengthTdscdma = new CellSignalStrengthTdscdma(cit.signalStrengthTdscdma); + } + /** * @return a {@link CellIdentityTdscdma} instance. */ diff --git a/telephony/java/android/telephony/CellInfoWcdma.java b/telephony/java/android/telephony/CellInfoWcdma.java index 3f792d17b8ef..c74955f807b0 100644 --- a/telephony/java/android/telephony/CellInfoWcdma.java +++ b/telephony/java/android/telephony/CellInfoWcdma.java @@ -72,6 +72,14 @@ public final class CellInfoWcdma extends CellInfo implements Parcelable { mCellSignalStrengthWcdma = new CellSignalStrengthWcdma(ciw.signalStrengthWcdma); } + /** @hide */ + public CellInfoWcdma(android.hardware.radio.V1_5.CellInfo ci, long timeStamp) { + super(ci, timeStamp); + final android.hardware.radio.V1_5.CellInfoWcdma ciw = ci.ratSpecificInfo.wcdma(); + mCellIdentityWcdma = new CellIdentityWcdma(ciw.cellIdentityWcdma); + mCellSignalStrengthWcdma = new CellSignalStrengthWcdma(ciw.signalStrengthWcdma); + } + /** * @return a {@link CellIdentityWcdma} instance. */ diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 6aea5eeca3fd..f6552eec88f6 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -697,7 +697,7 @@ public final class SmsManager { ISms iSms = getISmsServiceOrThrow(); if (iSms != null) { iSms.sendTextForSubscriberWithOptions(subId, - null, destinationAddress, + null, null, destinationAddress, scAddress, text, sentIntent, deliveryIntent, persistMessage, finalPriority, expectMore, finalValidity); @@ -719,7 +719,7 @@ public final class SmsManager { ISms iSms = getISmsServiceOrThrow(); if (iSms != null) { iSms.sendTextForSubscriberWithOptions(getSubscriptionId(), - null, destinationAddress, + null, null, destinationAddress, scAddress, text, sentIntent, deliveryIntent, persistMessage, finalPriority, expectMore, finalValidity); @@ -1672,7 +1672,6 @@ public final class SmsManager { * @throws IllegalArgumentException if pdu is null. * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.ACCESS_MESSAGES_ON_ICC) public boolean copyMessageToIcc( @Nullable byte[] smsc, @NonNull byte[] pdu, @StatusOnIcc int status) { @@ -1717,7 +1716,6 @@ public final class SmsManager { * * {@hide} */ - @SystemApi @RequiresPermission(Manifest.permission.ACCESS_MESSAGES_ON_ICC) public boolean deleteMessageFromIcc(int messageIndex) { boolean success = false; @@ -1798,7 +1796,6 @@ public final class SmsManager { * * {@hide} */ - @SystemApi @RequiresPermission(Manifest.permission.ACCESS_MESSAGES_ON_ICC) public @NonNull List<SmsMessage> getMessagesFromIcc() { return getAllMessagesFromIcc(); diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index bc5cc9601e05..e537f666d4c0 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -1198,6 +1198,7 @@ public class SmsMessage { /** * Returns the recipient address(receiver) of this SMS message in String form or null if * unavailable. + * {@hide} */ @Nullable public String getRecipientAddress() { diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 7a4253ed5aca..5d3cc44ac68c 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -1655,7 +1655,6 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public int setIconTint(@ColorInt int tint, int subId) { if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId); @@ -1672,7 +1671,6 @@ public class SubscriptionManager { * @return the number of records updated or < 0 if invalid subId * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public int setDisplayName(@Nullable String displayName, int subId, @SimDisplayNameSource int nameSource) { diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 2048334ae8c4..441a8ee567a0 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4926,7 +4926,8 @@ public class TelephonyManager { ITelephony telephony = getITelephony(); if (telephony != null) { telephony.sendVisualVoicemailSmsForSubscriber( - mContext.getOpPackageName(), subId, number, port, text, sentIntent); + mContext.getOpPackageName(), mContext.getAttributionTag(), subId, number, + port, text, sentIntent); } } catch (RemoteException ex) { } @@ -9862,32 +9863,12 @@ public class TelephonyManager { } /** - * Get baseband version for the default phone using the legacy approach. - * This change was added in P, to ensure backward compatiblity. - * - * @return baseband version. - * @hide - */ - private String getBasebandVersionLegacy(int phoneId) { - if (SubscriptionManager.isValidPhoneId(phoneId)) { - String prop = "gsm.version.baseband" - + ((phoneId == 0) ? "" : Integer.toString(phoneId)); - return SystemProperties.get(prop); - } - return null; - } - - /** * Get baseband version by phone id. * * @return baseband version. * @hide */ public String getBasebandVersionForPhone(int phoneId) { - String version = getBasebandVersionLegacy(phoneId); - if (version != null && !version.isEmpty()) { - setBasebandVersionForPhone(phoneId, version); - } return getTelephonyProperty(phoneId, TelephonyProperties.baseband_version(), ""); } @@ -12989,7 +12970,6 @@ public class TelephonyManager { * * @hide */ - @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAlwaysAllowMmsData(boolean alwaysAllow) { try { diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index f61d4e14f1d3..3e1d72c7eeb8 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -126,4 +126,7 @@ public class DctConstants { public static final String PROVISIONING_URL_KEY = "provisioningUrl"; public static final String BANDWIDTH_SOURCE_MODEM_KEY = "modem"; public static final String BANDWIDTH_SOURCE_CARRIER_CONFIG_KEY = "carrier_config"; + public static final String RAT_NAME_LTE = "LTE"; + public static final String RAT_NAME_NR_NSA = "NR_NSA"; + public static final String RAT_NAME_NR_NSA_MMWAVE = "NR_NSA_MMWAVE"; } diff --git a/telephony/java/com/android/internal/telephony/ISms.aidl b/telephony/java/com/android/internal/telephony/ISms.aidl index 79cdce8cba46..fed969d4948f 100644 --- a/telephony/java/com/android/internal/telephony/ISms.aidl +++ b/telephony/java/com/android/internal/telephony/ISms.aidl @@ -91,34 +91,6 @@ interface ISms { in PendingIntent deliveryIntent); /** - * Send a data SMS. Only for use internally. - * - * @param smsc the SMSC to send the message through, or NULL for the - * default SMSC - * @param data the body of the message to send - * @param sentIntent if not NULL this <code>PendingIntent</code> is - * broadcast when the message is sucessfully sent, or failed. - * The result code will be <code>Activity.RESULT_OK<code> for success, - * or one of these errors:<br> - * <code>RESULT_ERROR_GENERIC_FAILURE</code><br> - * <code>RESULT_ERROR_RADIO_OFF</code><br> - * <code>RESULT_ERROR_NULL_PDU</code><br> - * For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include - * the extra "errorCode" containing a radio technology specific value, - * generally only useful for troubleshooting.<br> - * The per-application based SMS control checks sentIntent. If sentIntent - * is NULL the caller will be checked against all unknown applicaitons, - * which cause smaller number of SMS to be sent in checking period. - * @param deliveryIntent if not NULL this <code>PendingIntent</code> is - * broadcast when the message is delivered to the recipient. The - * raw pdu of the status report is in the extended data ("pdu"). - * @param subId the subId id. - */ - void sendDataForSubscriberWithSelfPermissions(int subId, String callingPkg, in String destAddr, - in String scAddr, in int destPort, in byte[] data, in PendingIntent sentIntent, - in PendingIntent deliveryIntent); - - /** * Send an SMS. * * @param smsc the SMSC to send the message through, or NULL for the @@ -154,34 +126,6 @@ interface ISms { in long messageId); /** - * Send an SMS. Internal use only. - * - * @param smsc the SMSC to send the message through, or NULL for the - * default SMSC - * @param text the body of the message to send - * @param sentIntent if not NULL this <code>PendingIntent</code> is - * broadcast when the message is sucessfully sent, or failed. - * The result code will be <code>Activity.RESULT_OK<code> for success, - * or one of these errors:<br> - * <code>RESULT_ERROR_GENERIC_FAILURE</code><br> - * <code>RESULT_ERROR_RADIO_OFF</code><br> - * <code>RESULT_ERROR_NULL_PDU</code><br> - * For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include - * the extra "errorCode" containing a radio technology specific value, - * generally only useful for troubleshooting.<br> - * The per-application based SMS control checks sentIntent. If sentIntent - * is NULL the caller will be checked against all unknown applications, - * which cause smaller number of SMS to be sent in checking period. - * @param deliveryIntent if not NULL this <code>PendingIntent</code> is - * broadcast when the message is delivered to the recipient. The - * raw pdu of the status report is in the extended data ("pdu"). - * @param subId the subId on which the SMS has to be sent. - */ - void sendTextForSubscriberWithSelfPermissions(in int subId, String callingPkg, - in String destAddr, in String scAddr, in String text, in PendingIntent sentIntent, - in PendingIntent deliveryIntent, in boolean persistMessage); - - /** * Send an SMS with options using Subscription Id. * * @param subId the subId on which the SMS has to be sent. @@ -227,10 +171,11 @@ interface ISms { * Validity Period(Maximum) -> 635040 mins(i.e.63 weeks). * Any Other values included Negative considered as Invalid Validity Period of the message. */ - void sendTextForSubscriberWithOptions(in int subId, String callingPkg, in String destAddr, - in String scAddr, in String text, in PendingIntent sentIntent, - in PendingIntent deliveryIntent, in boolean persistMessageForNonDefaultSmsApp, - in int priority, in boolean expectMore, in int validityPeriod); + void sendTextForSubscriberWithOptions(in int subId, String callingPkg, + String callingAttributionTag, in String destAddr, in String scAddr, in String text, + in PendingIntent sentIntent, in PendingIntent deliveryIntent, + in boolean persistMessageForNonDefaultSmsApp, in int priority, in boolean expectMore, + in int validityPeriod); /** * Inject an SMS PDU into the android platform. diff --git a/telephony/java/com/android/internal/telephony/ISmsImplBase.java b/telephony/java/com/android/internal/telephony/ISmsImplBase.java index db0b8e528c87..67ad23a664fa 100644 --- a/telephony/java/com/android/internal/telephony/ISmsImplBase.java +++ b/telephony/java/com/android/internal/telephony/ISmsImplBase.java @@ -52,13 +52,6 @@ public class ISmsImplBase extends ISms.Stub { } @Override - public void sendDataForSubscriberWithSelfPermissions(int subId, String callingPkg, - String destAddr, String scAddr, int destPort, byte[] data, PendingIntent sentIntent, - PendingIntent deliveryIntent) { - throw new UnsupportedOperationException(); - } - - @Override public void sendTextForSubscriber(int subId, String callingPkg, String destAddr, String scAddr, String text, PendingIntent sentIntent, PendingIntent deliveryIntent, boolean persistMessageForNonDefaultSmsApp, @@ -67,17 +60,11 @@ public class ISmsImplBase extends ISms.Stub { } @Override - public void sendTextForSubscriberWithSelfPermissions(int subId, String callingPkg, - String destAddr, String scAddr, String text, PendingIntent sentIntent, - PendingIntent deliveryIntent, boolean persistMessage) { - throw new UnsupportedOperationException(); - } - - @Override - public void sendTextForSubscriberWithOptions(int subId, String callingPkg, String destAddr, - String scAddr, String text, PendingIntent sentIntent, - PendingIntent deliveryIntent, boolean persistMessageForNonDefaultSmsApp, - int priority, boolean expectMore, int validityPeriod) { + public void sendTextForSubscriberWithOptions(int subId, String callingPkg, + String callingAttributionTag, String destAddr, String scAddr, String text, + PendingIntent sentIntent, PendingIntent deliveryIntent, + boolean persistMessageForNonDefaultSmsApp, int priority, boolean expectMore, + int validityPeriod) { throw new UnsupportedOperationException(); } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index dcf339c1be2f..81c0895c76c0 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -473,8 +473,8 @@ interface ITelephony { * Send a visual voicemail SMS. Internal use only. * Requires caller to be the default dialer and have SEND_SMS permission */ - void sendVisualVoicemailSmsForSubscriber(in String callingPackage, in int subId, - in String number, in int port, in String text, in PendingIntent sentIntent); + void sendVisualVoicemailSmsForSubscriber(in String callingPackage, String callingAttributeTag, + in int subId, in String number, in int port, in String text, in PendingIntent sentIntent); // Send the special dialer code. The IPC caller must be the current default dialer. void sendDialerSpecialCode(String callingPackageName, String inputCode); diff --git a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java index 9fe1883010b7..b2e8c378d96d 100644 --- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java +++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java @@ -463,7 +463,7 @@ public class NetworkCapabilitiesTest { nc1.setSSID(TEST_SSID); nc2.combineCapabilities(nc1); - assertTrue(TEST_SSID.equals(nc2.getSSID())); + assertTrue(TEST_SSID.equals(nc2.getSsid())); // Because they now have the same SSID, the following call should not throw nc2.combineCapabilities(nc1); @@ -601,12 +601,12 @@ public class NetworkCapabilitiesTest { // from nc2. assertFalse(nc2.hasCapability(NET_CAPABILITY_NOT_ROAMING)); assertTrue(nc2.hasUnwantedCapability(NET_CAPABILITY_NOT_ROAMING)); - assertTrue(TEST_SSID.equals(nc2.getSSID())); + assertTrue(TEST_SSID.equals(nc2.getSsid())); nc1.setSSID(DIFFERENT_TEST_SSID); nc2.set(nc1); assertEquals(nc1, nc2); - assertTrue(DIFFERENT_TEST_SSID.equals(nc2.getSSID())); + assertTrue(DIFFERENT_TEST_SSID.equals(nc2.getSsid())); nc1.setUids(uidRange(10, 13)); nc2.set(nc1); // Overwrites, as opposed to combineCapabilities diff --git a/tests/net/java/android/net/TcpKeepalivePacketDataTest.java b/tests/net/java/android/net/TcpKeepalivePacketDataTest.java index e632aafde70e..cea8c5713a6b 100644 --- a/tests/net/java/android/net/TcpKeepalivePacketDataTest.java +++ b/tests/net/java/android/net/TcpKeepalivePacketDataTest.java @@ -66,10 +66,10 @@ public final class TcpKeepalivePacketDataTest { fail("InvalidPacketException: " + e); } - assertEquals(InetAddress.getByAddress(testInfo.srcAddress), resultData.srcAddress); - assertEquals(InetAddress.getByAddress(testInfo.dstAddress), resultData.dstAddress); - assertEquals(testInfo.srcPort, resultData.srcPort); - assertEquals(testInfo.dstPort, resultData.dstPort); + assertEquals(InetAddress.getByAddress(testInfo.srcAddress), resultData.getSrcAddress()); + assertEquals(InetAddress.getByAddress(testInfo.dstAddress), resultData.getDstAddress()); + assertEquals(testInfo.srcPort, resultData.getSrcPort()); + assertEquals(testInfo.dstPort, resultData.getDstPort()); assertEquals(testInfo.seq, resultData.tcpSeq); assertEquals(testInfo.ack, resultData.tcpAck); assertEquals(testInfo.rcvWnd, resultData.tcpWnd); diff --git a/wifi/java/android/net/wifi/ITxPacketCountListener.aidl b/wifi/java/android/net/wifi/ITxPacketCountListener.aidl index 8606ab5afa9c..9105bd0265cb 100644 --- a/wifi/java/android/net/wifi/ITxPacketCountListener.aidl +++ b/wifi/java/android/net/wifi/ITxPacketCountListener.aidl @@ -18,6 +18,7 @@ package android.net.wifi; /** * Interface for tx packet counter callback. + * @deprecated no longer used, remove once removed from BaseWifiService * @hide */ oneway interface ITxPacketCountListener diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 30a76e463f67..5063ad66e446 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -34,7 +34,6 @@ import android.net.wifi.IScanResultsCallback; import android.net.wifi.ISoftApCallback; import android.net.wifi.ISuggestionConnectionStatusListener; import android.net.wifi.ITrafficStateCallback; -import android.net.wifi.ITxPacketCountListener; import android.net.wifi.IWifiConnectedNetworkScorer; import android.net.wifi.ScanResult; import android.net.wifi.SoftApConfiguration; @@ -246,8 +245,6 @@ interface IWifiManager oneway void forget(int netId, in IBinder binder, in IActionListener listener, int callbackIdentifier); - oneway void getTxPacketCount(String packageName, in IBinder binder, in ITxPacketCountListener listener, int callbackIdentifier); - void registerScanResultsCallback(in IScanResultsCallback callback); void unregisterScanResultsCallback(in IScanResultsCallback callback); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index e1acaf83c227..dfeea9f4b52e 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -2909,28 +2909,6 @@ public class WifiManager { } /** - * Return TX packet counter, for CTS test of WiFi watchdog. - * @param listener is the interface to receive result - * - * @hide for CTS test only - */ - // TODO(b/144036594): add @TestApi - public void getTxPacketCount(@NonNull TxPacketCountListener listener) { - if (listener == null) throw new IllegalArgumentException("listener cannot be null"); - Binder binder = new Binder(); - TxPacketCountListenerProxy listenerProxy = - new TxPacketCountListenerProxy(mLooper, listener); - try { - mService.getTxPacketCount(mContext.getOpPackageName(), binder, listenerProxy, - listener.hashCode()); - } catch (RemoteException e) { - listenerProxy.onFailure(ERROR); - } catch (SecurityException e) { - listenerProxy.onFailure(NOT_AUTHORIZED); - } - } - - /** * Calculates the level of the signal. This should be used any time a signal * is being shown. * @@ -3582,56 +3560,6 @@ public class WifiManager { public abstract void onFailed(int reason); } - /** Interface for callback invocation on a TX packet count poll action {@hide} */ - public interface TxPacketCountListener { - /** - * The operation succeeded - * @param count TX packet counter - */ - public void onSuccess(int count); - /** - * The operation failed - * @param reason The reason for failure could be one of - * {@link #ERROR}, {@link #IN_PROGRESS} or {@link #BUSY} - */ - public void onFailure(int reason); - } - - /** - * Callback proxy for TxPacketCountListener objects. - * - * @hide - */ - private class TxPacketCountListenerProxy extends ITxPacketCountListener.Stub { - private final Handler mHandler; - private final TxPacketCountListener mCallback; - - TxPacketCountListenerProxy(Looper looper, TxPacketCountListener callback) { - mHandler = new Handler(looper); - mCallback = callback; - } - - @Override - public void onSuccess(int count) { - if (mVerboseLoggingEnabled) { - Log.v(TAG, "TxPacketCounterProxy: onSuccess: count=" + count); - } - mHandler.post(() -> { - mCallback.onSuccess(count); - }); - } - - @Override - public void onFailure(int reason) { - if (mVerboseLoggingEnabled) { - Log.v(TAG, "TxPacketCounterProxy: onFailure: reason=" + reason); - } - mHandler.post(() -> { - mCallback.onFailure(reason); - }); - } - } - /** * Base class for soft AP callback. Should be extended by applications and set when calling * {@link WifiManager#registerSoftApCallback(Executor, SoftApCallback)}. diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java index 90d6241aaa55..1398bfeef031 100644 --- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java @@ -30,7 +30,6 @@ import static android.net.wifi.WifiManager.OnWifiActivityEnergyInfoListener; import static android.net.wifi.WifiManager.SAP_START_FAILURE_GENERAL; import static android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS; import static android.net.wifi.WifiManager.STATUS_SUGGESTION_CONNECTION_FAILURE_AUTHENTICATION; -import static android.net.wifi.WifiManager.TxPacketCountListener; import static android.net.wifi.WifiManager.WIFI_AP_STATE_ENABLED; import static android.net.wifi.WifiManager.WIFI_AP_STATE_ENABLING; import static android.net.wifi.WifiManager.WIFI_AP_STATE_FAILED; @@ -2051,32 +2050,6 @@ public class WifiManagerTest { } /** - * Test behavior of {@link WifiManager#getTxPacketCount(TxPacketCountListener)} - */ - @Test - public void testGetTxPacketCount() throws Exception { - TxPacketCountListener externalListener = - mock(TxPacketCountListener.class); - mWifiManager.getTxPacketCount(externalListener); - - ArgumentCaptor<ITxPacketCountListener> binderListenerCaptor = - ArgumentCaptor.forClass(ITxPacketCountListener.class); - verify(mWifiService).getTxPacketCount(anyString(), any(Binder.class), - binderListenerCaptor.capture(), anyInt()); - assertNotNull(binderListenerCaptor.getValue()); - - // Trigger on success. - binderListenerCaptor.getValue().onSuccess(6); - mLooper.dispatchAll(); - verify(externalListener).onSuccess(6); - - // Trigger on failure. - binderListenerCaptor.getValue().onFailure(BUSY); - mLooper.dispatchAll(); - verify(externalListener).onFailure(BUSY); - } - - /** * Verify an IllegalArgumentException is thrown if callback is not provided. */ @Test(expected = IllegalArgumentException.class) |