diff options
362 files changed, 5852 insertions, 3524 deletions
diff --git a/Android.mk b/Android.mk index 915f103fca0c..b8b85baa95ee 100644 --- a/Android.mk +++ b/Android.mk @@ -273,7 +273,6 @@ LOCAL_SRC_FILES += \ core/java/android/security/IKeystoreService.aidl \ core/java/android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl \ core/java/android/service/autofill/IAutoFillService.aidl \ - core/java/android/service/autofill/IAutoFillServiceConnection.aidl \ core/java/android/service/autofill/IFillCallback.aidl \ core/java/android/service/autofill/ISaveCallback.aidl \ core/java/android/service/carrier/ICarrierService.aidl \ diff --git a/api/current.txt b/api/current.txt index 7c532d4b8ffa..ed8381184a95 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8056,7 +8056,6 @@ package android.bluetooth.le { public final class PeriodicAdvertisingParameters implements android.os.Parcelable { method public int describeContents(); - method public boolean getEnable(); method public boolean getIncludeTxPower(); method public int getInterval(); method public void writeToParcel(android.os.Parcel, int); @@ -8066,7 +8065,6 @@ package android.bluetooth.le { public static final class PeriodicAdvertisingParameters.Builder { ctor public PeriodicAdvertisingParameters.Builder(); method public android.bluetooth.le.PeriodicAdvertisingParameters build(); - method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setEnable(boolean); method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setIncludeTxPower(boolean); method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int); } @@ -12821,7 +12819,6 @@ package android.graphics { method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent); method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace); method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent); - method public static android.graphics.ColorSpace.Renderer createRenderer(); method public float[] fromXyz(float, float, float); method public abstract float[] fromXyz(float[]); method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named); @@ -12905,16 +12902,6 @@ package android.graphics { enum_constant public static final android.graphics.ColorSpace.RenderIntent SATURATION; } - public static class ColorSpace.Renderer { - method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, int); - method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, float, float, float, int); - method public android.graphics.ColorSpace.Renderer clip(boolean); - method public android.graphics.Bitmap render(); - method public android.graphics.ColorSpace.Renderer showWhitePoint(boolean); - method public android.graphics.ColorSpace.Renderer size(int); - method public android.graphics.ColorSpace.Renderer uniformChromaticityScale(boolean); - } - public static class ColorSpace.Rgb extends android.graphics.ColorSpace { ctor public ColorSpace.Rgb(java.lang.String, float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator); ctor public ColorSpace.Rgb(java.lang.String, float[], float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator, float, float); @@ -34890,8 +34877,8 @@ package android.provider { field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS"; - field public static final java.lang.String ACTION_MANAGE_EXTERNAL_SOURCES = "android.settings.action.MANAGE_EXTERNAL_SOURCES"; field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION"; + field public static final java.lang.String ACTION_MANAGE_UNKNOWN_APP_SOURCES = "android.settings.action.MANAGE_UNKNOWN_APP_SOURCES"; field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS"; field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; @@ -36986,7 +36973,7 @@ package android.service.autofill { public abstract class AutofillService extends android.app.Service { ctor public AutofillService(); - method public final void disableSelf(); + method public final deprecated void disableSelf(); method public final android.os.IBinder onBind(android.content.Intent); method public void onConnected(); method public void onDisconnected(); @@ -37317,12 +37304,16 @@ package android.service.notification { method public final int getCurrentInterruptionFilter(); method public final int getCurrentListenerHints(); method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking(); + method public final java.util.List<android.app.NotificationChannelGroup> getNotificationChannelGroups(java.lang.String); + method public final java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String); method public final android.service.notification.StatusBarNotification[] getSnoozedNotifications(); method public android.os.IBinder onBind(android.content.Intent); method public void onInterruptionFilterChanged(int); method public void onListenerConnected(); method public void onListenerDisconnected(); method public void onListenerHintsChanged(int); + method public void onNotificationChannelGroupModified(java.lang.String, android.app.NotificationChannelGroup, int); + method public void onNotificationChannelModified(java.lang.String, android.app.NotificationChannel, int); method public void onNotificationPosted(android.service.notification.StatusBarNotification); method public void onNotificationPosted(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap); method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap); @@ -37335,6 +37326,7 @@ package android.service.notification { method public final void requestUnbind(); method public final void setNotificationsShown(java.lang.String[]); method public final void snoozeNotification(java.lang.String, long); + method public final void updateNotificationChannel(java.lang.String, android.app.NotificationChannel); field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4 field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int HINT_HOST_DISABLE_NOTIFICATION_EFFECTS = 2; // 0x2 @@ -37343,6 +37335,9 @@ package android.service.notification { field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3 field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2 field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0 + field public static final int NOTIFICATION_CHANNEL_OR_GROUP_ADDED = 1; // 0x1 + field public static final int NOTIFICATION_CHANNEL_OR_GROUP_DELETED = 3; // 0x3 + field public static final int NOTIFICATION_CHANNEL_OR_GROUP_UPDATED = 2; // 0x2 field public static final int REASON_APP_CANCEL = 8; // 0x8 field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9 field public static final int REASON_CANCEL = 2; // 0x2 @@ -39339,6 +39334,7 @@ package android.telecom { method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String); method public java.lang.String getLine1Number(android.telecom.PhoneAccountHandle); method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle); + method public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts(); method public android.telecom.PhoneAccountHandle getSimCallManager(); method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle); method public boolean handleMmi(java.lang.String); @@ -40067,7 +40063,7 @@ package android.telephony { method public java.util.List<android.telephony.CellInfo> getAllCellInfo(); method public int getCallState(); method public android.os.PersistableBundle getCarrierConfig(); - method public android.telephony.CellLocation getCellLocation(); + method public deprecated android.telephony.CellLocation getCellLocation(); method public int getDataActivity(); method public int getDataNetworkType(); method public int getDataState(); @@ -47732,6 +47728,7 @@ package android.view.autofill { public final class AutofillManager { method public void cancel(); method public void commit(); + method public void disableOwnedAutofillServices(); method public boolean isEnabled(); method public void notifyValueChanged(android.view.View); method public void notifyValueChanged(android.view.View, int, android.view.autofill.AutofillValue); diff --git a/api/system-current.txt b/api/system-current.txt index 99a579321c79..3a9e41015425 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -163,6 +163,7 @@ package android { field public static final java.lang.String MOVE_PACKAGE = "android.permission.MOVE_PACKAGE"; field public static final java.lang.String NFC = "android.permission.NFC"; field public static final java.lang.String NOTIFICATION_DURING_SETUP = "android.permission.NOTIFICATION_DURING_SETUP"; + field public static final java.lang.String NOTIFY_TV_INPUTS = "android.permission.NOTIFY_TV_INPUTS"; field public static final java.lang.String OVERRIDE_WIFI_CONFIG = "android.permission.OVERRIDE_WIFI_CONFIG"; field public static final java.lang.String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS"; field public static final java.lang.String PACKAGE_VERIFICATION_AGENT = "android.permission.PACKAGE_VERIFICATION_AGENT"; @@ -8527,7 +8528,6 @@ package android.bluetooth.le { public final class PeriodicAdvertisingParameters implements android.os.Parcelable { method public int describeContents(); - method public boolean getEnable(); method public boolean getIncludeTxPower(); method public int getInterval(); method public void writeToParcel(android.os.Parcel, int); @@ -8537,7 +8537,6 @@ package android.bluetooth.le { public static final class PeriodicAdvertisingParameters.Builder { ctor public PeriodicAdvertisingParameters.Builder(); method public android.bluetooth.le.PeriodicAdvertisingParameters build(); - method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setEnable(boolean); method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setIncludeTxPower(boolean); method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int); } @@ -13584,7 +13583,6 @@ package android.graphics { method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent); method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace); method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent); - method public static android.graphics.ColorSpace.Renderer createRenderer(); method public float[] fromXyz(float, float, float); method public abstract float[] fromXyz(float[]); method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named); @@ -13668,16 +13666,6 @@ package android.graphics { enum_constant public static final android.graphics.ColorSpace.RenderIntent SATURATION; } - public static class ColorSpace.Renderer { - method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, int); - method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, float, float, float, int); - method public android.graphics.ColorSpace.Renderer clip(boolean); - method public android.graphics.Bitmap render(); - method public android.graphics.ColorSpace.Renderer showWhitePoint(boolean); - method public android.graphics.ColorSpace.Renderer size(int); - method public android.graphics.ColorSpace.Renderer uniformChromaticityScale(boolean); - } - public static class ColorSpace.Rgb extends android.graphics.ColorSpace { ctor public ColorSpace.Rgb(java.lang.String, float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator); ctor public ColorSpace.Rgb(java.lang.String, float[], float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator, float, float); @@ -26982,6 +26970,9 @@ package android.media.tv { method public boolean isParentalControlsEnabled(); method public boolean isRatingBlocked(android.media.tv.TvContentRating); method public boolean isSingleSessionActive(); + method public void notifyPreviewProgramAddedToWatchNext(java.lang.String, long, long); + method public void notifyPreviewProgramBrowsableDisabled(java.lang.String, long); + method public void notifyWatchNextProgramBrowsableDisabled(java.lang.String, long); method public void registerCallback(android.media.tv.TvInputManager.TvInputCallback, android.os.Handler); method public void releaseTvInputHardware(int, android.media.tv.TvInputManager.Hardware); method public void removeBlockedRating(android.media.tv.TvContentRating); @@ -37963,8 +37954,8 @@ package android.provider { field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS"; - field public static final java.lang.String ACTION_MANAGE_EXTERNAL_SOURCES = "android.settings.action.MANAGE_EXTERNAL_SOURCES"; field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION"; + field public static final java.lang.String ACTION_MANAGE_UNKNOWN_APP_SOURCES = "android.settings.action.MANAGE_UNKNOWN_APP_SOURCES"; field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS"; field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; @@ -40082,7 +40073,7 @@ package android.service.autofill { public abstract class AutofillService extends android.app.Service { ctor public AutofillService(); - method public final void disableSelf(); + method public final deprecated void disableSelf(); method public final android.os.IBinder onBind(android.content.Intent); method public void onConnected(); method public void onDisconnected(); @@ -40441,12 +40432,16 @@ package android.service.notification { method public final int getCurrentInterruptionFilter(); method public final int getCurrentListenerHints(); method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking(); + method public final java.util.List<android.app.NotificationChannelGroup> getNotificationChannelGroups(java.lang.String); + method public final java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String); method public final android.service.notification.StatusBarNotification[] getSnoozedNotifications(); method public android.os.IBinder onBind(android.content.Intent); method public void onInterruptionFilterChanged(int); method public void onListenerConnected(); method public void onListenerDisconnected(); method public void onListenerHintsChanged(int); + method public void onNotificationChannelGroupModified(java.lang.String, android.app.NotificationChannelGroup, int); + method public void onNotificationChannelModified(java.lang.String, android.app.NotificationChannel, int); method public void onNotificationPosted(android.service.notification.StatusBarNotification); method public void onNotificationPosted(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap); method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap); @@ -40463,6 +40458,7 @@ package android.service.notification { method public final void snoozeNotification(java.lang.String, java.lang.String); method public final void snoozeNotification(java.lang.String, long); method public void unregisterAsSystemService() throws android.os.RemoteException; + method public final void updateNotificationChannel(java.lang.String, android.app.NotificationChannel); field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4 field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int HINT_HOST_DISABLE_NOTIFICATION_EFFECTS = 2; // 0x2 @@ -40471,6 +40467,9 @@ package android.service.notification { field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3 field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2 field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0 + field public static final int NOTIFICATION_CHANNEL_OR_GROUP_ADDED = 1; // 0x1 + field public static final int NOTIFICATION_CHANNEL_OR_GROUP_DELETED = 3; // 0x3 + field public static final int NOTIFICATION_CHANNEL_OR_GROUP_UPDATED = 2; // 0x2 field public static final int REASON_APP_CANCEL = 8; // 0x8 field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9 field public static final int REASON_CANCEL = 2; // 0x2 @@ -42777,6 +42776,7 @@ package android.telecom { method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle); method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage(); method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String); + method public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts(); method public android.telecom.PhoneAccountHandle getSimCallManager(); method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle); method public boolean handleMmi(java.lang.String); @@ -43552,7 +43552,7 @@ package android.telephony { method public java.lang.String getCdmaMdn(int); method public java.lang.String getCdmaMin(); method public java.lang.String getCdmaMin(int); - method public android.telephony.CellLocation getCellLocation(); + method public deprecated android.telephony.CellLocation getCellLocation(); method public int getCurrentPhoneType(); method public int getCurrentPhoneType(int); method public int getDataActivity(); @@ -43886,8 +43886,8 @@ package android.telephony.gsm { package android.telephony.ims { - public class ImsServiceBase extends android.app.Service { - ctor public ImsServiceBase(); + public class ImsService extends android.app.Service { + ctor public ImsService(); method public android.os.IBinder onBind(android.content.Intent); } @@ -51284,6 +51284,7 @@ package android.view.autofill { public final class AutofillManager { method public void cancel(); method public void commit(); + method public void disableOwnedAutofillServices(); method public boolean isEnabled(); method public void notifyValueChanged(android.view.View); method public void notifyValueChanged(android.view.View, int, android.view.autofill.AutofillValue); diff --git a/api/test-current.txt b/api/test-current.txt index 570855fb0043..f8eefa9b0209 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -8086,7 +8086,6 @@ package android.bluetooth.le { public final class PeriodicAdvertisingParameters implements android.os.Parcelable { method public int describeContents(); - method public boolean getEnable(); method public boolean getIncludeTxPower(); method public int getInterval(); method public void writeToParcel(android.os.Parcel, int); @@ -8096,7 +8095,6 @@ package android.bluetooth.le { public static final class PeriodicAdvertisingParameters.Builder { ctor public PeriodicAdvertisingParameters.Builder(); method public android.bluetooth.le.PeriodicAdvertisingParameters build(); - method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setEnable(boolean); method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setIncludeTxPower(boolean); method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int); } @@ -12871,7 +12869,6 @@ package android.graphics { method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent); method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace); method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent); - method public static android.graphics.ColorSpace.Renderer createRenderer(); method public float[] fromXyz(float, float, float); method public abstract float[] fromXyz(float[]); method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named); @@ -12955,16 +12952,6 @@ package android.graphics { enum_constant public static final android.graphics.ColorSpace.RenderIntent SATURATION; } - public static class ColorSpace.Renderer { - method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, int); - method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, float, float, float, int); - method public android.graphics.ColorSpace.Renderer clip(boolean); - method public android.graphics.Bitmap render(); - method public android.graphics.ColorSpace.Renderer showWhitePoint(boolean); - method public android.graphics.ColorSpace.Renderer size(int); - method public android.graphics.ColorSpace.Renderer uniformChromaticityScale(boolean); - } - public static class ColorSpace.Rgb extends android.graphics.ColorSpace { ctor public ColorSpace.Rgb(java.lang.String, float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator); ctor public ColorSpace.Rgb(java.lang.String, float[], float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator, float, float); @@ -31859,6 +31846,7 @@ package android.os { ctor public UserHandle(android.os.Parcel); method public int describeContents(); method public static int getAppId(int); + method public int getIdentifier(); method public static android.os.UserHandle getUserHandleForUid(int); method public static android.os.UserHandle readFromParcel(android.os.Parcel); method public void writeToParcel(android.os.Parcel, int); @@ -35031,8 +35019,8 @@ package android.provider { field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS"; - field public static final java.lang.String ACTION_MANAGE_EXTERNAL_SOURCES = "android.settings.action.MANAGE_EXTERNAL_SOURCES"; field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION"; + field public static final java.lang.String ACTION_MANAGE_UNKNOWN_APP_SOURCES = "android.settings.action.MANAGE_UNKNOWN_APP_SOURCES"; field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS"; field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; @@ -37144,7 +37132,7 @@ package android.service.autofill { public abstract class AutofillService extends android.app.Service { ctor public AutofillService(); - method public final void disableSelf(); + method public final deprecated void disableSelf(); method public final android.os.IBinder onBind(android.content.Intent); method public void onConnected(); method public void onDisconnected(); @@ -37501,12 +37489,16 @@ package android.service.notification { method public final int getCurrentInterruptionFilter(); method public final int getCurrentListenerHints(); method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking(); + method public final java.util.List<android.app.NotificationChannelGroup> getNotificationChannelGroups(java.lang.String); + method public final java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String); method public final android.service.notification.StatusBarNotification[] getSnoozedNotifications(); method public android.os.IBinder onBind(android.content.Intent); method public void onInterruptionFilterChanged(int); method public void onListenerConnected(); method public void onListenerDisconnected(); method public void onListenerHintsChanged(int); + method public void onNotificationChannelGroupModified(java.lang.String, android.app.NotificationChannelGroup, int); + method public void onNotificationChannelModified(java.lang.String, android.app.NotificationChannel, int); method public void onNotificationPosted(android.service.notification.StatusBarNotification); method public void onNotificationPosted(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap); method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap); @@ -37520,6 +37512,7 @@ package android.service.notification { method public final void setNotificationsShown(java.lang.String[]); method public final void snoozeNotification(java.lang.String, java.lang.String); method public final void snoozeNotification(java.lang.String, long); + method public final void updateNotificationChannel(java.lang.String, android.app.NotificationChannel); field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4 field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int HINT_HOST_DISABLE_NOTIFICATION_EFFECTS = 2; // 0x2 @@ -37528,6 +37521,9 @@ package android.service.notification { field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3 field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2 field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0 + field public static final int NOTIFICATION_CHANNEL_OR_GROUP_ADDED = 1; // 0x1 + field public static final int NOTIFICATION_CHANNEL_OR_GROUP_DELETED = 3; // 0x3 + field public static final int NOTIFICATION_CHANNEL_OR_GROUP_UPDATED = 2; // 0x2 field public static final int REASON_APP_CANCEL = 8; // 0x8 field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9 field public static final int REASON_CANCEL = 2; // 0x2 @@ -39538,6 +39534,7 @@ package android.telecom { method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String); method public java.lang.String getLine1Number(android.telecom.PhoneAccountHandle); method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle); + method public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts(); method public android.telecom.PhoneAccountHandle getSimCallManager(); method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle); method public boolean handleMmi(java.lang.String); @@ -40266,7 +40263,7 @@ package android.telephony { method public java.util.List<android.telephony.CellInfo> getAllCellInfo(); method public int getCallState(); method public android.os.PersistableBundle getCarrierConfig(); - method public android.telephony.CellLocation getCellLocation(); + method public deprecated android.telephony.CellLocation getCellLocation(); method public int getDataActivity(); method public int getDataNetworkType(); method public int getDataState(); @@ -48114,6 +48111,7 @@ package android.view.autofill { public final class AutofillManager { method public void cancel(); method public void commit(); + method public void disableOwnedAutofillServices(); method public boolean isEnabled(); method public void notifyValueChanged(android.view.View); method public void notifyValueChanged(android.view.View, int, android.view.autofill.AutofillValue); diff --git a/cmds/svc/src/com/android/commands/svc/PowerCommand.java b/cmds/svc/src/com/android/commands/svc/PowerCommand.java index 6ce29cb24bc6..920a52dad641 100644 --- a/cmds/svc/src/com/android/commands/svc/PowerCommand.java +++ b/cmds/svc/src/com/android/commands/svc/PowerCommand.java @@ -22,6 +22,7 @@ import android.os.IPowerManager; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; +import android.os.SystemProperties; public class PowerCommand extends Svc.Command { public PowerCommand() { @@ -87,7 +88,7 @@ public class PowerCommand extends Svc.Command { // no confirm, wait till device is rebooted pm.reboot(false, mode, true); } catch (RemoteException e) { - System.err.println("Failed to reboot."); + maybeLogRemoteException("Failed to reboot."); } return; } else if ("shutdown".equals(args[1])) { @@ -95,7 +96,7 @@ public class PowerCommand extends Svc.Command { // no confirm, wait till device is off pm.shutdown(false, null, true); } catch (RemoteException e) { - System.err.println("Failed to shutdown."); + maybeLogRemoteException("Failed to shutdown."); } return; } @@ -103,4 +104,14 @@ public class PowerCommand extends Svc.Command { } System.err.println(longHelp()); } + + // Check if remote exception is benign during shutdown. Pm can be killed + // before system server during shutdown, so remote exception can be ignored + // if it is already in shutdown flow. + private void maybeLogRemoteException(String msg) { + String powerProp = SystemProperties.get("sys.powerctl"); + if (powerProp.isEmpty()) { + System.err.println(msg); + } + } } diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index 2a2fdbd272d3..80522886c78f 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -364,11 +364,19 @@ public class AccountManager { "android.accounts.key_legacy_visible"; /** - * Key to set visibility for applications targeting API level below - * {@link android.os.Build.VERSION_CODES#O} with - * {@link android.Manifest.permission#GET_ACCOUNTS} permission, or applications with any - * targeting API level with the same signature as authenticator. See - * {@link #getAccountVisibility}. If the value was not set by authenticator + * Key to set visibility for applications which satisfy one of the following conditions: + * <ul> + * <li>Target API level below {@link android.os.Build.VERSION_CODES#O} and have + * deprecated {@link android.Manifest.permission#GET_ACCOUNTS} permission. + * </li> + * <li> Have {@link android.Manifest.permission#GET_ACCOUNTS_PRIVILEGED} permission. </li> + * <li> Have the same signature as authenticator. </li> + * <li> Have {@link android.Manifest.permission#READ_CONTACTS} permission and + * account type may be associated with contacts data - (verified by + * {@link android.Manifest.permission#WRITE_CONTACTS} permission check for the authenticator). + * </li> + * </ul> + * See {@link #getAccountVisibility}. If the value was not set by authenticator * {@link #VISIBILITY_USER_MANAGED_VISIBLE} is used. */ public static final String PACKAGE_NAME_KEY_LEGACY_NOT_VISIBLE = diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 42192356ed10..06291abb69d4 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -18,6 +18,7 @@ package android.app; import android.metrics.LogMaker; import android.graphics.Rect; +import android.view.ViewRootImpl.ActivityConfigCallback; import android.view.autofill.AutofillId; import android.view.autofill.AutofillManager; import android.view.autofill.AutofillPopupWindow; @@ -4234,14 +4235,25 @@ public class Activity extends ContextThemeWrapper mTaskDescription.setPrimaryColor(colorPrimary); } } - // For dev-preview only. - if (mTaskDescription.getBackgroundColor() == 0) { - int colorBackground = a.getColor( - com.android.internal.R.styleable.ActivityTaskDescription_colorBackground, 0); - if (colorBackground != 0 && Color.alpha(colorBackground) == 0xFF) { - mTaskDescription.setBackgroundColor(colorBackground); - } + + int colorBackground = a.getColor( + com.android.internal.R.styleable.ActivityTaskDescription_colorBackground, 0); + if (colorBackground != 0 && Color.alpha(colorBackground) == 0xFF) { + mTaskDescription.setBackgroundColor(colorBackground); + } + + final int statusBarColor = a.getColor( + com.android.internal.R.styleable.ActivityTaskDescription_statusBarColor, 0); + if (statusBarColor != 0) { + mTaskDescription.setStatusBarColor(statusBarColor); } + + final int navigationBarColor = a.getColor( + com.android.internal.R.styleable.ActivityTaskDescription_navigationBarColor, 0); + if (navigationBarColor != 0) { + mTaskDescription.setNavigationBarColor(navigationBarColor); + } + a.recycle(); setTaskDescription(mTaskDescription); } @@ -6835,12 +6847,12 @@ public class Activity extends ContextThemeWrapper CharSequence title, Activity parent, String id, NonConfigurationInstances lastNonConfigurationInstances, Configuration config, String referrer, IVoiceInteractor voiceInteractor, - Window window) { + Window window, ActivityConfigCallback activityConfigCallback) { attachBaseContext(context); mFragments.attachHost(null /*parent*/); - mWindow = new PhoneWindow(this, window); + mWindow = new PhoneWindow(this, window, activityConfigCallback); mWindow.setWindowControllerCallback(this); mWindow.setCallback(this); mWindow.setOnWindowDismissedCallback(this); diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 4004bd6686b1..aede1bb67f80 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -1145,6 +1145,8 @@ public class ActivityManager { private String mIconFilename; private int mColorPrimary; private int mColorBackground; + private int mStatusBarColor; + private int mNavigationBarColor; /** * Creates the TaskDescription to the specified values. @@ -1155,7 +1157,7 @@ public class ActivityManager { * opaque. */ public TaskDescription(String label, Bitmap icon, int colorPrimary) { - this(label, icon, null, colorPrimary, 0); + this(label, icon, null, colorPrimary, 0, 0, 0); if ((colorPrimary != 0) && (Color.alpha(colorPrimary) != 255)) { throw new RuntimeException("A TaskDescription's primary color should be opaque"); } @@ -1168,7 +1170,7 @@ public class ActivityManager { * @param icon An icon that represents the current state of this activity. */ public TaskDescription(String label, Bitmap icon) { - this(label, icon, null, 0, 0); + this(label, icon, null, 0, 0, 0, 0); } /** @@ -1177,24 +1179,26 @@ public class ActivityManager { * @param label A label and description of the current state of this activity. */ public TaskDescription(String label) { - this(label, null, null, 0, 0); + this(label, null, null, 0, 0, 0, 0); } /** * Creates an empty TaskDescription. */ public TaskDescription() { - this(null, null, null, 0, 0); + this(null, null, null, 0, 0, 0, 0); } /** @hide */ public TaskDescription(String label, Bitmap icon, String iconFilename, int colorPrimary, - int colorBackground) { + int colorBackground, int statusBarColor, int navigationBarColor) { mLabel = label; mIcon = icon; mIconFilename = iconFilename; mColorPrimary = colorPrimary; mColorBackground = colorBackground; + mStatusBarColor = statusBarColor; + mNavigationBarColor = navigationBarColor; } /** @@ -1214,6 +1218,8 @@ public class ActivityManager { mIconFilename = other.mIconFilename; mColorPrimary = other.mColorPrimary; mColorBackground = other.mColorBackground; + mStatusBarColor = other.mStatusBarColor; + mNavigationBarColor = other.mNavigationBarColor; } private TaskDescription(Parcel source) { @@ -1253,6 +1259,20 @@ public class ActivityManager { } /** + * @hide + */ + public void setStatusBarColor(int statusBarColor) { + mStatusBarColor = statusBarColor; + } + + /** + * @hide + */ + public void setNavigationBarColor(int navigationBarColor) { + mNavigationBarColor = navigationBarColor; + } + + /** * Sets the icon for this task description. * @hide */ @@ -1325,6 +1345,20 @@ public class ActivityManager { return mColorBackground; } + /** + * @hide + */ + public int getStatusBarColor() { + return mStatusBarColor; + } + + /** + * @hide + */ + public int getNavigationBarColor() { + return mNavigationBarColor; + } + /** @hide */ public void saveToXml(XmlSerializer out) throws IOException { if (mLabel != null) { @@ -1377,6 +1411,8 @@ public class ActivityManager { } dest.writeInt(mColorPrimary); dest.writeInt(mColorBackground); + dest.writeInt(mStatusBarColor); + dest.writeInt(mNavigationBarColor); if (mIconFilename == null) { dest.writeInt(0); } else { @@ -1390,6 +1426,8 @@ public class ActivityManager { mIcon = source.readInt() > 0 ? Bitmap.CREATOR.createFromParcel(source) : null; mColorPrimary = source.readInt(); mColorBackground = source.readInt(); + mStatusBarColor = source.readInt(); + mNavigationBarColor = source.readInt(); mIconFilename = source.readInt() > 0 ? source.readString() : null; } @@ -1407,7 +1445,9 @@ public class ActivityManager { public String toString() { return "TaskDescription Label: " + mLabel + " Icon: " + mIcon + " IconFilename: " + mIconFilename + " colorPrimary: " + mColorPrimary + - " colorBackground: " + mColorBackground; + " colorBackground: " + mColorBackground + + " statusBarColor: " + mColorBackground + + " navigationBarColor: " + mNavigationBarColor; } } diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 182982a638f1..5022d7d9622b 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -2199,7 +2199,7 @@ public final class ActivityThread { public ContextImpl getSystemUiContext() { synchronized (this) { if (mSystemUiContext == null) { - mSystemUiContext = ContextImpl.createSystemUiContext(this); + mSystemUiContext = ContextImpl.createSystemUiContext(getSystemContext()); } return mSystemUiContext; } @@ -2748,7 +2748,7 @@ public final class ActivityThread { activity.attach(appContext, this, getInstrumentation(), r.token, r.ident, app, r.intent, r.activityInfo, title, r.parent, r.embeddedID, r.lastNonConfigurationInstances, config, - r.referrer, r.voiceInteractor, window); + r.referrer, r.voiceInteractor, window, r.configCallback); if (customIntent != null) { activity.mIntent = customIntent; @@ -3783,12 +3783,6 @@ public final class ActivityThread { if (r.activity.mVisibleFromClient) { r.activity.makeVisible(); } - final ViewRootImpl viewRoot = r.activity.mDecor.getViewRootImpl(); - if (viewRoot != null) { - // TODO: Figure out the best place to set the callback. - // This looks like a place where decor view is already initialized. - viewRoot.setActivityConfigCallback(r.configCallback); - } } if (!r.onlyLocalRequest) { @@ -5156,13 +5150,8 @@ public final class ActivityThread { if (DEBUG_CONFIGURATION) Slog.w(TAG, "Not found target activity to report to: " + r); return; } - final boolean movedToDifferentDisplay = displayId != INVALID_DISPLAY; - if (movedToDifferentDisplay) { - if (r.activity.getDisplay().getDisplayId() == displayId) { - throw new IllegalArgumentException("Activity is already on the target display: " - + displayId); - } - } + final boolean movedToDifferentDisplay = displayId != INVALID_DISPLAY + && displayId != r.activity.getDisplay().getDisplayId(); // Perform updates. r.overrideConfig = data.overrideConfig; diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 75f9d671fbad..6cc8a14ea2f9 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -2220,11 +2220,12 @@ class ContextImpl extends Context { /** * System Context to be used for UI. This Context has resources that can be themed. + * Make sure that the created system UI context shares the same LoadedApk as the system context. */ - static ContextImpl createSystemUiContext(ActivityThread mainThread) { - LoadedApk packageInfo = new LoadedApk(mainThread); - ContextImpl context = new ContextImpl(null, mainThread, packageInfo, null, null, null, 0, - null); + static ContextImpl createSystemUiContext(ContextImpl systemContext) { + final LoadedApk packageInfo = systemContext.mPackageInfo; + ContextImpl context = new ContextImpl(null, systemContext.mMainThread, packageInfo, null, + null, null, 0, null); context.setResources(createResources(null, packageInfo, null, Display.DEFAULT_DISPLAY, null, packageInfo.getCompatibilityInfo())); return context; diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index 61dacefd3f51..f4e8f3f5687e 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -101,6 +101,10 @@ interface INotificationManager void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim); void setInterruptionFilter(String pkg, int interruptionFilter); + void updateNotificationChannelFromPrivilegedListener(in INotificationListener token, String pkg, in NotificationChannel channel); + ParceledListSlice getNotificationChannelsFromPrivilegedListener(in INotificationListener token, String pkg); + ParceledListSlice getNotificationChannelGroupsFromPrivilegedListener(in INotificationListener token, String pkg); + void applyEnqueuedAdjustmentFromAssistant(in INotificationListener token, in Adjustment adjustment); void applyAdjustmentFromAssistant(in INotificationListener token, in Adjustment adjustment); void applyAdjustmentsFromAssistant(in INotificationListener token, in List<Adjustment> adjustments); diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index f9a3ea74a40f..d546f2771df8 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1146,10 +1146,11 @@ public class Instrumentation { IllegalAccessException { Activity activity = (Activity)clazz.newInstance(); ActivityThread aThread = null; - activity.attach(context, aThread, this, token, 0, application, intent, + activity.attach(context, aThread, this, token, 0 /* ident */, application, intent, info, title, parent, id, (Activity.NonConfigurationInstances)lastNonConfigurationInstance, - new Configuration(), null, null, null); + new Configuration(), null /* referrer */, null /* voiceInteractor */, + null /* window */, null /* activityConfigCallback */); return activity; } diff --git a/core/java/android/bluetooth/le/AdvertisingSetParameters.java b/core/java/android/bluetooth/le/AdvertisingSetParameters.java index f5c1f08562f6..4e9fac3ee22b 100644 --- a/core/java/android/bluetooth/le/AdvertisingSetParameters.java +++ b/core/java/android/bluetooth/le/AdvertisingSetParameters.java @@ -241,8 +241,8 @@ public final class AdvertisingSetParameters implements Parcelable { */ public static final class Builder { - private boolean connectable = true; - private boolean scannable = true; + private boolean connectable = false; + private boolean scannable = false; private boolean isLegacy = false; private boolean isAnonymous = false; private boolean includeTxPower = false; @@ -254,8 +254,8 @@ public final class AdvertisingSetParameters implements Parcelable { /** * Set whether the advertisement type should be connectable or * non-connectable. - * Legacy advertisements can be both connectable and scannable. Other - * advertisements can be connectable only if not scannable. + * Legacy advertisements can be both connectable and scannable. Non-legacy + * advertisements can be only scannable or only connectable. * @param connectable Controls whether the advertisment type will be * connectable (true) or non-connectable (false). */ @@ -265,9 +265,9 @@ public final class AdvertisingSetParameters implements Parcelable { } /** - * Set whether the advertisement type should be scannable - * Legacy advertisements can be both connectable and scannable. Other - * advertisements can be scannable only if not connectable. + * Set whether the advertisement type should be scannable. + * Legacy advertisements can be both connectable and scannable. Non-legacy + * advertisements can be only scannable or only connectable. * @param scannable Controls whether the advertisment type will be * scannable (true) or non-scannable (false). */ diff --git a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java index a9deb752e081..73fc1339afa6 100644 --- a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java +++ b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java @@ -386,7 +386,7 @@ public final class BluetoothLeAdvertiser { } boolean supportPeriodic = mBluetoothAdapter.isLePeriodicAdvertisingSupported(); - if (periodicParameters != null && periodicParameters.getEnable() && !supportPeriodic) { + if (periodicParameters != null && !supportPeriodic) { throw new IllegalArgumentException( "Controller does not support LE Periodic Advertising"); } diff --git a/core/java/android/bluetooth/le/PeriodicAdvertisingParameters.java b/core/java/android/bluetooth/le/PeriodicAdvertisingParameters.java index 149540ce0dab..8891d2e842d6 100644 --- a/core/java/android/bluetooth/le/PeriodicAdvertisingParameters.java +++ b/core/java/android/bluetooth/le/PeriodicAdvertisingParameters.java @@ -29,28 +29,20 @@ public final class PeriodicAdvertisingParameters implements Parcelable { private static final int INTERVAL_MAX = 80; private static final int INTERVAL_MIN = 65519; - private final boolean enable; private final boolean includeTxPower; private final int interval; - private PeriodicAdvertisingParameters(boolean enable, boolean includeTxPower, int interval) { - this.enable = enable; + private PeriodicAdvertisingParameters(boolean includeTxPower, int interval) { this.includeTxPower = includeTxPower; this.interval = interval; } private PeriodicAdvertisingParameters(Parcel in) { - enable = in.readInt() != 0 ? true : false; includeTxPower = in.readInt() != 0 ? true : false; interval = in.readInt(); } /** - * Returns whether the periodic advertising shall be enabled. - */ - public boolean getEnable() { return enable; } - - /** * Returns whether the TX Power will be included. */ public boolean getIncludeTxPower() { return includeTxPower; } @@ -68,7 +60,6 @@ public final class PeriodicAdvertisingParameters implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(enable ? 1 : 0); dest.writeInt(includeTxPower ? 1 : 0); dest.writeInt(interval); } @@ -89,18 +80,9 @@ public final class PeriodicAdvertisingParameters implements Parcelable { public static final class Builder { private boolean includeTxPower = false; - private boolean enable = false; private int interval = INTERVAL_MAX; /** - * Set whether the Periodic Advertising should be enabled for this set. - */ - public Builder setEnable(boolean enable) { - this.enable = enable; - return this; - } - - /** * Whether the transmission power level should be included in the periodic * packet. */ @@ -128,7 +110,7 @@ public final class PeriodicAdvertisingParameters implements Parcelable { * Build the {@link AdvertisingSetParameters} object. */ public PeriodicAdvertisingParameters build() { - return new PeriodicAdvertisingParameters(enable, includeTxPower, interval); + return new PeriodicAdvertisingParameters(includeTxPower, interval); } } } diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 5415eb565b90..b382cef39145 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3216,13 +3216,6 @@ public class Intent implements Parcelable, Cloneable { "android.intent.action.MEDIA_RESOURCE_GRANTED"; /** - * Broadcast Action: An overlay package has been installed. The data - * contains the name of the added overlay package. - * @hide - */ - public static final String ACTION_OVERLAY_ADDED = "android.intent.action.OVERLAY_ADDED"; - - /** * Broadcast Action: An overlay package has changed. The data contains the * name of the overlay package which has changed. This is broadcast on all * changes to the OverlayInfo returned by {@link @@ -3234,22 +3227,6 @@ public class Intent implements Parcelable, Cloneable { public static final String ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED"; /** - * Broadcast Action: An overlay package has been removed. The data contains - * the name of the overlay package which has been removed. - * @hide - */ - public static final String ACTION_OVERLAY_REMOVED = "android.intent.action.OVERLAY_REMOVED"; - - /** - * Broadcast Action: The order of a package's list of overlay packages has - * changed. The data contains the package name of the overlay package that - * had its position in the list adjusted. - * @hide - */ - public static final String - ACTION_OVERLAY_PRIORITY_CHANGED = "android.intent.action.OVERLAY_PRIORITY_CHANGED"; - - /** * Activity Action: Allow the user to select and return one or more existing * documents. When invoked, the system will display the various * {@link DocumentsProvider} instances installed on the device, letting the diff --git a/core/java/android/content/pm/PackageInfo.java b/core/java/android/content/pm/PackageInfo.java index 8ff2f352a362..7f1198541668 100644 --- a/core/java/android/content/pm/PackageInfo.java +++ b/core/java/android/content/pm/PackageInfo.java @@ -272,6 +272,9 @@ public class PackageInfo implements Parcelable { public String overlayTarget; /** @hide */ + public int overlayPriority; + + /** @hide */ public boolean isStaticOverlay; public PackageInfo() { @@ -327,6 +330,7 @@ public class PackageInfo implements Parcelable { dest.writeString(requiredAccountType); dest.writeString(overlayTarget); dest.writeInt(isStaticOverlay ? 1 : 0); + dest.writeInt(overlayPriority); } public static final Parcelable.Creator<PackageInfo> CREATOR @@ -377,6 +381,7 @@ public class PackageInfo implements Parcelable { requiredAccountType = source.readString(); overlayTarget = source.readString(); isStaticOverlay = source.readInt() != 0; + overlayPriority = source.readInt(); // The component lists were flattened with the redundant ApplicationInfo // instances omitted. Distribute the canonical one here as appropriate. diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index fa3e4e98b551..4bd44c15291a 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -6247,7 +6247,7 @@ public abstract class PackageManager { * @return true if the calling package is trusted by the user to request install packages on * the device, false otherwise. * @see {@link android.content.Intent#ACTION_INSTALL_PACKAGE} - * @see {@link android.provider.Settings#ACTION_MANAGE_EXTERNAL_SOURCES} + * @see {@link android.provider.Settings#ACTION_MANAGE_UNKNOWN_APP_SOURCES} */ public abstract boolean canRequestPackageInstalls(); diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index d44d0dcf00f2..e64b2a56a277 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -629,6 +629,7 @@ public class PackageParser { pi.restrictedAccountType = p.mRestrictedAccountType; pi.requiredAccountType = p.mRequiredAccountType; pi.overlayTarget = p.mOverlayTarget; + pi.overlayPriority = p.mOverlayPriority; pi.isStaticOverlay = p.mIsStaticOverlay; pi.firstInstallTime = firstInstallTime; pi.lastUpdateTime = lastUpdateTime; @@ -2104,6 +2105,9 @@ public class PackageParser { com.android.internal.R.styleable.AndroidManifestResourceOverlay); pkg.mOverlayTarget = sa.getString( com.android.internal.R.styleable.AndroidManifestResourceOverlay_targetPackage); + pkg.mOverlayPriority = sa.getInt( + com.android.internal.R.styleable.AndroidManifestResourceOverlay_priority, + 0); pkg.mIsStaticOverlay = sa.getBoolean( com.android.internal.R.styleable.AndroidManifestResourceOverlay_isStatic, false); @@ -2114,6 +2118,12 @@ public class PackageParser { mParseError = PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED; return null; } + if (pkg.mOverlayPriority < 0 || pkg.mOverlayPriority > 9999) { + outError[0] = "<overlay> priority must be between 0 and 9999"; + mParseError = + PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED; + return null; + } if (pkg.mIsStaticOverlay) { // TODO(b/35742444): Need to support selection method based on a package name. } @@ -5681,6 +5691,7 @@ public class PackageParser { public String mRequiredAccountType; public String mOverlayTarget; + public int mOverlayPriority; public boolean mIsStaticOverlay; public boolean mTrustedOverlay; @@ -6163,6 +6174,7 @@ public class PackageParser { mRestrictedAccountType = dest.readString(); mRequiredAccountType = dest.readString(); mOverlayTarget = dest.readString(); + mOverlayPriority = dest.readInt(); mIsStaticOverlay = (dest.readInt() == 1); mTrustedOverlay = (dest.readInt() == 1); mSigningKeys = (ArraySet<PublicKey>) dest.readArraySet(boot); @@ -6280,6 +6292,7 @@ public class PackageParser { dest.writeString(mRestrictedAccountType); dest.writeString(mRequiredAccountType); dest.writeString(mOverlayTarget); + dest.writeInt(mOverlayPriority); dest.writeInt(mIsStaticOverlay ? 1 : 0); dest.writeInt(mTrustedOverlay ? 1 : 0); dest.writeArraySet(mSigningKeys); diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index 4aec8aea24c5..6a4fef2b67e8 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -344,6 +344,7 @@ public final class UserHandle implements Parcelable { * @hide */ @SystemApi + @TestApi public @UserIdInt int getIdentifier() { return mHandle; } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index cac643fc8b5f..287ab9ecdf51 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -302,8 +302,8 @@ public final class Settings { * Output: Nothing. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_MANAGE_EXTERNAL_SOURCES = - "android.settings.action.MANAGE_EXTERNAL_SOURCES"; + public static final String ACTION_MANAGE_UNKNOWN_APP_SOURCES = + "android.settings.action.MANAGE_UNKNOWN_APP_SOURCES"; /** * Activity Action: Show trusted credentials settings, opening to the user tab, diff --git a/core/java/android/service/autofill/AutofillService.java b/core/java/android/service/autofill/AutofillService.java index c82b9ebb6b39..a4d3fb299734 100644 --- a/core/java/android/service/autofill/AutofillService.java +++ b/core/java/android/service/autofill/AutofillService.java @@ -94,9 +94,9 @@ public abstract class AutofillService extends Service { private final IAutoFillService mInterface = new IAutoFillService.Stub() { @Override - public void onInit(IAutoFillServiceConnection connection) { - if (connection != null) { - mHandlerCaller.obtainMessageO(MSG_CONNECT, connection).sendToTarget(); + public void onConnectedStateChanged(boolean connected) { + if (connected) { + mHandlerCaller.obtainMessage(MSG_CONNECT).sendToTarget(); } else { mHandlerCaller.obtainMessage(MSG_DISCONNECT).sendToTarget(); } @@ -127,7 +127,6 @@ public abstract class AutofillService extends Service { private final HandlerCaller.Callback mHandlerCallback = (msg) -> { switch (msg.what) { case MSG_CONNECT: { - mConnection = (IAutoFillServiceConnection) msg.obj; onConnected(); break; } case MSG_ON_FILL_REQUEST: { @@ -152,7 +151,6 @@ public abstract class AutofillService extends Service { break; } case MSG_DISCONNECT: { onDisconnected(); - mConnection = null; break; } default: { Log.w(TAG, "MyCallbacks received invalid message type: " + msg); @@ -162,8 +160,6 @@ public abstract class AutofillService extends Service { private HandlerCaller mHandlerCaller; - private IAutoFillServiceConnection mConnection; - /** * {@inheritDoc} * @@ -246,21 +242,9 @@ public abstract class AutofillService extends Service { public void onDisconnected() { } - /** - * Disables the service. After calling this method, the service will - * be disabled and settings will show that it is turned off. - * - * <p>You should call this method only after a call to {@link #onConnected()} - * and before the corresponding call to {@link #onDisconnected()}. In other words - * you can disable your service only while the system is connected to it.</p> - */ + @Deprecated public final void disableSelf() { - if (mConnection != null) { - try { - mConnection.disableSelf(); - } catch (RemoteException re) { - throw re.rethrowFromSystemServer(); - } - } + // TODO(b/33197203): Remove when GCore has migrated off this API + getSystemService(AutofillManager.class).disableOwnedAutofillServices(); } } diff --git a/core/java/android/service/autofill/IAutoFillService.aidl b/core/java/android/service/autofill/IAutoFillService.aidl index 9f296c60c6d4..a8d86ca1cc79 100644 --- a/core/java/android/service/autofill/IAutoFillService.aidl +++ b/core/java/android/service/autofill/IAutoFillService.aidl @@ -18,7 +18,6 @@ package android.service.autofill; import android.app.assist.AssistStructure; import android.os.Bundle; -import android.service.autofill.IAutoFillServiceConnection; import android.service.autofill.IFillCallback; import android.service.autofill.ISaveCallback; import com.android.internal.os.IResultReceiver; @@ -29,7 +28,7 @@ import com.android.internal.os.IResultReceiver; * @hide */ oneway interface IAutoFillService { - void onInit(in IAutoFillServiceConnection connection); + void onConnectedStateChanged(boolean connected); void onFillRequest(in AssistStructure structure, in Bundle extras, in IFillCallback callback, int flags); void onSaveRequest(in AssistStructure structure, in Bundle extras, diff --git a/core/java/android/service/autofill/IAutoFillServiceConnection.aidl b/core/java/android/service/autofill/IAutoFillServiceConnection.aidl deleted file mode 100644 index cf73a10ca58c..000000000000 --- a/core/java/android/service/autofill/IAutoFillServiceConnection.aidl +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.service.autofill; - -/** - * Interface from an auto fill service to the system. - * - * @hide - */ -interface IAutoFillServiceConnection { - void disableSelf(); -} diff --git a/core/java/android/service/notification/INotificationListener.aidl b/core/java/android/service/notification/INotificationListener.aidl index b26e32835aa1..dc1a70d74d7f 100644 --- a/core/java/android/service/notification/INotificationListener.aidl +++ b/core/java/android/service/notification/INotificationListener.aidl @@ -16,6 +16,8 @@ package android.service.notification; +import android.app.NotificationChannel; +import android.app.NotificationChannelGroup; import android.service.notification.IStatusBarNotificationHolder; import android.service.notification.StatusBarNotification; import android.service.notification.NotificationRankingUpdate; @@ -33,6 +35,10 @@ oneway interface INotificationListener void onListenerHintsChanged(int hints); void onInterruptionFilterChanged(int interruptionFilter); + // companion device managers only + void onNotificationChannelModification(String pkgName, in NotificationChannel channel, int modificationType); + void onNotificationChannelGroupModification(String pkgName, in NotificationChannelGroup group, int modificationType); + // rankers only void onNotificationEnqueued(in IStatusBarNotificationHolder notificationHolder); void onNotificationSnoozedUntilContext(in IStatusBarNotificationHolder notificationHolder, String snoozeCriterionId); diff --git a/core/java/android/service/notification/NotificationAssistantService.java b/core/java/android/service/notification/NotificationAssistantService.java index 6ec9d69583e3..d94017cdb2bf 100644 --- a/core/java/android/service/notification/NotificationAssistantService.java +++ b/core/java/android/service/notification/NotificationAssistantService.java @@ -138,7 +138,6 @@ public abstract class NotificationAssistantService extends NotificationListenerS } } - private class NotificationAssistantServiceWrapper extends NotificationListenerWrapper { @Override public void onNotificationEnqueued(IStatusBarNotificationHolder sbnHolder) { diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index f55c7cfb4ba5..4833be335c88 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -16,8 +16,13 @@ package android.service.notification; +import android.Manifest; +import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.TestApi; import android.app.NotificationChannel; +import android.app.NotificationChannelGroup; +import android.companion.CompanionDeviceManager; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -51,6 +56,8 @@ import android.widget.RemoteViews; import com.android.internal.annotations.GuardedBy; import com.android.internal.os.SomeArgs; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -59,7 +66,7 @@ import java.util.List; * A service that receives calls from the system when new notifications are * posted or removed, or their ranking changed. * <p>To extend this class, you must declare the service in your manifest file with - * the {@link android.Manifest.permission#BIND_NOTIFICATION_LISTENER_SERVICE} permission + * the {@link Manifest.permission#BIND_NOTIFICATION_LISTENER_SERVICE} permission * and include an intent filter with the {@link #SERVICE_INTERFACE} action. For example:</p> * <pre> * <service android:name=".NotificationListener" @@ -215,6 +222,37 @@ public abstract class NotificationListenerService extends Service { @SystemApi public static final int TRIM_LIGHT = 1; + + /** @hide */ + @IntDef({NOTIFICATION_CHANNEL_OR_GROUP_ADDED, NOTIFICATION_CHANNEL_OR_GROUP_UPDATED, + NOTIFICATION_CHANNEL_OR_GROUP_DELETED}) + @Retention(RetentionPolicy.SOURCE) + public @interface ChannelOrGroupModificationTypes {} + + /** + * Channel or group modification reason provided to + * {@link #onNotificationChannelModified(String, NotificationChannel, int)} or + * {@link #onNotificationChannelGroupModified(String, NotificationChannelGroup, int)}- the + * provided object was created. + */ + public static final int NOTIFICATION_CHANNEL_OR_GROUP_ADDED = 1; + + /** + * Channel or group modification reason provided to + * {@link #onNotificationChannelModified(String, NotificationChannel, int)} or + * {@link #onNotificationChannelGroupModified(String, NotificationChannelGroup, int)}- the + * provided object was updated. + */ + public static final int NOTIFICATION_CHANNEL_OR_GROUP_UPDATED = 2; + + /** + * Channel or group modification reason provided to + * {@link #onNotificationChannelModified(String, NotificationChannel, int)} or + * {@link #onNotificationChannelGroupModified(String, NotificationChannelGroup, int)}- the + * provided object was deleted. + */ + public static final int NOTIFICATION_CHANNEL_OR_GROUP_DELETED = 3; + private final Object mLock = new Object(); private Handler mHandler; @@ -388,6 +426,40 @@ public abstract class NotificationListenerService extends Service { } /** + * Implement this method to learn about notification channel modifications. + * + * <p>The caller must have {@link CompanionDeviceManager#getAssociations() an associated + * device} in order to receive this callback. + * + * @param pkg The package the channel belongs to. + * @param channel The channel that has changed. + * @param modificationType One of {@link #NOTIFICATION_CHANNEL_OR_GROUP_ADDED}, + * {@link #NOTIFICATION_CHANNEL_OR_GROUP_UPDATED}, + * {@link #NOTIFICATION_CHANNEL_OR_GROUP_DELETED}. + */ + public void onNotificationChannelModified(String pkg, NotificationChannel channel, + @ChannelOrGroupModificationTypes int modificationType) { + // optional + } + + /** + * Implement this method to learn about notification channel group modifications. + * + * <p>The caller must have {@link CompanionDeviceManager#getAssociations() an associated + * device} in order to receive this callback. + * + * @param pkg The package the group belongs to. + * @param group The group that has changed. + * @param modificationType One of {@link #NOTIFICATION_CHANNEL_OR_GROUP_ADDED}, + * {@link #NOTIFICATION_CHANNEL_OR_GROUP_UPDATED}, + * {@link #NOTIFICATION_CHANNEL_OR_GROUP_DELETED}. + */ + public void onNotificationChannelGroupModified(String pkg, NotificationChannelGroup group, + @ChannelOrGroupModificationTypes int modificationType) { + // optional + } + + /** * Implement this method to be notified when the * {@link #getCurrentInterruptionFilter() interruption filter} changed. * @@ -587,6 +659,69 @@ public abstract class NotificationListenerService extends Service { } } + + /** + * Updates a notification channel for a given package. This should only be used to reflect + * changes a user has made to the channel via the listener's user interface. + * + * <p>The caller must have {@link CompanionDeviceManager#getAssociations() an associated + * device} in order to use this method. + * + * @param pkg The package the channel belongs to. + * @param channel the channel to update. + */ + public final void updateNotificationChannel(@NonNull String pkg, + @NonNull NotificationChannel channel) { + if (!isBound()) return; + try { + getNotificationInterface().updateNotificationChannelFromPrivilegedListener( + mWrapper, pkg, channel); + } catch (RemoteException e) { + Log.v(TAG, "Unable to contact notification manager", e); + throw e.rethrowFromSystemServer(); + } + } + + /** + * Returns all notification channels belonging to the given package. + * + * <p>The caller must have {@link CompanionDeviceManager#getAssociations() an associated + * device} in order to use this method. + * + * @param pkg The package to retrieve channels for. + */ + public final List<NotificationChannel> getNotificationChannels(@NonNull String pkg) { + if (!isBound()) return null; + try { + + return getNotificationInterface().getNotificationChannelsFromPrivilegedListener( + mWrapper, pkg).getList(); + } catch (RemoteException e) { + Log.v(TAG, "Unable to contact notification manager", e); + throw e.rethrowFromSystemServer(); + } + } + + /** + * Returns all notification channel groups belonging to the given package. + * + * <p>The caller must have {@link CompanionDeviceManager#getAssociations() an associated + * device} in order to use this method. + * + * @param pkg The package to retrieve channel groups for. + */ + public final List<NotificationChannelGroup> getNotificationChannelGroups(@NonNull String pkg) { + if (!isBound()) return null; + try { + + return getNotificationInterface().getNotificationChannelGroupsFromPrivilegedListener( + mWrapper, pkg).getList(); + } catch (RemoteException e) { + Log.v(TAG, "Unable to contact notification manager", e); + throw e.rethrowFromSystemServer(); + } + } + /** * Sets the notification trim that will be received via {@link #onNotificationPosted}. * @@ -1116,6 +1251,28 @@ public abstract class NotificationListenerService extends Service { // no-op in the listener } + @Override + public void onNotificationChannelModification(String pkgName, NotificationChannel channel, + @ChannelOrGroupModificationTypes int modificationType) { + SomeArgs args = SomeArgs.obtain(); + args.arg1 = pkgName; + args.arg2 = channel; + args.arg3 = modificationType; + mHandler.obtainMessage( + MyHandler.MSG_ON_NOTIFICATION_CHANNEL_MODIFIED, args).sendToTarget(); + } + + @Override + public void onNotificationChannelGroupModification(String pkgName, + NotificationChannelGroup group, + @ChannelOrGroupModificationTypes int modificationType) { + SomeArgs args = SomeArgs.obtain(); + args.arg1 = pkgName; + args.arg2 = group; + args.arg3 = modificationType; + mHandler.obtainMessage( + MyHandler.MSG_ON_NOTIFICATION_CHANNEL_GROUP_MODIFIED, args).sendToTarget(); + } } /** @@ -1632,6 +1789,8 @@ public abstract class NotificationListenerService extends Service { public static final int MSG_ON_NOTIFICATION_RANKING_UPDATE = 4; public static final int MSG_ON_LISTENER_HINTS_CHANGED = 5; public static final int MSG_ON_INTERRUPTION_FILTER_CHANGED = 6; + public static final int MSG_ON_NOTIFICATION_CHANNEL_MODIFIED = 7; + public static final int MSG_ON_NOTIFICATION_CHANNEL_GROUP_MODIFIED = 8; public MyHandler(Looper looper) { super(looper, null, false); @@ -1678,6 +1837,22 @@ public abstract class NotificationListenerService extends Service { final int interruptionFilter = msg.arg1; onInterruptionFilterChanged(interruptionFilter); } break; + + case MSG_ON_NOTIFICATION_CHANNEL_MODIFIED: { + SomeArgs args = (SomeArgs) msg.obj; + String pkgName = (String) args.arg1; + NotificationChannel channel = (NotificationChannel) args.arg2; + int modificationType = (int) args.arg3; + onNotificationChannelModified(pkgName, channel, modificationType); + } break; + + case MSG_ON_NOTIFICATION_CHANNEL_GROUP_MODIFIED: { + SomeArgs args = (SomeArgs) msg.obj; + String pkgName = (String) args.arg1; + NotificationChannelGroup group = (NotificationChannelGroup) args.arg2; + int modificationType = (int) args.arg3; + onNotificationChannelGroupModified(pkgName, group, modificationType); + } break; } } } diff --git a/core/java/android/text/method/AllCapsTransformationMethod.java b/core/java/android/text/method/AllCapsTransformationMethod.java index 0cea82114a77..15f40d5121ef 100644 --- a/core/java/android/text/method/AllCapsTransformationMethod.java +++ b/core/java/android/text/method/AllCapsTransformationMethod.java @@ -17,6 +17,10 @@ package android.text.method; import android.content.Context; import android.graphics.Rect; +import android.icu.text.CaseMap; +import android.icu.text.Edits; +import android.text.SpannableStringBuilder; +import android.text.Spanned; import android.util.Log; import android.view.View; import android.widget.TextView; @@ -35,7 +39,7 @@ public class AllCapsTransformationMethod implements TransformationMethod2 { private Locale mLocale; public AllCapsTransformationMethod(Context context) { - mLocale = context.getResources().getConfiguration().locale; + mLocale = context.getResources().getConfiguration().getLocales().get(0); } @Override @@ -56,7 +60,61 @@ public class AllCapsTransformationMethod implements TransformationMethod2 { if (locale == null) { locale = mLocale; } - return source.toString().toUpperCase(locale); + + if (!(source instanceof Spanned)) { // No spans + return CaseMap.toUpper().apply( + locale, source, new StringBuilder(), + null /* we don't need the edits */); + } + + final Edits edits = new Edits(); + final SpannableStringBuilder result = CaseMap.toUpper().apply( + locale, source, new SpannableStringBuilder(), edits); + if (!edits.hasChanges()) { + // No changes happened while capitalizing. We can return the source as it was. + return source; + } + + final Edits.Iterator iterator = edits.getFineIterator(); + final Spanned spanned = (Spanned) source; + final int sourceLength = source.length(); + final Object[] spans = spanned.getSpans(0, sourceLength, Object.class); + for (Object span : spans) { + final int sourceStart = spanned.getSpanStart(span); + final int sourceEnd = spanned.getSpanEnd(span); + final int flags = spanned.getSpanFlags(span); + // Make sure the indexes are not at the end of the string, since in that case + // iterator.findSourceIndex() would fail. + final int destStart = sourceStart == sourceLength ? result.length() : + mapToDest(iterator, sourceStart); + final int destEnd = sourceEnd == sourceLength ? result.length() : + mapToDest(iterator, sourceEnd); + result.setSpan(span, destStart, destEnd, flags); + } + return result; + } + + private static int mapToDest(Edits.Iterator iterator, int sourceIndex) { + // Guaranteed to succeed if sourceIndex < source.length(). + iterator.findSourceIndex(sourceIndex); + if (sourceIndex == iterator.sourceIndex()) { + return iterator.destinationIndex(); + } + // We handle the situation differently depending on if we are in the changed slice or an + // unchanged one: In an unchanged slice, we can find the exact location the span + // boundary was before and map there. + // + // But in a changed slice, we need to treat the whole destination slice as an atomic unit. + // We adjust the span boundary to the end of that slice to reduce of the chance of adjacent + // spans in the source overlapping in the result. (The choice for the end vs the beginning + // is somewhat arbitrary, but was taken because we except to see slightly more spans only + // affecting a base character compared to spans only affecting a combining character.) + if (iterator.hasChange()) { + return iterator.destinationIndex() + iterator.newLength(); + } else { + // Move the index 1:1 along with this unchanged piece of text. + return iterator.destinationIndex() + (sourceIndex - iterator.sourceIndex()); + } } @Override diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 31911cb5b6fd..076b33cc9d6a 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -683,8 +683,7 @@ public class SurfaceView extends View { mTranslator.translateRectInAppWindowToScreen(mScreenRect); } - if (mSurfaceControl != null - && (!isHardwareAccelerated() || !mRtHandlingPositionUpdates)) { + if (!isHardwareAccelerated() || !mRtHandlingPositionUpdates) { try { if (DEBUG) Log.d(TAG, String.format("%d updateSurfacePosition UI, " + "postion = [%d, %d, %d, %d]", System.identityHashCode(this), diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 4a7b16eff93c..58ef0af3fe79 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1249,13 +1249,6 @@ public final class ViewRootImpl implements ViewParent, mIsAmbientMode = ambient; } - void setWindowVisibility(int visibility) { - if (visibility != mAttachInfo.mWindowVisibility) { - mAttachInfo.mWindowVisibility = visibility; - mView.dispatchWindowVisibilityChanged(visibility); - } - } - void setWindowStopped(boolean stopped) { if (mStopped != stopped) { mStopped = stopped; @@ -1270,7 +1263,6 @@ public final class ViewRootImpl implements ViewParent, if (renderer != null) { renderer.destroyHardwareResources(mView); } - mView.dispatchWindowVisibilityChanged(View.GONE); } } } @@ -1305,8 +1297,7 @@ public final class ViewRootImpl implements ViewParent, } int getHostVisibility() { - return (mAppVisible || mForceDecorViewVisibility) && !mStopped - ? mView.getVisibility() : View.GONE; + return (mAppVisible || mForceDecorViewVisibility) ? mView.getVisibility() : View.GONE; } /** @@ -1663,8 +1654,8 @@ public final class ViewRootImpl implements ViewParent, } if (viewVisibilityChanged) { - setWindowVisibility(viewVisibility); - + mAttachInfo.mWindowVisibility = viewVisibility; + host.dispatchWindowVisibilityChanged(viewVisibility); if (viewUserVisibilityChanged) { host.dispatchVisibilityAggregated(viewVisibility == View.VISIBLE); } diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 666ccf486941..8445b37b8133 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -978,8 +978,9 @@ public interface WindowManager extends ViewManager { * seeing this window, unless {@link #FLAG_SHOW_WHEN_LOCKED} has * also been set. * @deprecated Use {@link #FLAG_SHOW_WHEN_LOCKED} or {@link KeyguardManager#dismissKeyguard} - * instead. The Keyguard should never be dismissed automatically repeatedly as it also - * guards against unintentional touches. + * instead. Since keyguard was dismissed all the time as long as an activity with this flag + * on its window was focused, keyguard couldn't guard against unintentional touches on the + * screen, which isn't desired. */ @Deprecated public static final int FLAG_DISMISS_KEYGUARD = 0x00400000; diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index d429d379876f..ba004b967260 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -537,6 +537,18 @@ public final class AutofillManager { } } + /** + * If the app calling this API has enabled autofill services they + * will be disabled. + */ + public void disableOwnedAutofillServices() { + try { + mService.disableOwnedAutofillServices(mContext.getUserId()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + private AutofillClient getClientLocked() { if (mContext instanceof AutofillClient) { return (AutofillClient) mContext; diff --git a/core/java/android/view/autofill/IAutoFillManager.aidl b/core/java/android/view/autofill/IAutoFillManager.aidl index 20d09ae13a60..68b3ccabc8be 100644 --- a/core/java/android/view/autofill/IAutoFillManager.aidl +++ b/core/java/android/view/autofill/IAutoFillManager.aidl @@ -35,10 +35,11 @@ interface IAutoFillManager { boolean hasCallback, int flags, String packageName); boolean restoreSession(int sessionId, in IBinder activityToken, in IBinder appCallback); void setWindow(int sessionId, in IBinder windowToken); - oneway void updateSession(int sessionId, in AutofillId id, in Rect bounds, + void updateSession(int sessionId, in AutofillId id, in Rect bounds, in AutofillValue value, int flags, int userId); void finishSession(int sessionId, int userId); void cancelSession(int sessionId, int userId); void setAuthenticationResult(in Bundle data, int sessionId, int userId); - oneway void setHasCallback(int sessionId, int userId, boolean hasIt); + void setHasCallback(int sessionId, int userId, boolean hasIt); + void disableOwnedAutofillServices(int userId); } diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java index 5725b496f150..be548692ca08 100644 --- a/core/java/android/widget/AdapterView.java +++ b/core/java/android/widget/AdapterView.java @@ -216,7 +216,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { * @see #setFocusable(boolean) * @see #checkFocus() */ - private boolean mDesiredFocusableState; + private int mDesiredFocusableState = FOCUSABLE_AUTO; private boolean mDesiredFocusableInTouchModeState; /** Lazily-constructed runnable for dispatching selection events. */ @@ -250,6 +250,12 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { if (getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) { setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES); } + + mDesiredFocusableState = getFocusable(); + if (mDesiredFocusableState == FOCUSABLE_AUTO) { + // Starts off without an adapter, so NOT_FOCUSABLE by default. + super.setFocusable(NOT_FOCUSABLE); + } } /** @@ -710,16 +716,16 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { } @Override - public void setFocusable(boolean focusable) { + public void setFocusable(@Focusable int focusable) { final T adapter = getAdapter(); final boolean empty = adapter == null || adapter.getCount() == 0; mDesiredFocusableState = focusable; - if (!focusable) { + if ((focusable & (FOCUSABLE_AUTO | FOCUSABLE)) == 0) { mDesiredFocusableInTouchModeState = false; } - super.setFocusable(focusable && (!empty || isInFilterMode())); + super.setFocusable((!empty || isInFilterMode()) ? focusable : NOT_FOCUSABLE); } @Override @@ -729,7 +735,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { mDesiredFocusableInTouchModeState = focusable; if (focusable) { - mDesiredFocusableState = true; + mDesiredFocusableState = FOCUSABLE; } super.setFocusableInTouchMode(focusable && (!empty || isInFilterMode())); @@ -743,7 +749,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { // for the client, see View.setFocusableInTouchMode() comments for more // details super.setFocusableInTouchMode(focusable && mDesiredFocusableInTouchModeState); - super.setFocusable(focusable && mDesiredFocusableState); + super.setFocusable(focusable ? mDesiredFocusableState : NOT_FOCUSABLE); if (mEmptyView != null) { updateEmptyStatus((adapter == null) || adapter.isEmpty()); } diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 916241c31eba..fe3860507c27 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -2071,15 +2071,16 @@ public class BatteryStatsImpl extends BatteryStats { @Override public boolean reset(boolean detachIfReset) { boolean active = false; + // Do not detach the subTimer explicitly since that'll be done by DualTimer.detach(). + active |= !mSubTimer.reset(false); active |= !super.reset(detachIfReset); - active |= !mSubTimer.reset(detachIfReset); return !active; } @Override public void detach() { - super.detach(); mSubTimer.detach(); + super.detach(); } @Override diff --git a/core/java/com/android/internal/policy/BackdropFrameRenderer.java b/core/java/com/android/internal/policy/BackdropFrameRenderer.java index 1abb59b006dd..a70209c705c0 100644 --- a/core/java/com/android/internal/policy/BackdropFrameRenderer.java +++ b/core/java/com/android/internal/policy/BackdropFrameRenderer.java @@ -74,6 +74,7 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame private final Rect mOldStableInsets = new Rect(); private final Rect mSystemInsets = new Rect(); private final Rect mStableInsets = new Rect(); + private final Rect mTmpRect = new Rect(); public BackdropFrameRenderer(DecorView decorView, ThreadedRenderer renderer, Rect initialBounds, Drawable resizingBackgroundDrawable, Drawable captionBackgroundDrawable, @@ -370,12 +371,6 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame DisplayListCanvas canvas = mSystemBarBackgroundNode.start(width, height); mSystemBarBackgroundNode.setLeftTopRightBottom(left, top, left + width, top + height); final int topInset = DecorView.getColorViewTopInset(mStableInsets.top, mSystemInsets.top); - final int bottomInset = DecorView.getColorViewBottomInset(stableInsets.bottom, - systemInsets.bottom); - final int rightInset = DecorView.getColorViewRightInset(stableInsets.right, - systemInsets.right); - final int leftInset = DecorView.getColorViewLeftInset(stableInsets.left, - systemInsets.left); if (mStatusBarColor != null) { mStatusBarColor.setBounds(0, 0, left + width, topInset); mStatusBarColor.draw(canvas); @@ -385,14 +380,8 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame // don't want the navigation bar background be moving around when resizing in docked mode. // However, we need it for the transitions into/out of docked mode. if (mNavigationBarColor != null && fullscreen) { - final int size = DecorView.getNavBarSize(bottomInset, rightInset, leftInset); - if (DecorView.isNavBarToRightEdge(bottomInset, rightInset)) { - mNavigationBarColor.setBounds(width - size, 0, width, height); - } else if (DecorView.isNavBarToLeftEdge(bottomInset, leftInset)) { - mNavigationBarColor.setBounds(0, 0, size, height); - } else { - mNavigationBarColor.setBounds(0, height - size, width, height); - } + DecorView.getNavigationBarRect(width, height, stableInsets, systemInsets, mTmpRect); + mNavigationBarColor.setBounds(mTmpRect); mNavigationBarColor.draw(canvas); } mSystemBarBackgroundNode.end(canvas); diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index 9760f8111ec3..8e6e63b0e238 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -119,6 +119,21 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind // The height of a window which has not in DIP. private final static int DECOR_SHADOW_UNFOCUSED_HEIGHT_IN_DIP = 5; + public static final ColorViewAttributes STATUS_BAR_COLOR_VIEW_ATTRIBUTES = + new ColorViewAttributes(SYSTEM_UI_FLAG_FULLSCREEN, FLAG_TRANSLUCENT_STATUS, + Gravity.TOP, Gravity.LEFT, Gravity.RIGHT, + Window.STATUS_BAR_BACKGROUND_TRANSITION_NAME, + com.android.internal.R.id.statusBarBackground, + FLAG_FULLSCREEN); + + public static final ColorViewAttributes NAVIGATION_BAR_COLOR_VIEW_ATTRIBUTES = + new ColorViewAttributes( + SYSTEM_UI_FLAG_HIDE_NAVIGATION, FLAG_TRANSLUCENT_NAVIGATION, + Gravity.BOTTOM, Gravity.RIGHT, Gravity.LEFT, + Window.NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME, + com.android.internal.R.id.navigationBarBackground, + 0 /* hideWindowFlag */); + // Cludge to address b/22668382: Set the shadow size to the maximum so that the layer // size calculation takes the shadow size into account. We set the elevation currently // to max until the first layout command has been executed. @@ -162,18 +177,10 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind // View added at runtime to draw under the navigation bar area private View mNavigationGuard; - private final ColorViewState mStatusColorViewState = new ColorViewState( - SYSTEM_UI_FLAG_FULLSCREEN, FLAG_TRANSLUCENT_STATUS, - Gravity.TOP, Gravity.LEFT, Gravity.RIGHT, - Window.STATUS_BAR_BACKGROUND_TRANSITION_NAME, - com.android.internal.R.id.statusBarBackground, - FLAG_FULLSCREEN); - private final ColorViewState mNavigationColorViewState = new ColorViewState( - SYSTEM_UI_FLAG_HIDE_NAVIGATION, FLAG_TRANSLUCENT_NAVIGATION, - Gravity.BOTTOM, Gravity.RIGHT, Gravity.LEFT, - Window.NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME, - com.android.internal.R.id.navigationBarBackground, - 0 /* hideWindowFlag */); + private final ColorViewState mStatusColorViewState = + new ColorViewState(STATUS_BAR_COLOR_VIEW_ATTRIBUTES); + private final ColorViewState mNavigationColorViewState = + new ColorViewState(NAVIGATION_BAR_COLOR_VIEW_ATTRIBUTES); private final Interpolator mShowInterpolator; private final Interpolator mHideInterpolator; @@ -983,35 +990,50 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind return false; } - static int getColorViewTopInset(int stableTop, int systemTop) { + public static int getColorViewTopInset(int stableTop, int systemTop) { return Math.min(stableTop, systemTop); } - static int getColorViewBottomInset(int stableBottom, int systemBottom) { + public static int getColorViewBottomInset(int stableBottom, int systemBottom) { return Math.min(stableBottom, systemBottom); } - static int getColorViewRightInset(int stableRight, int systemRight) { + public static int getColorViewRightInset(int stableRight, int systemRight) { return Math.min(stableRight, systemRight); } - static int getColorViewLeftInset(int stableLeft, int systemLeft) { + public static int getColorViewLeftInset(int stableLeft, int systemLeft) { return Math.min(stableLeft, systemLeft); } - static boolean isNavBarToRightEdge(int bottomInset, int rightInset) { + public static boolean isNavBarToRightEdge(int bottomInset, int rightInset) { return bottomInset == 0 && rightInset > 0; } - static boolean isNavBarToLeftEdge(int bottomInset, int leftInset) { + public static boolean isNavBarToLeftEdge(int bottomInset, int leftInset) { return bottomInset == 0 && leftInset > 0; } - static int getNavBarSize(int bottomInset, int rightInset, int leftInset) { + public static int getNavBarSize(int bottomInset, int rightInset, int leftInset) { return isNavBarToRightEdge(bottomInset, rightInset) ? rightInset : isNavBarToLeftEdge(bottomInset, leftInset) ? leftInset : bottomInset; } + public static void getNavigationBarRect(int canvasWidth, int canvasHeight, Rect stableInsets, + Rect contentInsets, Rect outRect) { + final int bottomInset = getColorViewBottomInset(stableInsets.bottom, contentInsets.bottom); + final int leftInset = getColorViewLeftInset(stableInsets.left, contentInsets.left); + final int rightInset = getColorViewLeftInset(stableInsets.right, contentInsets.right); + final int size = getNavBarSize(bottomInset, rightInset, leftInset); + if (isNavBarToRightEdge(bottomInset, rightInset)) { + outRect.set(canvasWidth - size, 0, canvasWidth, canvasHeight); + } else if (isNavBarToLeftEdge(bottomInset, leftInset)) { + outRect.set(0, 0, size, canvasHeight); + } else { + outRect.set(0, canvasHeight - size, canvasWidth, canvasHeight); + } + } + WindowInsets updateColorViews(WindowInsets insets, boolean animate) { WindowManager.LayoutParams attrs = mWindow.getAttributes(); int sysUiVisibility = attrs.systemUiVisibility | getWindowSystemUiVisibility(); @@ -1131,9 +1153,14 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind } private int calculateStatusBarColor() { - int flags = mWindow.getAttributes().flags; - return (flags & FLAG_TRANSLUCENT_STATUS) != 0 ? mSemiTransparentStatusBarColor - : (flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0 ? mWindow.mStatusBarColor + return calculateStatusBarColor(mWindow.getAttributes().flags, + mSemiTransparentStatusBarColor, mWindow.mStatusBarColor); + } + + public static int calculateStatusBarColor(int flags, int semiTransparentStatusBarColor, + int statusBarColor) { + return (flags & FLAG_TRANSLUCENT_STATUS) != 0 ? semiTransparentStatusBarColor + : (flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0 ? statusBarColor : Color.BLACK; } @@ -1160,13 +1187,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind private void updateColorViewInt(final ColorViewState state, int sysUiVis, int color, int size, boolean verticalBar, boolean seascape, int sideMargin, boolean animate, boolean force) { - state.present = (sysUiVis & state.systemUiHideFlag) == 0 - && (mWindow.getAttributes().flags & state.hideWindowFlag) == 0 - && ((mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0 - || force); - boolean show = state.present - && (color & Color.BLACK) != 0 - && ((mWindow.getAttributes().flags & state.translucentFlag) == 0 || force); + state.present = state.attributes.isPresent(sysUiVis, mWindow.getAttributes().flags, force); + boolean show = state.attributes.isVisible(state.present, color, + mWindow.getAttributes().flags, force); boolean showView = show && !isResizing() && size > 0; boolean visibilityChanged = false; @@ -1175,15 +1198,15 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind int resolvedHeight = verticalBar ? LayoutParams.MATCH_PARENT : size; int resolvedWidth = verticalBar ? size : LayoutParams.MATCH_PARENT; int resolvedGravity = verticalBar - ? (seascape ? state.seascapeGravity : state.horizontalGravity) - : state.verticalGravity; + ? (seascape ? state.attributes.seascapeGravity : state.attributes.horizontalGravity) + : state.attributes.verticalGravity; if (view == null) { if (showView) { state.view = view = new View(mContext); view.setBackgroundColor(color); - view.setTransitionName(state.transitionName); - view.setId(state.id); + view.setTransitionName(state.attributes.transitionName); + view.setId(state.attributes.id); visibilityChanged = true; view.setVisibility(INVISIBLE); state.targetVisibility = VISIBLE; @@ -1499,6 +1522,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind // renderer about it. mBackdropFrameRenderer.onConfigurationChange(); } + mWindow.onViewRootImplSet(getViewRootImpl()); } @Override @@ -2270,6 +2294,15 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind boolean visible; int color; + final ColorViewAttributes attributes; + + ColorViewState(ColorViewAttributes attributes) { + this.attributes = attributes; + } + } + + public static class ColorViewAttributes { + final int id; final int systemUiHideFlag; final int translucentFlag; @@ -2279,9 +2312,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind final String transitionName; final int hideWindowFlag; - ColorViewState(int systemUiHideFlag, - int translucentFlag, int verticalGravity, int horizontalGravity, - int seascapeGravity, String transitionName, int id, int hideWindowFlag) { + private ColorViewAttributes(int systemUiHideFlag, int translucentFlag, int verticalGravity, + int horizontalGravity, int seascapeGravity, String transitionName, int id, + int hideWindowFlag) { this.id = id; this.systemUiHideFlag = systemUiHideFlag; this.translucentFlag = translucentFlag; @@ -2291,6 +2324,24 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind this.transitionName = transitionName; this.hideWindowFlag = hideWindowFlag; } + + public boolean isPresent(int sysUiVis, int windowFlags, boolean force) { + return (sysUiVis & systemUiHideFlag) == 0 + && (windowFlags & hideWindowFlag) == 0 + && ((windowFlags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0 + || force); + } + + public boolean isVisible(boolean present, int color, int windowFlags, boolean force) { + return present + && (color & Color.BLACK) != 0 + && ((windowFlags & translucentFlag) == 0 || force); + } + + public boolean isVisible(int sysUiVis, int color, int windowFlags, boolean force) { + final boolean present = isPresent(sysUiVis, windowFlags, force); + return isVisible(present, color, windowFlags, force); + } } /** diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 6c9280a1ea25..7b966de86756 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -47,6 +47,7 @@ import android.view.ViewGroup; import android.view.ViewManager; import android.view.ViewParent; import android.view.ViewRootImpl; +import android.view.ViewRootImpl.ActivityConfigCallback; import android.view.Window; import android.view.WindowManager; import com.android.internal.R; @@ -287,6 +288,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { private boolean mUseDecorContext = false; + /** @see ViewRootImpl#mActivityConfigCallback */ + private ActivityConfigCallback mActivityConfigCallback; + static class WindowManagerHolder { static final IWindowManager sWindowManager = IWindowManager.Stub.asInterface( ServiceManager.getService("window")); @@ -302,7 +306,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { /** * Constructor for main window of an activity. */ - public PhoneWindow(Context context, Window preservedWindow) { + public PhoneWindow(Context context, Window preservedWindow, + ActivityConfigCallback activityConfigCallback) { this(context); // Only main activity windows use decor context, all the other windows depend on whatever // context that was given to them. @@ -323,6 +328,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, 0) != 0; mSupportsPictureInPicture = forceResizable || context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_PICTURE_IN_PICTURE); + mActivityConfigCallback = activityConfigCallback; } @Override @@ -2060,6 +2066,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { return mDecor; } + /** Notify when decor view is attached to window and {@link ViewRootImpl} is available. */ + void onViewRootImplSet(ViewRootImpl viewRoot) { + viewRoot.setActivityConfigCallback(mActivityConfigCallback); + } + static private final String FOCUSED_ID_TAG = "android:focusedViewId"; static private final String VIEWS_TAG = "android:views"; static private final String PANELS_TAG = "android:Panels"; diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 43221051f39b..de9445d39c29 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -327,7 +327,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss) subHeap = HEAP_DALVIK_ZYGOTE; } else if (strstr(name, "/dev/ashmem/dalvik-indirect ref") == name) { subHeap = HEAP_DALVIK_INDIRECT_REFERENCE_TABLE; - } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name) { + } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name || + strstr(name, "/dev/ashmem/dalvik-data-code-cache") == name || + strstr(name, "/dev/ashmem/dalvik-CompilerMetadata") == name) { subHeap = HEAP_DALVIK_CODE_CACHE; } else { subHeap = HEAP_DALVIK_ACCOUNTING; // Default to accounting. diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a27c5ac9e5a2..889587735014 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -532,6 +532,9 @@ <protected-broadcast android:name="android.content.pm.action.SESSION_COMMITTED" /> <protected-broadcast android:name="android.os.action.USER_RESTRICTIONS_CHANGED" /> + <protected-broadcast android:name="android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT" /> + <protected-broadcast android:name="android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED" /> + <protected-broadcast android:name="android.media.tv.action.WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED" /> <!-- ====================================================================== --> <!-- RUNTIME PERMISSIONS --> @@ -804,7 +807,7 @@ <p>Protection level: dangerous--> <permission android:name="android.permission.READ_PHONE_NUMBERS" android:permissionGroup="android.permission-group.PHONE" - android:label="@string/permlab_readPhoneNumber" + android:label="@string/permlab_readPhoneNumbers" android:description="@string/permdesc_readPhoneNumbers" android:protectionLevel="dangerous|ephemeral" /> @@ -2519,6 +2522,13 @@ <permission android:name="android.permission.MODIFY_PARENTAL_CONTROLS" android:protectionLevel="signature|privileged" /> + <!-- @SystemApi Allows an application to notify TV inputs by sending broadcasts. + <p>Protection level: signature|privileged + <p>Not for use by third-party applications. + @hide --> + <permission android:name="android.permission.NOTIFY_TV_INPUTS" + android:protectionLevel="signature|privileged" /> + <!-- Must be required by a {@link android.media.routing.MediaRouteService} to ensure that only the system can interact with it. @hide --> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 69c6fa4a3a62..d26d952224f1 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -8559,6 +8559,11 @@ <!-- @hide From Theme.colorBackground, used for the TaskDescription background color. --> <attr name="colorBackground" /> + <!-- @hide From Theme.statusBarColor, used for the TaskDescription status bar color. --> + <attr name="statusBarColor"/> + <!-- @hide From Theme.navigationBarColor, used for the TaskDescription navigation bar + color. --> + <attr name="navigationBarColor"/> </declare-styleable> <declare-styleable name="Shortcut"> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 75de4dad3390..08216742add5 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3628,7 +3628,7 @@ <string name="data_usage_3g_limit_title">2G-3G data limit reached</string> <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] --> <string name="data_usage_4g_limit_title">4G data limit reached</string> - <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] --> + <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=50] --> <string name="data_usage_mobile_limit_title">Mobile data limit reached</string> <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] --> <string name="data_usage_wifi_limit_title">Wi-Fi data limit reached</string> diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsDualTimerTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsDualTimerTest.java new file mode 100644 index 000000000000..3a5a9f5bc67a --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsDualTimerTest.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.android.internal.os; + +import android.os.BatteryStats; +import android.support.test.filters.SmallTest; + +import junit.framework.TestCase; + +/** + * Test BatteryStatsImpl.DualTimer. + */ +public class BatteryStatsDualTimerTest extends TestCase { + + @SmallTest + public void testResetDetach() throws Exception { + final MockClocks clocks = new MockClocks(); + clocks.realtime = clocks.uptime = 100; + + final BatteryStatsImpl.TimeBase timeBase = new BatteryStatsImpl.TimeBase(); + timeBase.init(clocks.uptimeMillis(), clocks.elapsedRealtime()); + final BatteryStatsImpl.TimeBase subTimeBase = new BatteryStatsImpl.TimeBase(); + subTimeBase.init(clocks.uptimeMillis(), clocks.elapsedRealtime()); + + final BatteryStatsImpl.DualTimer timer = new BatteryStatsImpl.DualTimer(clocks, + null, BatteryStats.WAKE_TYPE_PARTIAL, null, timeBase, subTimeBase); + + assertTrue(timeBase.hasObserver(timer)); + assertFalse(subTimeBase.hasObserver(timer)); + assertFalse(timeBase.hasObserver(timer.getSubTimer())); + assertTrue(subTimeBase.hasObserver(timer.getSubTimer())); + + // Timer is running so resetting it should not remove it from timerbases. + clocks.realtime = clocks.uptime = 200; + timer.startRunningLocked(clocks.realtime); + timer.reset(true); + assertTrue(timeBase.hasObserver(timer)); + assertTrue(subTimeBase.hasObserver(timer.getSubTimer())); + + // Stop timer and ensure that resetting removes it from timebases. + clocks.realtime = clocks.uptime = 300; + timer.stopRunningLocked(clocks.realtime); + timer.reset(true); + assertFalse(timeBase.hasObserver(timer)); + assertFalse(timeBase.hasObserver(timer.getSubTimer())); + } +} diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java index 47bc502d4cf1..af4a6d92cea6 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java @@ -371,4 +371,48 @@ public class BatteryStatsSensorTest extends TestCase { // Test: UID_2 - background count assertEquals(2, bgTimer2.getCountLocked(BatteryStats.STATS_SINCE_CHARGED)); } + + @SmallTest + public void testSensorReset() throws Exception { + final MockClocks clocks = new MockClocks(); + MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); + bi.mForceOnBattery = true; + clocks.realtime = 100; + clocks.uptime = 100; + bi.getOnBatteryTimeBase().setRunning(true, 100_000, 100_000); + bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_RECEIVER); + + clocks.realtime += 100; + clocks.uptime += 100; + + bi.noteStartSensorLocked(UID, SENSOR_ID); + + clocks.realtime += 100; + clocks.uptime += 100; + + // The sensor is started and the timer has been created. + final BatteryStats.Uid uid = bi.getUidStats().get(UID); + assertNotNull(uid); + + BatteryStats.Uid.Sensor sensor = uid.getSensorStats().get(SENSOR_ID); + assertNotNull(sensor); + assertNotNull(sensor.getSensorTime()); + assertNotNull(sensor.getSensorBackgroundTime()); + + // Reset the stats. Since the sensor is still running, we should still see the timer + bi.getUidStatsLocked(UID).reset(); + + sensor = uid.getSensorStats().get(SENSOR_ID); + assertNotNull(sensor); + assertNotNull(sensor.getSensorTime()); + assertNotNull(sensor.getSensorBackgroundTime()); + + bi.noteStopSensorLocked(UID, SENSOR_ID); + + // Now the sensor timer has stopped so this reset should also take out the sensor. + bi.getUidStatsLocked(UID).reset(); + + sensor = uid.getSensorStats().get(SENSOR_ID); + assertNull(sensor); + } } diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java index 9607a59f58dd..57d6934d4bdc 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java @@ -5,6 +5,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ + BatteryStatsDualTimerTest.class, BatteryStatsDurationTimerTest.class, BatteryStatsSamplingTimerTest.class, BatteryStatsServTest.class, diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 6929fb91e1e0..ec653d0849b1 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -257,6 +257,7 @@ applications that come with the platform <permission name="android.permission.CHANGE_CONFIGURATION"/> <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" /> <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/> + <permission name="android.permission.CLEAR_APP_CACHE"/> <permission name="android.permission.CONNECTIVITY_INTERNAL"/> <permission name="android.permission.DELETE_CACHE_FILES"/> <permission name="android.permission.DELETE_PACKAGES"/> diff --git a/graphics/java/android/graphics/ColorSpace.java b/graphics/java/android/graphics/ColorSpace.java index e61d46736364..4fc63eacc4f1 100644 --- a/graphics/java/android/graphics/ColorSpace.java +++ b/graphics/java/android/graphics/ColorSpace.java @@ -123,39 +123,11 @@ import java.util.function.DoubleUnaryOperator; * and {@link #connect(ColorSpace, ColorSpace)}, are also guaranteed to be * thread-safe.</p> * - * <h3>Visualization and debugging</h3> - * - * <p>To visualize and debug color spaces, you can call {@link #createRenderer()}. - * The {@link Renderer} created by calling this method can be used to compare - * color spaces and locate specific colors on a CIE 1931 or CIE 1976 UCS - * chromaticity diagram.</p> - * - * <p>The following code snippet shows how to render a bitmap that compares - * the color gamuts and white points of {@link Named#DCI_P3} and - * {@link Named#PRO_PHOTO_RGB}:</p> - * - * <pre class="prettyprint"> - * Bitmap bitmap = ColorSpace.createRenderer() - * .size(768) - * .clip(true) - * .add(ColorSpace.get(ColorSpace.Named.DCI_P3), 0xffffc845) - * .add(ColorSpace.get(ColorSpace.Named.PRO_PHOTO_RGB), 0xff097ae9) - * .render(); - * </pre> - * <p> - * <img style="display: block; margin: 0 auto;" src="{@docRoot}reference/android/images/graphics/colorspace_renderer.png" /> - * <figcaption style="text-align: center;">DCI-P3 vs ProPhoto RGB</figcaption> - * </p> - * - * <p>Please refer to the documentation of the {@link Renderer} class for more - * information about its options and capabilities.</p> - * * @see #get(Named) * @see Named * @see Model * @see Connector * @see Adaptation - * @see Renderer */ @AnyThread @SuppressWarnings("StaticInitializerReferencesSubClass") @@ -1417,6 +1389,8 @@ public abstract class ColorSpace { * @return A new non-null {@link Renderer} instance * * @see Renderer + * + * @hide */ @NonNull public static Renderer createRenderer() { @@ -3712,6 +3686,8 @@ public abstract class ColorSpace { * See {@link #add(ColorSpace, float, float, float, int)} for more information.</p> * * @see ColorSpace#createRenderer() + * + * @hide */ public static class Renderer { private static final int NATIVE_SIZE = 1440; @@ -4054,7 +4030,7 @@ public abstract class ColorSpace { */ @NonNull @Size(6) - private static float[] getPrimaries(@NonNull Rgb rgb, + private static void getPrimaries(@NonNull Rgb rgb, @NonNull @Size(6) float[] primaries, boolean asUcs) { // TODO: We should find a better way to handle these cases if (rgb.equals(ColorSpace.get(Named.EXTENDED_SRGB)) || @@ -4069,7 +4045,6 @@ public abstract class ColorSpace { rgb.getPrimaries(primaries); } if (asUcs) xyYToUv(primaries); - return primaries; } /** diff --git a/media/java/android/media/ImageReader.java b/media/java/android/media/ImageReader.java index ed718493bd78..06555c1fa90b 100644 --- a/media/java/android/media/ImageReader.java +++ b/media/java/android/media/ImageReader.java @@ -17,6 +17,8 @@ package android.media; import android.graphics.ImageFormat; +import android.graphics.PixelFormat; +import android.hardware.HardwareBuffer; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -72,6 +74,12 @@ public class ImageReader implements AutoCloseable { private static final int ACQUIRE_MAX_IMAGES = 2; /** + * Invalid consumer buffer usage flag. This usage flag will be ignored + * by the {@code ImageReader} instance is constructed with this value. + */ + private static final long BUFFER_USAGE_UNKNOWN = 0; + + /** * <p> * Create a new reader for images of the desired size and format. * </p> @@ -121,13 +129,104 @@ public class ImageReader implements AutoCloseable { * @see Image */ public static ImageReader newInstance(int width, int height, int format, int maxImages) { - return new ImageReader(width, height, format, maxImages); + return new ImageReader(width, height, format, maxImages, BUFFER_USAGE_UNKNOWN); + } + + /** + * <p> + * Create a new reader for images of the desired size, format and consumer usage flag. + * </p> + * <p> + * The {@code maxImages} parameter determines the maximum number of {@link Image} objects that + * can be be acquired from the {@code ImageReader} simultaneously. Requesting more buffers will + * use up more memory, so it is important to use only the minimum number necessary for the use + * case. + * </p> + * <p> + * The valid sizes and formats depend on the source of the image data. + * </p> + * <p> + * The format and usage flag combination describes how the buffer will be used by + * consumer end-points. For example, if the application intends to send the images to + * {@link android.media.MediaCodec} or {@link android.media.MediaRecorder} for hardware video + * encoding, the format and usage flag combination needs to be + * {@link ImageFormat#PRIVATE PRIVATE} and {@link HardwareBuffer#USAGE0_VIDEO_ENCODE}. When an + * {@link ImageReader} object is created with a valid size and such format/usage flag + * combination, the application can send the {@link Image images} to an {@link ImageWriter} that + * is created with the input {@link android.view.Surface} provided by the + * {@link android.media.MediaCodec} or {@link android.media.MediaRecorder}. + * </p> + * <p> + * If the {@code format} is {@link ImageFormat#PRIVATE PRIVATE}, the created {@link ImageReader} + * will produce images that are not directly accessible by the application. The application can + * still acquire images from this {@link ImageReader}, and send them to the + * {@link android.hardware.camera2.CameraDevice camera} for reprocessing, or to the + * {@link android.media.MediaCodec} / {@link android.media.MediaRecorder} for hardware video + * encoding via {@link ImageWriter} interface. However, the {@link Image#getPlanes() + * getPlanes()} will return an empty array for {@link ImageFormat#PRIVATE PRIVATE} format + * images. The application can check if an existing reader's format by calling + * {@link #getImageFormat()}. + * </p> + * <p> + * {@link ImageFormat#PRIVATE PRIVATE} format {@link ImageReader ImageReaders} are more + * efficient to use when application access to image data is not necessary, compared to + * ImageReaders using other format such as {@link ImageFormat#YUV_420_888 YUV_420_888}. + * </p> + * <p> + * Note that not all format and usage flag combination is supported by the + * {@link ImageReader}. Below are the supported combinations by the {@link ImageReader} + * (assuming the consumer end-points support the such image consumption, e.g., hardware video + * encoding). + * <table> + * <tr> + * <th>Format</th> + * <th>Compatible usage flags</th> + * </tr> + * <tr> + * <td>non-{@link android.graphics.ImageFormat#PRIVATE PRIVATE} formats defined by + * {@link android.graphics.ImageFormat ImageFormat} or + * {@link android.graphics.PixelFormat PixelFormat}</td> + * <td>{@link HardwareBuffer#USAGE0_CPU_READ} or + * {@link HardwareBuffer#USAGE0_CPU_READ_OFTEN}</td> + * </tr> + * <tr> + * <td>{@link android.graphics.ImageFormat#PRIVATE}</td> + * <td>{@link HardwareBuffer#USAGE0_VIDEO_ENCODE} or + * {@link HardwareBuffer#USAGE0_GPU_SAMPLED_IMAGE}, or combined</td> + * </tr> + * </table> + * Using other combinations may result in {@link IllegalArgumentException}. + * </p> + * @param width The default width in pixels of the Images that this reader will produce. + * @param height The default height in pixels of the Images that this reader will produce. + * @param format The format of the Image that this reader will produce. This must be one of the + * {@link android.graphics.ImageFormat} or {@link android.graphics.PixelFormat} + * constants. Note that not all formats are supported, like ImageFormat.NV21. + * @param maxImages The maximum number of images the user will want to access simultaneously. + * This should be as small as possible to limit memory use. Once maxImages Images are + * obtained by the user, one of them has to be released before a new Image will + * become available for access through {@link #acquireLatestImage()} or + * {@link #acquireNextImage()}. Must be greater than 0. + * @param usage The intended usage of the images produced by this ImageReader. It needs + * to be one of the Usage0 defined by {@link HardwareBuffer}, or an + * {@link IllegalArgumentException} will be thrown. + * @see Image + * @see HardwareBuffer + * @hide + */ + public static ImageReader newInstance(int width, int height, int format, int maxImages, + long usage) { + if (!isFormatUsageCombinationAllowed(format, usage)) { + throw new IllegalArgumentException("Format usage combination is not supported:" + + " format = " + format + ", usage = " + usage); + } + return new ImageReader(width, height, format, maxImages, usage); } /** * @hide */ - protected ImageReader(int width, int height, int format, int maxImages) { + protected ImageReader(int width, int height, int format, int maxImages, long usage) { mWidth = width; mHeight = height; mFormat = format; @@ -149,7 +248,7 @@ public class ImageReader implements AutoCloseable { mNumPlanes = ImageUtils.getNumPlanesForFormat(mFormat); - nativeInit(new WeakReference<ImageReader>(this), width, height, format, maxImages); + nativeInit(new WeakReference<>(this), width, height, format, maxImages, usage); mSurface = nativeGetSurface(); @@ -617,6 +716,30 @@ public class ImageReader implements AutoCloseable { return si.getReader() == this; } + private static boolean isFormatUsageCombinationAllowed(int format, long usage) { + if (!ImageFormat.isPublicFormat(format) && !PixelFormat.isPublicFormat(format)) { + return false; + } + + // Valid usage needs to be provided. + if (usage == BUFFER_USAGE_UNKNOWN) { + return false; + } + + if (format == ImageFormat.PRIVATE) { + // Usage need to be either USAGE0_GPU_SAMPLED_IMAGE or USAGE0_VIDEO_ENCODE or combined. + boolean isAllowed = (usage == HardwareBuffer.USAGE0_GPU_SAMPLED_IMAGE); + isAllowed = isAllowed || (usage == HardwareBuffer.USAGE0_VIDEO_ENCODE); + isAllowed = isAllowed || (usage == + (HardwareBuffer.USAGE0_VIDEO_ENCODE | HardwareBuffer.USAGE0_GPU_SAMPLED_IMAGE)); + return isAllowed; + } else { + // Usage need to make the buffer CPU readable for explicit format. + return ((usage == HardwareBuffer.USAGE0_CPU_READ) || + (usage == HardwareBuffer.USAGE0_CPU_READ_OFTEN)); + } + } + /** * Called from Native code when an Event happens. * @@ -655,7 +778,7 @@ public class ImageReader implements AutoCloseable { private ListenerHandler mListenerHandler; // Keep track of the successfully acquired Images. This need to be thread safe as the images // could be closed by different threads (e.g., application thread and GC thread). - private List<Image> mAcquiredImages = new CopyOnWriteArrayList<Image>(); + private List<Image> mAcquiredImages = new CopyOnWriteArrayList<>(); /** * This field is used by native code, do not access or modify. @@ -896,7 +1019,7 @@ public class ImageReader implements AutoCloseable { } private synchronized native void nativeInit(Object weakSelf, int w, int h, - int fmt, int maxImgs); + int fmt, int maxImgs, long consumerUsage); private synchronized native void nativeClose(); private synchronized native void nativeReleaseImage(Image i); private synchronized native Surface nativeGetSurface(); diff --git a/media/java/android/media/ImageWriter.java b/media/java/android/media/ImageWriter.java index b142ddd9fbff..349c9cb94860 100644 --- a/media/java/android/media/ImageWriter.java +++ b/media/java/android/media/ImageWriter.java @@ -17,6 +17,7 @@ package android.media; import android.graphics.ImageFormat; +import android.graphics.PixelFormat; import android.graphics.Rect; import android.hardware.camera2.utils.SurfaceUtils; import android.os.Handler; @@ -89,7 +90,7 @@ public class ImageWriter implements AutoCloseable { private final int mMaxImages; // Keep track of the currently dequeued Image. This need to be thread safe as the images // could be closed by different threads (e.g., application thread and GC thread). - private List<Image> mDequeuedImages = new CopyOnWriteArrayList<Image>(); + private List<Image> mDequeuedImages = new CopyOnWriteArrayList<>(); private int mEstimatedNativeAllocBytes; /** @@ -118,22 +119,75 @@ public class ImageWriter implements AutoCloseable { * @return a new ImageWriter instance. */ public static ImageWriter newInstance(Surface surface, int maxImages) { - return new ImageWriter(surface, maxImages); + return new ImageWriter(surface, maxImages, ImageFormat.UNKNOWN); } /** + * <p> + * Create a new ImageWriter with given number of max Images and format. + * </p> + * <p> + * The {@code maxImages} parameter determines the maximum number of + * {@link Image} objects that can be be dequeued from the + * {@code ImageWriter} simultaneously. Requesting more buffers will use up + * more memory, so it is important to use only the minimum number necessary. + * </p> + * <p> + * The format specifies the image format of this ImageWriter. The format + * from the {@code surface} will be overridden with this format. For example, + * if the surface is obtained from a {@link android.graphics.SurfaceTexture}, the default + * format may be {@link PixelFormat#RGBA_8888}. If the application creates an ImageWriter + * with this surface and {@link ImageFormat#PRIVATE}, this ImageWriter will be able to operate + * with {@link ImageFormat#PRIVATE} Images. + * </p> + * <p> + * Note that the consumer end-point may or may not be able to support Images with different + * format, for such case, the application should only use this method if the consumer is able + * to consume such images. + * </p> + * <p> + * The input Image size depends on the Surface that is provided by + * the downstream consumer end-point. + * </p> + * + * @param surface The destination Surface this writer produces Image data + * into. + * @param maxImages The maximum number of Images the user will want to + * access simultaneously for producing Image data. This should be + * as small as possible to limit memory use. Once maxImages + * Images are dequeued by the user, one of them has to be queued + * back before a new Image can be dequeued for access via + * {@link #dequeueInputImage()}. + * @param format The format of this ImageWriter. It can be any valid format specified by + * {@link ImageFormat} or {@link PixelFormat}. + * + * @return a new ImageWriter instance. * @hide */ - protected ImageWriter(Surface surface, int maxImages) { + public static ImageWriter newInstance(Surface surface, int maxImages, int format) { + if (!ImageFormat.isPublicFormat(format) && !PixelFormat.isPublicFormat(format)) { + throw new IllegalArgumentException("Invalid format is specified: " + format); + } + return new ImageWriter(surface, maxImages, format); + } + + /** + * @hide + */ + protected ImageWriter(Surface surface, int maxImages, int format) { if (surface == null || maxImages < 1) { throw new IllegalArgumentException("Illegal input argument: surface " + surface + ", maxImages: " + maxImages); } mMaxImages = maxImages; + + if (format == ImageFormat.UNKNOWN) { + format = SurfaceUtils.getSurfaceFormat(surface); + } // Note that the underlying BufferQueue is working in synchronous mode // to avoid dropping any buffers. - mNativeContext = nativeInit(new WeakReference<ImageWriter>(this), surface, maxImages); + mNativeContext = nativeInit(new WeakReference<>(this), surface, maxImages, format); // Estimate the native buffer allocation size and register it so it gets accounted for // during GC. Note that this doesn't include the buffers required by the buffer queue @@ -142,7 +196,6 @@ public class ImageWriter implements AutoCloseable { // complex, and 1 buffer is enough for the VM to treat the ImageWriter as being of some // size. Size surfSize = SurfaceUtils.getSurfaceSize(surface); - int format = SurfaceUtils.getSurfaceFormat(surface); mEstimatedNativeAllocBytes = ImageUtils.getEstimatedNativeAllocBytes(surfSize.getWidth(),surfSize.getHeight(), format, /*buffer count*/ 1); @@ -809,7 +862,8 @@ public class ImageWriter implements AutoCloseable { } // Native implemented ImageWriter methods. - private synchronized native long nativeInit(Object weakSelf, Surface surface, int maxImgs); + private synchronized native long nativeInit(Object weakSelf, Surface surface, int maxImgs, + int format); private synchronized native void nativeClose(long nativeCtx); diff --git a/media/java/android/media/tv/ITvInputManager.aidl b/media/java/android/media/tv/ITvInputManager.aidl index 0d51b5b508b8..af4a5bed9743 100644 --- a/media/java/android/media/tv/ITvInputManager.aidl +++ b/media/java/android/media/tv/ITvInputManager.aidl @@ -17,6 +17,7 @@ package android.media.tv; import android.content.ComponentName; +import android.content.Intent; import android.graphics.Rect; import android.media.PlaybackParams; import android.media.tv.DvbDeviceInfo; @@ -105,4 +106,7 @@ interface ITvInputManager { // For DVB device binding List<DvbDeviceInfo> getDvbDeviceList(); ParcelFileDescriptor openDvbDevice(in DvbDeviceInfo info, int device); + + // For preview programs + void sendTvInputNotifyIntent(in Intent intent, int userId); } diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index 09b2050b1b1a..276a0dcb01ee 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; +import android.content.Intent; import android.graphics.Rect; import android.media.PlaybackParams; import android.net.Uri; @@ -1394,6 +1395,64 @@ public final class TvInputManager { } /** + * Notifies the TV input of the given preview program that the program's browsable state is + * disabled. + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.NOTIFY_TV_INPUTS) + public void notifyPreviewProgramBrowsableDisabled(String packageName, long programId) { + Intent intent = new Intent(); + intent.setAction(TvContract.ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED); + intent.putExtra(TvContract.EXTRA_PREVIEW_PROGRAM_ID, programId); + intent.setPackage(packageName); + try { + mService.sendTvInputNotifyIntent(intent, mUserId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Notifies the TV input of the given watch next program that the program's browsable state is + * disabled. + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.NOTIFY_TV_INPUTS) + public void notifyWatchNextProgramBrowsableDisabled(String packageName, long programId) { + Intent intent = new Intent(); + intent.setAction(TvContract.ACTION_WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED); + intent.putExtra(TvContract.EXTRA_WATCH_NEXT_PROGRAM_ID, programId); + intent.setPackage(packageName); + try { + mService.sendTvInputNotifyIntent(intent, mUserId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Notifies the TV input of the given preview program that the program is added to watch next. + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.NOTIFY_TV_INPUTS) + public void notifyPreviewProgramAddedToWatchNext(String packageName, long previewProgramId, + long watchNextProgramId) { + Intent intent = new Intent(); + intent.setAction(TvContract.ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT); + intent.putExtra(TvContract.EXTRA_PREVIEW_PROGRAM_ID, previewProgramId); + intent.putExtra(TvContract.EXTRA_WATCH_NEXT_PROGRAM_ID, watchNextProgramId); + intent.setPackage(packageName); + try { + mService.sendTvInputNotifyIntent(intent, mUserId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Creates a {@link Session} for a given TV input. * * <p>The number of sessions that can be created at the same time is limited by the capability diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 431d5d83a4bb..c2ed8cf15c1a 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -51,6 +51,7 @@ LOCAL_SHARED_LIBRARIES := \ libandroidfw LOCAL_STATIC_LIBRARIES := \ + libgrallocusage \ LOCAL_C_INCLUDES += \ external/libexif/ \ diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index f5e19f908d71..163c4b012262 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -31,6 +31,8 @@ #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_Surface.h> +#include <android_runtime/android_hardware_HardwareBuffer.h> +#include <grallocusage/GrallocUsageConversion.h> #include <jni.h> #include <JNIHelp.h> @@ -42,6 +44,7 @@ #define ANDROID_MEDIA_SURFACEIMAGE_BUFFER_JNI_ID "mNativeBuffer" #define ANDROID_MEDIA_SURFACEIMAGE_TS_JNI_ID "mTimestamp" +#define CONSUMER_BUFFER_USAGE_UNKNOWN 0; // ---------------------------------------------------------------------------- using namespace android; @@ -327,8 +330,8 @@ static void ImageReader_classInit(JNIEnv* env, jclass clazz) "Can not find SurfacePlane constructor"); } -static void ImageReader_init(JNIEnv* env, jobject thiz, jobject weakThiz, - jint width, jint height, jint format, jint maxImages) +static void ImageReader_init(JNIEnv* env, jobject thiz, jobject weakThiz, jint width, jint height, + jint format, jint maxImages, jlong ndkUsage) { status_t res; int nativeFormat; @@ -358,17 +361,29 @@ static void ImageReader_init(JNIEnv* env, jobject thiz, jobject weakThiz, width, height, format, maxImages, getpid(), createProcessUniqueId()); uint32_t consumerUsage = GRALLOC_USAGE_SW_READ_OFTEN; + bool needUsageOverride = ndkUsage != CONSUMER_BUFFER_USAGE_UNKNOWN; + uint64_t outProducerUsage = 0; + uint64_t outConsumerUsage = 0; + android_hardware_HardwareBuffer_convertToGrallocUsageBits(&outProducerUsage, &outConsumerUsage, + ndkUsage, 0); if (isFormatOpaque(nativeFormat)) { // Use the SW_READ_NEVER usage to tell producer that this format is not for preview or video // encoding. The only possibility will be ZSL output. consumerUsage = GRALLOC_USAGE_SW_READ_NEVER; + if (needUsageOverride) { + consumerUsage = android_convertGralloc1To0Usage(0, outConsumerUsage); + } + } else if (needUsageOverride) { + ALOGW("Consumer usage override for non-opaque format is not implemented yet, " + "ignore the provided usage from the application"); } bufferConsumer = new BufferItemConsumer(gbConsumer, consumerUsage, maxImages, /*controlledByApp*/true); if (bufferConsumer == nullptr) { jniThrowExceptionFmt(env, "java/lang/RuntimeException", - "Failed to allocate native buffer consumer for format 0x%x", nativeFormat); + "Failed to allocate native buffer consumer for format 0x%x and usage 0x%x", + nativeFormat, consumerUsage); return; } ctx->setBufferConsumer(bufferConsumer); @@ -788,7 +803,7 @@ static jint Image_getFormat(JNIEnv* env, jobject thiz, jint readerFormat) static const JNINativeMethod gImageReaderMethods[] = { {"nativeClassInit", "()V", (void*)ImageReader_classInit }, - {"nativeInit", "(Ljava/lang/Object;IIII)V", (void*)ImageReader_init }, + {"nativeInit", "(Ljava/lang/Object;IIIIJ)V", (void*)ImageReader_init }, {"nativeClose", "()V", (void*)ImageReader_close }, {"nativeReleaseImage", "(Landroid/media/Image;)V", (void*)ImageReader_imageRelease }, {"nativeImageSetup", "(Landroid/media/Image;)I", (void*)ImageReader_imageSetup }, diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp index 0149d7623660..ed5fbcfcd5b3 100644 --- a/media/jni/android_media_ImageWriter.cpp +++ b/media/jni/android_media_ImageWriter.cpp @@ -33,7 +33,7 @@ #include <inttypes.h> #define IMAGE_BUFFER_JNI_ID "mNativeBuffer" - +#define IMAGE_FORMAT_UNKNOWN 0 // This is the same value as ImageFormat#UNKNOWN. // ---------------------------------------------------------------------------- using namespace android; @@ -222,7 +222,7 @@ static void ImageWriter_classInit(JNIEnv* env, jclass clazz) { } static jlong ImageWriter_init(JNIEnv* env, jobject thiz, jobject weakThiz, jobject jsurface, - jint maxImages) { + jint maxImages, jint userFormat) { status_t res; ALOGV("%s: maxImages:%d", __FUNCTION__, maxImages); @@ -255,7 +255,7 @@ static jlong ImageWriter_init(JNIEnv* env, jobject thiz, jobject weakThiz, jobje // Get the dimension and format of the producer. sp<ANativeWindow> anw = producer; - int32_t width, height, format; + int32_t width, height, surfaceFormat; if ((res = anw->query(anw.get(), NATIVE_WINDOW_WIDTH, &width)) != OK) { ALOGE("%s: Query Surface width failed: %s (%d)", __FUNCTION__, strerror(-res), res); jniThrowRuntimeException(env, "Failed to query Surface width"); @@ -270,21 +270,27 @@ static jlong ImageWriter_init(JNIEnv* env, jobject thiz, jobject weakThiz, jobje } ctx->setBufferHeight(height); - if ((res = anw->query(anw.get(), NATIVE_WINDOW_FORMAT, &format)) != OK) { - ALOGE("%s: Query Surface format failed: %s (%d)", __FUNCTION__, strerror(-res), res); - jniThrowRuntimeException(env, "Failed to query Surface format"); - return 0; + // Query surface format if no valid user format is specified, otherwise, override surface format + // with user format. + if (userFormat == IMAGE_FORMAT_UNKNOWN) { + if ((res = anw->query(anw.get(), NATIVE_WINDOW_FORMAT, &surfaceFormat)) != OK) { + ALOGE("%s: Query Surface format failed: %s (%d)", __FUNCTION__, strerror(-res), res); + jniThrowRuntimeException(env, "Failed to query Surface format"); + return 0; + } + } else { + surfaceFormat = userFormat; } - ctx->setBufferFormat(format); - env->SetIntField(thiz, gImageWriterClassInfo.mWriterFormat, reinterpret_cast<jint>(format)); - + ctx->setBufferFormat(surfaceFormat); + env->SetIntField(thiz, + gImageWriterClassInfo.mWriterFormat, reinterpret_cast<jint>(surfaceFormat)); - if (!isFormatOpaque(format)) { + if (!isFormatOpaque(surfaceFormat)) { res = native_window_set_usage(anw.get(), GRALLOC_USAGE_SW_WRITE_OFTEN); if (res != OK) { ALOGE("%s: Configure usage %08x for format %08x failed: %s (%d)", __FUNCTION__, static_cast<unsigned int>(GRALLOC_USAGE_SW_WRITE_OFTEN), - format, strerror(-res), res); + surfaceFormat, strerror(-res), res); jniThrowRuntimeException(env, "Failed to SW_WRITE_OFTEN configure usage"); return 0; } @@ -784,7 +790,7 @@ static jobjectArray Image_createSurfacePlanes(JNIEnv* env, jobject thiz, static JNINativeMethod gImageWriterMethods[] = { {"nativeClassInit", "()V", (void*)ImageWriter_classInit }, - {"nativeInit", "(Ljava/lang/Object;Landroid/view/Surface;I)J", + {"nativeInit", "(Ljava/lang/Object;Landroid/view/Surface;II)J", (void*)ImageWriter_init }, {"nativeClose", "(J)V", (void*)ImageWriter_close }, {"nativeAttachAndQueueImage", "(JJIJIIII)I", (void*)ImageWriter_attachAndQueueImage }, diff --git a/native/android/Android.bp b/native/android/Android.bp index 58436371ae27..eacda938b88d 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -14,7 +14,7 @@ // The headers module is in frameworks/native/Android.bp. ndk_library { - name: "libandroid.ndk", + name: "libandroid", symbol_file: "libandroid.map.txt", first_version: "9", unversioned_until: "current", diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp index 17feb53bdb68..d456950037d4 100644 --- a/native/graphics/jni/Android.bp +++ b/native/graphics/jni/Android.bp @@ -14,7 +14,7 @@ // The headers module is in frameworks/native/Android.bp. ndk_library { - name: "libjnigraphics.ndk", + name: "libjnigraphics", symbol_file: "libjnigraphics.map.txt", first_version: "9", unversioned_until: "current", diff --git a/packages/CarrierDefaultApp/res/values-b+sr+Latn/strings.xml b/packages/CarrierDefaultApp/res/values-b+sr+Latn/strings.xml index e78fca3ba1b8..04926852f0e7 100644 --- a/packages/CarrierDefaultApp/res/values-b+sr+Latn/strings.xml +++ b/packages/CarrierDefaultApp/res/values-b+sr+Latn/strings.xml @@ -7,12 +7,9 @@ <string name="no_data_notification_id" msgid="668400731803969521">"Mobilni podaci su deaktivirani"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"Dodirnite da biste posetili veb-sajt %s"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"Kontaktirajte dobavljača usluge %s"</string> - <!-- no translation found for action_bar_label (4290345990334377177) --> - <skip /> - <!-- no translation found for ssl_error_warning (3127935140338254180) --> - <skip /> - <!-- no translation found for ssl_error_example (6188711843183058764) --> - <skip /> - <!-- no translation found for ssl_error_continue (1138548463994095584) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Status mobilnih podataka"</string> + <string name="action_bar_label" msgid="4290345990334377177">"Prijavite se na mobilnu mrežu"</string> + <string name="ssl_error_warning" msgid="3127935140338254180">"Mreža kojoj pokušavate da se pridružite ima bezbednosnih problema."</string> + <string name="ssl_error_example" msgid="6188711843183058764">"Na primer, stranica za prijavljivanje možda ne pripada prikazanoj organizaciji."</string> + <string name="ssl_error_continue" msgid="1138548463994095584">"Ipak nastavi preko pregledača"</string> </resources> diff --git a/packages/CarrierDefaultApp/res/values-be/strings.xml b/packages/CarrierDefaultApp/res/values-be/strings.xml index c46d0da8c268..12677f213b58 100644 --- a/packages/CarrierDefaultApp/res/values-be/strings.xml +++ b/packages/CarrierDefaultApp/res/values-be/strings.xml @@ -7,12 +7,9 @@ <string name="no_data_notification_id" msgid="668400731803969521">"Перадача мабільных даных была дэактывавана"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"Дакраніцеся, каб наведаць вэб-сайт %s"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"Звярніцеся да свайго пастаўшчыка паслуг %s"</string> - <!-- no translation found for action_bar_label (4290345990334377177) --> - <skip /> - <!-- no translation found for ssl_error_warning (3127935140338254180) --> - <skip /> - <!-- no translation found for ssl_error_example (6188711843183058764) --> - <skip /> - <!-- no translation found for ssl_error_continue (1138548463994095584) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Статус мабільнага трафіка"</string> + <string name="action_bar_label" msgid="4290345990334377177">"Увайсці ў мабільную сетку"</string> + <string name="ssl_error_warning" msgid="3127935140338254180">"У сеткі, да якой вы спрабуеце далучыцца, ёсць праблемы з бяспекай."</string> + <string name="ssl_error_example" msgid="6188711843183058764">"Напрыклад, старонка ўваходу можа не належаць указанай арганізацыі."</string> + <string name="ssl_error_continue" msgid="1138548463994095584">"Усё роўна працягнуць праз браўзер"</string> </resources> diff --git a/packages/CarrierDefaultApp/res/values-bs/strings.xml b/packages/CarrierDefaultApp/res/values-bs/strings.xml index ba9863f13fb7..ec0a3a50eed6 100644 --- a/packages/CarrierDefaultApp/res/values-bs/strings.xml +++ b/packages/CarrierDefaultApp/res/values-bs/strings.xml @@ -7,12 +7,9 @@ <string name="no_data_notification_id" msgid="668400731803969521">"Prijenos mobilnih podataka je deaktiviran"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"Dodirnite da posjetite %s web lokaciju"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"Obratite se pružaocu usluga %s"</string> - <!-- no translation found for action_bar_label (4290345990334377177) --> - <skip /> - <!-- no translation found for ssl_error_warning (3127935140338254180) --> - <skip /> - <!-- no translation found for ssl_error_example (6188711843183058764) --> - <skip /> - <!-- no translation found for ssl_error_continue (1138548463994095584) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Status mobilnih podataka"</string> + <string name="action_bar_label" msgid="4290345990334377177">"Prijavite se na mobilnu mrežu"</string> + <string name="ssl_error_warning" msgid="3127935140338254180">"Mreža kojoj pokušavate pristupiti ima sigurnosnih problema."</string> + <string name="ssl_error_example" msgid="6188711843183058764">"Naprimjer, stranica za prijavljivanje možda ne pripada prikazanoj organizaciji."</string> + <string name="ssl_error_continue" msgid="1138548463994095584">"Ipak nastavi preko preglednika"</string> </resources> diff --git a/packages/CarrierDefaultApp/res/values-gu/strings.xml b/packages/CarrierDefaultApp/res/values-gu/strings.xml index 0d1981169d0e..9f68aa49492c 100644 --- a/packages/CarrierDefaultApp/res/values-gu/strings.xml +++ b/packages/CarrierDefaultApp/res/values-gu/strings.xml @@ -7,8 +7,7 @@ <string name="no_data_notification_id" msgid="668400731803969521">"તમારો મોબાઇલ ડેટા નિષ્ક્રિય કરવામાં આવ્યો છે"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"%s વેબસાઇટની મુલાકાત લેવા માટે ટૅપ કરો"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"કૃપા કરીને તમારા સેવા પ્રદાતા %sનો સંપર્ક કરો"</string> - <!-- no translation found for mobile_data_status_notification_channel_name (833999690121305708) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"મોબાઇલ ડેટાની સ્થિતિ"</string> <string name="action_bar_label" msgid="4290345990334377177">"મોબાઇલ નેટવર્કમાં સાઇન ઇન કરો"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"તમે જોડાવાનો પ્રયાસ કરી રહ્યા છો તે નેટવર્કમાં સુરક્ષા સંબંધી સમસ્યાઓ છે."</string> <string name="ssl_error_example" msgid="6188711843183058764">"ઉદાહરણ તરીકે, લોગિન પૃષ્ઠ બતાવવામાં આવેલી સંસ્થાનું ન પણ હોય."</string> diff --git a/packages/CarrierDefaultApp/res/values-iw/strings.xml b/packages/CarrierDefaultApp/res/values-iw/strings.xml index e220b692a087..ca42d33b80b0 100644 --- a/packages/CarrierDefaultApp/res/values-iw/strings.xml +++ b/packages/CarrierDefaultApp/res/values-iw/strings.xml @@ -7,8 +7,7 @@ <string name="no_data_notification_id" msgid="668400731803969521">"חבילת הגלישה שלך הושבתה"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"הקש כדי לעבור לאתר של %s"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"פנה לספק השירות %s"</string> - <!-- no translation found for mobile_data_status_notification_channel_name (833999690121305708) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"סטטוס חבילת הגלישה"</string> <string name="action_bar_label" msgid="4290345990334377177">"היכנס לרשת סלולרית"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"יש בעיות אבטחה ברשת שאליה אתה מנסה להתחבר."</string> <string name="ssl_error_example" msgid="6188711843183058764">"לדוגמה, ייתכן שדף ההתחברות אינו שייך לארגון המוצג."</string> diff --git a/packages/CarrierDefaultApp/res/values-ky/strings.xml b/packages/CarrierDefaultApp/res/values-ky/strings.xml index d638e60b2704..19ad94efbd6e 100644 --- a/packages/CarrierDefaultApp/res/values-ky/strings.xml +++ b/packages/CarrierDefaultApp/res/values-ky/strings.xml @@ -7,7 +7,7 @@ <string name="no_data_notification_id" msgid="668400731803969521">"Мобилдик дайындарды колдонуу өчүрүлгөн"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"%s сайтына баш багуу үчүн басыңыз"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"%s Интернет провайдери менен байланышыңыз"</string> - <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Мобилдик түзмөктүн статусу"</string> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Мобилдик Интернеттин абалы"</string> <string name="action_bar_label" msgid="4290345990334377177">"Мобилдик тармакка кирүү"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"Кошулайын деген тармагыңызда коопсуздук көйгөйлөрү бар."</string> <string name="ssl_error_example" msgid="6188711843183058764">"Мисалы, каттоо эсебине кирүү баракчасы көрсөтүлгөн уюмга таандык эмес болушу мүмкүн."</string> diff --git a/packages/CarrierDefaultApp/res/values-mr/strings.xml b/packages/CarrierDefaultApp/res/values-mr/strings.xml index a04ae3161421..53d740006cfa 100644 --- a/packages/CarrierDefaultApp/res/values-mr/strings.xml +++ b/packages/CarrierDefaultApp/res/values-mr/strings.xml @@ -7,8 +7,7 @@ <string name="no_data_notification_id" msgid="668400731803969521">"आपला मोबाइल डेटा निष्क्रिय केला गेला"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"%s वेबसाइटला भेट देण्यासाठी टॅप करा"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"कृपया आपल्या %s सेवा प्रदात्याशी संपर्क साधा"</string> - <!-- no translation found for mobile_data_status_notification_channel_name (833999690121305708) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"मोबाइल डेटा स्थिती"</string> <string name="action_bar_label" msgid="4290345990334377177">"मोबाइल नेटवर्कमध्ये साइन इन करा"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"आपण ज्या नेटवर्कमध्ये सामील होण्याचा प्रयत्न करत आहात त्यात सुरक्षितता समस्या आहेत."</string> <string name="ssl_error_example" msgid="6188711843183058764">"उदाहरणार्थ, लॉग इन पृष्ठ दर्शवलेल्या संस्थेच्या मालकीचे नसू शकते."</string> diff --git a/packages/CarrierDefaultApp/res/values-nb/strings.xml b/packages/CarrierDefaultApp/res/values-nb/strings.xml index d032bdad4f5d..57d58a52d542 100644 --- a/packages/CarrierDefaultApp/res/values-nb/strings.xml +++ b/packages/CarrierDefaultApp/res/values-nb/strings.xml @@ -7,8 +7,7 @@ <string name="no_data_notification_id" msgid="668400731803969521">"Mobildata er deaktivert"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"Trykk for å besøke %s-nettstedet"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"Ta kontakt med tjenesteleverandøren din, %s"</string> - <!-- no translation found for mobile_data_status_notification_channel_name (833999690121305708) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Status for mobildata"</string> <string name="action_bar_label" msgid="4290345990334377177">"Logg på mobilnettverk"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"Nettverket du prøver å logge på, har sikkerhetsproblemer."</string> <string name="ssl_error_example" msgid="6188711843183058764">"Det er for eksempel mulig at påloggingssiden ikke tilhører organisasjonen som vises."</string> diff --git a/packages/CarrierDefaultApp/res/values-ne/strings.xml b/packages/CarrierDefaultApp/res/values-ne/strings.xml index 694adfe185d3..1070a6240930 100644 --- a/packages/CarrierDefaultApp/res/values-ne/strings.xml +++ b/packages/CarrierDefaultApp/res/values-ne/strings.xml @@ -7,8 +7,7 @@ <string name="no_data_notification_id" msgid="668400731803969521">"तपाईंको मोबाइल डेटा निष्क्रिय पारिएको छ"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"%s वेबसाइटमा जानका लागि ट्याप गर्नुहोस्"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"कृपया आफ्नो सेवा प्रदायक %s लाई सम्पर्क गर्नुहोस्"</string> - <!-- no translation found for mobile_data_status_notification_channel_name (833999690121305708) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"मोबाइल डेटाको स्थिति"</string> <string name="action_bar_label" msgid="4290345990334377177">"मोबाइल नेटवर्कमा साइन इन गर्नुहोस्"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"तपाईंले सामेल हुने प्रयास गरिरहनु भएको नेटवर्कमा सुरक्षा सम्बन्धी समस्याहरू छन्।"</string> <string name="ssl_error_example" msgid="6188711843183058764">"उदाहरणका लागि, लग इन पृष्ठ देखाइएको संस्थाको नहुन सक्छ।"</string> diff --git a/packages/CarrierDefaultApp/res/values-pa/strings.xml b/packages/CarrierDefaultApp/res/values-pa/strings.xml index a0692403ce57..6b754c165afb 100644 --- a/packages/CarrierDefaultApp/res/values-pa/strings.xml +++ b/packages/CarrierDefaultApp/res/values-pa/strings.xml @@ -7,7 +7,7 @@ <string name="no_data_notification_id" msgid="668400731803969521">"ਤੁਹਾਡਾ ਮੋਬਾਈਲ ਡੈਟਾ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"%s ਵੈੱਬਸਾਈਟ \'ਤੇ ਜਾਣ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਸੇਵਾ ਪ੍ਰਦਾਨਕ %s ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string> - <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"ਮੋਬਾਈਲ ਡੈਟੇ ਦੀ ਸਥਿਤੀ"</string> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"ਮੋਬਾਈਲ ਡੈਟੇ ਦੀ ਅਵਸਥਾ"</string> <string name="action_bar_label" msgid="4290345990334377177">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰੋ"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"ਤੁਸੀਂ ਜਿਸ ਨੈੱਟਵਰਕ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਹੇ ਹੋ ਉਸ ਵਿੱਚ ਸੁਰੱਖਿਆ ਸਬੰਧੀ ਸਮੱਸਿਆਵਾਂ ਹਨ।"</string> <string name="ssl_error_example" msgid="6188711843183058764">"ਉਦਾਹਰਣ ਵਜੋਂ, ਹੋ ਸਕਦਾ ਹੈ ਲੌਗਇਨ ਪੰਨਾ ਦਿਖਾਈ ਗਈ ਸੰਸਥਾ ਨਾਲ ਸਬੰਧਿਤ ਨਾ ਹੋਵੇ।"</string> diff --git a/packages/CarrierDefaultApp/res/values-si/strings.xml b/packages/CarrierDefaultApp/res/values-si/strings.xml index 108c3e2820ff..a31e5c40037e 100644 --- a/packages/CarrierDefaultApp/res/values-si/strings.xml +++ b/packages/CarrierDefaultApp/res/values-si/strings.xml @@ -7,8 +7,7 @@ <string name="no_data_notification_id" msgid="668400731803969521">"ඔබගේ ජංගම දත්ත අක්රිය කර ඇත"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"%s වෙබ් අඩවිය වෙත යාමට තට්ටු කරන්න"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"කරුණාකර ඔබගේ සේවා සැපයුම්කරු %s අමතන්න"</string> - <!-- no translation found for mobile_data_status_notification_channel_name (833999690121305708) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"ජංගම දත්ත තත්ත්වය"</string> <string name="action_bar_label" msgid="4290345990334377177">"ජංගම ජාලය වෙත පුරනය වෙන්න"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"ඔබ සම්බන්ධ වීමට උත්සහ කරන ජාලයේ ආරක්ෂක ගැටළු ඇත."</string> <string name="ssl_error_example" msgid="6188711843183058764">"උදාහරණයක් ලෙස, පුරනය වන පිටුව පෙන්වා ඇති සංවිධානයට අයිති නැති විය හැක."</string> diff --git a/packages/CarrierDefaultApp/res/values-ur/strings.xml b/packages/CarrierDefaultApp/res/values-ur/strings.xml index 0627a8d7ce1e..f5fbdc8b8709 100644 --- a/packages/CarrierDefaultApp/res/values-ur/strings.xml +++ b/packages/CarrierDefaultApp/res/values-ur/strings.xml @@ -7,8 +7,7 @@ <string name="no_data_notification_id" msgid="668400731803969521">"آپ کا موبائل ڈیٹا غیر فعال کر دیا گیا ہے"</string> <string name="portal_notification_detail" msgid="2295729385924660881">"%s ویب سائٹ ملاحظہ کرنے کیلئے تھپتھپائیں"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"براہ کرم اپنے خدمت کے فراہم کنندہ %s سے رابطہ کریں"</string> - <!-- no translation found for mobile_data_status_notification_channel_name (833999690121305708) --> - <skip /> + <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"موبائل ڈیٹا کی صورت حال"</string> <string name="action_bar_label" msgid="4290345990334377177">"موبائل نیٹ ورک میں سائن ان کریں"</string> <string name="ssl_error_warning" msgid="3127935140338254180">"آپ جس نیٹ ورک میں شامل ہونے کی کوشش کر رہے ہیں، اس میں سیکیورٹی کے مسائل ہیں۔"</string> <string name="ssl_error_example" msgid="6188711843183058764">"مثال کے طور پر ہو سکتا ہے کہ لاگ ان صفحہ دکھائی گئی تنظیم سے تعلق نہ رکھتا ہو۔"</string> diff --git a/packages/ExternalStorageProvider/res/values-b+sr+Latn/strings.xml b/packages/ExternalStorageProvider/res/values-b+sr+Latn/strings.xml index 9d2f7bbf155f..235b621097cb 100644 --- a/packages/ExternalStorageProvider/res/values-b+sr+Latn/strings.xml +++ b/packages/ExternalStorageProvider/res/values-b+sr+Latn/strings.xml @@ -17,8 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="7123375275748530234">"Spoljna memorija"</string> - <!-- no translation found for storage_description (8541974407321172792) --> - <skip /> + <string name="storage_description" msgid="8541974407321172792">"Lokalni memorijski prostor"</string> <string name="root_internal_storage" msgid="827844243068584127">"Interna memorija"</string> <string name="root_documents" msgid="4051252304075469250">"Dokumenti"</string> </resources> diff --git a/packages/ExternalStorageProvider/res/values-be/strings.xml b/packages/ExternalStorageProvider/res/values-be/strings.xml index ea8837b32474..911ff54cad6c 100644 --- a/packages/ExternalStorageProvider/res/values-be/strings.xml +++ b/packages/ExternalStorageProvider/res/values-be/strings.xml @@ -17,8 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="7123375275748530234">"Вонкавае сховішча"</string> - <!-- no translation found for storage_description (8541974407321172792) --> - <skip /> + <string name="storage_description" msgid="8541974407321172792">"Лакальнае сховішча"</string> <string name="root_internal_storage" msgid="827844243068584127">"Унутранае сховішча"</string> <string name="root_documents" msgid="4051252304075469250">"Дакументы"</string> </resources> diff --git a/packages/ExternalStorageProvider/res/values-bs/strings.xml b/packages/ExternalStorageProvider/res/values-bs/strings.xml index 194e66b4a05b..1eb3020f4a7b 100644 --- a/packages/ExternalStorageProvider/res/values-bs/strings.xml +++ b/packages/ExternalStorageProvider/res/values-bs/strings.xml @@ -17,8 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="7123375275748530234">"Aplikacija za vanjsku pohranu"</string> - <!-- no translation found for storage_description (8541974407321172792) --> - <skip /> + <string name="storage_description" msgid="8541974407321172792">"Lokalna pohrana"</string> <string name="root_internal_storage" msgid="827844243068584127">"Interna pohrana"</string> <string name="root_documents" msgid="4051252304075469250">"Dokumenti"</string> </resources> diff --git a/packages/PrintSpooler/res/values-af/strings.xml b/packages/PrintSpooler/res/values-af/strings.xml index e0702afb4ed9..5b8a341ee418 100644 --- a/packages/PrintSpooler/res/values-af/strings.xml +++ b/packages/PrintSpooler/res/values-af/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Meer inligting oor hierdie drukker"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Druktake wat tans loop"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Mislukte druktake"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Kon nie lêer skep nie"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Sommige drukdienste is gedeaktiveer"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Soek tans vir drukkers"</string> diff --git a/packages/PrintSpooler/res/values-am/strings.xml b/packages/PrintSpooler/res/values-am/strings.xml index b8e595ea03ef..832b8551f5d6 100644 --- a/packages/PrintSpooler/res/values-am/strings.xml +++ b/packages/PrintSpooler/res/values-am/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"ተጨማሪ የዚህ አታሚ መረጃ"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"የህትመት ስራዎችን በማሄድ ላይ"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"የህትመት ስራዎች አልተሳኩም"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ፋይል መፍጠር አልተቻለም"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"አንዳንድ የህትመት አገልግሎቶች ተሰናክለዋል"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"አታሚዎችን በመፈለግ ላይ"</string> diff --git a/packages/PrintSpooler/res/values-ar/strings.xml b/packages/PrintSpooler/res/values-ar/strings.xml index cbbd0176ed42..eab784db0e20 100644 --- a/packages/PrintSpooler/res/values-ar/strings.xml +++ b/packages/PrintSpooler/res/values-ar/strings.xml @@ -65,10 +65,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"مزيد من المعلومات حول هذه الطابعة"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"مهام الطباعة الجارية"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"مهام الطباعة التي تعذَّر تنفيذها"</string> <string name="could_not_create_file" msgid="3425025039427448443">"تعذَّر إنشاء الملف"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"بعض خدمات الطباعة معطَّلة"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"البحث عن طابعات"</string> diff --git a/packages/PrintSpooler/res/values-az/strings.xml b/packages/PrintSpooler/res/values-az/strings.xml index e57a9e7c2b43..4193afcafe06 100644 --- a/packages/PrintSpooler/res/values-az/strings.xml +++ b/packages/PrintSpooler/res/values-az/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Bu printer haqqında daha ətraflı məlumat"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Çap işləri çalışır"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Çap işləri alınmadı"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Fayl yaradıla bilmədi"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Bəzi çap xidmətləri deaktiv edilib."</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Printer axtarılır"</string> diff --git a/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml b/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml index 2b1b8caf6ae9..49fe52be9127 100644 --- a/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml +++ b/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml @@ -62,6 +62,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Još informacija o ovom štampaču"</string> + <string name="notification_channel_progress" msgid="872788690775721436">"Aktivni zadaci štampanja"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Neuspeli zadaci štampanja"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Pravljenje datoteke nije uspelo"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Neke usluge štampanja su onemogućene"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Pretraga štampača"</string> diff --git a/packages/PrintSpooler/res/values-be/strings.xml b/packages/PrintSpooler/res/values-be/strings.xml index 83d0627c6854..c04756c4bdc7 100644 --- a/packages/PrintSpooler/res/values-be/strings.xml +++ b/packages/PrintSpooler/res/values-be/strings.xml @@ -63,6 +63,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Больш падрабязная інфармацыя пра гэты прынтар"</string> + <string name="notification_channel_progress" msgid="872788690775721436">"Заданні друку, якія выконваюцца"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Заданні друку са збоямі"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Не ўдалося стварыць файл"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Некаторыя службы друку адключаны"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Пошук прынтараў"</string> diff --git a/packages/PrintSpooler/res/values-bg/strings.xml b/packages/PrintSpooler/res/values-bg/strings.xml index 4f1c598f874e..d44b4ce47c07 100644 --- a/packages/PrintSpooler/res/values-bg/strings.xml +++ b/packages/PrintSpooler/res/values-bg/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Още информация за този принтер"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Активни задания за отпечатване"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Неуспешни задания за отпечатване"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Файлът не можа да бъде създаден"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Някои услуги за отпечатване са деактивирани"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Търсене на принтери"</string> diff --git a/packages/PrintSpooler/res/values-bn/strings.xml b/packages/PrintSpooler/res/values-bn/strings.xml index 33e4794eb50f..88ba6ee5b9c1 100644 --- a/packages/PrintSpooler/res/values-bn/strings.xml +++ b/packages/PrintSpooler/res/values-bn/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"এই মুদ্রকটির বিষয়ে আরো তথ্য"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"এগুলি প্রিন্ট হচ্ছে"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"এগুলি প্রিন্ট করা যায়নি"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ফাইল তৈরি করা গেল না"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"কিছু মুদ্রণ পরিষেবা অক্ষম করা আছে"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"মুদ্রকগুলি অনুসন্ধান করা হচ্ছে"</string> diff --git a/packages/PrintSpooler/res/values-bs/strings.xml b/packages/PrintSpooler/res/values-bs/strings.xml index 2450be395279..d3f1b80088c0 100644 --- a/packages/PrintSpooler/res/values-bs/strings.xml +++ b/packages/PrintSpooler/res/values-bs/strings.xml @@ -62,6 +62,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Više informacija o ovom štampaču"</string> + <string name="notification_channel_progress" msgid="872788690775721436">"Tekući zadaci za štampanje"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Neizvršeni zadaci za štampanje"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Nije uspjelo kreiranje fajla"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Neke usluge za štampanje su isključene"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Traženje štampača"</string> diff --git a/packages/PrintSpooler/res/values-ca/strings.xml b/packages/PrintSpooler/res/values-ca/strings.xml index fa6cfeb32165..361e42004888 100644 --- a/packages/PrintSpooler/res/values-ca/strings.xml +++ b/packages/PrintSpooler/res/values-ca/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Més informació sobre aquesta impressora"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Tasques d\'impressió actives"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Tasques d\'impressió amb problemes"</string> <string name="could_not_create_file" msgid="3425025039427448443">"No s\'ha pogut crear el fitxer"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Alguns serveis d\'impressió estan desactivats"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Cerca d\'impressores"</string> diff --git a/packages/PrintSpooler/res/values-cs/strings.xml b/packages/PrintSpooler/res/values-cs/strings.xml index 4647c1a76e7d..1f38e3c70e82 100644 --- a/packages/PrintSpooler/res/values-cs/strings.xml +++ b/packages/PrintSpooler/res/values-cs/strings.xml @@ -63,10 +63,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Další informace o této tiskárně"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Spuštěné tiskové úlohy"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Nezdařené tiskové úlohy"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Soubor nelze vytvořit"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Některé tiskové služby nejsou aktivovány"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Vyhledávání tiskáren"</string> diff --git a/packages/PrintSpooler/res/values-da/strings.xml b/packages/PrintSpooler/res/values-da/strings.xml index f0a5be6dc96d..5f116dc8a28c 100644 --- a/packages/PrintSpooler/res/values-da/strings.xml +++ b/packages/PrintSpooler/res/values-da/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Flere oplysninger om denne printer"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Aktive udskriftsjobs"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Mislykkede udskriftsjobs"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Filen kunne ikke oprettes"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Nogle udskrivningstjenester er deaktiveret"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Søger efter printere"</string> diff --git a/packages/PrintSpooler/res/values-de/strings.xml b/packages/PrintSpooler/res/values-de/strings.xml index b4823501851f..c02e3c7bfd2c 100644 --- a/packages/PrintSpooler/res/values-de/strings.xml +++ b/packages/PrintSpooler/res/values-de/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Weitere Informationen über diesen Drucker"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Laufende Druckaufträge"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Fehlgeschlagene Druckaufträge"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Datei konnte nicht erstellt werden"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Einige Druckdienste sind deaktiviert"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Suche nach Druckern"</string> diff --git a/packages/PrintSpooler/res/values-el/strings.xml b/packages/PrintSpooler/res/values-el/strings.xml index ea1477e71ad1..9021f7ca218d 100644 --- a/packages/PrintSpooler/res/values-el/strings.xml +++ b/packages/PrintSpooler/res/values-el/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Περισσότερες πληροφορίες σχετικά με αυτόν τον εκτυπωτή"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Εργασίες εκτύπωσης σε εξέλιξη"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Αποτυχημένες εργασίες εκτύπωσης"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Δεν ήταν δυνατή η δημιουργία του αρχείου"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Ορισμένες υπηρ. εκτύπωσης είναι απενεργοποιημένες"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Αναζήτηση για εκτυπωτές"</string> diff --git a/packages/PrintSpooler/res/values-en-rAU/strings.xml b/packages/PrintSpooler/res/values-en-rAU/strings.xml index 5939182134d9..7fbfeb3b3d3b 100644 --- a/packages/PrintSpooler/res/values-en-rAU/strings.xml +++ b/packages/PrintSpooler/res/values-en-rAU/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"More information about this printer"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Running print jobs"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Failed print jobs"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Could not create file"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Some print services are disabled"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Searching for printers"</string> diff --git a/packages/PrintSpooler/res/values-en-rGB/strings.xml b/packages/PrintSpooler/res/values-en-rGB/strings.xml index 5939182134d9..7fbfeb3b3d3b 100644 --- a/packages/PrintSpooler/res/values-en-rGB/strings.xml +++ b/packages/PrintSpooler/res/values-en-rGB/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"More information about this printer"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Running print jobs"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Failed print jobs"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Could not create file"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Some print services are disabled"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Searching for printers"</string> diff --git a/packages/PrintSpooler/res/values-en-rIN/strings.xml b/packages/PrintSpooler/res/values-en-rIN/strings.xml index 5939182134d9..7fbfeb3b3d3b 100644 --- a/packages/PrintSpooler/res/values-en-rIN/strings.xml +++ b/packages/PrintSpooler/res/values-en-rIN/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"More information about this printer"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Running print jobs"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Failed print jobs"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Could not create file"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Some print services are disabled"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Searching for printers"</string> diff --git a/packages/PrintSpooler/res/values-es-rUS/strings.xml b/packages/PrintSpooler/res/values-es-rUS/strings.xml index 7ee41ee9fea0..441ae73877c0 100644 --- a/packages/PrintSpooler/res/values-es-rUS/strings.xml +++ b/packages/PrintSpooler/res/values-es-rUS/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Más información sobre esta impresora"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Trabajos de impresión activos"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Trabajos de impresión con errores"</string> <string name="could_not_create_file" msgid="3425025039427448443">"No se pudo crear el archivo"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Hay servicios de impresión inhabilitados"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Buscando impresoras"</string> diff --git a/packages/PrintSpooler/res/values-es/strings.xml b/packages/PrintSpooler/res/values-es/strings.xml index f970b83c3d52..c1ff28207ac3 100644 --- a/packages/PrintSpooler/res/values-es/strings.xml +++ b/packages/PrintSpooler/res/values-es/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Más información sobre esta impresora"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Trabajos de impresión activos"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Trabajos de impresión con errores"</string> <string name="could_not_create_file" msgid="3425025039427448443">"No se ha podido crear el archivo"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Algunos servicios de impresión están inhabilitados"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Buscando impresoras"</string> diff --git a/packages/PrintSpooler/res/values-et/strings.xml b/packages/PrintSpooler/res/values-et/strings.xml index 92979e91252b..eebc56998463 100644 --- a/packages/PrintSpooler/res/values-et/strings.xml +++ b/packages/PrintSpooler/res/values-et/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Lisateave selle printeri kohta"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Toimivad printimistööd"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Ebaõnnestunud printimistööd"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Faili ei õnnestunud luua"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Mõned printimisteenused on keelatud"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Printerite otsimine"</string> diff --git a/packages/PrintSpooler/res/values-eu/strings.xml b/packages/PrintSpooler/res/values-eu/strings.xml index df34e73f2b0c..8fdea1f7e0b3 100644 --- a/packages/PrintSpooler/res/values-eu/strings.xml +++ b/packages/PrintSpooler/res/values-eu/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Informazio gehiago inprimagailuari buruz"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Abian diren inprimatze-lanak"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Huts egin duten inprimatze-lanak"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Ezin izan da sortu fitxategia"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Desgaituta daude inprimatzeko zerbitzu batzuk"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Inprimagailuak bilatzen"</string> diff --git a/packages/PrintSpooler/res/values-fa/strings.xml b/packages/PrintSpooler/res/values-fa/strings.xml index 06cdc2330702..596947dfb6dc 100644 --- a/packages/PrintSpooler/res/values-fa/strings.xml +++ b/packages/PrintSpooler/res/values-fa/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"اطلاعات بیشتر درباره چاپگر"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"کارهای چاپی درحال اجرا"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"کارهای چاپی ناموفق"</string> <string name="could_not_create_file" msgid="3425025039427448443">"فایل ایجاد نشد"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"بعضی از خدمات چاپ غیرفعال هستند"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"درحال جستجوی چاپگرها"</string> diff --git a/packages/PrintSpooler/res/values-fi/strings.xml b/packages/PrintSpooler/res/values-fi/strings.xml index 53b96957b48c..724d1d75bdd6 100644 --- a/packages/PrintSpooler/res/values-fi/strings.xml +++ b/packages/PrintSpooler/res/values-fi/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Lisätietoja tästä tulostimesta"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Käynnissä olevat tulostustyöt"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Epäonnistuneet tulostustyöt"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Tiedoston luominen epäonnistui."</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Osa tulostuspalveluista on poistettu käytöstä."</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Etsitään tulostimia"</string> diff --git a/packages/PrintSpooler/res/values-fr-rCA/strings.xml b/packages/PrintSpooler/res/values-fr-rCA/strings.xml index a483b9aa446c..9329d2a51a0a 100644 --- a/packages/PrintSpooler/res/values-fr-rCA/strings.xml +++ b/packages/PrintSpooler/res/values-fr-rCA/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Plus d\'information sur cette imprimante"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Tâches d\'impression en cours"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Tâches d\'impression échouées"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Impossible de créer le fichier"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Certains services d\'impression sont désactivés"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Recherche d\'imprimantes en cours..."</string> diff --git a/packages/PrintSpooler/res/values-fr/strings.xml b/packages/PrintSpooler/res/values-fr/strings.xml index 56920a42ec3a..d2a477d711be 100644 --- a/packages/PrintSpooler/res/values-fr/strings.xml +++ b/packages/PrintSpooler/res/values-fr/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Plus d\'informations sur cette imprimante"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Tâches d\'impression en cours"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Tâches d\'impression non abouties"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Impossible de créer le fichier"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Certains services d\'impression sont désactivés."</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Recherche d\'imprimantes en cours"</string> diff --git a/packages/PrintSpooler/res/values-gl/strings.xml b/packages/PrintSpooler/res/values-gl/strings.xml index 75df0195a6bc..4019d8d048c3 100644 --- a/packages/PrintSpooler/res/values-gl/strings.xml +++ b/packages/PrintSpooler/res/values-gl/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Máis información sobre esta impresora"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Executando traballos de impresión"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Erro nos traballos de impresión"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Non se puido crear o arquivo"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Algúns servizos de impresión están desactivados"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Busca de impresoras"</string> diff --git a/packages/PrintSpooler/res/values-gu/strings.xml b/packages/PrintSpooler/res/values-gu/strings.xml index 292c4fa37de9..f5d698d49eb5 100644 --- a/packages/PrintSpooler/res/values-gu/strings.xml +++ b/packages/PrintSpooler/res/values-gu/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"આ પ્રિન્ટર વિશે વધુ માહિતી"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"ચાલી રહેલા છાપવાનાં કાર્યો"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"નિષ્ફળ થયેલ છાપવાના કાર્યો"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ફાઇલ બનાવી શક્યાં નથી"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"કેટલીક છાપવાની સેવાઓ અક્ષમ કરેલ છે"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"પ્રિન્ટર્સ માટે શોધી રહ્યું છે"</string> diff --git a/packages/PrintSpooler/res/values-hi/strings.xml b/packages/PrintSpooler/res/values-hi/strings.xml index 82dadcdce0a1..809431d1483c 100644 --- a/packages/PrintSpooler/res/values-hi/strings.xml +++ b/packages/PrintSpooler/res/values-hi/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"इस प्रिंटर के बारे में अधिक जानकारी"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"चल रहे प्रिंट कार्य"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"असफल रहे प्रिंट कार्य"</string> <string name="could_not_create_file" msgid="3425025039427448443">"फ़ाइल नहीं बनाई जा सकी"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"कुछ प्रिंट सेवाएं अक्षम हैं"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"प्रिंटर खोज रहा है"</string> diff --git a/packages/PrintSpooler/res/values-hr/strings.xml b/packages/PrintSpooler/res/values-hr/strings.xml index d657c51a5382..217dbaa9969a 100644 --- a/packages/PrintSpooler/res/values-hr/strings.xml +++ b/packages/PrintSpooler/res/values-hr/strings.xml @@ -62,10 +62,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Više informacija o ovom pisaču"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Zadaci ispisa u tijeku"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Neuspjeli zadaci ispisa"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Izrada datoteke nije uspjela"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Neke su usluge ispisa onemogućene"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Traženje pisača"</string> diff --git a/packages/PrintSpooler/res/values-hu/strings.xml b/packages/PrintSpooler/res/values-hu/strings.xml index 4b25171e91e3..b9a0d9d78f62 100644 --- a/packages/PrintSpooler/res/values-hu/strings.xml +++ b/packages/PrintSpooler/res/values-hu/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"További információ erről a nyomtatóról"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Folyamatban lévő nyomtatási feladatok"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Nem sikerült nyomtatási feladatok"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Nem sikerült létrehozni a fájlt"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Egyes nyomtatási szolgáltatások le vannak tiltva"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Nyomtatók keresése"</string> diff --git a/packages/PrintSpooler/res/values-hy/strings.xml b/packages/PrintSpooler/res/values-hy/strings.xml index 1162cb195a16..56045beca1e0 100644 --- a/packages/PrintSpooler/res/values-hy/strings.xml +++ b/packages/PrintSpooler/res/values-hy/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Հավելյալ տեղեկություններ այս տպիչի մասին"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Ընթացիկ տպելու առաջադրանքները"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Ձախողված տպելու առաջադրանքները"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Չհաջողվեց ստեղծել ֆայլ"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Տպելու որոշ ծառայությունները կասեցված են"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Տպիչների որոնում"</string> diff --git a/packages/PrintSpooler/res/values-in/strings.xml b/packages/PrintSpooler/res/values-in/strings.xml index 9139f02a971a..1e536f1f69f2 100644 --- a/packages/PrintSpooler/res/values-in/strings.xml +++ b/packages/PrintSpooler/res/values-in/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Informasi selengkapnya tentang printer ini"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Menjalankan proses pencetakan"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Proses pencetakan yang gagal"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Tidak dapat membuat file"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Beberapa layanan cetak dinonaktifkan"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Mencari printer"</string> diff --git a/packages/PrintSpooler/res/values-is/strings.xml b/packages/PrintSpooler/res/values-is/strings.xml index 419ba60b0880..eb7f01d14355 100644 --- a/packages/PrintSpooler/res/values-is/strings.xml +++ b/packages/PrintSpooler/res/values-is/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Frekari upplýsingar um þennan prentara"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Prentverk í gangi"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Prentverk sem mistókust"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Ekki tókst að búa til skrá"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Hluti prentþjónustunnar er óvirkur"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Leitar að prentara"</string> diff --git a/packages/PrintSpooler/res/values-it/strings.xml b/packages/PrintSpooler/res/values-it/strings.xml index 84e31452dd36..d898b1e62226 100644 --- a/packages/PrintSpooler/res/values-it/strings.xml +++ b/packages/PrintSpooler/res/values-it/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Ulteriori informazioni su questa stampante"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Processi di stampa in esecuzione"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Processi di stampa non riusciti"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Impossibile creare il file"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Alcuni servizi di stampa sono disattivati"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Ricerca di stampanti"</string> diff --git a/packages/PrintSpooler/res/values-iw/strings.xml b/packages/PrintSpooler/res/values-iw/strings.xml index 6227f464731b..74480791c949 100644 --- a/packages/PrintSpooler/res/values-iw/strings.xml +++ b/packages/PrintSpooler/res/values-iw/strings.xml @@ -63,10 +63,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"מידע נוסף על מדפסת זו"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"עבודות הדפסה פועלות"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"עבודות הדפסה שנכשלו"</string> <string name="could_not_create_file" msgid="3425025039427448443">"לא ניתן היה ליצור קובץ"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"שירותי הדפסה מסוימים מושבתים"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"מחפש מדפסות"</string> diff --git a/packages/PrintSpooler/res/values-ja/strings.xml b/packages/PrintSpooler/res/values-ja/strings.xml index 7e6f5e419e09..85296064454b 100644 --- a/packages/PrintSpooler/res/values-ja/strings.xml +++ b/packages/PrintSpooler/res/values-ja/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"このプリンタの詳細"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"アクティブな印刷ジョブ"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"エラーが発生した印刷ジョブ"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ファイルを作成できませんでした"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"一部の印刷サービスは無効になっています"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"プリンタの検索中"</string> diff --git a/packages/PrintSpooler/res/values-ka/strings.xml b/packages/PrintSpooler/res/values-ka/strings.xml index edfab767c72a..f11c0e1dec4b 100644 --- a/packages/PrintSpooler/res/values-ka/strings.xml +++ b/packages/PrintSpooler/res/values-ka/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> — <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"დამატებითი ინფორმაცია ამ პრინტერის შესახებ"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"ბეჭდვის გაშვებული დავალებები"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"ბეჭდვის შეუსრულებელი დავალებები"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ფაილი ვერ შეიქმნა"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"ბეჭდვის ზოგიერთი სერვისი გათიშულია"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"მიმდინარეობს პრინტერების ძიება"</string> diff --git a/packages/PrintSpooler/res/values-kk/strings.xml b/packages/PrintSpooler/res/values-kk/strings.xml index 59b0cd0d4634..a822d1ce7f5c 100644 --- a/packages/PrintSpooler/res/values-kk/strings.xml +++ b/packages/PrintSpooler/res/values-kk/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Осы принтер туралы қосымша ақпарат"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Басып шығару тапсырмасы орындалуда"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Басып шығару тапсырмасы орындалмады"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Файл жасалмады"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Кейбір басып шығару қызметтері өшірілген."</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Принтерлерді іздеу"</string> diff --git a/packages/PrintSpooler/res/values-km/strings.xml b/packages/PrintSpooler/res/values-km/strings.xml index 8072600a10b5..2bc7baa8a4ff 100644 --- a/packages/PrintSpooler/res/values-km/strings.xml +++ b/packages/PrintSpooler/res/values-km/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"ព័ត៌មានបន្ថែមអំពីម៉ាស៊ីបោះពុម្ពនេះ"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"កំពុងដំណើរការកិច្ចការបោះពុម្ព"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"មិនអាចដំណើរការកិច្ចការបោះពុម្ពបានទេ"</string> <string name="could_not_create_file" msgid="3425025039427448443">"មិនអាចបង្កើតឯកសារបានទេ"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"សេវាកម្មបោះពុម្ពមួយចំនួនត្រូវបានបិទដំណើរការ"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"ស្វែងរកម៉ាស៊ីនបោះពុម្ព"</string> diff --git a/packages/PrintSpooler/res/values-kn/strings.xml b/packages/PrintSpooler/res/values-kn/strings.xml index e01dcf7b72ae..c8eaf6e49b55 100644 --- a/packages/PrintSpooler/res/values-kn/strings.xml +++ b/packages/PrintSpooler/res/values-kn/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"ಈ ಪ್ರಿಂಟರ್ ಬಗ್ಗೆ ಇನ್ನಷ್ಟು ಮಾಹಿತಿ"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"ಜಾರಿಯಲ್ಲಿರುವ ಮುದ್ರಣ ಕಾರ್ಯಗಳು"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"ವಿಫಲಗೊಂಡಿರುವ ಮುದ್ರಣ ಕಾರ್ಯಗಳು"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ಫೈಲ್ ರಚಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"ಕೆಲವು ಮುದ್ರಣ ಸೇವೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"ಪ್ರಿಂಟರ್ಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string> diff --git a/packages/PrintSpooler/res/values-ko/strings.xml b/packages/PrintSpooler/res/values-ko/strings.xml index 36d25fb58780..8219b5b0ef10 100644 --- a/packages/PrintSpooler/res/values-ko/strings.xml +++ b/packages/PrintSpooler/res/values-ko/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"이 프린터에 대한 정보 더보기"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"실행 중인 인쇄 작업"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"실패한 인쇄 작업"</string> <string name="could_not_create_file" msgid="3425025039427448443">"파일을 만들 수 없습니다."</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"프린트 서비스 일부가 사용 중지되었습니다."</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"프린터 검색 중"</string> diff --git a/packages/PrintSpooler/res/values-ky/strings.xml b/packages/PrintSpooler/res/values-ky/strings.xml index 06cf8df185e0..655201ea6a48 100644 --- a/packages/PrintSpooler/res/values-ky/strings.xml +++ b/packages/PrintSpooler/res/values-ky/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Бул принтер жөнүндө көбүрөөк маалымат"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Басып чыгаруу тапшырмалары аткарылууда"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Басып чыгарылбай калган тапшырмалар"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Файл түзүлбөй койду"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Басып чыгаруу кызматтарынын айрымы өчүрүлгөн"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Принтерлер изделүүдө"</string> diff --git a/packages/PrintSpooler/res/values-lo/strings.xml b/packages/PrintSpooler/res/values-lo/strings.xml index 79b4fffaff52..cee63764da26 100644 --- a/packages/PrintSpooler/res/values-lo/strings.xml +++ b/packages/PrintSpooler/res/values-lo/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"ຂໍ້ມູນເພີ່ມເຕີມກ່ຽວກັບເຄື່ອງພິມນີ້"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"ກຳລັງແລ່ນວຽກ"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"ພິມວຽກບໍ່ສຳເລັດ"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ບໍ່ສາມາດສ້າງໄຟລ໌ໄດ້"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"ບາງການບໍລິການພິມຖືກປິດການນຳໃຊ້"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"ກຳລັງຊອກຫາເຄື່ອງພິມ"</string> diff --git a/packages/PrintSpooler/res/values-lt/strings.xml b/packages/PrintSpooler/res/values-lt/strings.xml index b17434195f0a..9ed807f4002e 100644 --- a/packages/PrintSpooler/res/values-lt/strings.xml +++ b/packages/PrintSpooler/res/values-lt/strings.xml @@ -63,10 +63,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"„<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g>“ – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Daugiau informacijos apie šį spausdintuvą"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Vykdomos spausdinimo užduotys"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Spausdinimo užduotys su triktimis"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Nepavyko sukurti failo"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Kai kurios spausdinimo paslaugos išjungtos"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Ieškoma spausdintuvų"</string> diff --git a/packages/PrintSpooler/res/values-lv/strings.xml b/packages/PrintSpooler/res/values-lv/strings.xml index 92b5d0e6649b..bf9fb3b630f7 100644 --- a/packages/PrintSpooler/res/values-lv/strings.xml +++ b/packages/PrintSpooler/res/values-lv/strings.xml @@ -62,10 +62,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> — <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Plašāka informācija par šo printeri"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Tiek veikti drukas darbi"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Neizdevās veikt drukas darbus"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Nevarēja izveidot failu."</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Daži drukas pakalpojumi ir atspējoti."</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Printeru meklēšana"</string> diff --git a/packages/PrintSpooler/res/values-mk/strings.xml b/packages/PrintSpooler/res/values-mk/strings.xml index 302f87fcd93e..11d78679631d 100644 --- a/packages/PrintSpooler/res/values-mk/strings.xml +++ b/packages/PrintSpooler/res/values-mk/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Повеќе информации за овој печатач"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Тековни работи за печатење"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Неуспешни работи за печатење"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Не можеше да се создаде датотека"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Некои услуги за печатење се оневозможени"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Пребарување печатачи"</string> diff --git a/packages/PrintSpooler/res/values-ml/strings.xml b/packages/PrintSpooler/res/values-ml/strings.xml index e6add8c2030a..05be7a749e7d 100644 --- a/packages/PrintSpooler/res/values-ml/strings.xml +++ b/packages/PrintSpooler/res/values-ml/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"ഈ പ്രിന്ററിനെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾ"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"നടന്നുകൊണ്ടിരിക്കുന്ന പ്രിന്റ് ജോലികൾ"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"പരാജയപ്പെട്ട പ്രിന്റ് ജോലികൾ"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ഫയൽ സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"ചില പ്രിന്റ് സേവനങ്ങൾ പ്രവർത്തനരഹിതമാക്കി"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"പ്രിന്ററുകൾക്കായി തിരയുന്നു"</string> diff --git a/packages/PrintSpooler/res/values-mn/strings.xml b/packages/PrintSpooler/res/values-mn/strings.xml index b7d33bb41791..fa9935444293 100644 --- a/packages/PrintSpooler/res/values-mn/strings.xml +++ b/packages/PrintSpooler/res/values-mn/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Энэ хэвлэгчийн талаарх дэлгэрэнгүй мэдээлэл"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Хэвлэж байна"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Хэвлэж чадсангүй"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Файл үүсгэж чадсангүй"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Зарим хэвлэх үйлчилгээг идэвхгүй болгосон байна"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Принтер хайж байна"</string> diff --git a/packages/PrintSpooler/res/values-mr/strings.xml b/packages/PrintSpooler/res/values-mr/strings.xml index 482c08591e7e..8981cd83c649 100644 --- a/packages/PrintSpooler/res/values-mr/strings.xml +++ b/packages/PrintSpooler/res/values-mr/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"या प्रिंटर विषयी अधिक माहिती"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"प्रिंट कार्ये चालवणे"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"अयशस्वी प्रिंट कार्ये"</string> <string name="could_not_create_file" msgid="3425025039427448443">"फाईल तयार करणेे शक्य झाले नाही"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"काही मुद्रण सेवा अक्षम केल्या आहेत"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"प्रिंटर शोधत आहे"</string> diff --git a/packages/PrintSpooler/res/values-ms/strings.xml b/packages/PrintSpooler/res/values-ms/strings.xml index 65f26228871d..75ff205610a6 100644 --- a/packages/PrintSpooler/res/values-ms/strings.xml +++ b/packages/PrintSpooler/res/values-ms/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Maklumat lanjut tentang pencetak ini"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Tugas cetak yang sedang berjalan"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Tugas cetak yang gagal"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Tidak dapat membuat fail"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Sesetengah perkhidmatan cetak dilumpuhkan"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Mencari pencetak"</string> diff --git a/packages/PrintSpooler/res/values-my/strings.xml b/packages/PrintSpooler/res/values-my/strings.xml index 87c0b88a9a18..c581e5913007 100644 --- a/packages/PrintSpooler/res/values-my/strings.xml +++ b/packages/PrintSpooler/res/values-my/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"ဤပရင်တာ အကြောင်း ပိုမိုလေ့လာပါ"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"လုပ်နေဆဲ ပရင့်ထုတ်မှုများ"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"မအောင်မြင်သည့် ပရင့်ထုတ်မှုများ"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ဖိုင်အမည်ကို ထည့်၍မရပါ"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"အချို့ပုံနှိပ်ဝန်ဆောင်မှုများကို ပိတ်ထားပါသည်"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"စာထုတ်စက်များကို ရှာနေပါသည်"</string> diff --git a/packages/PrintSpooler/res/values-nb/strings.xml b/packages/PrintSpooler/res/values-nb/strings.xml index 884e8736d11f..6b04c2e7f37c 100644 --- a/packages/PrintSpooler/res/values-nb/strings.xml +++ b/packages/PrintSpooler/res/values-nb/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Mer informasjon om denne printeren"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Utskriftsjobber som er i gang"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Mislykkede utskriftsjobber"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Kunne ikke opprette filen"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Noen utskriftstjenester er slått av"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Søker etter skrivere"</string> diff --git a/packages/PrintSpooler/res/values-ne/strings.xml b/packages/PrintSpooler/res/values-ne/strings.xml index e746b3463a85..c5f597824afa 100644 --- a/packages/PrintSpooler/res/values-ne/strings.xml +++ b/packages/PrintSpooler/res/values-ne/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"यस प्रिन्टरको बारेमा थप जानकारी"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"चलिरहेका छपाइका कार्यहरू"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"कार्यहरूलाई छाप्न सकिएन"</string> <string name="could_not_create_file" msgid="3425025039427448443">"फाइल सिर्जना गर्न सकिएन"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"केही मुद्रण सम्बन्धी सेवाहरूलाई असक्षम गरिएको छ"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"प्रिन्टरहरू खोज्दै"</string> diff --git a/packages/PrintSpooler/res/values-nl/strings.xml b/packages/PrintSpooler/res/values-nl/strings.xml index 7f41bb5d1770..804891447316 100644 --- a/packages/PrintSpooler/res/values-nl/strings.xml +++ b/packages/PrintSpooler/res/values-nl/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Meer informatie over deze printer"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Actieve afdruktaken"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Mislukte afdruktaken"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Kan bestand niet maken"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Sommige afdrukservices zijn uitgeschakeld"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Printers zoeken"</string> diff --git a/packages/PrintSpooler/res/values-pa/strings.xml b/packages/PrintSpooler/res/values-pa/strings.xml index c5d9bf4f6374..6fd021b3082c 100644 --- a/packages/PrintSpooler/res/values-pa/strings.xml +++ b/packages/PrintSpooler/res/values-pa/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"ਇਸ ਪ੍ਰਿੰਟਰ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"ਚੱਲ ਰਹੇ ਪ੍ਰਿੰਟ ਕੰਮ"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"ਪ੍ਰਿੰਟ ਦੇ ਕੰਮ ਅਸਫਲ ਰਹੇ"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ਫ਼ਾਈਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"ਕੁਝ ਪ੍ਰਿੰਟ ਸੇਵਾਵਾਂ ਅਯੋਗ ਬਣਾਈਆਂ ਗਈਆਂ ਹਨ"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"ਪ੍ਰਿੰਟਰ ਖੋਜ ਰਿਹਾ ਹੈ"</string> diff --git a/packages/PrintSpooler/res/values-pl/strings.xml b/packages/PrintSpooler/res/values-pl/strings.xml index 2f0f9839cf2c..a960fe206a58 100644 --- a/packages/PrintSpooler/res/values-pl/strings.xml +++ b/packages/PrintSpooler/res/values-pl/strings.xml @@ -63,10 +63,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Więcej informacji o tej drukarce"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Realizowane zadania drukowania"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Nieudane zadania drukowania"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Nie udało się utworzyć pliku"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Niektóre usługi drukowania są wyłączone"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Szukanie drukarek"</string> diff --git a/packages/PrintSpooler/res/values-pt-rBR/strings.xml b/packages/PrintSpooler/res/values-pt-rBR/strings.xml index 5c68daf96ac1..a2f5ab0bea5b 100644 --- a/packages/PrintSpooler/res/values-pt-rBR/strings.xml +++ b/packages/PrintSpooler/res/values-pt-rBR/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Mais informações sobre essa impressora"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Executando trabalhos de impressão"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Falha em trabalhos de impressão"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Não foi possível criar o arquivo"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Alguns serviços de impressão estão desativados"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Procurando impressoras"</string> diff --git a/packages/PrintSpooler/res/values-pt-rPT/strings.xml b/packages/PrintSpooler/res/values-pt-rPT/strings.xml index 86abd03df2ac..5da31bde591a 100644 --- a/packages/PrintSpooler/res/values-pt-rPT/strings.xml +++ b/packages/PrintSpooler/res/values-pt-rPT/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Mais informações acerca desta impressora"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Tarefas de impressão em execução"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Tarefas de impressão falhadas"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Não foi possível criar o ficheiro"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Alguns serviços de impressão estão desativados"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"A procurar impressoras"</string> diff --git a/packages/PrintSpooler/res/values-pt/strings.xml b/packages/PrintSpooler/res/values-pt/strings.xml index 5c68daf96ac1..a2f5ab0bea5b 100644 --- a/packages/PrintSpooler/res/values-pt/strings.xml +++ b/packages/PrintSpooler/res/values-pt/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Mais informações sobre essa impressora"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Executando trabalhos de impressão"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Falha em trabalhos de impressão"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Não foi possível criar o arquivo"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Alguns serviços de impressão estão desativados"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Procurando impressoras"</string> diff --git a/packages/PrintSpooler/res/values-ro/strings.xml b/packages/PrintSpooler/res/values-ro/strings.xml index 0530fc4eb4c4..e0fb0b89ea88 100644 --- a/packages/PrintSpooler/res/values-ro/strings.xml +++ b/packages/PrintSpooler/res/values-ro/strings.xml @@ -62,10 +62,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Mai multe informații despre această imprimantă"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Sarcini de printare în rulare"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Sarcini de printare nereușite"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Fișierul nu a putut fi creat"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Unele servicii de printare sunt dezactivate"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Se caută imprimante"</string> diff --git a/packages/PrintSpooler/res/values-ru/strings.xml b/packages/PrintSpooler/res/values-ru/strings.xml index 33f3166c4e25..e0aef53bff26 100644 --- a/packages/PrintSpooler/res/values-ru/strings.xml +++ b/packages/PrintSpooler/res/values-ru/strings.xml @@ -63,10 +63,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Подробные сведения о принтере"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Активные задания печати"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Проблемные задания печати"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Не удалось создать файл"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Некоторые службы печати отключены"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Поиск принтеров…"</string> diff --git a/packages/PrintSpooler/res/values-si/strings.xml b/packages/PrintSpooler/res/values-si/strings.xml index 56eb90908aa6..fe17ee09d799 100644 --- a/packages/PrintSpooler/res/values-si/strings.xml +++ b/packages/PrintSpooler/res/values-si/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"මෙම මුද්රණ යන්ත්රය ගැන තවත් තොරතුරු"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"කෙරෙමින් පවතින මුද්රණ කාර්යයන්"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"අසාර්තක වූ මුද්රණ කාර්යයන්"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ගොනුව සෑදීමට නොහැකි විය"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"සමහර මුද්රණ සේවා අබලයි"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"මුද්රණ යන්ත්ර සොයමින්"</string> diff --git a/packages/PrintSpooler/res/values-sk/strings.xml b/packages/PrintSpooler/res/values-sk/strings.xml index 4c480f083a1d..17a029a46294 100644 --- a/packages/PrintSpooler/res/values-sk/strings.xml +++ b/packages/PrintSpooler/res/values-sk/strings.xml @@ -63,10 +63,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Ďalšie informácie o tejto tlačiarni"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Prebiehajúce tlačové úlohy"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Neúspešné tlačové úlohy"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Súbor nie je možné vytvoriť"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Niektoré tlačové služby sú zakázané"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Vyhľadávanie tlačiarní"</string> diff --git a/packages/PrintSpooler/res/values-sl/strings.xml b/packages/PrintSpooler/res/values-sl/strings.xml index 94202dd7a2e6..3217756ceea5 100644 --- a/packages/PrintSpooler/res/values-sl/strings.xml +++ b/packages/PrintSpooler/res/values-sl/strings.xml @@ -63,10 +63,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Več informacij o tem tiskalniku"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Tiskalna opravila, ki se izvajajo"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Neuspela tiskalna opravila"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Datoteke ni bilo mogoče ustvariti"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Nekatere tiskalne storitve so onemogočene"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Iskanje tiskalnikov"</string> diff --git a/packages/PrintSpooler/res/values-sq/strings.xml b/packages/PrintSpooler/res/values-sq/strings.xml index c2d9480b9a3d..0fd5cbbf4579 100644 --- a/packages/PrintSpooler/res/values-sq/strings.xml +++ b/packages/PrintSpooler/res/values-sq/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Më shumë informacione mbi këtë printer"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Punët e printimit që po ekzekutohen"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Punët e printimit që kanë dështuar"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Skedari nuk mund të krijohej"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Disa shërbime printimi janë çaktivizuar"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Po kërkon për printerë"</string> diff --git a/packages/PrintSpooler/res/values-sr/strings.xml b/packages/PrintSpooler/res/values-sr/strings.xml index 372986d25bdf..c20a5af89e66 100644 --- a/packages/PrintSpooler/res/values-sr/strings.xml +++ b/packages/PrintSpooler/res/values-sr/strings.xml @@ -62,10 +62,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Још информација о овом штампачу"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Активни задаци штампања"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Неуспели задаци штампања"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Прављење датотеке није успело"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Неке услуге штампања су онемогућене"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Претрага штампача"</string> diff --git a/packages/PrintSpooler/res/values-sv/strings.xml b/packages/PrintSpooler/res/values-sv/strings.xml index a769a6e3ca08..9dac4cca1a29 100644 --- a/packages/PrintSpooler/res/values-sv/strings.xml +++ b/packages/PrintSpooler/res/values-sv/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Mer information om den här skrivaren"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Utskriftsjobb som pågår"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Utskriftsjobb som misslyckats"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Det gick inte att skapa filen"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Några utskriftstjänster har inaktiverats"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Söker efter skrivare"</string> diff --git a/packages/PrintSpooler/res/values-sw/strings.xml b/packages/PrintSpooler/res/values-sw/strings.xml index 2bee95334b7f..8aaf6f49a83d 100644 --- a/packages/PrintSpooler/res/values-sw/strings.xml +++ b/packages/PrintSpooler/res/values-sw/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Maelezo zaidi kuhusu printa hii"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Kazi ambazo zinachapishwa"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Kazi ambazo hazikuchapishwa"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Imeshindwa kuunda faili"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Baadhi ya huduma za uchapishaji haziruhusiwi"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Inatafuta printa"</string> diff --git a/packages/PrintSpooler/res/values-ta/strings.xml b/packages/PrintSpooler/res/values-ta/strings.xml index 124a1e67b6be..47faf174d27f 100644 --- a/packages/PrintSpooler/res/values-ta/strings.xml +++ b/packages/PrintSpooler/res/values-ta/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"இந்தப் பிரிண்டர் பற்றிய கூடுதல் தகவல்"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"இயக்கத்திலுள்ள அச்சுப் பணிகள்"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"தோல்வியடைந்த அச்சுப் பணிகள்"</string> <string name="could_not_create_file" msgid="3425025039427448443">"கோப்பை உருவாக்க முடியவில்லை"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"சில அச்சுப் பொறிகள் முடக்கப்பட்டன"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"அச்சுப்பொறிகளைத் தேடுகிறது"</string> diff --git a/packages/PrintSpooler/res/values-te/strings.xml b/packages/PrintSpooler/res/values-te/strings.xml index f07f8f0b1f25..e5a0879736a1 100644 --- a/packages/PrintSpooler/res/values-te/strings.xml +++ b/packages/PrintSpooler/res/values-te/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"ఈ ప్రింటర్ గురించి మరింత సమాచారం"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"జరుగుతున్న ముద్రణలు"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"విఫలమైన ముద్రణలు"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ఫైల్ను సృష్టించలేకపోయాము"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"కొన్ని ముద్రణ సేవలు నిలిపివేయబడ్డాయి"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"ప్రింటర్ల కోసం శోధిస్తోంది"</string> diff --git a/packages/PrintSpooler/res/values-th/strings.xml b/packages/PrintSpooler/res/values-th/strings.xml index c230cacfb493..5b73fa9f968e 100644 --- a/packages/PrintSpooler/res/values-th/strings.xml +++ b/packages/PrintSpooler/res/values-th/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"ข้อมูลเพิ่มเติมเกี่ยวกับเครื่องพิมพ์นี้"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"กำลังดำเนินการงานพิมพ์"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"งานพิมพ์ล้มเหลว"</string> <string name="could_not_create_file" msgid="3425025039427448443">"ไม่สามารถสร้างไฟล์ได้"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"บริการพิมพ์บางอย่างปิดใช้อยู่"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"กำลังค้นหาเครื่องพิมพ์"</string> diff --git a/packages/PrintSpooler/res/values-tl/strings.xml b/packages/PrintSpooler/res/values-tl/strings.xml index deafac3b3080..ffc7738f8bdd 100644 --- a/packages/PrintSpooler/res/values-tl/strings.xml +++ b/packages/PrintSpooler/res/values-tl/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Higit pang impormasyon tungkol sa printer na ito"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Mga pag-print na walang naging problema"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Mga hindi matagumpay na pag-print"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Hindi makagawa ng file"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Naka-disable ang ilang serbisyo sa pag-print"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Naghahanap ng mga printer"</string> diff --git a/packages/PrintSpooler/res/values-tr/strings.xml b/packages/PrintSpooler/res/values-tr/strings.xml index b21dde2d7460..3ff3f389323f 100644 --- a/packages/PrintSpooler/res/values-tr/strings.xml +++ b/packages/PrintSpooler/res/values-tr/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Bu yazıcıyla ilgili daha fazla bilgi"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Devam eden yazdırma işleri"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Başarısız yazdırma işleri"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Dosya oluşturulamadı"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Bazı yazdırma hizmetleri devre dışı bırakıldı"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Yazıcılar aranıyor"</string> diff --git a/packages/PrintSpooler/res/values-uk/strings.xml b/packages/PrintSpooler/res/values-uk/strings.xml index 1e145d6d860f..b5d426e56e60 100644 --- a/packages/PrintSpooler/res/values-uk/strings.xml +++ b/packages/PrintSpooler/res/values-uk/strings.xml @@ -63,10 +63,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Докладніше про цей принтер"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Активні завдання друку"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Невиконані завдання друку"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Не вдалося створити файл"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Деякі служби друку вимкнено"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Пошук принтерів"</string> diff --git a/packages/PrintSpooler/res/values-ur/strings.xml b/packages/PrintSpooler/res/values-ur/strings.xml index 10938c88fb36..026a41e6a56a 100644 --- a/packages/PrintSpooler/res/values-ur/strings.xml +++ b/packages/PrintSpooler/res/values-ur/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"اس پرنٹر کے بارے میں مزید معلومات"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"چلنے والے پرنٹ جابز"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"ناکام پرنٹ جابز"</string> <string name="could_not_create_file" msgid="3425025039427448443">"فائل تخلیق نہیں ہو سکی"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"پرنٹ کی کچھ سروسز غیر فعال ہیں"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"پرنٹرز تلاش کر رہا ہے"</string> diff --git a/packages/PrintSpooler/res/values-uz/strings.xml b/packages/PrintSpooler/res/values-uz/strings.xml index 8e5f807e4ef8..8921f8e5d282 100644 --- a/packages/PrintSpooler/res/values-uz/strings.xml +++ b/packages/PrintSpooler/res/values-uz/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Printer haqida batafsil ma’lumot"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Faol chop etish vazifalari"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Muammoli chop etish vazifalari"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Faylni yaratib bo‘lmadi"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Ayrim chop etish xizmatlari o‘chirib qo‘yilgan"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Printerlar qidirilmoqda"</string> diff --git a/packages/PrintSpooler/res/values-vi/strings.xml b/packages/PrintSpooler/res/values-vi/strings.xml index 627e85815cad..a181424f48ce 100644 --- a/packages/PrintSpooler/res/values-vi/strings.xml +++ b/packages/PrintSpooler/res/values-vi/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Thông tin khác về máy in này"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Lệnh in đang chạy"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Lệnh in bị lỗi"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Không thể tạo tệp"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Một số dịch vụ in đã bị tắt"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Đang tìm kiếm máy in"</string> diff --git a/packages/PrintSpooler/res/values-zh-rCN/strings.xml b/packages/PrintSpooler/res/values-zh-rCN/strings.xml index e657093b256c..54e88c05cda1 100644 --- a/packages/PrintSpooler/res/values-zh-rCN/strings.xml +++ b/packages/PrintSpooler/res/values-zh-rCN/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"此打印机的详细信息"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"进行中的打印作业"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"失败的打印作业"</string> <string name="could_not_create_file" msgid="3425025039427448443">"无法创建文件"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"部分打印服务已停用"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"正在搜索打印机"</string> diff --git a/packages/PrintSpooler/res/values-zh-rHK/strings.xml b/packages/PrintSpooler/res/values-zh-rHK/strings.xml index 4a3002e5d64e..9a98cee2d751 100644 --- a/packages/PrintSpooler/res/values-zh-rHK/strings.xml +++ b/packages/PrintSpooler/res/values-zh-rHK/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"此打印機詳情"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"正在執行列印工作"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"列印工作失敗"</string> <string name="could_not_create_file" msgid="3425025039427448443">"無法建立檔案"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"部分列印服務已停用"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"正在搜尋打印機"</string> diff --git a/packages/PrintSpooler/res/values-zh-rTW/strings.xml b/packages/PrintSpooler/res/values-zh-rTW/strings.xml index 946a31d2c97a..f1596050a33e 100644 --- a/packages/PrintSpooler/res/values-zh-rTW/strings.xml +++ b/packages/PrintSpooler/res/values-zh-rTW/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"查看這台印表機的詳細資訊"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"執行中的列印工作"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"失敗的列印工作"</string> <string name="could_not_create_file" msgid="3425025039427448443">"無法建立檔案"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"已停用部分列印服務"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"正在搜尋印表機"</string> diff --git a/packages/PrintSpooler/res/values-zu/strings.xml b/packages/PrintSpooler/res/values-zu/strings.xml index 1f505cebf22e..9b1d5bbc0f5f 100644 --- a/packages/PrintSpooler/res/values-zu/strings.xml +++ b/packages/PrintSpooler/res/values-zu/strings.xml @@ -61,10 +61,8 @@ </plurals> <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> - <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> <string name="printer_info_desc" msgid="7181988788991581654">"Olunye ulwazi mayelana nale phrinta"</string> - <!-- no translation found for notification_channel_progress (872788690775721436) --> - <skip /> - <!-- no translation found for notification_channel_failure (9042250774797916414) --> - <skip /> + <string name="notification_channel_progress" msgid="872788690775721436">"Yenza imisebenzi yokuphrinta"</string> + <string name="notification_channel_failure" msgid="9042250774797916414">"Imisebenzi yokuphrinta ehlulekile"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Ayikwazanga ukufala ifayela"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Amanye amasevisi okuphrinta akhutshaziwe"</string> <string name="print_searching_for_printers" msgid="6550424555079932867">"Isesha amaphrinta"</string> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml b/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml index 7d098761c545..1eeed3c69632 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml @@ -58,12 +58,16 @@ <item msgid="3878793616631049349">"Koristi HDCP proveru samo za DRM sadržaj"</item> <item msgid="45075631231212732">"Uvek koristi HDCP proveru"</item> </string-array> - <!-- no translation found for bluetooth_avrcp_versions:0 (5347678900838034763) --> - <!-- no translation found for bluetooth_avrcp_versions:1 (2089555299377409443) --> - <!-- no translation found for bluetooth_avrcp_versions:2 (2895327394279434278) --> - <!-- no translation found for bluetooth_avrcp_version_values:0 (2838624067805073303) --> - <!-- no translation found for bluetooth_avrcp_version_values:1 (1913619118958233129) --> - <!-- no translation found for bluetooth_avrcp_version_values:2 (7142710449249088270) --> + <string-array name="bluetooth_avrcp_versions"> + <item msgid="5347678900838034763">"AVRCP 1.4 (podrazumevano)"</item> + <item msgid="2089555299377409443">"AVRCP 1.5"</item> + <item msgid="2895327394279434278">"AVRCP 1.6"</item> + </string-array> + <string-array name="bluetooth_avrcp_version_values"> + <item msgid="2838624067805073303">"avrcp14"</item> + <item msgid="1913619118958233129">"avrcp15"</item> + <item msgid="7142710449249088270">"avrcp16"</item> + </string-array> <string-array name="bluetooth_a2dp_codec_titles"> <item msgid="7065842274271279580">"Koristi izbor sistema (podrazumevano)"</item> <item msgid="7539690996561263909">"SBC"</item> @@ -71,6 +75,8 @@ <item msgid="8910200421843557332">"aptX"</item> <item msgid="8434403964359457768">"aptX HD"</item> <item msgid="6751080638867012696">"LDAC"</item> + <item msgid="723675059572222462">"Omogući opcionalne kodeke"</item> + <item msgid="3304843301758635896">"Onemogući opcionalne kodeke"</item> </string-array> <string-array name="bluetooth_a2dp_codec_summaries"> <item msgid="5062108632402595000">"Koristi izbor sistema (podrazumevano)"</item> @@ -79,6 +85,8 @@ <item msgid="2279916056363477395">"aptX"</item> <item msgid="6641171061200063516">"aptX HD"</item> <item msgid="7950781694447359344">"LDAC"</item> + <item msgid="2209680154067241740">"Omogući opcionalne kodeke"</item> + <item msgid="741805482892725657">"Onemogući opcionalne kodeke"</item> </string-array> <string-array name="bluetooth_a2dp_codec_sample_rate_titles"> <item msgid="3093023430402746802">"Koristi izbor sistema (podrazumevano)"</item> @@ -120,11 +128,13 @@ <item msgid="7158319962230727476">"Optimizovano za kvalitet zvuka (990 kb/s/909 kb/s)"</item> <item msgid="2921767058740704969">"Ujednačen kvalitet zvuka i veze (660 kb/s/606 kb/s)"</item> <item msgid="8860982705384396512">"Optimizovano za kvalitet veze (330 kb/s/303 kb/s)"</item> + <item msgid="4414060457677684127">"Najbolje moguće (prilagodljiva brzina prenosa)"</item> </string-array> <string-array name="bluetooth_a2dp_codec_ldac_playback_quality_summaries"> <item msgid="6398189564246596868">"Optimizovano za kvalitet zvuka"</item> <item msgid="4327143584633311908">"Ujednačen kvalitet zvuka i veze"</item> <item msgid="4681409244565426925">"Optimizovano za kvalitet veze"</item> + <item msgid="364670732877872677">"Najbolje moguće (prilagodljiva brzina prenosa)"</item> </string-array> <string-array name="select_logd_size_titles"> <item msgid="8665206199209698501">"Isključeno"</item> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml index 24b2a13854c3..94c3907ce784 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml @@ -32,10 +32,8 @@ <string name="wifi_no_internet_no_reconnect" msgid="5724903347310541706">"Automatsko povezivanje nije uspelo"</string> <string name="wifi_no_internet" msgid="3880396223819116454">"Nema pristupa internetu"</string> <string name="saved_network" msgid="4352716707126620811">"Sačuvao/la je <xliff:g id="NAME">%1$s</xliff:g>"</string> - <!-- no translation found for connected_via_network_scorer (5713793306870815341) --> - <skip /> - <!-- no translation found for connected_via_network_scorer_default (8430960324014668989) --> - <skip /> + <string name="connected_via_network_scorer" msgid="5713793306870815341">"Automatski povezano preko %1$s"</string> + <string name="connected_via_network_scorer_default" msgid="7867260222020343104">"Automatski povezano preko dobavljača ocene mreže"</string> <string name="connected_via_passpoint" msgid="2826205693803088747">"Veza je uspostavljena preko pristupne tačke %1$s"</string> <string name="available_via_passpoint" msgid="1617440946846329613">"Dostupna je preko pristupne tačke %1$s"</string> <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Veza je uspostavljena, nema interneta"</string> @@ -141,7 +139,7 @@ <item msgid="5194774745031751806">"Veoma ubrzano"</item> <item msgid="9085102246155045744">"Najbrže"</item> </string-array> - <string name="choose_profile" msgid="8229363046053568878">"Izaberite profil"</string> + <string name="choose_profile" msgid="6921016979430278661">"Izaberite profil"</string> <string name="category_personal" msgid="1299663247844969448">"Lično"</string> <string name="category_work" msgid="8699184680584175622">"Posao"</string> <string name="development_settings_title" msgid="215179176067683667">"Opcije za programera"</string> @@ -170,16 +168,12 @@ <string name="debug_networking_category" msgid="7044075693643009662">"Umrežavanje"</string> <string name="wifi_display_certification" msgid="8611569543791307533">"Sertifikacija bežičnog ekrana"</string> <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogući detaljniju evidenciju za Wi‑Fi"</string> - <!-- no translation found for wifi_aggressive_handover (5309131983693661320) --> - <skip /> + <string name="wifi_aggressive_handover" msgid="5309131983693661320">"Agresivan prelaz sa Wi‑Fi mreže na mobilnu"</string> <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Uvek dozvoli skeniranje Wi‑Fi-ja u romingu"</string> - <!-- no translation found for mobile_data_always_on (8774857027458200434) --> - <skip /> + <string name="mobile_data_always_on" msgid="8774857027458200434">"Mobilni podaci su uvek aktivni"</string> <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"Onemogući glavno podešavanje jačine zvuka"</string> - <!-- no translation found for bluetooth_select_avrcp_version_string (3750059931120293633) --> - <skip /> - <!-- no translation found for bluetooth_select_avrcp_version_dialog_title (7277329668298705702) --> - <skip /> + <string name="bluetooth_select_avrcp_version_string" msgid="3750059931120293633">"Verzija Bluetooth AVRCP-a"</string> + <string name="bluetooth_select_avrcp_version_dialog_title" msgid="7277329668298705702">"Izaberite verziju Bluetooth AVRCP-a"</string> <string name="bluetooth_select_a2dp_codec_type" msgid="90597356942154882">"Bluetooth audio kodek"</string> <string name="bluetooth_select_a2dp_codec_type_dialog_title" msgid="4558347981670553665">"Izaberite Bluetooth audio kodek"</string> <string name="bluetooth_select_a2dp_codec_sample_rate" msgid="4788245703824623062">"Brzina uzorkovanja za Bluetooth audio"</string> @@ -193,8 +187,7 @@ <string name="bluetooth_select_a2dp_codec_streaming_label" msgid="5347862512596240506">"Strimovanje: <xliff:g id="STREAMING_PARAMETER">%1$s</xliff:g>"</string> <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Prikaz opcija za sertifikaciju bežičnog ekrana"</string> <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Povećava nivo evidentiranja za Wi‑Fi. Prikaz po SSID RSSI-u u biraču Wi‑Fi mreže"</string> - <!-- no translation found for wifi_aggressive_handover_summary (7266329646559808827) --> - <skip /> + <string name="wifi_aggressive_handover_summary" msgid="7266329646559808827">"Kad se omogući, Wi‑Fi će biti agresivniji pri prebacivanju mreže za prenos podataka na mobilnu ako je Wi‑Fi signal slab"</string> <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Dozvoli/zabrani skeniranje Wi-Fi-ja u romingu na osnovu prisutnog protoka podataka na interfejsu"</string> <string name="select_logd_size_title" msgid="7433137108348553508">"Veličine bafera podataka u programu za evidentiranje"</string> <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Izaberite veličine po baferu evidencije"</string> @@ -323,38 +316,23 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korekcija boja"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna i može da utiče na performanse."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Zamenjuje ga <xliff:g id="TITLE">%1$s</xliff:g>"</string> - <string name="power_remaining_duration_only" msgid="4400068916452346544">"Još otprilike <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="845431008899029842">"Još oko <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> do potpunog punjenja"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"Preostalo vreme: <xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for power_discharging_duration (2843747179907396142) --> - <skip /> + <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> – ostalo je oko <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"Preostalo je <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration (4676999980973411875) --> - <skip /> + <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do potpunog punjenja"</string> <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration_ac (7341243578143555689) --> - <skip /> - <string name="power_charging_duration_ac_short" msgid="7895864687218765582">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration_usb (3720632890882121805) --> - <skip /> - <string name="power_charging_duration_usb_short" msgid="941854728040426399">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration_wireless (5768338238751562058) --> - <skip /> - <string name="power_charging_duration_wireless_short" msgid="1642664799869599476">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Nepoznato"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Punjenje"</string> - <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Punjenje preko punjača"</string> - <string name="battery_info_status_charging_ac_short" msgid="7431401092096415502">"Puni se"</string> - <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Punjenje preko USB-a"</string> - <string name="battery_info_status_charging_usb_short" msgid="6733371990319101366">"Puni se"</string> - <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Bežično punjenje"</string> - <string name="battery_info_status_charging_wireless_short" msgid="752569941028903610">"Puni se"</string> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"puni se"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"Puno"</string> <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Kontroliše administrator"</string> - <string name="enabled_by_admin" msgid="2386503803463071894">"Omogućio je administrator"</string> - <string name="disabled_by_admin" msgid="3669999613095206948">"Onemogućio je administrator"</string> + <string name="enabled_by_admin" msgid="5302986023578399263">"Omogućio je administrator"</string> + <string name="disabled_by_admin" msgid="8505398946020816620">"Administrator je onemogućio"</string> <string name="home" msgid="3256884684164448244">"Početna za Podešavanja"</string> <string-array name="battery_labels"> <item msgid="8494684293649631252">"0%"</item> @@ -377,4 +355,7 @@ <string name="retail_demo_reset_title" msgid="696589204029930100">"Potrebna je lozinka"</string> <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metode aktivnog unosa"</string> <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Koristi jezike sistema"</string> + <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Otvaranje podešavanja za aplikaciju <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> nije uspelo"</string> + <string name="ime_security_warning" msgid="4135828934735934248">"Ovaj metod unosa možda može da prikuplja sav tekst koji unosite, uključujući lične podatke, kao što su lozinke i brojevi kreditnih kartica. Potiče od aplikacije <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Želite li da koristite ovaj metod unosa?"</string> + <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Napomena: Posle restartovanja ova aplikacija ne može da se pokrene dok ne otključate telefon"</string> </resources> diff --git a/packages/SettingsLib/res/values-be/arrays.xml b/packages/SettingsLib/res/values-be/arrays.xml index 6c883e3e0c54..8ea31e58943e 100644 --- a/packages/SettingsLib/res/values-be/arrays.xml +++ b/packages/SettingsLib/res/values-be/arrays.xml @@ -58,12 +58,16 @@ <item msgid="3878793616631049349">"Выкарыстанне праверкі HDCP только для змесціва, абароненага DRM"</item> <item msgid="45075631231212732">"Заўсёды выкарыстоўваць праверку HDCP"</item> </string-array> - <!-- no translation found for bluetooth_avrcp_versions:0 (5347678900838034763) --> - <!-- no translation found for bluetooth_avrcp_versions:1 (2089555299377409443) --> - <!-- no translation found for bluetooth_avrcp_versions:2 (2895327394279434278) --> - <!-- no translation found for bluetooth_avrcp_version_values:0 (2838624067805073303) --> - <!-- no translation found for bluetooth_avrcp_version_values:1 (1913619118958233129) --> - <!-- no translation found for bluetooth_avrcp_version_values:2 (7142710449249088270) --> + <string-array name="bluetooth_avrcp_versions"> + <item msgid="5347678900838034763">"AVRCP 1.4 (стандартная)"</item> + <item msgid="2089555299377409443">"AVRCP 1.5"</item> + <item msgid="2895327394279434278">"AVRCP 1.6"</item> + </string-array> + <string-array name="bluetooth_avrcp_version_values"> + <item msgid="2838624067805073303">"avrcp14"</item> + <item msgid="1913619118958233129">"avrcp15"</item> + <item msgid="7142710449249088270">"avrcp16"</item> + </string-array> <string-array name="bluetooth_a2dp_codec_titles"> <item msgid="7065842274271279580">"Выбар сістэмы (стандартны)"</item> <item msgid="7539690996561263909">"SBC"</item> @@ -71,6 +75,8 @@ <item msgid="8910200421843557332">"aptX"</item> <item msgid="8434403964359457768">"aptX HD"</item> <item msgid="6751080638867012696">"LDAC"</item> + <item msgid="723675059572222462">"Уключыць дадатковыя кодэкі"</item> + <item msgid="3304843301758635896">"Адключыць дадатковыя кодэкі"</item> </string-array> <string-array name="bluetooth_a2dp_codec_summaries"> <item msgid="5062108632402595000">"Выбар сістэмы (стандартны)"</item> @@ -79,6 +85,8 @@ <item msgid="2279916056363477395">"aptX"</item> <item msgid="6641171061200063516">"aptX HD"</item> <item msgid="7950781694447359344">"LDAC"</item> + <item msgid="2209680154067241740">"Уключыць дадатковыя кодэкі"</item> + <item msgid="741805482892725657">"Адключыць дадатковыя кодэкі"</item> </string-array> <string-array name="bluetooth_a2dp_codec_sample_rate_titles"> <item msgid="3093023430402746802">"Выбар сістэмы (стандартны)"</item> @@ -120,11 +128,13 @@ <item msgid="7158319962230727476">"Аптымізавана якасць гуку (990 кбіт/c / 909 кбіт/c)"</item> <item msgid="2921767058740704969">"Збалансаваная якасць аўдыя і падключэння (660кбіт/c / 606 кбіт/c)"</item> <item msgid="8860982705384396512">"Аптымізавана якасць падключэння (330 кбіт/c / 303 кбіт/c)"</item> + <item msgid="4414060457677684127">"Best Effort (адаптыўны бітрэйт)"</item> </string-array> <string-array name="bluetooth_a2dp_codec_ldac_playback_quality_summaries"> <item msgid="6398189564246596868">"Аптымізавана якасць гуку"</item> <item msgid="4327143584633311908">"Збалансаваная якасць аўдыя і падключэння"</item> <item msgid="4681409244565426925">"Аптымізавана якасць падключэння"</item> + <item msgid="364670732877872677">"Best Effort (адаптыўны бітрэйт)"</item> </string-array> <string-array name="select_logd_size_titles"> <item msgid="8665206199209698501">"Выкл."</item> diff --git a/packages/SettingsLib/res/values-be/strings.xml b/packages/SettingsLib/res/values-be/strings.xml index 36ebaa309636..f3402325b152 100644 --- a/packages/SettingsLib/res/values-be/strings.xml +++ b/packages/SettingsLib/res/values-be/strings.xml @@ -32,10 +32,8 @@ <string name="wifi_no_internet_no_reconnect" msgid="5724903347310541706">"Не будзе аўтаматычна падключацца"</string> <string name="wifi_no_internet" msgid="3880396223819116454">"Няма доступу да інтэрнэту"</string> <string name="saved_network" msgid="4352716707126620811">"Хто захаваў: <xliff:g id="NAME">%1$s</xliff:g>"</string> - <!-- no translation found for connected_via_network_scorer (5713793306870815341) --> - <skip /> - <!-- no translation found for connected_via_network_scorer_default (8430960324014668989) --> - <skip /> + <string name="connected_via_network_scorer" msgid="5713793306870815341">"Аўтаматычна падключана праз %1$s"</string> + <string name="connected_via_network_scorer_default" msgid="7867260222020343104">"Аўтаматычна падключана праз пастаўшчыка паслугі ацэнкі сеткі"</string> <string name="connected_via_passpoint" msgid="2826205693803088747">"Падлучана праз %1$s"</string> <string name="available_via_passpoint" msgid="1617440946846329613">"Даступна праз %1$s"</string> <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Падлучана, няма інтэрнэту"</string> @@ -141,7 +139,7 @@ <item msgid="5194774745031751806">"Вельмі шпарка"</item> <item msgid="9085102246155045744">"Максімальна хутка"</item> </string-array> - <string name="choose_profile" msgid="8229363046053568878">"Выбраць профіль"</string> + <string name="choose_profile" msgid="6921016979430278661">"Выбраць профіль"</string> <string name="category_personal" msgid="1299663247844969448">"Асабісты"</string> <string name="category_work" msgid="8699184680584175622">"Рабочы"</string> <string name="development_settings_title" msgid="215179176067683667">"Параметры распрацоўшчыка"</string> @@ -170,16 +168,12 @@ <string name="debug_networking_category" msgid="7044075693643009662">"Сеткі"</string> <string name="wifi_display_certification" msgid="8611569543791307533">"Сертыфікацыя бесправаднога дысплея"</string> <string name="wifi_verbose_logging" msgid="4203729756047242344">"Уключыць падрабязны журнал Wi‑Fi"</string> - <!-- no translation found for wifi_aggressive_handover (5309131983693661320) --> - <skip /> + <string name="wifi_aggressive_handover" msgid="5309131983693661320">"Інтэнсіўны пераход з Wi‑Fi на маб. сетку"</string> <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Заўсёды дазваляць роўмінгавае сканіраванне Wi‑Fi"</string> - <!-- no translation found for mobile_data_always_on (8774857027458200434) --> - <skip /> + <string name="mobile_data_always_on" msgid="8774857027458200434">"Мабільная перадача даных заўсёды актыўная"</string> <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"Адключыць абсалютны гук"</string> - <!-- no translation found for bluetooth_select_avrcp_version_string (3750059931120293633) --> - <skip /> - <!-- no translation found for bluetooth_select_avrcp_version_dialog_title (7277329668298705702) --> - <skip /> + <string name="bluetooth_select_avrcp_version_string" msgid="3750059931120293633">"Версія Bluetooth AVRCP"</string> + <string name="bluetooth_select_avrcp_version_dialog_title" msgid="7277329668298705702">"Выбраць версію Bluetooth AVRCP"</string> <string name="bluetooth_select_a2dp_codec_type" msgid="90597356942154882">"Кодэк Bluetooth Audio"</string> <string name="bluetooth_select_a2dp_codec_type_dialog_title" msgid="4558347981670553665">"Выбраць аўдыякодэк Bluetooth"</string> <string name="bluetooth_select_a2dp_codec_sample_rate" msgid="4788245703824623062">"Частата дыскрэтызацыі Bluetooth Audio"</string> @@ -193,8 +187,7 @@ <string name="bluetooth_select_a2dp_codec_streaming_label" msgid="5347862512596240506">"Перадача плынню: <xliff:g id="STREAMING_PARAMETER">%1$s</xliff:g>"</string> <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Паказаць опцыі сертыфікацыі бесправаднога дысплея"</string> <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Падвыс. узровень дэтал-цыі журнала Wi‑Fi у залежн. ад SSID RSSI у Wi‑Fi Picker"</string> - <!-- no translation found for wifi_aggressive_handover_summary (7266329646559808827) --> - <skip /> + <string name="wifi_aggressive_handover_summary" msgid="7266329646559808827">"Калі гэта функцыя ўключана, Wi-Fi будзе больш інтэнсіўна імкнуцца перайсці на падключ. маб. перад. даных пры слабым сігнале Wi‑Fi"</string> <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Дазволіць/забараніць роўмінгавае сканіраванне Wi‑Fi ў залежнасці ад аб\'ёму трафіку даных у інтэрфейсе"</string> <string name="select_logd_size_title" msgid="7433137108348553508">"Памеры буфера для сродку вядзення журнала"</string> <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Выберыце памеры сродку вядзення журнала для буфераў журнала"</string> @@ -323,38 +316,23 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Карэкцыя колеру"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Гэтая функцыя з\'яўляецца эксперыментальнай і можа паўплываць на прадукцыйнасць."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Перавызначаны <xliff:g id="TITLE">%1$s</xliff:g>"</string> - <string name="power_remaining_duration_only" msgid="4400068916452346544">"Засталося прыблізна <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="845431008899029842">"Засталося каля <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Да поўнай зарадкі засталося <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"Засталося <xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for power_discharging_duration (2843747179907396142) --> - <skip /> + <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> – засталося каля <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> – засталося <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration (4676999980973411875) --> - <skip /> + <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> да поўнай зарадкі"</string> <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration_ac (7341243578143555689) --> - <skip /> - <string name="power_charging_duration_ac_short" msgid="7895864687218765582">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration_usb (3720632890882121805) --> - <skip /> - <string name="power_charging_duration_usb_short" msgid="941854728040426399">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration_wireless (5768338238751562058) --> - <skip /> - <string name="power_charging_duration_wireless_short" msgid="1642664799869599476">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Невядома"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарадка"</string> - <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Зар. ад сеткі пер. току"</string> - <string name="battery_info_status_charging_ac_short" msgid="7431401092096415502">"Зарадка"</string> - <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Зарадка па USB"</string> - <string name="battery_info_status_charging_usb_short" msgid="6733371990319101366">"Зарадка"</string> - <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Бесправадная зарадка"</string> - <string name="battery_info_status_charging_wireless_short" msgid="752569941028903610">"Зарадка"</string> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ідзе зарадка"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"Не зараджаецца"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не зараджаецца"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"Поўная"</string> <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Кантралюецца адміністратарам"</string> - <string name="enabled_by_admin" msgid="2386503803463071894">"Уключана адміністратарам"</string> - <string name="disabled_by_admin" msgid="3669999613095206948">"Адключана адміністратарам"</string> + <string name="enabled_by_admin" msgid="5302986023578399263">"Уключана адміністратарам"</string> + <string name="disabled_by_admin" msgid="8505398946020816620">"Адключана адміністратарам"</string> <string name="home" msgid="3256884684164448244">"Галоўная старонка налад"</string> <string-array name="battery_labels"> <item msgid="8494684293649631252">"0 %"</item> @@ -377,4 +355,7 @@ <string name="retail_demo_reset_title" msgid="696589204029930100">"Патрабуецца пароль"</string> <string name="active_input_method_subtypes" msgid="3596398805424733238">"Актыўныя метады ўводу"</string> <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Выкарыстоўваць мовы сістэмы"</string> + <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Не атрымалася адкрыць параметры <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string> + <string name="ime_security_warning" msgid="4135828934735934248">"Гэты метад уводу можа збіраць увесь тэкст, які ўводзіцца, у тым лiку такiя персанальныя дадзеныя, як паролі і нумары крэдытных карт. Ён выкарыстоўваецца прыкладаннем <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Выкарыстоўваць гэты метад уводу?"</string> + <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Заўвага. Пасля перазагрузкі гэта праграма не зможа запусціцца, пакуль вы не разблакіруеце тэлефон"</string> </resources> diff --git a/packages/SettingsLib/res/values-bs/arrays.xml b/packages/SettingsLib/res/values-bs/arrays.xml index 58b3a47d0030..e0b3e3612d83 100644 --- a/packages/SettingsLib/res/values-bs/arrays.xml +++ b/packages/SettingsLib/res/values-bs/arrays.xml @@ -58,12 +58,16 @@ <item msgid="3878793616631049349">"Koristi HDCP provjeru samo za DRM sadržaj"</item> <item msgid="45075631231212732">"Uvijek koristi HDCP provjeru"</item> </string-array> - <!-- no translation found for bluetooth_avrcp_versions:0 (5347678900838034763) --> - <!-- no translation found for bluetooth_avrcp_versions:1 (2089555299377409443) --> - <!-- no translation found for bluetooth_avrcp_versions:2 (2895327394279434278) --> - <!-- no translation found for bluetooth_avrcp_version_values:0 (2838624067805073303) --> - <!-- no translation found for bluetooth_avrcp_version_values:1 (1913619118958233129) --> - <!-- no translation found for bluetooth_avrcp_version_values:2 (7142710449249088270) --> + <string-array name="bluetooth_avrcp_versions"> + <item msgid="5347678900838034763">"AVRCP 1.4 (Zadano)"</item> + <item msgid="2089555299377409443">"AVRCP 1.5"</item> + <item msgid="2895327394279434278">"AVRCP 1.6"</item> + </string-array> + <string-array name="bluetooth_avrcp_version_values"> + <item msgid="2838624067805073303">"avrcp14"</item> + <item msgid="1913619118958233129">"avrcp15"</item> + <item msgid="7142710449249088270">"avrcp16"</item> + </string-array> <string-array name="bluetooth_a2dp_codec_titles"> <item msgid="7065842274271279580">"Koristi odabir sistema (Zadano)"</item> <item msgid="7539690996561263909">"SBC"</item> @@ -71,6 +75,8 @@ <item msgid="8910200421843557332">"aptX"</item> <item msgid="8434403964359457768">"aptX HD"</item> <item msgid="6751080638867012696">"LDAC"</item> + <item msgid="723675059572222462">"Omogućite opcionalne kodeke"</item> + <item msgid="3304843301758635896">"Onemogućite opcionalne kodeke"</item> </string-array> <string-array name="bluetooth_a2dp_codec_summaries"> <item msgid="5062108632402595000">"Koristi odabir sistema (Zadano)"</item> @@ -79,6 +85,8 @@ <item msgid="2279916056363477395">"aptX"</item> <item msgid="6641171061200063516">"aptX HD"</item> <item msgid="7950781694447359344">"LDAC"</item> + <item msgid="2209680154067241740">"Omogućite opcionalne kodeke"</item> + <item msgid="741805482892725657">"Onemogućite opcionalne kodeke"</item> </string-array> <string-array name="bluetooth_a2dp_codec_sample_rate_titles"> <item msgid="3093023430402746802">"Koristi odabir sistema (Zadano)"</item> @@ -120,11 +128,13 @@ <item msgid="7158319962230727476">"Optimizirano za kvalitet zvuka (990 kbps/909 kbps)"</item> <item msgid="2921767058740704969">"Uravnotežen kvalitet zvuka i veze (660kbps/606kbps)"</item> <item msgid="8860982705384396512">"Optimizirano za kvalitet veze (330 kbps/303 kbps)"</item> + <item msgid="4414060457677684127">"Maksimalan napor (Prilagodljiva brzina prijenosa)"</item> </string-array> <string-array name="bluetooth_a2dp_codec_ldac_playback_quality_summaries"> <item msgid="6398189564246596868">"Optimizirano za kvalitet zvuka"</item> <item msgid="4327143584633311908">"Uravnotežen kvalitet zvuka i veze"</item> <item msgid="4681409244565426925">"Optimizirano za kvalitet veze"</item> + <item msgid="364670732877872677">"Maksimalan napor (Prilagodljiva brzina prijenosa)"</item> </string-array> <string-array name="select_logd_size_titles"> <item msgid="8665206199209698501">"Isključeno"</item> diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml index ce40282174fd..6a41f74f3510 100644 --- a/packages/SettingsLib/res/values-bs/strings.xml +++ b/packages/SettingsLib/res/values-bs/strings.xml @@ -32,10 +32,8 @@ <string name="wifi_no_internet_no_reconnect" msgid="5724903347310541706">"Neće se automatski povezati"</string> <string name="wifi_no_internet" msgid="3880396223819116454">"Nema pristupa internetu"</string> <string name="saved_network" msgid="4352716707126620811">"Sačuvao <xliff:g id="NAME">%1$s</xliff:g>"</string> - <!-- no translation found for connected_via_network_scorer (5713793306870815341) --> - <skip /> - <!-- no translation found for connected_via_network_scorer_default (8430960324014668989) --> - <skip /> + <string name="connected_via_network_scorer" msgid="5713793306870815341">"Automatski povezano koristeći %1$s"</string> + <string name="connected_via_network_scorer_default" msgid="7867260222020343104">"Automatski povezano putem ocjenjivača mreže"</string> <string name="connected_via_passpoint" msgid="2826205693803088747">"Povezani preko %1$s"</string> <string name="available_via_passpoint" msgid="1617440946846329613">"Dostupan preko %1$s"</string> <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Povezano. Nema interneta"</string> @@ -141,7 +139,7 @@ <item msgid="5194774745031751806">"Veoma ubrzano"</item> <item msgid="9085102246155045744">"Najbrže"</item> </string-array> - <string name="choose_profile" msgid="8229363046053568878">"Odaberite profil"</string> + <string name="choose_profile" msgid="6921016979430278661">"Odaberite profil"</string> <string name="category_personal" msgid="1299663247844969448">"Lično"</string> <string name="category_work" msgid="8699184680584175622">"Posao"</string> <string name="development_settings_title" msgid="215179176067683667">"Opcije za programere"</string> @@ -170,16 +168,12 @@ <string name="debug_networking_category" msgid="7044075693643009662">"Umrežavanje"</string> <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikacija bežičnog prikaza"</string> <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogućiti Wi-Fi Verbose zapisivanje"</string> - <!-- no translation found for wifi_aggressive_handover (5309131983693661320) --> - <skip /> + <string name="wifi_aggressive_handover" msgid="5309131983693661320">"Agresivni prijenos s Wi-Fi mreže na mob."</string> <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Uvijek dopustiti Wi-Fi lutajuće skeniranje"</string> - <!-- no translation found for mobile_data_always_on (8774857027458200434) --> - <skip /> + <string name="mobile_data_always_on" msgid="8774857027458200434">"Mobilna mreža za prijenos podataka je uvijek aktivna"</string> <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"Onemogućite apsolutnu jačinu zvuka"</string> - <!-- no translation found for bluetooth_select_avrcp_version_string (3750059931120293633) --> - <skip /> - <!-- no translation found for bluetooth_select_avrcp_version_dialog_title (7277329668298705702) --> - <skip /> + <string name="bluetooth_select_avrcp_version_string" msgid="3750059931120293633">"Bluetooth AVRCP verzija"</string> + <string name="bluetooth_select_avrcp_version_dialog_title" msgid="7277329668298705702">"Odaberite Bluetooth AVRCP verziju"</string> <string name="bluetooth_select_a2dp_codec_type" msgid="90597356942154882">"Bluetooth Audio kodek"</string> <string name="bluetooth_select_a2dp_codec_type_dialog_title" msgid="4558347981670553665">"Odaberite Bluetooth Audio kodek"</string> <string name="bluetooth_select_a2dp_codec_sample_rate" msgid="4788245703824623062">"Brzina uzorkovanja za Bluetooth audio"</string> @@ -193,8 +187,7 @@ <string name="bluetooth_select_a2dp_codec_streaming_label" msgid="5347862512596240506">"Prijenos: <xliff:g id="STREAMING_PARAMETER">%1$s</xliff:g>"</string> <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaži opcije za certifikaciju Bežičnog prikaza"</string> <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Povećajte nivo Wi-Fi zapisivanja, pokazati po SSID RSSI Wi-Fi Picker"</string> - <!-- no translation found for wifi_aggressive_handover_summary (7266329646559808827) --> - <skip /> + <string name="wifi_aggressive_handover_summary" msgid="7266329646559808827">"Kada je omogućeno, Wi-Fi veza će u slučaju slabog signala agresivnije predavati vezu za prijenos podataka na mobilnu vezu"</string> <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Dozvoli/Zabrani Wi-Fi lutajuće skeniranje na osnovu količine podatkovnog prometa prisutnog na sučelju"</string> <string name="select_logd_size_title" msgid="7433137108348553508">"Veličine bafera za zapisnik"</string> <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Izaberite veličine za Logger prema međumemoriji evidencije"</string> @@ -323,38 +316,23 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Ispravka boje"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna te može utjecati na performanse."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Zamjenjuje <xliff:g id="TITLE">%1$s</xliff:g>"</string> - <string name="power_remaining_duration_only" msgid="4400068916452346544">"Još otprilike <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="845431008899029842">"Preostalo je otprilike još <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Do potpune napunjenosti preostalo je <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"Imate još <xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for power_discharging_duration (2843747179907396142) --> - <skip /> + <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - imate još <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> - imate još <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration (4676999980973411875) --> - <skip /> + <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> do potpune napunjenosti"</string> <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration_ac (7341243578143555689) --> - <skip /> - <string name="power_charging_duration_ac_short" msgid="7895864687218765582">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration_usb (3720632890882121805) --> - <skip /> - <string name="power_charging_duration_usb_short" msgid="941854728040426399">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> - <!-- no translation found for power_charging_duration_wireless (5768338238751562058) --> - <skip /> - <string name="power_charging_duration_wireless_short" msgid="1642664799869599476">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Nepoznato"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Puni se"</string> - <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Puni se na punjaču"</string> - <string name="battery_info_status_charging_ac_short" msgid="7431401092096415502">"Punjenje"</string> - <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Punjenje preko USB-a"</string> - <string name="battery_info_status_charging_usb_short" msgid="6733371990319101366">"Punjenje"</string> - <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Bežično punjenje"</string> - <string name="battery_info_status_charging_wireless_short" msgid="752569941028903610">"Punjenje"</string> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"punjenje"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string> <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Pod kontrolom administratora"</string> - <string name="enabled_by_admin" msgid="2386503803463071894">"Omogućio administrator"</string> - <string name="disabled_by_admin" msgid="3669999613095206948">"Onemogućio je administrator"</string> + <string name="enabled_by_admin" msgid="5302986023578399263">"Omogućio administrator"</string> + <string name="disabled_by_admin" msgid="8505398946020816620">"Onemogućio administrator"</string> <string name="home" msgid="3256884684164448244">"Postavke početne stranice"</string> <string-array name="battery_labels"> <item msgid="8494684293649631252">"0%"</item> @@ -377,4 +355,7 @@ <string name="retail_demo_reset_title" msgid="696589204029930100">"Potrebna je lozinka"</string> <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktivne metode unosa"</string> <string name="use_system_language_to_select_input_method_subtypes" msgid="5747329075020379587">"Koristi jezik sistema"</string> + <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Nije uspjelo otvaranje postavki za <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string> + <string name="ime_security_warning" msgid="4135828934735934248">"Ovaj način unosa može prikupiti sav tekst koji otkucate, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Način omogućava aplikacija <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Da li želite koristiti ovaj način unosa?"</string> + <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Napomena: Nakon ponovnog pokretanja, ova aplikacija se neće moći pokrenuti dok ne otključate telefon"</string> </resources> diff --git a/packages/SettingsLib/res/values-eu/strings.xml b/packages/SettingsLib/res/values-eu/strings.xml index dfd2a82b991a..2f92ecdc0163 100644 --- a/packages/SettingsLib/res/values-eu/strings.xml +++ b/packages/SettingsLib/res/values-eu/strings.xml @@ -113,7 +113,7 @@ <string name="tts_play_example_title" msgid="7094780383253097230">"Entzun adibide bat"</string> <string name="tts_play_example_summary" msgid="8029071615047894486">"Erreproduzitu hizketa-sintesiaren demostrazio laburra"</string> <string name="tts_install_data_title" msgid="4264378440508149986">"Instalatu ahotsaren datuak"</string> - <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalatu hizketaren sintesirako behar diren ahots-datuak"</string> + <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalatu hizketaren sintesirako behar diren ahotsaren datuak"</string> <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hizketaren sintesi-motorrak idazten duzun testu guztia bil dezake, pasahitzak eta kreditu-txarteleko zenbakiak bezalako datu pertsonalak barne. <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motorrak egin du eskaera. Hizketaren sintesi-motor hori erabili nahi duzu?"</string> <string name="tts_engine_network_required" msgid="1190837151485314743">"Testua ahots bihurtzeko eginbidea erabiltzeko, hizkuntza honek sareko konexioa behar du."</string> <string name="tts_default_sample_string" msgid="4040835213373086322">"Hizketa-sintesiaren adibide bat da hau"</string> diff --git a/packages/SettingsLib/res/values-gu/strings.xml b/packages/SettingsLib/res/values-gu/strings.xml index e623180454c3..2f4ac522fc7b 100644 --- a/packages/SettingsLib/res/values-gu/strings.xml +++ b/packages/SettingsLib/res/values-gu/strings.xml @@ -316,10 +316,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"રંગ સુધારણા"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"આ સુવિધા પ્રાયોગિક છે અને કામગીરી પર અસર કરી શકે છે."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> દ્વારા ઓવરરાઇડ થયું"</string> - <!-- no translation found for power_remaining_duration_only (845431008899029842) --> - <skip /> - <!-- no translation found for power_remaining_charging_duration_only (1421102457410268886) --> - <skip /> + <string name="power_remaining_duration_only" msgid="845431008899029842">"અંદાજે <xliff:g id="TIME">%1$s</xliff:g> બાકી"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"સંપૂર્ણપણે ચાર્જ થવામાં <xliff:g id="TIME">%1$s</xliff:g> બાકી"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"<xliff:g id="TIME">%1$s</xliff:g> બાકી"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - લગભગ <xliff:g id="TIME">%2$s</xliff:g> બાકી"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> બાકી"</string> @@ -328,8 +326,7 @@ <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"અજાણ્યું"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ચાર્જ થઈ રહ્યું છે"</string> - <!-- no translation found for battery_info_status_charging_lower (8689770213898117994) --> - <skip /> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ચાર્જ થઈ રહ્યું છે"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"ચાર્જ થઈ રહ્યું નથી"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ચાર્જ થઈ રહ્યું નથી"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"પૂર્ણ"</string> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index b7dbd415ad98..e7364dba7267 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -316,10 +316,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"תיקון צבע"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"תכונה זו היא ניסיונית ועשויה להשפיע על הביצועים."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"נעקף על ידי <xliff:g id="TITLE">%1$s</xliff:g>"</string> - <!-- no translation found for power_remaining_duration_only (845431008899029842) --> - <skip /> - <!-- no translation found for power_remaining_charging_duration_only (1421102457410268886) --> - <skip /> + <string name="power_remaining_duration_only" msgid="845431008899029842">"עוד <xliff:g id="TIME">%1$s</xliff:g> בקירוב"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> עד לטעינה מלאה"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"נותרו <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - הזמן הנותר: בערך <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> - נותרו <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -328,8 +326,7 @@ <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"לא ידוע"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"טוען"</string> - <!-- no translation found for battery_info_status_charging_lower (8689770213898117994) --> - <skip /> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"בטעינה"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"לא בטעינה"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"לא טוען"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"מלא"</string> diff --git a/packages/SettingsLib/res/values-ky/strings.xml b/packages/SettingsLib/res/values-ky/strings.xml index f063a7bd7ac3..ba098e565445 100644 --- a/packages/SettingsLib/res/values-ky/strings.xml +++ b/packages/SettingsLib/res/values-ky/strings.xml @@ -316,7 +316,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Түсүн тууралоо"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Бул сынамык мүмкүнчүлүк болгондуктан, иштин майнаптуулугуна таасир этиши мүмкүн."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> менен алмаштырылган"</string> - <string name="power_remaining_duration_only" msgid="845431008899029842">"Батарея толгонго чейин болж. убакыт: <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="845431008899029842">"Батарея түгөнгөнгө чейин калган убакыт: <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Батарея толгонго чейин калган убакыт: <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"<xliff:g id="TIME">%1$s</xliff:g> калды"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> – болжол менен <xliff:g id="TIME">%2$s</xliff:g> калды"</string> diff --git a/packages/SettingsLib/res/values-mr/strings.xml b/packages/SettingsLib/res/values-mr/strings.xml index eb55e0dd3825..89bbc715ad95 100644 --- a/packages/SettingsLib/res/values-mr/strings.xml +++ b/packages/SettingsLib/res/values-mr/strings.xml @@ -316,10 +316,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"रंग सुधारणा"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"हे वैशिष्ट्य प्रायोगिक आहे आणि कदाचित कार्यप्रदर्शन प्रभावित करू शकते."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> द्वारे अधिलिखित"</string> - <!-- no translation found for power_remaining_duration_only (845431008899029842) --> - <skip /> - <!-- no translation found for power_remaining_charging_duration_only (1421102457410268886) --> - <skip /> + <string name="power_remaining_duration_only" msgid="845431008899029842">"सुमारे <xliff:g id="TIME">%1$s</xliff:g> शिल्लक"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"पूर्णपणे चार्ज होण्यास <xliff:g id="TIME">%1$s</xliff:g> शिल्लक"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"<xliff:g id="TIME">%1$s</xliff:g> शिल्लक"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - सुमारे <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</string> @@ -328,8 +326,7 @@ <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"अज्ञात"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"चार्ज होत आहे"</string> - <!-- no translation found for battery_info_status_charging_lower (8689770213898117994) --> - <skip /> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"चार्ज होत आहे"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"चार्ज होत नाही"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"चार्ज होत नाही"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"पूर्ण"</string> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index 3a696f66ba2d..2e574dc9bbe0 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -316,10 +316,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Fargekorrigering"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Denne funksjonen er eksperimentell og kan påvirke ytelsen."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Overstyres av <xliff:g id="TITLE">%1$s</xliff:g>"</string> - <!-- no translation found for power_remaining_duration_only (845431008899029842) --> - <skip /> - <!-- no translation found for power_remaining_charging_duration_only (1421102457410268886) --> - <skip /> + <string name="power_remaining_duration_only" msgid="845431008899029842">"Omtrent <xliff:g id="TIME">%1$s</xliff:g> gjenstår"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> til det er fulladet"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"<xliff:g id="TIME">%1$s</xliff:g> gjenstår"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> – omtrent <xliff:g id="TIME">%2$s</xliff:g> gjenstår"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> gjenstår"</string> @@ -328,8 +326,7 @@ <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Ukjent"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Lader"</string> - <!-- no translation found for battery_info_status_charging_lower (8689770213898117994) --> - <skip /> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"lader"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"Lader ikke"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Lader ikke"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"Fullt"</string> diff --git a/packages/SettingsLib/res/values-ne/strings.xml b/packages/SettingsLib/res/values-ne/strings.xml index 0015f79bffeb..35d8363eba39 100644 --- a/packages/SettingsLib/res/values-ne/strings.xml +++ b/packages/SettingsLib/res/values-ne/strings.xml @@ -316,10 +316,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"रङ्ग सुधार"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"यो सुविधा प्रयोगात्मक छ र प्रदर्शनमा असर गर्न सक्छ।"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> द्वारा अधिरोहित"</string> - <!-- no translation found for power_remaining_duration_only (845431008899029842) --> - <skip /> - <!-- no translation found for power_remaining_charging_duration_only (1421102457410268886) --> - <skip /> + <string name="power_remaining_duration_only" msgid="845431008899029842">"लगभग <xliff:g id="TIME">%1$s</xliff:g> बाँकी"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"पूर्णरूपमा चार्ज हुन <xliff:g id="TIME">%1$s</xliff:g> बाँकी"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"बाँकी समय <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - करिब <xliff:g id="TIME">%2$s</xliff:g> बाँकी"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"बाँकी समय <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -328,8 +326,7 @@ <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"अज्ञात"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"चार्ज हुँदै"</string> - <!-- no translation found for battery_info_status_charging_lower (8689770213898117994) --> - <skip /> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"चार्ज हुँदै"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"चार्ज भइरहेको छैन"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"चार्ज हुँदै छैन"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"पूर्ण"</string> diff --git a/packages/SettingsLib/res/values-pa/strings.xml b/packages/SettingsLib/res/values-pa/strings.xml index 2eb611f898a6..dc949c35ff19 100644 --- a/packages/SettingsLib/res/values-pa/strings.xml +++ b/packages/SettingsLib/res/values-pa/strings.xml @@ -316,10 +316,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"ਰੰਗ ਸੰਸ਼ੋਧਨ"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਪ੍ਰਯੋਗਾਤਮਿਕ ਹੈ ਅਤੇ ਪ੍ਰਦਰਸ਼ਨ ਤੇ ਅਸਰ ਪਾ ਸਕਦੀ ਹੈ।"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> ਦੁਆਰਾ ਓਵਰਰਾਈਡ ਕੀਤਾ"</string> - <!-- no translation found for power_remaining_duration_only (845431008899029842) --> - <skip /> - <!-- no translation found for power_remaining_charging_duration_only (1421102457410268886) --> - <skip /> + <string name="power_remaining_duration_only" msgid="845431008899029842">"ਲਗਭਗ <xliff:g id="TIME">%1$s</xliff:g> ਬਾਕੀ"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਚਾਰਜ ਹੋਣ ਲਈ <xliff:g id="TIME">%1$s</xliff:g> ਬਾਕੀ"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"<xliff:g id="TIME">%1$s</xliff:g> ਬਾਕੀ"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - ਲਗਭਗ <xliff:g id="TIME">%2$s</xliff:g> ਬਾਕੀ"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ਬਾਕੀ"</string> @@ -328,8 +326,7 @@ <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"ਅਗਿਆਤ"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ਚਾਰਜਿੰਗ"</string> - <!-- no translation found for battery_info_status_charging_lower (8689770213898117994) --> - <skip /> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ਚਾਰਜ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"ਚਾਰਜ ਨਹੀਂ ਹੋ ਰਿਹਾ"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ਚਾਰਜ ਨਹੀਂ ਹੋ ਰਿਹਾ"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"ਪੂਰੀ"</string> diff --git a/packages/SettingsLib/res/values-si/strings.xml b/packages/SettingsLib/res/values-si/strings.xml index 75501d75c593..a8fd5bda6924 100644 --- a/packages/SettingsLib/res/values-si/strings.xml +++ b/packages/SettingsLib/res/values-si/strings.xml @@ -316,10 +316,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"වර්ණ නිවැරදි කිරීම"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"මෙම විශේෂාංගය පරීක්ෂණාත්මක සහ ඇතැම් විට ක්රියාකාරිත්වයට බලපෑ හැක."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> මගින් ඉක්මවන ලදී"</string> - <!-- no translation found for power_remaining_duration_only (845431008899029842) --> - <skip /> - <!-- no translation found for power_remaining_charging_duration_only (1421102457410268886) --> - <skip /> + <string name="power_remaining_duration_only" msgid="845431008899029842">"<xliff:g id="TIME">%1$s</xliff:g> පමණ ඉතිරියි"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"පූර්ණව ආරෝපණය වන තෙක් <xliff:g id="TIME">%1$s</xliff:g> ඉතිරියි"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"ඉතිරි <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>ක් පමණ ඇත"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> - ඉතිරි <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -328,8 +326,7 @@ <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"නොදනී"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ආරෝපණය වෙමින්"</string> - <!-- no translation found for battery_info_status_charging_lower (8689770213898117994) --> - <skip /> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ආරෝපණය වේ"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"ආරෝපණය නොවේ"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ආරෝපණය නොවෙමින්"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"පූර්ණ"</string> diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml index 46458157a698..e38a5c672738 100644 --- a/packages/SettingsLib/res/values-sw/strings.xml +++ b/packages/SettingsLib/res/values-sw/strings.xml @@ -317,7 +317,7 @@ <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Kipengele hiki ni cha majaribio na huenda kikaathiri utendaji wa kifaa chako."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Imetanguliwa na <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"Zimesalia takribani <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Imebaki <xliff:g id="TIME">%1$s</xliff:g> hadi chaji ijae"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Imebaki <xliff:g id="TIME">%1$s</xliff:g> chaji ijae"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"Zimesalia <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - imesalia takribani <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"Imechaji <xliff:g id="LEVEL">%1$s</xliff:g> - Zimesalia <xliff:g id="TIME">%2$s</xliff:g>"</string> diff --git a/packages/SettingsLib/res/values-te/strings.xml b/packages/SettingsLib/res/values-te/strings.xml index ab38cce19ab5..1c937ed4d55f 100644 --- a/packages/SettingsLib/res/values-te/strings.xml +++ b/packages/SettingsLib/res/values-te/strings.xml @@ -316,10 +316,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"రంగు సవరణ"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ఈ లక్షణం ప్రయోగాత్మకమైనది మరియు పనితీరుపై ప్రభావం చూపవచ్చు."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> ద్వారా భర్తీ చేయబడింది"</string> - <!-- no translation found for power_remaining_duration_only (845431008899029842) --> - <skip /> - <!-- no translation found for power_remaining_charging_duration_only (1421102457410268886) --> - <skip /> + <string name="power_remaining_duration_only" msgid="845431008899029842">"మిగిలి ఉన్న సమయం, <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"పూర్తిగా ఛార్జ్ కావడానికి <xliff:g id="TIME">%1$s</xliff:g> పడుతుంది"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"<xliff:g id="TIME">%1$s</xliff:g> మిగిలి ఉంది"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> పని చేస్తుంది"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> మిగిలి ఉంది"</string> @@ -328,8 +326,7 @@ <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"తెలియదు"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ఛార్జ్ అవుతోంది"</string> - <!-- no translation found for battery_info_status_charging_lower (8689770213898117994) --> - <skip /> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ఛార్జ్ అవుతోంది"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"ఛార్జ్ కావడం లేదు"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ఛార్జ్ కావడం లేదు"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"నిండింది"</string> diff --git a/packages/SettingsLib/res/values-ur/strings.xml b/packages/SettingsLib/res/values-ur/strings.xml index 11ae5f3d9068..8c1d8f449145 100644 --- a/packages/SettingsLib/res/values-ur/strings.xml +++ b/packages/SettingsLib/res/values-ur/strings.xml @@ -316,10 +316,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"رنگ کی اصلاح"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"یہ خصوصیت تجرباتی ہے اور اس کی وجہ سے کاکردگی متاثر ہو سکتی ہے۔"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> کے ذریعہ منسوخ کردیا گیا"</string> - <!-- no translation found for power_remaining_duration_only (845431008899029842) --> - <skip /> - <!-- no translation found for power_remaining_charging_duration_only (1421102457410268886) --> - <skip /> + <string name="power_remaining_duration_only" msgid="845431008899029842">"تقریبًا <xliff:g id="TIME">%1$s</xliff:g> باقی ہے"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"پوری طرح چارج ہونے میں <xliff:g id="TIME">%1$s</xliff:g> باقی ہے"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"<xliff:g id="TIME">%1$s</xliff:g> باقی ہے"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - تقریباً <xliff:g id="TIME">%2$s</xliff:g> باقی ہے"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> باقی ہے"</string> @@ -328,8 +326,7 @@ <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"نامعلوم"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"چارج ہو رہا ہے"</string> - <!-- no translation found for battery_info_status_charging_lower (8689770213898117994) --> - <skip /> + <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"چارج ہو رہا ہے"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"چارج نہیں ہو رہا ہے"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"چارج نہیں ہو رہا ہے"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"مکمل"</string> diff --git a/packages/SettingsLib/res/values-uz/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml index 9d5c9cc0a096..588ea1a9c2ff 100644 --- a/packages/SettingsLib/res/values-uz/strings.xml +++ b/packages/SettingsLib/res/values-uz/strings.xml @@ -317,7 +317,7 @@ <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Bu funksiya tajribaviy bo‘lib, u qurilma unumdorligiga ta’sir qilishi mumkin."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> bilan almashtirildi"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"Taxminan <xliff:g id="TIME">%1$s</xliff:g> qoldi"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"To‘liq quvvat olishiga <xliff:g id="TIME">%1$s</xliff:g> qoldi"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"To‘lishiga <xliff:g id="TIME">%1$s</xliff:g> qoldi"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"<xliff:g id="TIME">%1$s</xliff:g> qoldi"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> – taxminan <xliff:g id="TIME">%2$s</xliff:g> qoldi"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> qoldi"</string> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index ff310cc233a7..34f2822eed60 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -423,7 +423,7 @@ <string name="wifi_display_certification">Wireless display certification</string> <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] --> <string name="wifi_verbose_logging">Enable Wi\u2011Fi Verbose Logging</string> - <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] --> + <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover (more actively switch from wifi to mobile data). [CHAR LIMIT=40] --> <string name="wifi_aggressive_handover">Aggressive Wi\u2011Fi to mobile handover</string> <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] --> <string name="wifi_allow_scan_with_traffic">Always allow Wi\u2011Fi Roam Scans</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java index 953dda29d7c4..60e10a125d0b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java @@ -151,8 +151,15 @@ public class StorageMeasurement { final MeasurementDetails details = new MeasurementDetails(); if (mVolume == null) return details; - details.totalSize = mStats.getTotalBytes(mVolume.fsUuid); - details.availSize = mStats.getFreeBytes(mVolume.fsUuid); + try { + details.totalSize = mStats.getTotalBytes(mVolume.fsUuid); + details.availSize = mStats.getFreeBytes(mVolume.fsUuid); + } catch (IllegalStateException e) { + // The storage volume became null while we were measuring it. + Log.w(TAG, e); + return details; + } + final long finishTotal = SystemClock.elapsedRealtime(); Log.d(TAG, "Measured total storage in " + (finishTotal - start) + "ms"); diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 0c4c69931161..e6d9a9a39280 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -71,6 +71,7 @@ <uses-permission android:name="android.permission.INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.MOVE_PACKAGE" /> <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" /> + <uses-permission android:name="android.permission.CLEAR_APP_CACHE" /> <uses-permission android:name="android.permission.DELETE_CACHE_FILES" /> <uses-permission android:name="android.permission.DELETE_PACKAGES" /> <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" /> diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index 53c5b1b6b2bc..5ee0c64c9591 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk @@ -35,6 +35,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-v7-preference \ android-support-v7-appcompat \ android-support-v7-mediarouter \ + android-support-v7-palette \ android-support-v14-preference \ android-support-v17-leanback diff --git a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml index c7cfe88e35b4..b28a0cc16015 100644 --- a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml @@ -116,7 +116,7 @@ <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3398054847288438444">"Treba da unesete šablon kada prelazite sa jednog profila na drugi"</string> <string name="kg_prompt_reason_switch_profiles_pin" msgid="7426368139226961699">"Treba da unesete PIN kada prelazite sa jednog profila na drugi"</string> <string name="kg_prompt_reason_switch_profiles_password" msgid="8383831046318421845">"Treba da unesete lozinku kada prelazite sa jednog profila na drugi"</string> - <string name="kg_prompt_reason_device_admin" msgid="2438626748767361010">"Administrator uređaja je zaključao uređaj"</string> + <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"Administrator je zaključao uređaj"</string> <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"Uređaj je ručno zaključan"</string> <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="71299470072448533"> <item quantity="one">Niste otključali uređaj <xliff:g id="NUMBER_1">%d</xliff:g> sat. Potvrdite šablon.</item> diff --git a/packages/SystemUI/res-keyguard/values-be/strings.xml b/packages/SystemUI/res-keyguard/values-be/strings.xml index e1dfc04d689c..89caf904c803 100644 --- a/packages/SystemUI/res-keyguard/values-be/strings.xml +++ b/packages/SystemUI/res-keyguard/values-be/strings.xml @@ -118,7 +118,7 @@ <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3398054847288438444">"Пры пераключэнні профіляў патрабуецца ўзор"</string> <string name="kg_prompt_reason_switch_profiles_pin" msgid="7426368139226961699">"Пры пераключэнні профіляў патрабуецца PIN-код"</string> <string name="kg_prompt_reason_switch_profiles_password" msgid="8383831046318421845">"Пры пераключэнні профіляў патрабуецца пароль"</string> - <string name="kg_prompt_reason_device_admin" msgid="2438626748767361010">"Адміністратар прылады заблакіраваў яе"</string> + <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"Прылада заблакіравана адміністратарам"</string> <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"Прылада была заблакіравана ўручную"</string> <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="71299470072448533"> <item quantity="one">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзіны. Увядзіце ўзор.</item> diff --git a/packages/SystemUI/res-keyguard/values-bs/strings.xml b/packages/SystemUI/res-keyguard/values-bs/strings.xml index 04256f1882dc..86f81bc54dc6 100644 --- a/packages/SystemUI/res-keyguard/values-bs/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bs/strings.xml @@ -62,8 +62,8 @@ <string name="kg_sim_pin_instructions_multi" msgid="1586316574649150223">"Unesite PIN kôd za SIM karticu operatera \"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string> <string name="kg_pin_instructions" msgid="4069609316644030034">"Unesite PIN kôd"</string> <string name="kg_password_instructions" msgid="136952397352976538">"Unesite lozinku"</string> - <string name="kg_puk_enter_puk_hint" msgid="2288964170039899277">"SIM kartica je sada onemogućena. Unesite PUK kôd da nastavite. Obratite se operateru za detalje."</string> - <string name="kg_puk_enter_puk_hint_multi" msgid="1373131883510840794">"Operater SIM kartice \"<xliff:g id="CARRIER">%1$s</xliff:g>\" sada je onemogućen. Unesite PUK kôd da nastavite. Za više detalja obratite se operateru."</string> + <string name="kg_puk_enter_puk_hint" msgid="2288964170039899277">"SIM kartica je sada onemogućena. Unesite PUK kôd da nastavite. Za više informacija obratite se operateru."</string> + <string name="kg_puk_enter_puk_hint_multi" msgid="1373131883510840794">"Operater SIM kartice \"<xliff:g id="CARRIER">%1$s</xliff:g>\" sada je onemogućen. Unesite PUK kôd da nastavite. Za više informacija obratite se operateru."</string> <string name="kg_puk_enter_pin_hint" msgid="3137789674920391087">"Unesite željeni PIN kôd"</string> <string name="kg_enter_confirm_pin_hint" msgid="3089485999116759671">"Potvrdite željeni PIN kôd"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="4471738151810900114">"Otključavanje SIM kartice…"</string> @@ -116,7 +116,7 @@ <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3398054847288438444">"Potreban je uzorak nakon prelaska na drugi profil"</string> <string name="kg_prompt_reason_switch_profiles_pin" msgid="7426368139226961699">"Potreban je PIN kôd nakon prelaska na drugi profil"</string> <string name="kg_prompt_reason_switch_profiles_password" msgid="8383831046318421845">"Potrebna je lozinka nakon prelaska na drugi profil"</string> - <string name="kg_prompt_reason_device_admin" msgid="2438626748767361010">"Administrator je zaključao uređaj."</string> + <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"Uređaj je zaključao administrator"</string> <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"Uređaj je ručno zaključan"</string> <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="71299470072448533"> <item quantity="one">Uređaj nije otključavan <xliff:g id="NUMBER_1">%d</xliff:g> sat. Potvrdite uzorak.</item> diff --git a/packages/SystemUI/res/drawable/ic_activity_down.xml b/packages/SystemUI/res/drawable/ic_activity_down.xml new file mode 100644 index 000000000000..526c98728be0 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_activity_down.xml @@ -0,0 +1,24 @@ +<!-- + Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="5dp" + android:height="17.0dp" + android:viewportWidth="7.1" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M3.6000004,13.2l-3.6,0.0 3.6,7.3 0.0,0.0 0.0,0.0 0.0,0.0 0.0,0.0 3.5,-7.3z"/> +</vector> diff --git a/packages/SystemUI/res/drawable/ic_activity_up.xml b/packages/SystemUI/res/drawable/ic_activity_up.xml new file mode 100644 index 000000000000..8d18bebf4784 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_activity_up.xml @@ -0,0 +1,24 @@ +<!-- + Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="5dp" + android:height="17.0dp" + android:viewportWidth="7.1" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M3.6000004,10.8l3.5,0.0 -3.5,-7.3 0.0,0.0 0.0,0.0 0.0,0.0 0.0,0.0 -3.6,7.3z"/> +</vector> diff --git a/packages/SystemUI/res/layout/mobile_signal_group.xml b/packages/SystemUI/res/layout/mobile_signal_group.xml index d988acc78411..33effba53059 100644 --- a/packages/SystemUI/res/layout/mobile_signal_group.xml +++ b/packages/SystemUI/res/layout/mobile_signal_group.xml @@ -16,48 +16,67 @@ ** limitations under the License. */ --> -<FrameLayout +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/mobile_combo" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:orientation="horizontal" > - <com.android.systemui.statusbar.AnimatedImageView - android:theme="@style/DualToneLightTheme" - android:id="@+id/mobile_signal" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - systemui:hasOverlappingRendering="false" - /> - <com.android.systemui.statusbar.AnimatedImageView - android:theme="@style/DualToneDarkTheme" - android:id="@+id/mobile_signal_dark" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:alpha="0.0" - systemui:hasOverlappingRendering="false" - /> - <ImageView - android:id="@+id/mobile_type" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - /> - <ImageView - android:id="@+id/mobile_roaming" - android:layout_width="wrap_content" + <FrameLayout android:layout_height="17dp" - android:paddingStart="22dp" - android:paddingTop="1.5dp" - android:paddingBottom="3dp" - android:scaleType="fitCenter" - android:src="@drawable/stat_sys_roaming" - android:contentDescription="@string/accessibility_data_connection_roaming" - android:visibility="gone" /> - <ImageView - android:id="@+id/mobile_inout" - android:layout_height="wrap_content" + android:layout_width="wrap_content"> + <ImageView + android:id="@+id/mobile_in" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/ic_activity_down" + android:visibility="gone" + android:paddingEnd="2dp" + /> + <ImageView + android:id="@+id/mobile_out" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/ic_activity_up" + android:paddingEnd="2dp" + android:visibility="gone" + /> + </FrameLayout> + <FrameLayout android:layout_width="wrap_content" - android:visibility="gone" - /> -</FrameLayout> + android:layout_height="wrap_content"> + <com.android.systemui.statusbar.AnimatedImageView + android:theme="@style/DualToneLightTheme" + android:id="@+id/mobile_signal" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + systemui:hasOverlappingRendering="false" + /> + <com.android.systemui.statusbar.AnimatedImageView + android:theme="@style/DualToneDarkTheme" + android:id="@+id/mobile_signal_dark" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:alpha="0.0" + systemui:hasOverlappingRendering="false" + /> + <ImageView + android:id="@+id/mobile_type" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + /> + <ImageView + android:id="@+id/mobile_roaming" + android:layout_width="wrap_content" + android:layout_height="17dp" + android:paddingStart="22dp" + android:paddingTop="1.5dp" + android:paddingBottom="3dp" + android:scaleType="fitCenter" + android:src="@drawable/stat_sys_roaming" + android:contentDescription="@string/accessibility_data_connection_roaming" + android:visibility="gone" /> + </FrameLayout> +</LinearLayout> diff --git a/packages/SystemUI/res/layout/screen_pinning_request_buttons_sea.xml b/packages/SystemUI/res/layout/screen_pinning_request_buttons_sea.xml new file mode 100644 index 000000000000..f3a6d44f5ec7 --- /dev/null +++ b/packages/SystemUI/res/layout/screen_pinning_request_buttons_sea.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2014, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<!-- Note all width/height dimensions are switched here to handle landspace + rather than duplicating them all. + This layout matches the structure of navigation_bar.xml (rot90) and + will need to be kept up to sync with changes there. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/screen_pinning_buttons" + android:layout_height="match_parent" + android:layout_width="@dimen/screen_pinning_request_button_height" + android:background="?android:attr/colorAccent" + android:orientation="vertical"> + + <View + android:layout_height="@dimen/screen_pinning_request_side_width" + android:layout_width="match_parent" + android:layout_weight="0" + android:visibility="invisible" /> + + <FrameLayout + android:id="@+id/screen_pinning_back_group" + android:layout_height="@dimen/screen_pinning_request_button_width" + android:layout_width="@dimen/screen_pinning_request_button_height" + android:layout_weight="0" + android:theme="@*android:style/ThemeOverlay.DeviceDefault.Accent"> + + <ImageView + android:id="@+id/screen_pinning_back_bg_light" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:scaleType="matrix" + android:layout_marginLeft="@dimen/screen_pinning_request_seascape_padding_negative" + android:src="@drawable/screen_pinning_light_bg_circ" /> + + <ImageView + android:id="@+id/screen_pinning_back_bg" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:scaleType="matrix" + android:layout_marginLeft="@dimen/screen_pinning_request_seascape_button_offset" + android:paddingRight="@dimen/screen_pinning_request_inner_padding" + android:paddingTop="@dimen/screen_pinning_request_inner_padding" + android:paddingBottom="@dimen/screen_pinning_request_inner_padding" + android:src="@drawable/screen_pinning_bg_circ" /> + + <ImageView + android:layout_height="match_parent" + android:layout_width="match_parent" + android:scaleType="center" + android:paddingRight="@dimen/screen_pinning_request_nav_icon_padding" + android:paddingTop="@dimen/screen_pinning_request_nav_side_padding" + android:paddingBottom="@dimen/screen_pinning_request_nav_side_padding" + android:src="@drawable/ic_sysbar_back" /> + </FrameLayout> + + <View + android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_weight="1" + android:visibility="invisible" /> + + <FrameLayout + android:id="@+id/screen_pinning_home_group" + android:layout_height="@dimen/screen_pinning_request_button_width" + android:layout_width="@dimen/screen_pinning_request_button_height" + android:layout_weight="0" > + + <ImageView + android:layout_height="match_parent" + android:layout_width="match_parent" + android:scaleType="center" + android:paddingRight="@dimen/screen_pinning_request_nav_icon_padding" + android:paddingTop="@dimen/screen_pinning_request_nav_side_padding" + android:paddingBottom="@dimen/screen_pinning_request_nav_side_padding" + android:src="@drawable/ic_sysbar_home" /> + </FrameLayout> + + <View + android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_weight="1" + android:visibility="invisible" /> + + <FrameLayout + android:id="@+id/screen_pinning_recents_group" + android:layout_height="@dimen/screen_pinning_request_button_width" + android:layout_width="@dimen/screen_pinning_request_button_height" + android:layout_weight="0" + android:theme="@*android:style/ThemeOverlay.DeviceDefault.Accent"> + + <ImageView + android:id="@+id/screen_pinning_recents_bg_light" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:scaleType="matrix" + android:layout_marginLeft="@dimen/screen_pinning_request_seascape_padding_negative" + android:src="@drawable/screen_pinning_light_bg_circ" /> + + <ImageView + android:id="@+id/screen_pinning_recents_bg" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:scaleType="matrix" + android:layout_marginLeft="@dimen/screen_pinning_request_seascape_button_offset" + android:paddingRight="@dimen/screen_pinning_request_inner_padding" + android:paddingTop="@dimen/screen_pinning_request_inner_padding" + android:paddingBottom="@dimen/screen_pinning_request_inner_padding" + android:src="@drawable/screen_pinning_bg_circ" /> + + <ImageView + android:layout_height="match_parent" + android:layout_width="match_parent" + android:scaleType="center" + android:paddingRight="@dimen/screen_pinning_request_nav_icon_padding" + android:paddingTop="@dimen/screen_pinning_request_nav_side_padding" + android:paddingBottom="@dimen/screen_pinning_request_nav_side_padding" + android:src="@drawable/ic_sysbar_recent" /> + </FrameLayout> + + <View + android:layout_height="@dimen/screen_pinning_request_side_width" + android:layout_width="match_parent" + android:layout_weight="0" + android:visibility="invisible" /> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/screen_pinning_request_sea_phone.xml b/packages/SystemUI/res/layout/screen_pinning_request_sea_phone.xml new file mode 100644 index 000000000000..770cead87ac0 --- /dev/null +++ b/packages/SystemUI/res/layout/screen_pinning_request_sea_phone.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2014, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="@dimen/screen_pinning_request_width" + android:layout_width="wrap_content" + android:gravity="left|center_vertical" + android:orientation="horizontal" + android:theme="@android:style/Theme.DeviceDefault.Light"> + + <include + android:layout_width="wrap_content" + android:layout_height="@dimen/screen_pinning_request_width" + layout="@layout/screen_pinning_request_buttons_sea" /> + + <include + android:layout_width="360dp" + android:layout_height="@dimen/screen_pinning_request_width" + layout="@layout/screen_pinning_request_text_area" /> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index 4d03f0f3459d..da7e4d79fc46 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -53,6 +53,26 @@ /> </FrameLayout> <FrameLayout + android:layout_height="17dp" + android:layout_width="wrap_content"> + <ImageView + android:id="@+id/wifi_in" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/ic_activity_down" + android:visibility="gone" + android:paddingEnd="2dp" + /> + <ImageView + android:id="@+id/wifi_out" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/ic_activity_up" + android:paddingEnd="2dp" + android:visibility="gone" + /> + </FrameLayout> + <FrameLayout android:id="@+id/wifi_combo" android:layout_height="wrap_content" android:layout_width="wrap_content" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 8b5fab1b82d2..74047cdb1334 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Battery laai tans, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> persent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Stelselinstellings"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Kennisgewings"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Kennisgewingoorloophouer"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Sien alle kennisgewings"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Verwyder kennisgewing"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS geaktiveer."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS soek ligging."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Alle kategorieë"</string> <string name="notification_more_settings" msgid="816306283396553571">"Meer instellings"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Pasmaak: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Klaar"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"kennisgewingkontroles"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index fba8bc4727c3..9ef3792ced19 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"ባትሪ ኃይል በመሙላት ላይ፣ <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> በመቶ።"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"የስርዓት ቅንብሮች"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"ማሳወቂያዎች"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"የማሳወቂያ ትርፍ ፍሰት መያዣ"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"ሁሉንም ማሳወቂያዎች ይመልከቱ"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"ማሳወቂያ አጽዳ"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ነቅቷል።"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS በማግኘት ላይ።"</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"ሁሉም ምድቦች"</string> <string name="notification_more_settings" msgid="816306283396553571">"ተጨማሪ ቅንብሮች"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"ያብጁ፦ <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"ተከናውኗል"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"የማሳወቂያ መቆጣጠሪያዎች"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index ec353358421d..31621a4c86e3 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -168,7 +168,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"جارٍ شحن البطارية، <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> بالمائة."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"إعدادات النظام."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"الإشعارات."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"حاوية التدفق الزائد للإشعارات"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"الاطلاع على جميع الإشعارات"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"محو الإشعار."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"تم تمكين GPS."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"الحصول على GPS."</string> @@ -576,8 +576,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"كل الفئات"</string> <string name="notification_more_settings" msgid="816306283396553571">"المزيد من الإعدادات"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"تخصيص: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"تم"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"عناصر التحكم في الإشعارات"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 5c62018f68e6..5d485d59efdf 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Batareya doldurulur, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> faiz."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Sistem parametrləri"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Bildirişlər."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Bildiriş daşması konteyneri"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Bildirişi təmizlə."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS aktivdir."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS əldə edilir."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Bütün Kateqoriyalar"</string> <string name="notification_more_settings" msgid="816306283396553571">"Daha çox ayar"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Fərdiləşdirin: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Hazırdır"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"bildiriş nəzarəti"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 0b44eb567393..259e3ab0b369 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -76,7 +76,7 @@ <string name="screenshot_failed_title" msgid="705781116746922771">"Nije moguće napraviti snimak ekrana."</string> <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"Došlo je do problema pri čuvanju snimka ekrana."</string> <string name="screenshot_failed_to_save_text" msgid="2592658083866306296">"Čuvanje snimka ekrana nije uspelo zbog ograničenog memorijskog prostora."</string> - <string name="screenshot_failed_to_capture_text" msgid="7602391003979898374">"Aplikacija ili organizacija ne dozvoljavaju pravljenje snimaka ekrana."</string> + <string name="screenshot_failed_to_capture_text" msgid="173674476457581486">"Aplikacija ili organizacija ne dozvoljavaju pravljenje snimaka ekrana"</string> <string name="usb_preference_title" msgid="6551050377388882787">"Opcije USB prenosa datoteka"</string> <string name="use_mtp_button_title" msgid="4333504413563023626">"Priključi kao medija plejer (MTP)"</string> <string name="use_ptp_button_title" msgid="7517127540301625751">"Priključi kao kameru (PTP)"</string> @@ -91,7 +91,7 @@ <string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string> <string name="accessibility_voice_assist_button" msgid="487611083884852965">"Glasovna pomoć"</string> <string name="accessibility_unlock_button" msgid="128158454631118828">"Otključajte"</string> - <string name="accessibility_unlock_button_fingerprint" msgid="8214125623493923751">"Dugme za otključavanje, čeka se na otisak prsta"</string> + <string name="accessibility_waiting_for_fingerprint" msgid="4808860050517462885">"Čeka se otisak prsta"</string> <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"Otključaj bez korišćenja otiska prsta"</string> <string name="unlock_label" msgid="8779712358041029439">"otključaj"</string> <string name="phone_label" msgid="2320074140205331708">"otvori telefon"</string> @@ -165,7 +165,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Baterija se puni, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> procenata."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Sistemska podešavanja."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Obaveštenja."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Kontejner preklopnog menija za obaveštenja"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Pogledajte sva obaveštenja"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Obriši obaveštenje."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS je omogućen."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Učitavanje GPS-a."</string> @@ -237,8 +237,7 @@ <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Ušteda podataka je isključena."</string> <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Ušteda podataka je uključena."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Osvetljenost ekrana"</string> - <!-- no translation found for accessibility_ambient_display_charging (9084521679384069087) --> - <skip /> + <string name="accessibility_ambient_display_charging" msgid="9084521679384069087">"Puni se"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G–3G podaci su pauzirani"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G podaci su pauzirani"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="4651001290947318931">"Mobilni podaci su pauzirani"</string> @@ -279,7 +278,7 @@ <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Osvetljenost"</string> <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatska rotacija"</string> <string name="accessibility_quick_settings_rotation" msgid="4231661040698488779">"Automatsko rotiranje ekrana"</string> - <string name="accessibility_quick_settings_rotation_value" msgid="1428962304214992318">"Podesi na <xliff:g id="ID_1">%s</xliff:g>"</string> + <string name="accessibility_quick_settings_rotation_value" msgid="8187398200140760213">"Režim <xliff:g id="ID_1">%s</xliff:g>"</string> <string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"Rotacija je zaključana"</string> <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"Vertikalni prikaz"</string> <string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"Horizontalni prikaz"</string> @@ -337,7 +336,6 @@ <string name="recents_launch_error_message" msgid="2969287838120550506">"Pokretanje aplikacije <xliff:g id="APP">%s</xliff:g> nije uspelo."</string> <string name="recents_launch_disabled_message" msgid="1624523193008871793">"Aplikacija <xliff:g id="APP">%s</xliff:g> je onemogućena u bezbednom režimu."</string> <string name="recents_stack_action_button_label" msgid="6593727103310426253">"Obriši sve"</string> - <string name="recents_incompatible_app_message" msgid="5075812958564082451">"Aplikacija ne podržava podeljeni ekran"</string> <string name="recents_drag_hint_message" msgid="2649739267073203985">"Prevucite ovde da biste koristili razdeljeni ekran"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podeli horizontalno"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podeli vertikalno"</string> @@ -363,7 +361,7 @@ <string name="speed_bump_explanation" msgid="1288875699658819755">"Manje hitna obaveštenja su u nastavku"</string> <string name="notification_tap_again" msgid="7590196980943943842">"Dodirnite ponovo da biste otvorili"</string> <string name="keyguard_unlock" msgid="8043466894212841998">"Prevucite nagore da biste otključali"</string> - <string name="do_disclosure_generic" msgid="8498005633306135779">"Ovim uređajem se upravlja"</string> + <string name="do_disclosure_generic" msgid="5615898451805157556">"Ovim uređajem upravlja organizacija"</string> <string name="do_disclosure_with_name" msgid="5640615509915445501">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="phone_hint" msgid="4872890986869209950">"Prevucite od ikone za telefon"</string> <string name="voice_hint" msgid="8939888732119726665">"Prevucite od ikone za glasovnu pomoć"</string> @@ -416,13 +414,40 @@ <string name="profile_owned_footer" msgid="8021888108553696069">"Profil se možda nadgleda"</string> <string name="vpn_footer" msgid="2388611096129106812">"Mreža se možda nadgleda"</string> <string name="branded_vpn_footer" msgid="2168111859226496230">"Mreža se možda nadgleda"</string> + <string name="quick_settings_disclosure_management_monitoring" msgid="6645176135063957394">"Organizacija upravlja ovim uređajem i može da nadgleda mrežni saobraćaj"</string> + <string name="quick_settings_disclosure_named_management_monitoring" msgid="370622174777570853">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> upravlja ovim uređajem i može da nadgleda mrežni saobraćaj"</string> + <string name="quick_settings_disclosure_management_named_vpn" msgid="1085137869053332307">"Uređajem upravlja organizacija i povezan je sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_management_named_vpn" msgid="6290456493852584017">"Uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je sa aplikacijom <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <string name="quick_settings_disclosure_management" msgid="3294967280853150271">"Uređajem upravlja organizacija"</string> + <string name="quick_settings_disclosure_named_management" msgid="1059403025094542908">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_management_vpns" msgid="3698767349925266482">"Uređajem upravlja organizacija i povezan je sa VPN-ovima"</string> + <string name="quick_settings_disclosure_named_management_vpns" msgid="7777821385318891527">"Uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je sa VPN-ovima"</string> + <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="5125463987558278215">"Organizacija može da prati mrežni saobraćaj na profilu za Work"</string> + <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8973606847896650284">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> može da nadgleda mrežni saobraćaj na profilu za Work"</string> + <string name="quick_settings_disclosure_monitoring" msgid="679658227269205728">"Mreža se možda nadgleda"</string> + <string name="quick_settings_disclosure_vpns" msgid="8170318392053156330">"Uređaj je povezan sa VPN-ovima"</string> + <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="3494535754792751741">"Profil za Work je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="4467456202486569906">"Lični profil je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_vpn" msgid="6943724064780847080">"Uređaj je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7121079311903859610">"Nadgledanje uređaja"</string> <string name="monitoring_title_profile_owned" msgid="6790109874733501487">"Nadgledanje profila"</string> <string name="monitoring_title" msgid="169206259253048106">"Nadgledanje mreže"</string> <string name="monitoring_subtitle_vpn" msgid="876537538087857300">"VPN"</string> - <string name="monitoring_subtitle_network_logging" msgid="5569072711320784030">"Evidentiranje mreže"</string> + <string name="monitoring_subtitle_network_logging" msgid="3341264304793193386">"Evidentiranje mreže"</string> + <string name="monitoring_subtitle_ca_certificate" msgid="3874151893894355988">"CA sertifikati"</string> <string name="disable_vpn" msgid="4435534311510272506">"Onemogući VPN"</string> <string name="disconnect_vpn" msgid="1324915059568548655">"Prekini vezu sa VPN-om"</string> + <string name="monitoring_button_view_policies" msgid="100913612638514424">"Prikaži smernice"</string> + <string name="monitoring_description_named_management" msgid="4872859182820011954">"Uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>.\n\nAdministrator može da nadgleda podešavanja, korporativni pristup, aplikacije, podatke povezane sa uređajem i informacije o lokaciji uređaja, kao i da upravlja njima.\n\nViše informacija potražite od administratora."</string> + <string name="monitoring_description_management" msgid="3115563193381106341">"Uređajem upravlja organizacija.\n\nAdministrator može da nadgleda podešavanja, korporativni pristup, aplikacije, podatke povezane sa uređajem i informacije o lokaciji uređaja, kao i da upravlja njima.\n\nViše informacija potražite od administratora."</string> + <string name="monitoring_description_management_ca_certificate" msgid="5202023784131001751">"Organizacija je na ovom uređaju instalirala autoritet za izdavanje sertifikata. Bezbedni mrežni saobraćaj može da se prati ili menja."</string> + <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"Organizacija je na profilu za Work instalirala autoritet za izdavanje sertifikata. Bezbedni mrežni saobraćaj može da se prati ili menja."</string> + <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"Na ovom uređaju je instaliran autoritet za izdavanje sertifikata. Bezbedni mrežni saobraćaj može da se prati ili menja."</string> + <string name="monitoring_description_management_network_logging" msgid="7184005419733060736">"Administrator je uključio evidentiranje mreže, koje prati saobraćaj na uređaju."</string> + <string name="monitoring_description_named_vpn" msgid="639013857356724268">"Povezani ste sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može da nadgleda aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> + <string name="monitoring_description_two_named_vpns" msgid="4479748971871539316">"Povezani ste sa aplikacijama <xliff:g id="VPN_APP_0">%1$s</xliff:g> i <xliff:g id="VPN_APP_1">%2$s</xliff:g>, koje mogu da nadgledaju aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> + <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"Profil za Work je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može da nadgleda aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> + <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"Lični profil je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može da nadgleda aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"Uređajem upravlja <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g>."</string> <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> koristi <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> za upravljanje uređajem."</string> <string name="monitoring_description_do_body" msgid="3639594537660975895">"Administrator može da nadgleda podešavanja, korporativni pristup, aplikacije, podatke povezane sa uređajem i informacije o lokaciji uređaja, kao i da upravlja njima."</string> @@ -431,15 +456,17 @@ <string name="monitoring_description_do_body_vpn" msgid="8255218762488901796">"Povezani ste sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može da nadgleda aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> <string name="monitoring_description_vpn_settings_separator" msgid="1933186756733474388">" "</string> <string name="monitoring_description_vpn_settings" msgid="8869300202410505143">"Otvorite podešavanja VPN-a"</string> + <string name="monitoring_description_ca_cert_settings_separator" msgid="4987350385906393626">" "</string> + <string name="monitoring_description_ca_cert_settings" msgid="5489969458872997092">"Otvorite pouzdane akreditive"</string> <string name="monitoring_description_network_logging" msgid="7223505523384076027">"Administrator je uključio evidentiranje mreže, koje prati saobraćaj na uređaju.\n\nKontaktirajte administratora za više informacija."</string> <string name="monitoring_description_vpn" msgid="4445150119515393526">"Dali ste dozvolu aplikaciji da podešava VPN vezu.\n\nTa aplikacija može da nadgleda aktivnosti na uređaju i mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"<xliff:g id="ORGANIZATION">%1$s</xliff:g> upravlja profilom za Work.\n\nAdministrator može da prati aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove.\n\nKontaktirajte administratora za više informacija.\n\nPovezani ste i sa VPN-om, koji može da prati aktivnosti na mreži."</string> <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string> - <string name="monitoring_description_app" msgid="6259179342284742878">"Povezani ste sa aplikacijom <xliff:g id="APPLICATION">%1$s</xliff:g>, koja može da nadgleda aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> + <string name="monitoring_description_app" msgid="1828472472674709532">"Povezani ste sa aplikacijom <xliff:g id="APPLICATION">%1$s</xliff:g>, koja može da nadgleda aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> <string name="monitoring_description_app_personal" msgid="484599052118316268">"Povezani ste sa aplikacijom <xliff:g id="APPLICATION">%1$s</xliff:g>, koja može da nadgleda aktivnosti na ličnoj mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"Povezani ste sa aplikacijom <xliff:g id="APPLICATION">%1$s</xliff:g>, koja može da nadgleda aktivnosti na ličnoj mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> - <string name="monitoring_description_app_work" msgid="7777228449969022305">"<xliff:g id="ORGANIZATION">%1$s</xliff:g> upravlja profilom za Work. On je povezan sa aplikacijom <xliff:g id="APPLICATION">%2$s</xliff:g>, koja može da prati aktivnosti na poslovnoj mreži, uključujući imejlove, aplikacije i veb-sajtove.\n\nKontaktirajte administratora za više informacija."</string> - <string name="monitoring_description_app_personal_work" msgid="4946600443852045903">"Profilom za Work upravlja <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Povezan je sa aplikacijom <xliff:g id="APPLICATION_WORK">%2$s</xliff:g>, koja može da nadgleda aktivnosti na poslovnoj mreži, uključujući imejlove, aplikacije i veb-sajtove.\n\nPovezani ste i sa aplikacijom <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g>, koja može da nadgleda aktivnosti na ličnoj mreži."</string> + <string name="monitoring_description_app_work" msgid="4612997849787922906">"Profilom za Work upravlja <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Povezan je sa aplikacijom <xliff:g id="APPLICATION">%2$s</xliff:g>, koja može da nadgleda aktivnosti na poslovnoj mreži, uključujući imejlove, aplikacije i veb-sajtove.\n\nViše informacija potražite od administratora."</string> + <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"Profilom za Work upravlja <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Povezan je sa aplikacijom <xliff:g id="APPLICATION_WORK">%2$s</xliff:g>, koja može da nadgleda aktivnosti na poslovnoj mreži, uključujući imejlove, aplikacije i veb-sajtove.\n\nPovezani ste i sa aplikacijom <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g>, koja može da nadgleda aktivnosti na ličnoj mreži."</string> <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"Uređaj će ostati zaključan dok ga ne otključate ručno"</string> <string name="hidden_notifications_title" msgid="7139628534207443290">"Brže dobijajte obaveštenja"</string> <string name="hidden_notifications_text" msgid="2326409389088668981">"Pregledajte ih pre otključavanja"</string> @@ -470,10 +497,8 @@ <string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Dodirnite da biste uključili zvuk."</string> <string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Dodirnite da biste podesili na vibraciju. Zvuk usluga pristupačnosti će možda biti isključen."</string> <string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Dodirnite da biste isključili zvuk. Zvuk usluga pristupačnosti će možda biti isključen."</string> - <!-- no translation found for volume_stream_content_description_vibrate_a11y (6427727603978431301) --> - <skip /> - <!-- no translation found for volume_stream_content_description_mute_a11y (8995013018414535494) --> - <skip /> + <string name="volume_stream_content_description_vibrate_a11y" msgid="6427727603978431301">"%1$s. Dodirnite da biste podesili na vibraciju."</string> + <string name="volume_stream_content_description_mute_a11y" msgid="8995013018414535494">"%1$s. Dodirnite da biste isključili zvuk."</string> <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"Kontrole za jačinu zvuka (%s) su prikazane. Prevucite nagore da biste ih odbacili."</string> <string name="volume_dialog_accessibility_dismissed_message" msgid="51543526013711399">"Kontrole za jačinu zvuka su sakrivene"</string> <string name="system_ui_tuner" msgid="708224127392452018">"Tjuner za korisnički interfejs sistema"</string> @@ -524,13 +549,22 @@ <string name="power_notification_controls_description" msgid="4372459941671353358">"Pomoću naprednih kontrola za obaveštenja možete da podesite nivo važnosti od 0. do 5. za obaveštenja aplikacije. \n\n"<b>"5. nivo"</b>" \n– Prikazuju se u vrhu liste obaveštenja \n- Dozvoli prekid režima celog ekrana \n– Uvek zaviruj \n\n"<b>"4. nivo"</b>" \n– Spreči prekid režima celog ekrana \n– Uvek zaviruj \n\n"<b>"3. nivo"</b>" \n– Spreči prekid režima celog ekrana \n– Nikada ne zaviruj \n\n"<b>"2. nivo"</b>" \n– Spreči prekid režima celog ekrana \n– Nikada ne zaviruj \n– Nikada ne proizvodi zvuk ili vibraciju \n\n"<b>"1. nivo"</b>" \n– Spreči prekid režima celog ekrana \n– Nikada ne zaviruj \n– Nikada ne proizvodi zvuk ili vibraciju \n– Sakrij na zaključanom ekranu i statusnoj traci \n– Prikazuju se u dnu liste obaveštenja \n\n"<b>"0. nivo"</b>" \n– Blokiraj sva obaveštenja iz aplikacije"</string> <string name="notification_header_default_channel" msgid="7506845022070889909">"Obaveštenja"</string> <string name="notification_channel_disabled" msgid="5805874247999578073">"Više nećete da dobijate ova obaveštenja."</string> - <plurals name="notification_num_channels_desc" formatted="false" msgid="8808748716499517938"> - <item quantity="one">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorije iz ove aplikacije</item> - <item quantity="few">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorije iz ove aplikacije</item> - <item quantity="other">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorija iz ove aplikacije</item> + <string name="notification_num_channels" msgid="2048144408999179471">"Kategorija obaveštenja: <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string name="notification_default_channel_desc" msgid="2506053815870808359">"Ova aplikacija nema kategorije obaveštenja"</string> + <plurals name="notification_num_channels_desc" formatted="false" msgid="5492793452274077663"> + <item quantity="one">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorije obaveštenja za ovu aplikaciju</item> + <item quantity="few">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorije obaveštenja za ovu aplikaciju</item> + <item quantity="other">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorija obaveštenja za ovu aplikaciju</item> + </plurals> + <string name="notification_channels_list_desc_2" msgid="6214732715833946441">"<xliff:g id="CHANNEL_NAME_1">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2">%2$s</xliff:g>"</string> + <plurals name="notification_channels_list_desc_2_and_others" formatted="false" msgid="2747813553355336157"> + <item quantity="one"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g> i još <xliff:g id="NUMBER_5">%3$d</xliff:g></item> + <item quantity="few"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g> i još <xliff:g id="NUMBER_5">%3$d</xliff:g></item> + <item quantity="other"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g> i još <xliff:g id="NUMBER_5">%3$d</xliff:g></item> </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Sve kategorije"</string> <string name="notification_more_settings" msgid="816306283396553571">"Još podešavanja"</string> + <string name="notification_app_settings" msgid="3743278649182392015">"Prilagodite: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Gotovo"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"kontrole obaveštenja"</string> @@ -538,7 +572,7 @@ <string name="snooze_option_15_min" msgid="1068727451405610715">"15 minuta"</string> <string name="snooze_option_30_min" msgid="867081342535195788">"30 minuta"</string> <string name="snooze_option_1_hour" msgid="1098086401880077154">"1 sat"</string> - <string name="snooze_option_dont_snooze" msgid="655446566007801922">"Ne odlaži"</string> + <string name="snooze_option_dont_snooze" msgid="2252098379349499668">"Otkaži"</string> <string name="snooze_undo" msgid="6074877317002985129">"OPOZOVI"</string> <string name="snoozed_for_time" msgid="2390718332980204462">"Odloženo je za <xliff:g id="TIME_AMOUNT">%1$s</xliff:g>"</string> <string name="battery_panel_title" msgid="7944156115535366613">"Potrošnja baterije"</string> @@ -680,6 +714,10 @@ <string name="pip_phone_expand" msgid="5889780005575693909">"Proširi"</string> <string name="pip_phone_minimize" msgid="1079119422589131792">"Umanji"</string> <string name="pip_phone_close" msgid="8416647892889710330">"Zatvori"</string> + <string name="pip_phone_dismiss_hint" msgid="6351678169095923899">"Prevucite nadole da biste odbili"</string> + <string name="pip_menu_title" msgid="3328510504196964712">"Meni Slika u slici"</string> + <string name="pip_notification_title" msgid="3204024940158161322">"<xliff:g id="NAME">%s</xliff:g> je slika u slici"</string> + <string name="pip_notification_message" msgid="4171698133469539591">"Ako ne želite da <xliff:g id="NAME">%s</xliff:g> koristi ovu funkciju, dodirnite da biste otvorili podešavanja i isključili je."</string> <string name="high_temp_title" msgid="4589508026407318374">"Telefon se zagrejao"</string> <string name="high_temp_notif_message" msgid="5642466103153429279">"Neke funkcije su ograničene dok se telefon ne ohladi"</string> <string name="high_temp_dialog_message" msgid="6840700639374113553">"Telefon će automatski pokušati da se ohladi. I dalje ćete moći da koristite telefon, ali će sporije reagovati.\n\nKada se telefon ohladi, normalno će raditi."</string> @@ -702,9 +740,16 @@ <string name="notification_channel_general" msgid="4525309436693914482">"Opšte poruke"</string> <string name="notification_channel_storage" msgid="3077205683020695313">"Memorijski prostor"</string> <string name="instant_apps" msgid="6647570248119804907">"Instant aplikacije"</string> - <!-- no translation found for pip_menu_title (3328510504196964712) --> - <skip /> <string name="instant_apps_message" msgid="8116608994995104836">"Instant aplikacije ne zahtevaju instalaciju."</string> <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> <string name="mobile_data" msgid="7094582042819250762">"Mobilni podaci"</string> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi je isključen"</string> + <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth je isključen"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"Režim Ne uznemiravaj je isključen"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"Automatsko pravilo (<xliff:g id="ID_1">%s</xliff:g>) je uključilo režim Ne uznemiravaj. Želite li da zadržite aktuelna podešavanja?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"Aplikacija (<xliff:g id="ID_1">%s</xliff:g>) je uključila režim Ne uznemiravaj. Želite li da zadržite aktuelna podešavanja?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"Automatsko pravilo ili aplikacija su uključili režim Ne uznemiravaj. Želite li da zadržite aktuelna podešavanja?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"Do <xliff:g id="ID_1">%s</xliff:g>"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"Zadrži"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"Zameni"</string> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml b/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml index 8b01a835587c..67cdbd886e21 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml @@ -27,7 +27,4 @@ <string name="pip_onboarding_title" msgid="7850436557670253991">"Slika u slici"</string> <string name="pip_onboarding_description" msgid="4028124563309465267">"Na ovaj način će video biti prikazan dok ne pustite neki drugi. Pritisnite i zadržite "<b>"POČETNA"</b>" da biste ga kontrolisali."</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Važi"</string> - <string name="recents_tv_dismiss" msgid="3555093879593377731">"Odbaci"</string> - <string-array name="recents_tv_blacklist_array"> - </string-array> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 0796cffea349..e9b2c85a6929 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -77,7 +77,7 @@ <string name="screenshot_failed_title" msgid="705781116746922771">"Не атрымалася зрабiць скрыншот."</string> <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"Падчас захавання скрыншота адбылася памылка."</string> <string name="screenshot_failed_to_save_text" msgid="2592658083866306296">"Немагчыма захаваць здымак экрана, бо мала месца ў памяці."</string> - <string name="screenshot_failed_to_capture_text" msgid="7602391003979898374">"Рабіць здымкі экрана не дазваляе праграма ці ваша арганізацыя."</string> + <string name="screenshot_failed_to_capture_text" msgid="173674476457581486">"Рабіць здымкі экрана не дазваляе праграма ці ваша арганізацыя"</string> <string name="usb_preference_title" msgid="6551050377388882787">"Парам. перадачы файлаў па USB"</string> <string name="use_mtp_button_title" msgid="4333504413563023626">"Падлучыць як медыяпрайгравальнік (ССП)"</string> <string name="use_ptp_button_title" msgid="7517127540301625751">"Падлучыць як камеру (PTP)"</string> @@ -92,7 +92,7 @@ <string name="accessibility_phone_button" msgid="6738112589538563574">"Тэлефон"</string> <string name="accessibility_voice_assist_button" msgid="487611083884852965">"Галасавая дапамога"</string> <string name="accessibility_unlock_button" msgid="128158454631118828">"Разблакiраваць"</string> - <string name="accessibility_unlock_button_fingerprint" msgid="8214125623493923751">"Кнопка разблакіроўкі, чаканне адбітка пальца"</string> + <string name="accessibility_waiting_for_fingerprint" msgid="4808860050517462885">"Чаканне ўводу даных адбітка пальца"</string> <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"Разблакіроўка без выкарыстання адбітка пальца"</string> <string name="unlock_label" msgid="8779712358041029439">"разблакiраваць"</string> <string name="phone_label" msgid="2320074140205331708">"адкрыць тэлефон"</string> @@ -168,7 +168,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Зарадка акумулятара, працэнтаў: <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g>."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Сістэмныя налады."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Апавяшчэнні."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Кантэйнер для апавяшчэнняў пры перапаўненні"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Паказаць усе апавяшчэнні"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Выдаліць апавяшчэнне."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS уключаны."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Атрыманне GPS."</string> @@ -240,8 +240,7 @@ <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Эканомія трафіку адключана."</string> <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Эканомія трафіку ўключана."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Яркасць дысплэя"</string> - <!-- no translation found for accessibility_ambient_display_charging (9084521679384069087) --> - <skip /> + <string name="accessibility_ambient_display_charging" msgid="9084521679384069087">"Ідзе зарадка"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Перадача даных 2G-3G прыпынена"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Перадача даных 4G прыпынена"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="4651001290947318931">"Мабільная перадача даных прыпынена"</string> @@ -283,7 +282,7 @@ <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Яркасць"</string> <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Аўтапаварот"</string> <string name="accessibility_quick_settings_rotation" msgid="4231661040698488779">"Аўтаматычны паварот экрана"</string> - <string name="accessibility_quick_settings_rotation_value" msgid="1428962304214992318">"Усталявана на <xliff:g id="ID_1">%s</xliff:g>"</string> + <string name="accessibility_quick_settings_rotation_value" msgid="8187398200140760213">"Рэжым <xliff:g id="ID_1">%s</xliff:g>"</string> <string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"Паварот заблакіраваны"</string> <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"Кніжная арыентацыя"</string> <string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"Альбомная арыентацыя"</string> @@ -341,7 +340,6 @@ <string name="recents_launch_error_message" msgid="2969287838120550506">"Не атрымалася запусціць <xliff:g id="APP">%s</xliff:g>."</string> <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> адключана ў бяспечным рэжыме."</string> <string name="recents_stack_action_button_label" msgid="6593727103310426253">"Ачысціць усё"</string> - <string name="recents_incompatible_app_message" msgid="5075812958564082451">"Праграма не падтрымлівае функцыю дзялення экрана"</string> <string name="recents_drag_hint_message" msgid="2649739267073203985">"Перацягніце сюды, каб перайсці ў рэжым падзеленага экрана"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Падзяліць гарызантальна"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Падзяліць вертыкальна"</string> @@ -367,7 +365,7 @@ <string name="speed_bump_explanation" msgid="1288875699658819755">"Менш тэрміновыя апавяшчэнні ніжэй"</string> <string name="notification_tap_again" msgid="7590196980943943842">"Дакраніцеся яшчэ раз, каб адкрыць"</string> <string name="keyguard_unlock" msgid="8043466894212841998">"Правядзіце пальцам уверх, каб разблакіраваць"</string> - <string name="do_disclosure_generic" msgid="8498005633306135779">"Гэта прылада знаходзіцца пад кіраваннем"</string> + <string name="do_disclosure_generic" msgid="5615898451805157556">"Гэта прылада знаходзіцца пад кіраваннем вашай арганізацыі"</string> <string name="do_disclosure_with_name" msgid="5640615509915445501">"Гэта прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="phone_hint" msgid="4872890986869209950">"Тэлефон: правядзіце пальцам ад значка"</string> <string name="voice_hint" msgid="8939888732119726665">"Галасавая дапамога: правядзіце пальцам ад значка"</string> @@ -420,13 +418,40 @@ <string name="profile_owned_footer" msgid="8021888108553696069">"За профілем могуць назіраць"</string> <string name="vpn_footer" msgid="2388611096129106812">"За сеткай могуць назіраць"</string> <string name="branded_vpn_footer" msgid="2168111859226496230">"За сеткай могуць назіраць"</string> + <string name="quick_settings_disclosure_management_monitoring" msgid="6645176135063957394">"Ваша арганізацыя кіруе гэтай прыладай і можа сачыць за сеткавым трафікам"</string> + <string name="quick_settings_disclosure_named_management_monitoring" msgid="370622174777570853">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> кіруе гэтай прыладай і можа сачыць за сеткавым трафікам"</string> + <string name="quick_settings_disclosure_management_named_vpn" msgid="1085137869053332307">"Прылада знаходзіцца пад кіраваннем вашай арганізацыі і падключана да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_management_named_vpn" msgid="6290456493852584017">"Прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> і падключана да праграмы <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <string name="quick_settings_disclosure_management" msgid="3294967280853150271">"Прылада знаходзіцца пад кіраваннем вашай арганізацыі"</string> + <string name="quick_settings_disclosure_named_management" msgid="1059403025094542908">"Гэта прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_management_vpns" msgid="3698767349925266482">"Прылада знаходзіцца пад кіраваннем вашай арганізацыі і падключана да сетак VPN"</string> + <string name="quick_settings_disclosure_named_management_vpns" msgid="7777821385318891527">"Прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> і падключана да сетак VPN"</string> + <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="5125463987558278215">"Ваша арганізацыя можа сачыць за сеткавым трафікам у вашым працоўным профілі"</string> + <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8973606847896650284">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> можа сачыць за сеткавым трафікам у вашым працоўным профілі"</string> + <string name="quick_settings_disclosure_monitoring" msgid="679658227269205728">"За сеткай могуць сачыць"</string> + <string name="quick_settings_disclosure_vpns" msgid="8170318392053156330">"Прылада падключана да сетак VPN"</string> + <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="3494535754792751741">"Працоўны профіль падключаны да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="4467456202486569906">"Асабісты профіль падключаны да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_vpn" msgid="6943724064780847080">"Прылада падключана да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7121079311903859610">"Маніторынг прылад"</string> <string name="monitoring_title_profile_owned" msgid="6790109874733501487">"Маніторынг профіляў"</string> <string name="monitoring_title" msgid="169206259253048106">"Маніторынг сеткі"</string> <string name="monitoring_subtitle_vpn" msgid="876537538087857300">"VPN"</string> - <string name="monitoring_subtitle_network_logging" msgid="5569072711320784030">"Журнал сеткі"</string> + <string name="monitoring_subtitle_network_logging" msgid="3341264304793193386">"Журнал сеткі"</string> + <string name="monitoring_subtitle_ca_certificate" msgid="3874151893894355988">"Сертыфікаты ЦС"</string> <string name="disable_vpn" msgid="4435534311510272506">"Адключыць VPN"</string> <string name="disconnect_vpn" msgid="1324915059568548655">"Адлучыць VPN"</string> + <string name="monitoring_button_view_policies" msgid="100913612638514424">"Праглядзець палітыку"</string> + <string name="monitoring_description_named_management" msgid="4872859182820011954">"Ваша прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>.\n\nУ вашага адміністратара ёсць магчымасць маніторынгу і адміністравання налад, карпаратыўнага доступу, праграм, даных, звязаных з гэтай прыладай, і адпаведных геаданых.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара."</string> + <string name="monitoring_description_management" msgid="3115563193381106341">"Ваша прылада знаходзіцца пад кіраваннем вашай арганізацыі.\n\nУ вашага адміністратара ёсць магчымасць маніторынгу і адміністравання налад, карпаратыўнага доступу, праграм, даных, звязаных з гэтай прыладай, і адпаведных геаданых.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара."</string> + <string name="monitoring_description_management_ca_certificate" msgid="5202023784131001751">"Ваша арганізацыя ўсталявала на гэтай прыладзе цэнтр сертыфікацыі. Ваш абаронены сеткавы трафік могуць праглядваць ці змяняць."</string> + <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"Ваша арганізацыя ўсталявала ў вашым працоўным профілі цэнтр сертыфікацыі. Ваш абаронены сеткавы трафік могуць праглядваць ці змяняць."</string> + <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"На гэтай прыладзе ўсталяваны цэнтр сертыфікацыі. Ваш абаронены сеткавы трафік могуць праглядваць ці змяняць."</string> + <string name="monitoring_description_management_network_logging" msgid="7184005419733060736">"Ваш адміністратар уключыў вядзенне журнала сеткі, з дапамогай якога адсочваецца трафік на вашай прыладзе."</string> + <string name="monitoring_description_named_vpn" msgid="639013857356724268">"Вы падключаны да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> + <string name="monitoring_description_two_named_vpns" msgid="4479748971871539316">"Вы падключаны да праграм <xliff:g id="VPN_APP_0">%1$s</xliff:g> і <xliff:g id="VPN_APP_1">%2$s</xliff:g>, якія могуць сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> + <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"Ваш працоўны профіль падключаны да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> + <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"Ваш асабісты профіль падключаны да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"Ваша прылада знаходзіцца пад кіраваннем <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g>."</string> <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> выкарыстоўвае <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> для кіравання вашай прыладай."</string> <string name="monitoring_description_do_body" msgid="3639594537660975895">"Адміністратар кантралюе налады, праграмы, карпаратыўны доступ, звязаныя з прыладай даныя і перадачу геаданых."</string> @@ -435,15 +460,17 @@ <string name="monitoring_description_do_body_vpn" msgid="8255218762488901796">"Вы падключаны да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай дзейнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> <string name="monitoring_description_vpn_settings_separator" msgid="1933186756733474388">" ,"</string> <string name="monitoring_description_vpn_settings" msgid="8869300202410505143">"Адкрыйце налады VPN"</string> + <string name="monitoring_description_ca_cert_settings_separator" msgid="4987350385906393626">" "</string> + <string name="monitoring_description_ca_cert_settings" msgid="5489969458872997092">"Адкрыць давераныя ўліковыя даныя"</string> <string name="monitoring_description_network_logging" msgid="7223505523384076027">"Ваш адміністратар уключыў вядзенне журнала сеткі, з дапамогай якога адсочваецца трафік на вашай прыладзе.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара."</string> <string name="monitoring_description_vpn" msgid="4445150119515393526">"Вы далі праграме дазвол на наладжванне злучэння VPN.\n\nГэта праграма можа сачыць за актыўнасцю вашай прылады і вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"Ваш працоўны профіль знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nВаш адміністратар можа сачыць за вашай сеткавай дзейнасцю, уключаючы электронную пошту, праграмы і вэб-сайты.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара.\n\nВы таксама падключаны да сеткі VPN, якая можа сачыць за вашай сеткавай дзейнасцю."</string> <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string> - <string name="monitoring_description_app" msgid="6259179342284742878">"Вы падлучаны да праграмы <xliff:g id="APPLICATION">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> + <string name="monitoring_description_app" msgid="1828472472674709532">"Вы падключаны да праграмы <xliff:g id="APPLICATION">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> <string name="monitoring_description_app_personal" msgid="484599052118316268">"Вы падлучаны да праграмы <xliff:g id="APPLICATION">%1$s</xliff:g>, якая сачыць за вашай асабістай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"Вы падключаны да праграмы <xliff:g id="APPLICATION">%1$s</xliff:g>, якая можа сачыць за вашай асабістай сеткавай дзейнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> - <string name="monitoring_description_app_work" msgid="7777228449969022305">"Ваш працоўны профіль знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Ён падключаны да праграмы <xliff:g id="APPLICATION">%2$s</xliff:g>, якая можа сачыць за вашай сеткавай дзейнасцю, уключаючы электронную пошту, праграмы і вэб-сайты.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара."</string> - <string name="monitoring_description_app_personal_work" msgid="4946600443852045903">"Ваш працоўны профіль знаходзіцца пад кіраваннем <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="monitoring_description_app_work" msgid="4612997849787922906">"Ваш працоўны профіль знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Ён падключаны да праграмы <xliff:g id="APPLICATION">%2$s</xliff:g>, якая можа сачыць за вашай працоўнай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара."</string> + <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"Ваш працоўны профіль знаходзіцца пад кіраваннем <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_disabled" msgid="7412534203633528135">"Прылада будзе заставацца заблакіраванай, пакуль вы не разблакіруеце яе ўручную"</string> <string name="hidden_notifications_title" msgid="7139628534207443290">"Атрымлівайце апавяшчэнні хутчэй"</string> <string name="hidden_notifications_text" msgid="2326409389088668981">"Праглядайце іх перад разблакіроўкай"</string> @@ -474,10 +501,8 @@ <string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Дакраніцеся, каб уключыць гук."</string> <string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Дакраніцеся, каб уключыць вібрацыю. Можа быць адключаны гук службаў спецыяльных магчымасцей."</string> <string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Дакраніцеся, каб адключыць гук. Можа быць адключаны гук службаў спецыяльных магчымасцей."</string> - <!-- no translation found for volume_stream_content_description_vibrate_a11y (6427727603978431301) --> - <skip /> - <!-- no translation found for volume_stream_content_description_mute_a11y (8995013018414535494) --> - <skip /> + <string name="volume_stream_content_description_vibrate_a11y" msgid="6427727603978431301">"%1$s. Дакраніцеся, каб уключыць вібрацыю."</string> + <string name="volume_stream_content_description_mute_a11y" msgid="8995013018414535494">"%1$s. Дакраніцеся, каб адключыць гук"</string> <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"Паказваецца наступная колькасць рэгулятараў гучнасці: %s. Правядзіце пальцам уверх, каб закрыць іх."</string> <string name="volume_dialog_accessibility_dismissed_message" msgid="51543526013711399">"Рэгулятары гучнасці схаваны"</string> <string name="system_ui_tuner" msgid="708224127392452018">"Наладка сістэмнага інтэрфейсу карыстальніка"</string> @@ -528,14 +553,24 @@ <string name="power_notification_controls_description" msgid="4372459941671353358">"З дапамогай пашыранага кіравання апавяшчэннямі вы можаце задаваць узровень важнасці апавяшчэнняў праграмы ад 0 да 5. \n\n"<b>"Узровень 5"</b>" \n- Паказваць уверсе спіса апавяшчэнняў \n- Дазваляць перапыняць рэжым поўнага экрана \n- Заўсёды дазваляць кароткі паказ \n\n"<b>"Узровень 4"</b>" \n- Забараняць перапыняць рэжым поўнага экрана \n- Заўсёды дазваляць кароткі паказ \n\n"<b>"Узровень 3"</b>" \n- Забараняць перапыняць рэжым поўнага экрана \n- Ніколі не дазваляць кароткі паказ \n\n"<b>"Узровень 2"</b>" \n- Забараняць перапыняць рэжым поўнага экрана \n- Ніколі не дазваляць кароткі паказ \n- Ніколі не прайграваць гук і не вібрыраваць \n\n"<b>"Узровень 1"</b>" \n- Забараняць перапыняць рэжым поўнага экрана \n- Ніколі не дазваляць кароткі паказ \n- Ніколі не прайграваць гук і не вібрыраваць \n- Хаваць з экрана блакіроўкі і панэлі стану \n- Паказваць унізе спіса апавяшчэнняў \n\n"<b>"Узровень 0"</b>" \n- Блакіраваць усе апавяшчэнні ад праграмы"</string> <string name="notification_header_default_channel" msgid="7506845022070889909">"Апавяшчэнні"</string> <string name="notification_channel_disabled" msgid="5805874247999578073">"Вы больш не будзеце атрымліваць гэтыя апавяшчэнні."</string> - <plurals name="notification_num_channels_desc" formatted="false" msgid="8808748716499517938"> - <item quantity="one">1 з <xliff:g id="NUMBER_1">%d</xliff:g> катэгорыі ў гэтай праграме</item> - <item quantity="few">1 з <xliff:g id="NUMBER_1">%d</xliff:g> катэгорый у гэтай праграме</item> - <item quantity="many">1 з <xliff:g id="NUMBER_1">%d</xliff:g> катэгорый у гэтай праграме</item> - <item quantity="other">1 з <xliff:g id="NUMBER_1">%d</xliff:g> катэгорыі ў гэтай праграме</item> + <string name="notification_num_channels" msgid="2048144408999179471">"Катэгорый апавяшчэнняў: <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string name="notification_default_channel_desc" msgid="2506053815870808359">"У гэтай праграме няма катэгорый апавяшчэнняў"</string> + <plurals name="notification_num_channels_desc" formatted="false" msgid="5492793452274077663"> + <item quantity="one">1 з <xliff:g id="NUMBER_1">%d</xliff:g> катэгорыі апавяшчэнняў у гэтай праграме</item> + <item quantity="few">1 з <xliff:g id="NUMBER_1">%d</xliff:g> катэгорый апавяшчэнняў у гэтай праграме</item> + <item quantity="many">1 з <xliff:g id="NUMBER_1">%d</xliff:g> катэгорый апавяшчэнняў у гэтай праграме</item> + <item quantity="other">1 з <xliff:g id="NUMBER_1">%d</xliff:g> катэгорыі апавяшчэнняў у гэтай праграме</item> + </plurals> + <string name="notification_channels_list_desc_2" msgid="6214732715833946441">"<xliff:g id="CHANNEL_NAME_1">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2">%2$s</xliff:g>"</string> + <plurals name="notification_channels_list_desc_2_and_others" formatted="false" msgid="2747813553355336157"> + <item quantity="one"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g> і яшчэ <xliff:g id="NUMBER_5">%3$d</xliff:g></item> + <item quantity="few"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g> і яшчэ <xliff:g id="NUMBER_5">%3$d</xliff:g></item> + <item quantity="many"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g> і яшчэ <xliff:g id="NUMBER_5">%3$d</xliff:g></item> + <item quantity="other"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g> і яшчэ <xliff:g id="NUMBER_5">%3$d</xliff:g></item> </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Усе катэгорыі"</string> <string name="notification_more_settings" msgid="816306283396553571">"Дадатковыя налады"</string> + <string name="notification_app_settings" msgid="3743278649182392015">"Персаналізаваць: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Гатова"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"кіраванне апавяшчэннямі"</string> @@ -543,7 +578,7 @@ <string name="snooze_option_15_min" msgid="1068727451405610715">"15 хвілін"</string> <string name="snooze_option_30_min" msgid="867081342535195788">"30 хвілін"</string> <string name="snooze_option_1_hour" msgid="1098086401880077154">"1 гадзіна"</string> - <string name="snooze_option_dont_snooze" msgid="655446566007801922">"Не адкладваць"</string> + <string name="snooze_option_dont_snooze" msgid="2252098379349499668">"Скасаваць"</string> <string name="snooze_undo" msgid="6074877317002985129">"АДРАБІЦЬ"</string> <string name="snoozed_for_time" msgid="2390718332980204462">"Адкладзена на <xliff:g id="TIME_AMOUNT">%1$s</xliff:g>"</string> <string name="battery_panel_title" msgid="7944156115535366613">"Выкарыстанне зараду"</string> @@ -685,6 +720,10 @@ <string name="pip_phone_expand" msgid="5889780005575693909">"Разгарнуць"</string> <string name="pip_phone_minimize" msgid="1079119422589131792">"Згарнуць"</string> <string name="pip_phone_close" msgid="8416647892889710330">"Закрыць"</string> + <string name="pip_phone_dismiss_hint" msgid="6351678169095923899">"Перацягніце ўніз, каб адхіліць"</string> + <string name="pip_menu_title" msgid="3328510504196964712">"Меню \"Відарыс у відарысе\""</string> + <string name="pip_notification_title" msgid="3204024940158161322">"<xliff:g id="NAME">%s</xliff:g> з’яўляецца відарысам у відарысе"</string> + <string name="pip_notification_message" msgid="4171698133469539591">"Калі вы не хочаце, каб праграма <xliff:g id="NAME">%s</xliff:g> выкарыстоўвала гэту функцыю, дакраніцеся, каб адкрыць налады і адключыць яе."</string> <string name="high_temp_title" msgid="4589508026407318374">"Тэлефон награваецца"</string> <string name="high_temp_notif_message" msgid="5642466103153429279">"Некаторыя функцыі абмежаваны, пакуль тэлефон астывае"</string> <string name="high_temp_dialog_message" msgid="6840700639374113553">"Ваш тэлефон аўтаматычна паспрабуе астыць. Вы можаце па-ранейшаму карыстацца сваім тэлефонам, але ён можа працаваць больш павольна.\n\nПасля таго як ваш тэлефон астыне, ён будзе працаваць у звычайным рэжыме."</string> @@ -707,9 +746,16 @@ <string name="notification_channel_general" msgid="4525309436693914482">"Агульныя паведамленні"</string> <string name="notification_channel_storage" msgid="3077205683020695313">"Захоўванне"</string> <string name="instant_apps" msgid="6647570248119804907">"Імгненныя праграмы"</string> - <!-- no translation found for pip_menu_title (3328510504196964712) --> - <skip /> <string name="instant_apps_message" msgid="8116608994995104836">"Імгненныя праграмы не патрабуюць усталёўкі."</string> <string name="app_info" msgid="6856026610594615344">"Інфармацыя пра праграму"</string> <string name="mobile_data" msgid="7094582042819250762">"Маб. перадача даных"</string> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi выключаны"</string> + <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth выключаны"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"Рэжым \"Не турбаваць\" выключаны"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"Рэжым \"Не турбаваць\" быў уключаны аўтаматычным правілам (<xliff:g id="ID_1">%s</xliff:g>). Пакінуць бягучыя налады?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"Рэжым \"Не турбаваць\" быў уключаны праграмай (<xliff:g id="ID_1">%s</xliff:g>). Пакінуць бягучыя налады?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"Рэжым \"Не турбаваць\" быў уключаны аўтаматычным правілам ці праграмай. Пакінуць бягучыя налады?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"Да <xliff:g id="ID_1">%s</xliff:g>"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"Пакінуць"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"Замяніць"</string> </resources> diff --git a/packages/SystemUI/res/values-be/strings_tv.xml b/packages/SystemUI/res/values-be/strings_tv.xml index 4b871a6311a0..88635fe31341 100644 --- a/packages/SystemUI/res/values-be/strings_tv.xml +++ b/packages/SystemUI/res/values-be/strings_tv.xml @@ -27,7 +27,4 @@ <string name="pip_onboarding_title" msgid="7850436557670253991">"Відарыс у відарысе"</string> <string name="pip_onboarding_description" msgid="4028124563309465267">"Гэта дазваляе захоўваць ваша відэа ў полі зроку, пакуль вы не пачняце прайграванне іншага. Націсніце і ўтрымлівайце "<b>"HOME"</b>" для кіравання."</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Зразумела"</string> - <string name="recents_tv_dismiss" msgid="3555093879593377731">"Адхіліць"</string> - <string-array name="recents_tv_blacklist_array"> - </string-array> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 0a5a195a5c8c..ac940dfb9778 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Батерията се зарежда – <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> процента."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Системни настройки."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Известия."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Контейнер за препълване за известията"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Вижте всички известия"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Изчистване на известието."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS е активиран."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS се придобива."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Всички категории"</string> <string name="notification_more_settings" msgid="816306283396553571">"Още настройки"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Персонализиране: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> от <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"контроли за известията"</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 8c825094ac57..056ab31df33b 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"ব্যাটারি চার্জ হচ্ছে, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> শতাংশ৷"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"সিস্টেম সেটিংস৷"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"বিজ্ঞপ্তিগুলি৷"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"বিজ্ঞপ্তি ওভারফ্লো কন্টেনার"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"বিজ্ঞপ্তি সাফ করুন৷"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS সক্ষম করা হয়েছে৷"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS অর্জন করা হচ্ছে৷"</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"সকল বিভাগ"</string> <string name="notification_more_settings" msgid="816306283396553571">"আরো সেটিংস"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"কাস্টমাইজ করুন: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"সম্পন্ন"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"বিজ্ঞপ্তির নিয়ন্ত্রণগুলি"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 27390b966433..49eee2420a3f 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -76,7 +76,7 @@ <string name="screenshot_failed_title" msgid="705781116746922771">"Došlo je do greške prilikom snimanja ekrana."</string> <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"Došlo je do problema prilikom spašavanja snimka ekrana."</string> <string name="screenshot_failed_to_save_text" msgid="2592658083866306296">"Snimak ekrana se ne može sačuvati zbog manjka prostora za pohranu."</string> - <string name="screenshot_failed_to_capture_text" msgid="7602391003979898374">"Aplikacija ili vaša organizacija ne dopuštaju pravljenje snimaka ekrana."</string> + <string name="screenshot_failed_to_capture_text" msgid="173674476457581486">"Ova aplikacija ili vaša organizacija ne dozvoljavaju snimanje ekrana"</string> <string name="usb_preference_title" msgid="6551050377388882787">"Opcije USB prijenosa fajlova"</string> <string name="use_mtp_button_title" msgid="4333504413563023626">"Reproduciranje medijskih sadržaja (MTP)"</string> <string name="use_ptp_button_title" msgid="7517127540301625751">"Priključiti kao kameru (PTP)"</string> @@ -91,7 +91,7 @@ <string name="accessibility_phone_button" msgid="6738112589538563574">"Telefon"</string> <string name="accessibility_voice_assist_button" msgid="487611083884852965">"Glasovna pomoć"</string> <string name="accessibility_unlock_button" msgid="128158454631118828">"Otključaj"</string> - <string name="accessibility_unlock_button_fingerprint" msgid="8214125623493923751">"Dugme za otključavanje, čeka se na otisak prsta"</string> + <string name="accessibility_waiting_for_fingerprint" msgid="4808860050517462885">"Čeka se otisak prsta"</string> <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"Otključaj bez korištenja otiska prsta"</string> <string name="unlock_label" msgid="8779712358041029439">"otključaj"</string> <string name="phone_label" msgid="2320074140205331708">"otvori telefon"</string> @@ -165,7 +165,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Punjenje baterije, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> procenata."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Postavke sistema."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Obavještenja."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Spremnik za prelijevanje obavještenja"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Vidite sva obavještenja"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Ukloniti obavještenje."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS omogućen."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Uspostavljanje GPS veze."</string> @@ -237,13 +237,12 @@ <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Ušteda podataka je isključena."</string> <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Ušteda podataka je uključena."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Osvjetljenje ekrana"</string> - <!-- no translation found for accessibility_ambient_display_charging (9084521679384069087) --> - <skip /> + <string name="accessibility_ambient_display_charging" msgid="9084521679384069087">"Punjenje"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G–3G prijenos podataka je pauzirano"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G prijenos podataka je pauzirano"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="4651001290947318931">"Mobilni podaci su pauzirani"</string> <string name="data_usage_disabled_dialog_title" msgid="3932437232199671967">"Prijenos podataka je pauziran"</string> - <string name="data_usage_disabled_dialog" msgid="1841738975235283398">"Dostigli ste ograničenje za prijenos podataka koje ste postavili. Više ne koristite mobilne podatke.\n\nUkoliko nastavite koristiti mobilne podatke, mogući su troškovi za prijenos podataka."</string> + <string name="data_usage_disabled_dialog" msgid="1841738975235283398">"Dostigli ste ograničenje za prijenos podataka koje ste postavili. Više ne koristite mobilne podatke.\n\nUkoliko nastavite koristiti mobilne podatke, mogu nastati troškovi prijenosa podataka."</string> <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"Nastavi"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="1940231521274147771">"Niste povezani na internet"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"Wi-Fi veza aktivna"</string> @@ -279,7 +278,7 @@ <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Osvjetljenje"</string> <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Automatsko rotiranje"</string> <string name="accessibility_quick_settings_rotation" msgid="4231661040698488779">"Automatsko rotiranje ekrana"</string> - <string name="accessibility_quick_settings_rotation_value" msgid="1428962304214992318">"Postaviti način rada: <xliff:g id="ID_1">%s</xliff:g>"</string> + <string name="accessibility_quick_settings_rotation_value" msgid="8187398200140760213">"Način rada <xliff:g id="ID_1">%s</xliff:g>"</string> <string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"Rotiranje je zaključano"</string> <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"Uspravno"</string> <string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"Vodoravno"</string> @@ -337,7 +336,6 @@ <string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikacija <xliff:g id="APP">%s</xliff:g> nije pokrenuta."</string> <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> je onemogućena u sigurnom načinu rada."</string> <string name="recents_stack_action_button_label" msgid="6593727103310426253">"Obriši sve"</string> - <string name="recents_incompatible_app_message" msgid="5075812958564082451">"Aplikacija ne podržava dijeljenje ekrana."</string> <string name="recents_drag_hint_message" msgid="2649739267073203985">"Povucite ovdje za korištenje podijeljenog ekrana"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podjela po horizontali"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podjela po vertikali"</string> @@ -363,7 +361,7 @@ <string name="speed_bump_explanation" msgid="1288875699658819755">"Prikaži manje važna obavještenja ispod"</string> <string name="notification_tap_again" msgid="7590196980943943842">"Dodirnite ponovo da otvorite"</string> <string name="keyguard_unlock" msgid="8043466894212841998">"Prevucite prema gore da otključate"</string> - <string name="do_disclosure_generic" msgid="8498005633306135779">"Ovim uređajem upravlja"</string> + <string name="do_disclosure_generic" msgid="5615898451805157556">"Ovim uređajem upravlja vaša organizacija"</string> <string name="do_disclosure_with_name" msgid="5640615509915445501">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="phone_hint" msgid="4872890986869209950">"Prevucite preko ikone da otvorite telefon"</string> <string name="voice_hint" msgid="8939888732119726665">"Prevucite preko ikone za glasovnu pomoć"</string> @@ -416,13 +414,40 @@ <string name="profile_owned_footer" msgid="8021888108553696069">"Profil može biti nadziran"</string> <string name="vpn_footer" msgid="2388611096129106812">"Mreža može biti nadzirana"</string> <string name="branded_vpn_footer" msgid="2168111859226496230">"Mreža može biti nadzirana"</string> + <string name="quick_settings_disclosure_management_monitoring" msgid="6645176135063957394">"Vaša organizacija upravlja ovim uređajem i može pratiti mrežni promet."</string> + <string name="quick_settings_disclosure_named_management_monitoring" msgid="370622174777570853">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> upravlja ovim uređajem i može pratiti vaš mrežni promet"</string> + <string name="quick_settings_disclosure_management_named_vpn" msgid="1085137869053332307">"Uređajem upravlja vaša organizacija i povezan je s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_management_named_vpn" msgid="6290456493852584017">"Uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je s aplikacijom <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <string name="quick_settings_disclosure_management" msgid="3294967280853150271">"Uređajem upravlja vaša organizacija"</string> + <string name="quick_settings_disclosure_named_management" msgid="1059403025094542908">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>."</string> + <string name="quick_settings_disclosure_management_vpns" msgid="3698767349925266482">"Uređajem upravlja vaša organizacija i povezan je s VPN-ovima"</string> + <string name="quick_settings_disclosure_named_management_vpns" msgid="7777821385318891527">"Uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je s VPN-ovima"</string> + <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="5125463987558278215">"Vaša organizacija može pratiti mrežni promet na vašem profilu."</string> + <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8973606847896650284">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> može pratiti mrežni promet na vašem radnom profilu"</string> + <string name="quick_settings_disclosure_monitoring" msgid="679658227269205728">"Mreža može biti nadzirana"</string> + <string name="quick_settings_disclosure_vpns" msgid="8170318392053156330">"Uređaj je povezan s VPN-ovima"</string> + <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="3494535754792751741">"Radni profil je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="4467456202486569906">"Lični profil je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_vpn" msgid="6943724064780847080">"Uređaj je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7121079311903859610">"Praćenje uređaja"</string> <string name="monitoring_title_profile_owned" msgid="6790109874733501487">"Praćenje profila"</string> <string name="monitoring_title" msgid="169206259253048106">"Praćenje mreže"</string> <string name="monitoring_subtitle_vpn" msgid="876537538087857300">"VPN mreža"</string> - <string name="monitoring_subtitle_network_logging" msgid="5569072711320784030">"Zapisivanje na mreži"</string> + <string name="monitoring_subtitle_network_logging" msgid="3341264304793193386">"Zapisivanje na mreži"</string> + <string name="monitoring_subtitle_ca_certificate" msgid="3874151893894355988">"CA certifikati"</string> <string name="disable_vpn" msgid="4435534311510272506">"Isključi VPN"</string> <string name="disconnect_vpn" msgid="1324915059568548655">"Prekini VPN vezu"</string> + <string name="monitoring_button_view_policies" msgid="100913612638514424">"Prikaži pravila"</string> + <string name="monitoring_description_named_management" msgid="4872859182820011954">"Vašim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>.\n\nVaš administrator može pratiti i upravljati postavkama, korporativnim pristupom, aplikacijama, podacima povezanim s vašim uređajem i informacijama o lokaciji vašeg uređaja.\n\nZa više informacija, obratite se svom administratoru.\""</string> + <string name="monitoring_description_management" msgid="3115563193381106341">"Vašim uređajem upravlja vaša organizacija.\n\nVaš administrator može pratiti i upravljati postavkama, korporativnim pristupom, aplikacijama, podacima povezanim s vašim uređajem i informacijama o lokaciji vašeg uređaja.\n\nZa više informacija, obratite se svom administratoru.\""</string> + <string name="monitoring_description_management_ca_certificate" msgid="5202023784131001751">"Vaša organizacija je instalirala CA certifikat na ovom uređaju. Vaš promet preko sigurne mreže može se pratiti."</string> + <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"Vaša organizacija je instalirala CA certifikat na vašem radnom profilu. Vaš promet preko sigurne mreže može se pratiti."</string> + <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"CA certifikat je instaliran na ovom uređaju. Vaš promet preko sigurne mreže može se pratiti."</string> + <string name="monitoring_description_management_network_logging" msgid="7184005419733060736">"Vaš administrator je uključio zapisivanje na mreži, čime se prati promet na vašem uređaju."</string> + <string name="monitoring_description_named_vpn" msgid="639013857356724268">"Povezani ste s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može pratiti vašu aktivnost na mreži, uključujući e-poruke i web lokacije."</string> + <string name="monitoring_description_two_named_vpns" msgid="4479748971871539316">"Povezani ste s aplikacijama <xliff:g id="VPN_APP_0">%1$s</xliff:g> i <xliff:g id="VPN_APP_1">%2$s</xliff:g>, koje mogu pratiti vašu aktivnost na mreži, uključujući e-poruke, aplikacije i web lokacije."</string> + <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"Vaš radni profil je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može pratiti vašu aktivnost na mreži, uključujući e-poruke i web lokacije."</string> + <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"Vaš lični profil je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može pratiti vašu aktivnost na mreži, uključujući e-poruke, aplikacije i web lokacije."</string> <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"Vašim uređajem upravlja aplikacija <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g>."</string> <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> koristi aplikaciju <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> za upravljanje vašim uređajem."</string> <string name="monitoring_description_do_body" msgid="3639594537660975895">"Vaš administrator može pratiti postavke, korporativni pristup, aplikacije, podatke povezane s vašim uređajem i informacije o lokaciji vašeg uređaja."</string> @@ -431,15 +456,17 @@ <string name="monitoring_description_do_body_vpn" msgid="8255218762488901796">"Povezani ste s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može pratiti vašu aktivnost na mreži, uključujući e-poruke i web lokacije."</string> <string name="monitoring_description_vpn_settings_separator" msgid="1933186756733474388">" "</string> <string name="monitoring_description_vpn_settings" msgid="8869300202410505143">"Postavke otvorene VPN mreže"</string> + <string name="monitoring_description_ca_cert_settings_separator" msgid="4987350385906393626">" "</string> + <string name="monitoring_description_ca_cert_settings" msgid="5489969458872997092">"Otvorite pouzdane akreditive"</string> <string name="monitoring_description_network_logging" msgid="7223505523384076027">"Vaš administrator je uključio zapisivanje na mreži, čime se prati saobraćaj na vašem uređaju.\n\nZa više informacija, obratite se administratoru."</string> <string name="monitoring_description_vpn" msgid="4445150119515393526">"Jednoj aplikaciji ste dali odobrenje da uspostavi VPN vezu.\n\nTa aplikacija može pratiti vašu aktivnost na uređaju i mreži, uključujući e-poštu, aplikacije i web-lokacije."</string> <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"Vašim radnim profilom upravlja <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nVaš administrator može pratiti vašu aktivnost na radnoj mreži, uključujući e-poruke, aplikacije i web lokacije.\n\nZa više informacija, obratite se administratoru.\n\nPovezani ste i na VPN, koji može pratiti vašu aktivnost na mreži."</string> <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string> - <string name="monitoring_description_app" msgid="6259179342284742878">"Povezani ste sa aplikacijom <xliff:g id="APPLICATION">%1$s</xliff:g>, koja može pratiti vašu aktivnost na mreži, uključujući e-mailove, aplikacije i web-lokacije."</string> + <string name="monitoring_description_app" msgid="1828472472674709532">"Povezani ste s aplikacijom <xliff:g id="APPLICATION">%1$s</xliff:g>, koja može pratiti vašu aktivnost na mreži, uključujući e-poruke, aplikacije i web lokacije."</string> <string name="monitoring_description_app_personal" msgid="484599052118316268">"Povezani ste sa aplikacijom <xliff:g id="APPLICATION">%1$s</xliff:g>, koja može pratiti vašu aktivnost na privatnoj mreži, uključujući e-mailove, aplikacije i web-lokacije."</string> <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"Povezani ste na aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g>, koja može pratiti vaše privatne aktivnosti na mreži, uključujući e-poštu, aplikacije i web stranice."</string> - <string name="monitoring_description_app_work" msgid="7777228449969022305">"Vašim radnim profilom upravlja <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Povezan je s aplikacijom <xliff:g id="APPLICATION">%2$s</xliff:g>, koja može pratiti vašu aktivnost na radnoj mreži, uključujući e-poruke, aplikacije i web lokacije.\n\nZa više informacija, obratite se svom administratoru."</string> - <string name="monitoring_description_app_personal_work" msgid="4946600443852045903">"Profilom za posao upravlja <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Povezan je sa aplikacijom <xliff:g id="APPLICATION_WORK">%2$s</xliff:g>, koja može pratiti vašu aktivnost na radnoj mreži, uključujući e-poštu, aplikacije i web-lokacije.\n\nPovezani ste i sa aplikacijom <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g>, koja može pratiti vašu aktivnost na privatnoj mreži."</string> + <string name="monitoring_description_app_work" msgid="4612997849787922906">"Vašim radnim profilom upravlja <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Profil je povezan s aplikacijom <xliff:g id="APPLICATION">%2$s</xliff:g>, koja može pratiti vašu aktivnost na radnoj mreži, uključujući e-poruke, aplikacije i web lokacije.\n\nZa više informacija, obratite se svom administratoru."</string> + <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"Radnim profilom upravlja <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Profil je povezan s aplikacijom <xliff:g id="APPLICATION_WORK">%2$s</xliff:g>, koja može pratiti vašu aktivnost na radnoj mreži, uključujući e-poruke, aplikacije i web lokacije.\n\nPovezani ste i sa aplikacijom <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g>, koja može pratiti vašu aktivnost na privatnoj mreži."</string> <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"Uređaj će ostati zaključan dok ga ručno ne otključate"</string> <string name="hidden_notifications_title" msgid="7139628534207443290">"Brže primaj obavještenja"</string> <string name="hidden_notifications_text" msgid="2326409389088668981">"Vidi ih prije otključavanja"</string> @@ -472,10 +499,8 @@ <skip /> <string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Dodirnite za postavljanje vibracije. Zvukovi usluga pristupačnosti mogu biti isključeni."</string> <string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Dodirnite da isključite zvuk. Zvukovi usluga pristupačnosti mogu biti isključeni."</string> - <!-- no translation found for volume_stream_content_description_vibrate_a11y (6427727603978431301) --> - <skip /> - <!-- no translation found for volume_stream_content_description_mute_a11y (8995013018414535494) --> - <skip /> + <string name="volume_stream_content_description_vibrate_a11y" msgid="6427727603978431301">"%1$s. Dodirnite da postavite vibraciju."</string> + <string name="volume_stream_content_description_mute_a11y" msgid="8995013018414535494">"%1$s. Dodirnite da isključite zvuk."</string> <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"Prikazane kontrole jačine zvuka za: %s. Prevucite prema gore za odbacivanje."</string> <string name="volume_dialog_accessibility_dismissed_message" msgid="51543526013711399">"Kontrole jačine zvuka sakrivene"</string> <string name="system_ui_tuner" msgid="708224127392452018">"Podešavač za korisničko sučelje sistema"</string> @@ -526,13 +551,22 @@ <string name="power_notification_controls_description" msgid="4372459941671353358">"Uz kontrolu obavještenja o napajanju, možete postaviti nivo značaja obavještenja iz aplikacije, i to od nivoa 0 do 5. \n\n"<b>"Nivo 5"</b>" \n- Prikaži na vrhu liste obavještenja \n- Dopusti prekid prikaza cijelog ekrana \n- Uvijek izviruj \n\n"<b>"Nvio 4"</b>" \n- Spriječi prekid prikaza cijelog ekrana \n- Uvijek izviruj \n\n"<b>"Nivo 3"</b>" \n- Spriječi prekid prikaza cijelog ekrana \n- Nikad ne izviruj \n\n"<b>"Nivo 2"</b>" \n- Spriječi prekid prikaza cijelog ekrana \n- Nikad ne izviruj \n- Nikada ne puštaj zvuk ili vibraciju \n\n"<b>"Nivo 1"</b>" \n- Spriječi prekid prikaza cijelog ekrana \n- Nikada ne izviruj \n- Nikada ne puštaj zvuk ili vibraciju \n- Sakrij sa ekrana za zaključavanje i statusne trake \n- Prikaži na dnu liste obavještenja \n\n"<b>"Nivo 0"</b>" \n- Blokiraj sva obavještenja iz aplikacije"</string> <string name="notification_header_default_channel" msgid="7506845022070889909">"Obavještenja"</string> <string name="notification_channel_disabled" msgid="5805874247999578073">"Nećete više primati ova obavještenja."</string> - <plurals name="notification_num_channels_desc" formatted="false" msgid="8808748716499517938"> - <item quantity="one">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorije iz ove aplikacije</item> - <item quantity="few">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorije iz ove aplikacije</item> - <item quantity="other">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorija iz ove aplikacije</item> + <string name="notification_num_channels" msgid="2048144408999179471">"Kategorije obavještenja: <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string name="notification_default_channel_desc" msgid="2506053815870808359">"Ova aplikacija nema kategorije obavještenja"</string> + <plurals name="notification_num_channels_desc" formatted="false" msgid="5492793452274077663"> + <item quantity="one">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorije obavještenja iz ove aplikacije</item> + <item quantity="few">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorije obavještenja iz ove aplikacije</item> + <item quantity="other">1 od <xliff:g id="NUMBER_1">%d</xliff:g> kategorija obavještenja iz ove aplikacije</item> + </plurals> + <string name="notification_channels_list_desc_2" msgid="6214732715833946441">"<xliff:g id="CHANNEL_NAME_1">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2">%2$s</xliff:g>"</string> + <plurals name="notification_channels_list_desc_2_and_others" formatted="false" msgid="2747813553355336157"> + <item quantity="one"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g>, i još <xliff:g id="NUMBER_5">%3$d</xliff:g></item> + <item quantity="few"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g>, i još <xliff:g id="NUMBER_5">%3$d</xliff:g></item> + <item quantity="other"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g>, i još <xliff:g id="NUMBER_5">%3$d</xliff:g></item> </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Sve kategorije"</string> <string name="notification_more_settings" msgid="816306283396553571">"Više postavki"</string> + <string name="notification_app_settings" msgid="3743278649182392015">"Prilagodite: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Gotovo"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"kontrole obavještenja"</string> @@ -540,7 +574,7 @@ <string name="snooze_option_15_min" msgid="1068727451405610715">"15 minuta"</string> <string name="snooze_option_30_min" msgid="867081342535195788">"30 minuta"</string> <string name="snooze_option_1_hour" msgid="1098086401880077154">"1 sat"</string> - <string name="snooze_option_dont_snooze" msgid="655446566007801922">"Ne odgađaj"</string> + <string name="snooze_option_dont_snooze" msgid="2252098379349499668">"Otkaži"</string> <string name="snooze_undo" msgid="6074877317002985129">"OPOZOVI"</string> <string name="snoozed_for_time" msgid="2390718332980204462">"Odgođeno za <xliff:g id="TIME_AMOUNT">%1$s</xliff:g>"</string> <string name="battery_panel_title" msgid="7944156115535366613">"Upotreba baterije"</string> @@ -682,6 +716,10 @@ <string name="pip_phone_expand" msgid="5889780005575693909">"Proširi"</string> <string name="pip_phone_minimize" msgid="1079119422589131792">"Umanji"</string> <string name="pip_phone_close" msgid="8416647892889710330">"Zatvori"</string> + <string name="pip_phone_dismiss_hint" msgid="6351678169095923899">"Povucite prema dolje da odbacite"</string> + <string name="pip_menu_title" msgid="3328510504196964712">"Meni za način rada Slika u slici"</string> + <string name="pip_notification_title" msgid="3204024940158161322">"<xliff:g id="NAME">%s</xliff:g> je u načinu priakza Slika u slici"</string> + <string name="pip_notification_message" msgid="4171698133469539591">"Ako ne želite da <xliff:g id="NAME">%s</xliff:g> koristi ovu funkciju, dodirnite da otvorite postavke i isključite je."</string> <string name="high_temp_title" msgid="4589508026407318374">"Telefon se pregrijava"</string> <string name="high_temp_notif_message" msgid="5642466103153429279">"Neke funkcije su ograničene dok se telefon hladi"</string> <string name="high_temp_dialog_message" msgid="6840700639374113553">"Vaš telefon će se automatski pokušati ohladiti. I dalje možete koristi telefon, ali će možda raditi sporije.\n\nNakon što se ohladi, telefon će normalno raditi."</string> @@ -704,9 +742,16 @@ <string name="notification_channel_general" msgid="4525309436693914482">"Općenite poruke"</string> <string name="notification_channel_storage" msgid="3077205683020695313">"Pohrana"</string> <string name="instant_apps" msgid="6647570248119804907">"Instant-aplikacije"</string> - <!-- no translation found for pip_menu_title (3328510504196964712) --> - <skip /> <string name="instant_apps_message" msgid="8116608994995104836">"Za instant aplikacije nije potrebna instalacija"</string> <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> <string name="mobile_data" msgid="7094582042819250762">"Mobilni podaci"</string> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi veza je isključena"</string> + <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth je isključen"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"Opcija Ne ometaj je isključena"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"Automatsko pravilo (<xliff:g id="ID_1">%s</xliff:g>) uključilo je opciju Ne ometaj. Želite li zadržati trenutne postavke?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"Aplikacija (<xliff:g id="ID_1">%s</xliff:g>) uključila je opciju Ne ometaj. Želite li zadržati trenutne postavke?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"Automatsko pravilo ili aplikacija uključili su opciju Ne ometaj. Želite li zadržati trenutne postavke?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"Do <xliff:g id="ID_1">%s</xliff:g>"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"Zadrži"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"Zamijeni"</string> </resources> diff --git a/packages/SystemUI/res/values-bs/strings_tv.xml b/packages/SystemUI/res/values-bs/strings_tv.xml index 40347dcd9f2c..20b5bd6e63c7 100644 --- a/packages/SystemUI/res/values-bs/strings_tv.xml +++ b/packages/SystemUI/res/values-bs/strings_tv.xml @@ -27,7 +27,4 @@ <string name="pip_onboarding_title" msgid="7850436557670253991">"Slika u slici"</string> <string name="pip_onboarding_description" msgid="4028124563309465267">"Ovim videozapis ostaje prikazan sve dok pokrenete sljedeći. Pritisnite i držite "<b>" POČETAK "</b>" za kontrole PIP-a."</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Jasno mi je"</string> - <string name="recents_tv_dismiss" msgid="3555093879593377731">"Odbaci"</string> - <string-array name="recents_tv_blacklist_array"> - </string-array> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index af531a2e8c32..d95c9915b466 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"La bateria s\'està carregant, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g>%%."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Configuració del sistema."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notificacions."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Contenidor de notificacions addicional"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Esborra la notificació."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS activat."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"S\'està adquirint el GPS."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Totes les categories"</string> <string name="notification_more_settings" msgid="816306283396553571">"Més opcions"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personalitza: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Fet"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"controls de notificació"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index a0f4a01b7258..af27f4af96a0 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -168,7 +168,7 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Systémová nastavení."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Oznámení."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Kontejner pro ikonu přetečení s oznámením"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Zobrazit všechna oznámení"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Vymazat oznámení."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS je povoleno."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Zaměřování GPS."</string> @@ -570,8 +570,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Všechny kategorie"</string> <string name="notification_more_settings" msgid="816306283396553571">"Další nastavení"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Přizpůsobit: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Hotovo"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> aplikace <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"Nastavení oznámení"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 7c8de3931ac7..330265bb115c 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Batteriet oplades. <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> procent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Systemindstillinger."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Underretninger."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Overløbsbeholder for underretninger"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Ryd underretning."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS aktiveret."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS samler data."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Alle kategorier"</string> <string name="notification_more_settings" msgid="816306283396553571">"Flere indstillinger"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Tilpas: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Udfør"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"kontrolelementer til underretninger"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 25e68bb5fd9e..434ce6d6c9c3 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -166,7 +166,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Systemeinstellungen"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Benachrichtigungen"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Überlaufcontainer für Benachrichtigungen"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Benachrichtigung löschen"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS aktiviert"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS-Signal abrufen"</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Alle Kategorien"</string> <string name="notification_more_settings" msgid="816306283396553571">"Weitere Einstellungen"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Anpassen: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Fertig"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> – <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"Benachrichtigungseinstellungen"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index e36b22d78685..785f3db5eaf1 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Φόρτιση μπαταρίας, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> τοις εκατό."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Ρυθμίσεις συστήματος."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Ειδοποιήσεις."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Κοντέινερ υπερχείλισης ειδοποίησης"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Δείτε όλες τις ειδοποιήσεις"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Διαγραφή ειδοποίησης."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"Το GPS ενεργοποιήθηκε."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Προσδιορισμός GPS."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Όλες οι κατηγορίες"</string> <string name="notification_more_settings" msgid="816306283396553571">"Περισσότερες ρυθμίσεις"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Προσαρμογή: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Τέλος"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"στοιχεία ελέγχου ειδοποιήσεων"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 462a6e364a12..79f924b02a10 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Battery charging, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> percent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"System settings"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Notification overflow container"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"See all notifications"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Clear notification."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS enabled."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS acquiring."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"All Categories"</string> <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Customise: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Done"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"notification controls"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 462a6e364a12..79f924b02a10 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Battery charging, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> percent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"System settings"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Notification overflow container"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"See all notifications"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Clear notification."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS enabled."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS acquiring."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"All Categories"</string> <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Customise: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Done"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"notification controls"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 462a6e364a12..79f924b02a10 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Battery charging, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> percent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"System settings"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Notification overflow container"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"See all notifications"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Clear notification."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS enabled."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS acquiring."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"All Categories"</string> <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Customise: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Done"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"notification controls"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 18fedb147d24..9090fa05c339 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -166,7 +166,7 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Configuración del sistema"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notificaciones"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Contenedor del flujo de notificaciones"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Ver todas las notificaciones"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Eliminar notificación"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS habilitado"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Adquisición de GPS"</string> @@ -562,8 +562,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Todas las categorías"</string> <string name="notification_more_settings" msgid="816306283396553571">"Más opciones de configuración"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personalizar: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Listo"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"controles de notificación"</string> @@ -744,11 +743,11 @@ <string name="mobile_data" msgid="7094582042819250762">"Datos móviles"</string> <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi desactivado"</string> <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth desactivado"</string> - <string name="dnd_is_off" msgid="6167780215212497572">"No molestar desactivado"</string> - <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"Una regla automática activó No molestar (<xliff:g id="ID_1">%s</xliff:g>). ¿Deseas mantener la configuración actual?"</string> - <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"Una app (<xliff:g id="ID_1">%s</xliff:g>) activó No molestar. ¿Deseas mantener la configuración actual?"</string> - <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"Una app o regla automática activó No molestar. ¿Deseas mantener la configuración actual?"</string> - <string name="qs_dnd_until" msgid="3469471136280079874">"Hasta las <xliff:g id="ID_1">%s</xliff:g>"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"No interrumpir desactivado"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"Una regla automática activó No interrumpir (<xliff:g id="ID_1">%s</xliff:g>). ¿Deseas mantener la configuración actual?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"Una app (<xliff:g id="ID_1">%s</xliff:g>) activó No interrumpir. ¿Deseas mantener la configuración actual?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"Una app o regla automática activó No interrumpir. ¿Deseas mantener la configuración actual?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"Hasta la(s) <xliff:g id="ID_1">%s</xliff:g>"</string> <string name="qs_dnd_keep" msgid="1825009164681928736">"Mantener"</string> <string name="qs_dnd_replace" msgid="8019520786644276623">"Reemplazar"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 0a72eacc4f6f..f15b5c1097a8 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -166,7 +166,7 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Ajustes del sistema"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notificaciones"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Contenedor adicional de notificaciones"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Ver todas las notificaciones"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Borrar notificación"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS habilitado"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Obteniendo ubicación..."</string> @@ -562,8 +562,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Todas las categorías"</string> <string name="notification_more_settings" msgid="816306283396553571">"Más ajustes"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personalizar: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Listo"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"Controles de las notificaciones"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index b29af77062a1..f423f8c3bc18 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -166,7 +166,7 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Süsteemiseaded"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Märguanded"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Märguande ületäite konteiner"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Kõikide märguannete kuvamine"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Märguande eemaldamine."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS on lubatud."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS-signaali otsimine."</string> @@ -562,8 +562,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Kõik kategooriad"</string> <string name="notification_more_settings" msgid="816306283396553571">"Rohkem seadeid"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Kohandamine: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Valmis"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"märguannete juhtnupud"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 105079db7a69..02c861763a10 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -166,7 +166,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Sistemaren ezarpenak."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Jakinarazpenak."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Gehiegizko jakinarazpenen edukitzailea"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Garbitu jakinarazpena."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS aktibatuta."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS seinalea lortzen."</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Kategoria guztiak"</string> <string name="notification_more_settings" msgid="816306283396553571">"Ezarpen gehiago"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Pertsonalizatu: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Eginda"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"jakinarazpena kontrolatzeko aukerak"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 35e2a0ce90c8..0408f71993f3 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"در حال شارژ باتری، <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> درصد"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"تنظیمات سیستم."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"اعلانها."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"محتوی سرریز اعلان"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"پاک کردن اعلان"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS فعال شد."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"دستیابی به GPS."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"همه دستهها"</string> <string name="notification_more_settings" msgid="816306283396553571">"تنظیمات بیشتر"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"سفارشی کردن: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"تمام"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"کنترلهای اعلان"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index ca555567363d..ee01382e0e2d 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Akku latautuu: <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> prosenttia"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Järjestelmän asetukset"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Ilmoitukset"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Ilmoitusten ylivuototila"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Näytä kaikki ilmoitukset"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Tyhjennä ilmoitus"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS käytössä."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Haetaan GPS-signaalia."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Kaikki luokat"</string> <string name="notification_more_settings" msgid="816306283396553571">"Lisäasetukset"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Muokkaa: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Valmis"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"Ilmoitusten hallinta"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index a9e788357b1e..4331edfb57fe 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -166,7 +166,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Paramètres système"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Conteneur de dépassement des notifications"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Supprimer la notification"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS activé"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Acquisition de données GPS"</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Toutes les catégories"</string> <string name="notification_more_settings" msgid="816306283396553571">"Plus de paramètres"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personnaliser : <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Terminé"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"paramètres des notifications"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 1bcf6b4b5f94..661d2d85aa02 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -166,7 +166,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Paramètres système"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Conteneur de dépassement des notifications"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Supprimer la notification"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS activé"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Acquisition de données GPS"</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Toutes les catégories"</string> <string name="notification_more_settings" msgid="816306283396553571">"Plus de paramètres"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personnaliser : <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Terminé"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> : <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"paramètres des notifications"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index eb856c9ed403..e10bd20b30ba 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -166,7 +166,7 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Configuración do sistema"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notificacións"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Contedor de rebordamento de notificacións"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Ver todas as notificacións"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Eliminar notificación."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS activado"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Obtendo GPS."</string> @@ -562,8 +562,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Todas as categorías"</string> <string name="notification_more_settings" msgid="816306283396553571">"Máis opcións"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personalizar: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Feito"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"controis de notificacións"</string> @@ -744,10 +743,10 @@ <string name="mobile_data" msgid="7094582042819250762">"Datos móbiles"</string> <string name="wifi_is_off" msgid="1838559392210456893">"A wifi está desactivada"</string> <string name="bt_is_off" msgid="2640685272289706392">"O Bluetooth está desactivado"</string> - <string name="dnd_is_off" msgid="6167780215212497572">"Non molestar está desactivado"</string> - <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"Unha norma automática (<xliff:g id="ID_1">%s</xliff:g>) activou Non molestar. Queres manter a configuración actual?"</string> - <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"Unha aplicación (<xliff:g id="ID_1">%s</xliff:g>) activou Non molestar. Queres manter a configuración actual?"</string> - <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"Unha aplicación ou norma automática activou Non molestar. Queres manter a configuración actual?"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"O modo Non molestar está desactivado"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"Unha norma automática (<xliff:g id="ID_1">%s</xliff:g>) activou o modo Non molestar. Queres manter a configuración actual?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"Unha aplicación (<xliff:g id="ID_1">%s</xliff:g>) activou o modo Non molestar. Queres manter a configuración actual?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"Unha aplicación ou norma automática activou o modo Non molestar. Queres manter a configuración actual?"</string> <string name="qs_dnd_until" msgid="3469471136280079874">"Ata: <xliff:g id="ID_1">%s</xliff:g>"</string> <string name="qs_dnd_keep" msgid="1825009164681928736">"Manter"</string> <string name="qs_dnd_replace" msgid="8019520786644276623">"Substituír"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index e18628591256..53d1e1c8e932 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"બૅટરી ચાર્જ થઈ રહી છે, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> ટકા."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"સિસ્ટમ સેટિંગ્સ."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"સૂચનાઓ."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"સૂચના ઓવરફ્લો કંટેનર"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"સૂચના સાફ કરો."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS સક્ષમ."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS મેળવી રહ્યું છે."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"બધી કૅટેગરી"</string> <string name="notification_more_settings" msgid="816306283396553571">"વધુ સેટિંગ્સ"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"કસ્ટમાઇઝ કરો: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"થઈ ગયું"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"સૂચના નિયંત્રણો"</string> @@ -740,22 +740,13 @@ <string name="instant_apps_message" msgid="8116608994995104836">"ઝટપટ ઍપ્લિકેશનો માટે ઇન્સ્ટૉલેશનની જરૂર નથી."</string> <string name="app_info" msgid="6856026610594615344">"ઍપ્લિકેશન માહિતી"</string> <string name="mobile_data" msgid="7094582042819250762">"મોબાઇલ ડેટા"</string> - <!-- no translation found for wifi_is_off (1838559392210456893) --> - <skip /> - <!-- no translation found for bt_is_off (2640685272289706392) --> - <skip /> - <!-- no translation found for dnd_is_off (6167780215212497572) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule (1570808639425342) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_app (1131614608680529190) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule_app (3685659782196144067) --> - <skip /> - <!-- no translation found for qs_dnd_until (3469471136280079874) --> - <skip /> - <!-- no translation found for qs_dnd_keep (1825009164681928736) --> - <skip /> - <!-- no translation found for qs_dnd_replace (8019520786644276623) --> - <skip /> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi બંધ છે"</string> + <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth બંધ છે"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"ખલેલ પાડશો નહીં બંધ છે"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"ખલેલ પાડશો નહીં એક સ્વચાલિત નિયમ દ્વારા ચાલુ કરાયું હતું (<xliff:g id="ID_1">%s</xliff:g>). વર્તમાન સેટિંગ્સ રાખીએ?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"ખલેલ પાડશો નહીં એક ઍપ્લિકેશન દ્વારા ચાલુ કરાયું હતું. (<xliff:g id="ID_1">%s</xliff:g>). વર્તમાન સેટિંગ્સ રાખીએ?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"ખલેલ પાડશો નહીં એક સ્વચાલિત નિયમ અથવા ઍપ્લિકેશન દ્વારા ચાલુ કરાયું હતું. વર્તમાન સેટિંગ્સ રાખીએ?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"<xliff:g id="ID_1">%s</xliff:g> સુધી"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"રાખો"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"બદલો"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index c41c06f5f42b..6068dc921db9 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"बैटरी चार्ज हो रही है, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> प्रतिशत."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"सिस्टम सेटिंग."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"सूचनाएं."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"नोटिफ़िकेशन ओवरफ़्लो कंटेनर"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"सभी नोटिफ़िकेशन देखें"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"नोटिफिकेशन साफ़ करें"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS सक्षम."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS प्राप्त करना."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"सभी श्रेणियां"</string> <string name="notification_more_settings" msgid="816306283396553571">"और सेटिंग"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"कस्टमाइज़ करें: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"हो गया"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"नोटिफ़िकेशन नियंत्रण"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index dfcd5f2c6f7e..2cced0e7292f 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -165,7 +165,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Baterija se puni, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> posto."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Postavke sustava."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Obavijesti."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Spremnik dodatnih obavijesti"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Pogledajte sve obavijesti"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Brisanje obavijesti"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS je omogućen."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Dohvaćanje GPS-a."</string> @@ -564,8 +564,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Sve kategorije"</string> <string name="notification_more_settings" msgid="816306283396553571">"Više postavki"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Prilagodite: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Gotovo"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"kontrole obavijesti"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 7ce96d3cfa0c..d2e37e961b55 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Akkumulátor töltése folyamatban, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> százalék."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Rendszerbeállítások"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Értesítések"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Az értesítések túlcsordulási tárolója"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Értesítés törlése"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS engedélyezve."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS lekérése."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Minden kategória"</string> <string name="notification_more_settings" msgid="816306283396553571">"További beállítások"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Személyre szabás: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Kész"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> – <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"értesítésvezérlők"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 1fb282e43dd2..599a774c917f 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Մարտկոցը լիցքավորվում է: Լիցքը <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> տոկոս է:"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Համակարգի կարգավորումներ:"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Ծանուցումներ:"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Ծանուցումների գերբեռնման զետեղարան"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Տեսնել բոլոր ծանուցումները"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Մաքրել ծանուցումը:"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS-ը միացված է:"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS-ի ստացում:"</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Բոլոր կատեգորիաները"</string> <string name="notification_more_settings" msgid="816306283396553571">"Այլ կարգավորումներ"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Հարմարեցնել՝ <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Պատրաստ է"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"ծանուցման կառավարներ"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 153a5b725b4d..8bf0077c3809 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Mengisi daya baterai, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> persen."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Setelan sistem."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifikasi."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Penampung luapan notifikasi"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Lihat semua notifikasi"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Menghapus pemberitahuan."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS diaktifkan."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Memperoleh GPS."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Semua Kategori"</string> <string name="notification_more_settings" msgid="816306283396553571">"Setelan lainnya"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Sesuaikan: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Selesai"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"kontrol notifikasi"</string> @@ -740,7 +739,7 @@ <string name="instant_apps_message" msgid="8116608994995104836">"Aplikasi instan tidak perlu diinstal."</string> <string name="app_info" msgid="6856026610594615344">"Info aplikasi"</string> <string name="mobile_data" msgid="7094582042819250762">"Data seluler"</string> - <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi aktif"</string> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi nonaktif"</string> <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth nonaktif"</string> <string name="dnd_is_off" msgid="6167780215212497572">"Fitur Jangan Ganggu nonaktif"</string> <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"Fitur Jangan Ganggu diaktifkan oleh aturan otomatis (<xliff:g id="ID_1">%s</xliff:g>). Simpan setelan saat ini?"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index e92c8d21fffd..3b4899de4ea7 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Rafhlaða í hleðslu, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> prósent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Kerfisstillingar."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Tilkynningar."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Geymir yfirflæðistilkynninga"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Sjá allar tilkynningar"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Hreinsa tilkynningu."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS virkt."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Tenging við GPS."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Allir flokkar"</string> <string name="notification_more_settings" msgid="816306283396553571">"Fleiri stillingar"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Sérstilla: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Lokið"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"tilkynningastýringar"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index b9141c7e8e55..23fe502e0314 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -166,7 +166,7 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Impostazioni di sistema."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifiche."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Contenitore per notifiche overflow"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Visualizza tutte le notifiche"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Cancella notifica."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS abilitato."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Acquisizione GPS."</string> @@ -562,8 +562,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Tutte le categorie"</string> <string name="notification_more_settings" msgid="816306283396553571">"Altre impostazioni"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personalizza: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Fine"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"gestione delle notifiche"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index d1a160cbf8f4..b5a1e672f1c8 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -166,7 +166,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"טעינת סוללה, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> אחוז."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"הגדרות מערכת"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"התראות"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"מאגר הודעות נוספות"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"נקה התראה"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS מופעל."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"השגת GPS."</string> @@ -568,8 +569,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"כל הקטגוריות"</string> <string name="notification_more_settings" msgid="816306283396553571">"הגדרות נוספות"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"התאם אישית: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"סיום"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"בקרת הודעות"</string> @@ -748,22 +748,13 @@ <string name="instant_apps_message" msgid="8116608994995104836">"אפליקציות אינסטנט לא דורשות התקנה."</string> <string name="app_info" msgid="6856026610594615344">"פרטי אפליקציה"</string> <string name="mobile_data" msgid="7094582042819250762">"נתונים סלולריים"</string> - <!-- no translation found for wifi_is_off (1838559392210456893) --> - <skip /> - <!-- no translation found for bt_is_off (2640685272289706392) --> - <skip /> - <!-- no translation found for dnd_is_off (6167780215212497572) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule (1570808639425342) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_app (1131614608680529190) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule_app (3685659782196144067) --> - <skip /> - <!-- no translation found for qs_dnd_until (3469471136280079874) --> - <skip /> - <!-- no translation found for qs_dnd_keep (1825009164681928736) --> - <skip /> - <!-- no translation found for qs_dnd_replace (8019520786644276623) --> - <skip /> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi כבוי"</string> + <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth כבוי"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"מצב \'נא לא להפריע\' כבוי"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"מצב \'נא לא להפריע\' הופעל על ידי כלל אוטומטי (<xliff:g id="ID_1">%s</xliff:g>). האם לשמור את ההגדרות הקיימות?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"מצב \'נא לא להפריע\' הופעל על ידי האפליקציה (<xliff:g id="ID_1">%s</xliff:g>). האם לשמור את ההגדרות הקיימות?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"מצב \'נא לא להפריע\' הופעל על ידי כלל אוטומטי או אפליקציה. האם לשמור את ההגדרות הקיימות?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"עד <xliff:g id="ID_1">%s</xliff:g>"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"שמור"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"החלף"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 4a8fb669ea65..06f761a54147 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -166,7 +166,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"システム設定。"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"通知。"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"通知のオーバーフロー コンテナ"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"通知を消去。"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPSが有効です。"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS取得中です。"</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"すべてのカテゴリ"</string> <string name="notification_more_settings" msgid="816306283396553571">"詳細設定"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"カスタマイズ: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"完了"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"通知管理"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 9099a0285942..94884dac78f7 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"ბატარეა იტენება, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> პროცენტი."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"სისტემის პარამეტრები."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"შეტყობინებები"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"შეტყობინების გადავსების კონტეინერი"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"შეტყობინებების გასუფთავება."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS გააქტიურდა."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS-ის დადგენა."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"ყველა კატეგორია"</string> <string name="notification_more_settings" msgid="816306283396553571">"დამატებითი პარამეტრები"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"მორგება: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"მზადაა"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"შეტყობინებების მართვის საშუალებები"</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 1ba56ac720d5..970591c56562 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Батарея зарядталуда, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> пайыз."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Жүйе параметрлері."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Хабарлар."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Хабарландырулардың қосымша контейнері"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Барлық хабарландыруды қарау"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Хабарларды өшіру."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS қосылған."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS қыземтін шығару."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Барлық санаттар"</string> <string name="notification_more_settings" msgid="816306283396553571">"Қосымша параметрлер"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Реттеу: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Дайын"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"хабарландыруларды басқару элементтері"</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 989bd5e5fd25..a259301a03b5 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"កំពុងសាកថ្ម <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> ភាគរយ"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"ការកំណត់ប្រព័ន្ធ។"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"ការជូនដំណឹង។"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"អង្គផ្ទុកបន្ថែមសម្រាប់ការជូនដំណឹង"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"សម្អាតការជូនដំណឹង។"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"បានបើក GPS ។"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"ទទួល GPS ។"</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"ប្រភេទទាំងអស់"</string> <string name="notification_more_settings" msgid="816306283396553571">"ការកំណត់ច្រើនទៀត"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"ប្ដូរតាមបំណង៖ <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"រួចរាល់"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"ការគ្រប់គ្រងការជូនដំណឹង"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 5b0a02d8bc29..df7935abe356 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"ಬ್ಯಾಟರಿ ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> ಪ್ರತಿಶತ."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳು."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"ಅಧಿಸೂಚನೆಗಳು."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"ಅಧಿಸೂಚನೆಯ ಓವರ್ಫ್ಲೋ ಕಂಟೇನರ್"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"ಅಧಿಸೂಚನೆ ತೆರವುಗೊಳಿಸು."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ಸಕ್ರಿಯವಾಗಿದೆ."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS ಸ್ವಾಧೀನ."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"ಎಲ್ಲ ವರ್ಗಗಳು"</string> <string name="notification_more_settings" msgid="816306283396553571">"ಹೆಚ್ಚಿನ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"ಕಸ್ಟಮೈಸ್: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"ಮುಗಿದಿದೆ"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"ಅಧಿಸೂಚನೆ ನಿಯಂತ್ರಣಗಳು"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 3bd22e26a644..42862354edf8 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -166,7 +166,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"시스템 설정"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"알림"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"알림 오버플로우 컨테이너"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"알림 지우기"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS가 사용 설정되었습니다."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS를 가져오는 중입니다."</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"전체 카테고리"</string> <string name="notification_more_settings" msgid="816306283396553571">"설정 더보기"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"맞춤설정: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"완료"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"알림 관리"</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 1b0505d372c8..174872d26527 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Батарея кубатталууда, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> пайыз."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Система тууралоолору."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Эскертмелер."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Эскертмелер контейнери"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Бардык эскертмелерди көрүү"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Эскертмелерди тазалоо."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS жандырылган."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS байланышууда."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Бардык категориялар"</string> <string name="notification_more_settings" msgid="816306283396553571">"Дагы жөндөөлөр"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Ыңгайлаштыруу: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Бүттү"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"эскертмелерди башкаруу каражаттары"</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 02798f1d5513..afac24741f45 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"ກຳລັງສາກແບັດເຕີຣີ, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> ເປີເຊັນ."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"ການຕັ້ງຄ່າລະບົບ."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"ການແຈ້ງເຕືອນ."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"ຕົວບັນຈຸການລົ້ມການແຈ້ງເຕືອນ"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"ເບິ່ງການແຈ້ງເຕືອນທັງໝົດ"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"ລຶບລ້າງການແຈ້ງເຕືອນ."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ເປີດແລ້ວ."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"ກຳລັງຊອກຫາ GPS."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"ທຸກໝວດໝູ່"</string> <string name="notification_more_settings" msgid="816306283396553571">"ການຕັ້ງຄ່າເພີ່ມເຕີມ"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"ປັບແຕ່ງ: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"ສຳເລັດແລ້ວ"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"ການຄວບຄຸມການແຈ້ງເຕືອນ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 3470ad47d243..4743c98026a3 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -166,7 +166,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Įkraunamas akumuliatorius, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> proc."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Sistemos nustatymai"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Pranešimai."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Pranešimų perpildymo sudėtinis rodinys"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Išvalyti pranešimą."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS įgalintas."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Gaunama GPS."</string> @@ -568,8 +569,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Visos kategorijos"</string> <string name="notification_more_settings" msgid="816306283396553571">"Daugiau nustatymų"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Tinkinti: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Atlikta"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"pranešimų valdikliai"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 6bc7b38c22e7..3e68272d450f 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -165,7 +165,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Notiek akumulatora uzlāde, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> procenti."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Sistēmas iestatījumi"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Paziņojumi"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Paziņojumu pārpildes konteiners"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Notīrīt paziņojumu"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ir iespējots."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS iegūšana."</string> @@ -564,8 +565,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Visas kategorijas"</string> <string name="notification_more_settings" msgid="816306283396553571">"Citi iestatījumi"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Pielāgot: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Gatavs"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"paziņojumu vadīklas"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 0b160f591f60..49e4d5360138 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Полнење на батеријата, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> проценти."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Поставки на систем."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Известувања"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Контејнер за прелевање на известувања"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Видете ги сите известувања"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Избриши известување."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS е овозможен."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Се добива GPS..."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Сите категории"</string> <string name="notification_more_settings" msgid="816306283396553571">"Повеќе поставки"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Приспособи: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"контроли за известувањето"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 2c949c9e2ca3..e7c7fed1c437 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"ബാറ്ററി ചാർജുചെയ്യുന്നു, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> ശതമാനം."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"സിസ്റ്റം ക്രമീകരണങ്ങൾ."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"അറിയിപ്പുകൾ."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"അറിയിപ്പ് ഓവർഫ്ലോ കണ്ടെയിനർ"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"എല്ലാ അറിയിപ്പുകളും കാണുക"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"വിവരം മായ്ക്കുക."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS പ്രവർത്തനക്ഷമമായി."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS നേടുന്നു."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"എല്ലാ വിഭാഗങ്ങളും"</string> <string name="notification_more_settings" msgid="816306283396553571">"കൂടുതൽ ക്രമീകരണം"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"ഇഷ്ടാനുസൃതമാക്കുക: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"പൂർത്തിയായി"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"അറിയിപ്പ് നിയന്ത്രണങ്ങൾ"</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 56d4b05cd25f..39474645fee5 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -162,7 +162,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Тэжээлийг цэнэглэж байна, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> хувь."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Системийн тохиргоо."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Мэдэгдэл."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Илүү гарсан мэдэгдлийг агуулагч"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Мэдэгдлийг цэвэрлэх."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS идэвхтэй."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS хайж байна."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Бүх ангилал"</string> <string name="notification_more_settings" msgid="816306283396553571">"Бусад тохиргоо"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Өөрчлөх: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Дууссан"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"мэдэгдлийн удирдлага"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 1bdb2723b27a..75b3b1503903 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"बॅटरी चार्ज होत आहे, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> टक्के."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"सिस्टम सेटिंग्ज."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"सूचना."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"सूचना ओव्हरफ्लो कंटेनर"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"सूचना साफ करा."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS सक्षम केले."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS प्राप्त करीत आहे."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"सर्व श्रेण्या"</string> <string name="notification_more_settings" msgid="816306283396553571">"अधिक सेटिंग्ज"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"सानुकूल करा: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"पूर्ण झाले"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"सूचना नियंत्रणे"</string> @@ -740,22 +740,13 @@ <string name="instant_apps_message" msgid="8116608994995104836">"इन्सटंट अॅप्सना स्थापनेची आवश्यकता नसते."</string> <string name="app_info" msgid="6856026610594615344">"अॅप माहिती"</string> <string name="mobile_data" msgid="7094582042819250762">"मोबाइल डेटा"</string> - <!-- no translation found for wifi_is_off (1838559392210456893) --> - <skip /> - <!-- no translation found for bt_is_off (2640685272289706392) --> - <skip /> - <!-- no translation found for dnd_is_off (6167780215212497572) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule (1570808639425342) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_app (1131614608680529190) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule_app (3685659782196144067) --> - <skip /> - <!-- no translation found for qs_dnd_until (3469471136280079874) --> - <skip /> - <!-- no translation found for qs_dnd_keep (1825009164681928736) --> - <skip /> - <!-- no translation found for qs_dnd_replace (8019520786644276623) --> - <skip /> + <string name="wifi_is_off" msgid="1838559392210456893">"वाय-फाय बंद आहे"</string> + <string name="bt_is_off" msgid="2640685272289706392">"ब्लूटुथ बंद आहे"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"व्यत्यय आणू नका बंद आहे"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"व्यत्यय आणू नका एक स्वयंचलित <xliff:g id="ID_1">%s</xliff:g> नियमाने चालू केले. वर्तमान सेटिंग्ज ठेवायच्या?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"व्यत्यय आणू नका (<xliff:g id="ID_1">%s</xliff:g>) अॅपने चालू केले. वर्तमान सेटिंग्ज ठेवायच्या?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"व्यत्यय आणू नका एका स्वयंचलित नियमाने किंवा अॅपने चालू केले. वर्तमान सेटिंग्ज ठेवायच्या?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"<xliff:g id="ID_1">%s</xliff:g> पर्यंत"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"ठेवा"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"पुनर्स्थित करा"</string> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 76f2bf5159d3..a9115813588d 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Bateri mengecas, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> peratus."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Tetapan sistem."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Pemberitahuan."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Bekas limpahan pemberitahuan"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Padamkan pemberitahuan."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS didayakan."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS sedang mendapatkan."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Semua Kategori"</string> <string name="notification_more_settings" msgid="816306283396553571">"Lagi tetapan"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Sesuaikan: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Selesai"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"kawalan pemberitahuan"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 770ec034be6e..810828483e8d 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"ဘက်ထရီအားသွင်းနေသည်၊ <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> ရာခိုင်နှုန်း။"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"စနစ်အပြင်အဆင်များ"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"အကြောင်းကြားချက်များ။"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"အကြောင်းကြားချက် ကွန်တိန်နာ"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"သတိပေးချက်များအားလုံးကို ကြည့်ရန်"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"သတိပေးချက်အား ဖယ်ရှားခြင်း။"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPSသုံးစွဲနိုင်သည်"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS ဖမ်းယူနေသည်။"</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"အုပ်စုအားလုံး"</string> <string name="notification_more_settings" msgid="816306283396553571">"နောက်ထပ် ဆက်တင်များ"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"စိတ်ကြိုက်သတ်မှတ်ရန်− <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"ပြီးပါပြီ"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"အကြောင်းကြားချက် ထိန်းချုပ်မှုများ"</string> @@ -743,9 +742,9 @@ <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ကို ပိတ်ထားသည်"</string> <string name="bt_is_off" msgid="2640685272289706392">"ဘလူးတုသ်ကို ပိတ်ထားသည်"</string> <string name="dnd_is_off" msgid="6167780215212497572">"\"မနှောင့်ယှက်ရ\" ကို ပိတ်ထားသည်"</string> - <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"အလိုလျောက်စည်းမျဉ်း (<xliff:g id="ID_1">%s</xliff:g>) က \"မနှောင့်ယှက်ရ\" ကို ဖွင့့့်််လိုက်ပါသည်။ လက်ရှိဆက်တင်များကို သိမ်းလိုပါသလား။"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"အလိုအလျောက်စည်းမျဉ်း (<xliff:g id="ID_1">%s</xliff:g>) က \"မနှောင့်ယှက်ရ\" ကို ဖွင့့့်််လိုက်ပါသည်။ လက်ရှိဆက်တင်များကို သိမ်းလိုပါသလား။"</string> <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"အက်ပ် (<xliff:g id="ID_1">%s</xliff:g>) က \"မနှောင့်ယှက်ရ\" ကို ဖွင့်လိုက်ပါသည်။ လက်ရှိဆက်တင်များကို သိမ်းလိုပါသလား။"</string> - <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"အလိုလျောက်စည်းမျဉ်း သို့မဟုတ် အက်ပ်တစ်ခုက \"မနှောင့်ယှက်ရ\" ကို ဖွင့့့်််လိုက်ပါသည်။ လက်ရှိဆက်တင်များကို သိမ်းလိုပါသလား။"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"အလိုအလျောက်စည်းမျဉ်း သို့မဟုတ် အက်ပ်တစ်ခုက \"မနှောင့်ယှက်ရ\" ကို ဖွင့့့်််လိုက်ပါသည်။ လက်ရှိဆက်တင်များကို သိမ်းလိုပါသလား။"</string> <string name="qs_dnd_until" msgid="3469471136280079874">"<xliff:g id="ID_1">%s</xliff:g> အထိ"</string> <string name="qs_dnd_keep" msgid="1825009164681928736">"သိမ်းထားရန်"</string> <string name="qs_dnd_replace" msgid="8019520786644276623">"အစားထိုးရန်"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 4fe0bca13546..f7f8e9ddf1a7 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Batteriet lades – <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> prosent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Systeminnstillinger."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Varsler."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Overflytsbeholder for varsel"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Fjern varsling"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS er aktivert."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Henting av GPS-signal."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Alle kategorier"</string> <string name="notification_more_settings" msgid="816306283396553571">"Flere innstillinger"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Tilpass: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Ferdig"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"varselinnstillinger"</string> @@ -740,22 +740,13 @@ <string name="instant_apps_message" msgid="8116608994995104836">"Du trenger ikke å installere instant-apper."</string> <string name="app_info" msgid="6856026610594615344">"Info om appen"</string> <string name="mobile_data" msgid="7094582042819250762">"Mobildata"</string> - <!-- no translation found for wifi_is_off (1838559392210456893) --> - <skip /> - <!-- no translation found for bt_is_off (2640685272289706392) --> - <skip /> - <!-- no translation found for dnd_is_off (6167780215212497572) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule (1570808639425342) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_app (1131614608680529190) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule_app (3685659782196144067) --> - <skip /> - <!-- no translation found for qs_dnd_until (3469471136280079874) --> - <skip /> - <!-- no translation found for qs_dnd_keep (1825009164681928736) --> - <skip /> - <!-- no translation found for qs_dnd_replace (8019520786644276623) --> - <skip /> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi er av"</string> + <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth er av"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"Ikke forstyrr er av"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"Ikke forstyrr ble slått på av en automatisk regel (<xliff:g id="ID_1">%s</xliff:g>). Vil du beholde de nåværende innstillingene?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"Ikke forstyrr ble slått på av en app (<xliff:g id="ID_1">%s</xliff:g>). Vil du beholde de nåværende innstillingene?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"Ikke forstyrr ble slått på av en automatisk regel eller en app. Vil du beholde de nåværende innstillingene?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"Til <xliff:g id="ID_1">%s</xliff:g>"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"Behold"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"Erstatt"</string> </resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 3c4203641a34..80d4928bc4c8 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"ब्याट्री चार्ज हुँदैछ, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> प्रतिशत।"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"प्रणाली सेटिङहरू"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"सूचनाहरू।"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"सूचना ओभरफ्लोको कन्टेनर"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"सूचना खाली गर्नुहोस्।"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS सक्षम गरिएको"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS प्राप्त हुँदैछ।"</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"सबै कोटिहरू"</string> <string name="notification_more_settings" msgid="816306283396553571">"थप सेटिङहरू"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"आफू अनुकूल पार्नुहोस्: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"सम्पन्न भयो"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"सूचना सम्बन्धी नियन्त्रणहरू"</string> @@ -740,22 +740,13 @@ <string name="instant_apps_message" msgid="8116608994995104836">"तात्कालिक अनुप्रयोगहरूलाई स्थापना गर्नु पर्दैन|"</string> <string name="app_info" msgid="6856026610594615344">"अनुप्रयोगका बारे जानकारी"</string> <string name="mobile_data" msgid="7094582042819250762">"मोबाइल डेटा"</string> - <!-- no translation found for wifi_is_off (1838559392210456893) --> - <skip /> - <!-- no translation found for bt_is_off (2640685272289706392) --> - <skip /> - <!-- no translation found for dnd_is_off (6167780215212497572) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule (1570808639425342) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_app (1131614608680529190) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule_app (3685659782196144067) --> - <skip /> - <!-- no translation found for qs_dnd_until (3469471136280079874) --> - <skip /> - <!-- no translation found for qs_dnd_keep (1825009164681928736) --> - <skip /> - <!-- no translation found for qs_dnd_replace (8019520786644276623) --> - <skip /> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi‑Fi निष्क्रिय छ"</string> + <string name="bt_is_off" msgid="2640685272289706392">"ब्लुटुथ निष्क्रिय छ"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"बाधा नपुर्याउनुहोस् नामक विकल्प निष्क्रिय छ"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"कुनै स्वचालित नियमले बाधा नपुर्याउनुहोस् नामक विकल्पलाई सक्रिय गऱ्यो(<xliff:g id="ID_1">%s</xliff:g>)। हालका सेटिङहरू राख्ने हो?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"कुनै अनुप्रयोगले बाधा नपुर्याउनुहोस् नामक विकल्पलाई सक्रिय गऱ्यो (<xliff:g id="ID_1">%s</xliff:g>)। हालका सेटिङहरू राख्ने हो?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"कुनै स्वचालित नियम वा अनुप्रयोगले बाधा नपुर्याउनुहोस् नामक विकल्पलाई सक्रिय गऱ्यो। हालका सेटिङहरू राख्ने हो?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"<xliff:g id="ID_1">%s</xliff:g> सम्म"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"राख्नुहोस्"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"प्रतिस्थापन गर्नुहोस्"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index cb75e5479709..745dac27b564 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Accu wordt opgeladen, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> procent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Systeeminstellingen."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Meldingen."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Overloopcontainer voor meldingen"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Alle meldingen bekijken"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Melding wissen"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"gps ingeschakeld."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Verbinding maken met gps."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Alle categorieën"</string> <string name="notification_more_settings" msgid="816306283396553571">"Meer instellingen"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Aanpassen: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Gereed"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"beheeropties voor meldingen"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index ee4df3880bde..fc99a06898ad 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"ਬੈਟਰੀ ਚਾਰਜ ਹੋ ਰਹੀ ਹੈ, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> ਪ੍ਰਤੀਸ਼ਤ।"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ।"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"ਸੂਚਨਾਵਾਂ।"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"ਸੂਚਨਾ ਓਵਰਫਲੋ ਕੰਟੇਨਰ"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"ਸੂਚਨਾ ਹਟਾਓ।"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ਸਮਰਥਿਤ।"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ।"</string> @@ -438,14 +439,14 @@ <string name="monitoring_button_view_policies" msgid="100913612638514424">"ਨੀਤੀਆਂ ਵੇਖੋ"</string> <string name="monitoring_description_named_management" msgid="4872859182820011954">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।\n\nਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨਾਲ ਸਬੰਧਿਤ ਸੈਟਿੰਗਾਂ, ਕਾਰਪੋਰੇਟ ਪਹੁੰਚ, ਐਪਾਂ, ਡੈਟੇ ਅਤੇ ਤੁਹਾਡੀਆਂ ਡੀਵਾਈਸਾਂ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਉਹਨਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ।\n\nਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।\""</string> <string name="monitoring_description_management" msgid="3115563193381106341">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।\n\nਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨਾਲ ਸਬੰਧਿਤ ਸੈਟਿੰਗਾਂ, ਕਾਰਪੋਰੇਟ ਪਹੁੰਚ, ਐਪਾਂ, ਡੈਟੇ ਅਤੇ ਤੁਹਾਡੀਆਂ ਡੀਵਾਈਸਾਂ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦਾ ਹੈ ਅਤੇ ਉਹਨਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ।\n\nਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।\""</string> - <string name="monitoring_description_management_ca_certificate" msgid="5202023784131001751">"ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਇੱਕ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀ ਸਥਾਪਤ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਸੁਰੱਖਿਅਤ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ ਜਾਂ ਉਸਨੂੰ ਸੋਧਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string> - <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇੱਕ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਸਥਾਪਤ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਸੁਰੱਖਿਅਤ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ ਜਾਂ ਉਸਨੂੰ ਸੋਧਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string> - <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"ਇੱਕ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਸਥਾਪਤ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਤੁਹਾਡੀ ਸੁਰੱਖਿਅਤ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ ਜਾਂ ਉਸਨੂੰ ਸੋਧਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string> - <string name="monitoring_description_management_network_logging" msgid="7184005419733060736">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਨੇ ਨੈੱਟਵਰਕ ਲੌਗਿੰਗ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ, ਜੋ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕਰਦੀ ਹੈ।"</string> + <string name="monitoring_description_management_ca_certificate" msgid="5202023784131001751">"ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਇੱਕ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਟੀ ਸਥਾਪਤ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ ਜਾਂ ਉਸਨੂੰ ਸੋਧਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string> + <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"ਤੁਹਾਡੀ ਸੰਸਥਾ ਵੱਲੋਂ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਇੱਕ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਟੀ ਸਥਾਪਤ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ ਜਾਂ ਉਸਨੂੰ ਸੋਧਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string> + <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"ਇੱਕ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਟੀ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਸਥਾਪਤ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ ਜਾਂ ਉਸਨੂੰ ਸੋਧਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string> + <string name="monitoring_description_management_network_logging" msgid="7184005419733060736">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਨੇ ਨੈੱਟਵਰਕ ਲੌਗਿੰਗ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ, ਜੋ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕਰਦਾ ਹੈ।"</string> <string name="monitoring_description_named_vpn" msgid="639013857356724268">"ਤੁਸੀਂ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="monitoring_description_two_named_vpns" msgid="4479748971871539316">"ਤੁਸੀਂ <xliff:g id="VPN_APP_0">%1$s</xliff:g> ਅਤੇ <xliff:g id="VPN_APP_1">%2$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"ਤੁਹਾਡਾ ਨਿੱਜੀ ਪ੍ਰੋਫ਼ਾਈਲ <xliff:g id="VPN_APP">%1$s</xliff:g>ਨਾਲ ਕਨੈਕਟ ਹੈ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।"</string> + <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"ਤੁਹਾਡਾ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g> ਵੱਲੋਂ ਪ੍ਰਬੰਧਿਤ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।"</string> <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਦੇ ਪ੍ਰਬੰਧਨ ਲਈ <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰਦੀ ਹੈ।"</string> <string name="monitoring_description_do_body" msgid="3639594537660975895">"ਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਸੈਟਿੰਗਾਂ, ਕਾਰਪੋਰੇਟ ਪਹੁੰਚ, ਐਪਾਂ, ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨਾਲ ਜੁੜੇ ਡੈਟੇ ਅਤੇ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ।"</string> @@ -464,7 +465,7 @@ <string name="monitoring_description_app_personal" msgid="484599052118316268">"ਤੁਸੀਂ <xliff:g id="APPLICATION">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ, ਜੋ ਈਮੇਲ, ਐਪਸ ਅਤੇ ਵੈਬਸਫ਼ਿਆਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਗਤੀਵਿਧੀ ਦਾ ਨਿਰੀਖਣ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"ਤੁਸੀਂ <xliff:g id="APPLICATION">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨਿੱਜੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="monitoring_description_app_work" msgid="4612997849787922906">"ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫ਼ਾਈਲ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION">%1$s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਇਹ ਪ੍ਰੋਫ਼ਾਈਲ <xliff:g id="APPLICATION">%2$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਕਾਰਜ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।\n\nਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string> - <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"ਤੁਹਾਡੀ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਦਾ ਪ੍ਰਬੰਧਨ <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="monitoring_description_app_personal_work" msgid="5664165460056859391">"ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਦਾ ਪ੍ਰਬੰਧਨ <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_disabled" msgid="7412534203633528135">"ਡੀਵਾਈਸ ਲੌਕ ਰਹੇਗੀ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਮੈਨੂਅਲੀ ਅਨਲੌਕ ਨਹੀਂ ਕਰਦੇ"</string> <string name="hidden_notifications_title" msgid="7139628534207443290">"ਤੇਜ਼ੀ ਨਾਲ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string> <string name="hidden_notifications_text" msgid="2326409389088668981">"ਅਨਲੌਕ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਉਹਨਾਂ ਨੂੰ ਦੇਖੋ"</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"ਸਭ ਸ਼੍ਰੇਣੀਆਂ"</string> <string name="notification_more_settings" msgid="816306283396553571">"ਹੋਰ ਸੈਟਿੰਗਾਂ"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"ਹੋ ਗਿਆ"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"ਸੂਚਨਾ ਕੰਟਰੋਲ"</string> @@ -743,9 +743,9 @@ <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ਬੰਦ ਹੈ"</string> <string name="bt_is_off" msgid="2640685272289706392">"ਬਲੂਟੁੱਥ ਬੰਦ ਹੈ"</string> <string name="dnd_is_off" msgid="6167780215212497572">"\'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਬੰਦ ਹੈ"</string> - <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"ਸਵੈਚਲਿਤ ਨਿਯਮ ਦੁਆਰਾ \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕੀਤਾ ਗਿਆ (<xliff:g id="ID_1">%s</xliff:g>)। ਵਰਤਮਾਨ ਸੈਟਿੰਗਾਂ ਰੱਖੀਏ?"</string> - <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"ਐਪ ਵੱਲੋਂ \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕੀਤਾ ਗਿਆ (<xliff:g id="ID_1">%s</xliff:g>)। ਵਰਤਮਾਨ ਸੈਟਿੰਗਾਂ ਰੱਖੀਏ?"</string> - <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"ਸਵੈਚਲਿਤ ਨਿਯਮ ਜਾਂ ਐਪ ਵੱਲੋਂ \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕੀਤਾ ਗਿਆ। ਵਰਤਮਾਨ ਸੈਟਿੰਗਾਂ ਰੱਖੀਏ?"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"ਸਵੈਚਲਿਤ ਨਿਯਮ ਦੁਆਰਾ \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕੀਤਾ ਗਿਆ ਸੀ (<xliff:g id="ID_1">%s</xliff:g>)। ਵਰਤਮਾਨ ਸੈਟਿੰਗਾਂ ਰੱਖੀਏ?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"ਐਪ ਵੱਲੋਂ \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕੀਤਾ ਗਿਆ ਸੀ (<xliff:g id="ID_1">%s</xliff:g>)। ਵਰਤਮਾਨ ਸੈਟਿੰਗਾਂ ਰੱਖੀਏ?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"ਸਵੈਚਲਿਤ ਨਿਯਮ ਜਾਂ ਐਪ ਵੱਲੋਂ \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕੀਤਾ ਗਿਆ। ਵਰਤਮਾਨ ਸੈਟਿੰਗਾਂ ਰੱਖੀਏ?"</string> <string name="qs_dnd_until" msgid="3469471136280079874">"<xliff:g id="ID_1">%s</xliff:g> ਤੱਕ"</string> <string name="qs_dnd_keep" msgid="1825009164681928736">"ਰੱਖੋ"</string> <string name="qs_dnd_replace" msgid="8019520786644276623">"ਬਦਲੋ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 96eeb6a6af8f..a8a9a3ff75cf 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -166,7 +166,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Ładuję baterię, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> procent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Ustawienia systemu."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Powiadomienia."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Kontener przepełnienia powiadomień"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Usuń powiadomienie."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS włączony."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Pobieranie danych GPS."</string> @@ -568,8 +569,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Wszystkie kategorie"</string> <string name="notification_more_settings" msgid="816306283396553571">"Więcej ustawień"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Dostosuj: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Gotowe"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"sterowanie powiadomieniami"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 4ec9a0ec8c12..6be88580cfc9 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -166,7 +166,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Configurações do sistema"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notificações."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Contêiner flutuante de notificações"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Limpar notificação."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ativado."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Aquisição de GPS."</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Todas as categorias"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mais configurações"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personalizar: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Concluído"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"controles de notificação"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index e8351f81a1f3..79f6aa9573af 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"A bateria está a carregar, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> por cento."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Definições do sistema"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notificações."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Contentor de excesso de notificações"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Ver todas as notificações"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Limpar notificações"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ativado."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Adquirir GPS."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Todas as categorias"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mais definições"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personalizar: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Concluído"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"controlos de notificação"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 4ec9a0ec8c12..6be88580cfc9 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -166,7 +166,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Configurações do sistema"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notificações."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Contêiner flutuante de notificações"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Limpar notificação."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ativado."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Aquisição de GPS."</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Todas as categorias"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mais configurações"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personalizar: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Concluído"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g> do <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"controles de notificação"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 6cdc29c95b33..76051034c0b5 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -167,7 +167,7 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Setări de sistem."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notificări."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Container pentru surplusul de notificări"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Vedeți toate notificările"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Ștergeți notificarea."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS activat."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Se obține GPS."</string> @@ -566,8 +566,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Toate categoriile"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mai multe setări"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Personalizați: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Terminat"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"comenzile notificării"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 0bcdf7ae7f0a..cd8053dcb9b2 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -168,7 +168,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Настройки"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Уведомления"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Контейнер всплывающих уведомлений"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Удалить уведомление"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"Система GPS включена."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Установление связи с GPS."</string> @@ -570,8 +571,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Все категории"</string> <string name="notification_more_settings" msgid="816306283396553571">"Другие настройки"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"<xliff:g id="SUB_CATEGORY">%1$s</xliff:g>: настроить"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g>: <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"настройки уведомлений"</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 419912357243..52f49bf9c03e 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"බැටරිය ආරෝපණය කරමින්, සියයට <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g>."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"පද්ධති සැකසීම්."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"දැනුම්දීම්."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"දැනුම් දීම් පිටාර බඳුන"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"දැනුම්දීම හිස් කරන්න."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS සබල කර ඇත."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS ලබා ගනිමින්."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"සියලු ප්රවර්ග"</string> <string name="notification_more_settings" msgid="816306283396553571">"තව සැකසීම්"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"අභිමත කරන්න: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"නිමයි"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"දැනුම්දීම් පාලන"</string> @@ -740,22 +740,13 @@ <string name="instant_apps_message" msgid="8116608994995104836">"ක්ෂණික යෙදුම් ස්ථාපනය කිරීම අවශ්ය නොවේ."</string> <string name="app_info" msgid="6856026610594615344">"යෙදුම් තොරතුරු"</string> <string name="mobile_data" msgid="7094582042819250762">"ජංගම දත්ත"</string> - <!-- no translation found for wifi_is_off (1838559392210456893) --> - <skip /> - <!-- no translation found for bt_is_off (2640685272289706392) --> - <skip /> - <!-- no translation found for dnd_is_off (6167780215212497572) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule (1570808639425342) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_app (1131614608680529190) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule_app (3685659782196144067) --> - <skip /> - <!-- no translation found for qs_dnd_until (3469471136280079874) --> - <skip /> - <!-- no translation found for qs_dnd_keep (1825009164681928736) --> - <skip /> - <!-- no translation found for qs_dnd_replace (8019520786644276623) --> - <skip /> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi ක්රියා විරහිතයි"</string> + <string name="bt_is_off" msgid="2640685272289706392">"බ්ලූටූත් ක්රියා විරහිතයි"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"බාධා නොකරන්න ක්රියා විරහිතයි"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"බාධා නොකරන්න ස්වයංක්රීය රීතියකින් ක්රියාත්මක කෙරිණි (<xliff:g id="ID_1">%s</xliff:g>). වත්මන් සැකසීම් තබා ගන්නවා ද?"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"බාධා නොකරන්න යෙදුමකින් ක්රියාත්මක කෙරිණි (<xliff:g id="ID_1">%s</xliff:g>). වත්මන් සැකසීම් තබා ගන්නවා ද?"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"බාධා නොකරන්න ස්වයංක්රීය රීතියකින් හෝ යෙදුමකින් ක්රියාත්මක කෙරිණි. වත්මන් සැකසීම් තබා ගන්නවා ද?"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"<xliff:g id="ID_1">%s</xliff:g> දක්වා"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"තබන්න"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"ප්රතිස්ථාපනය"</string> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 829226e37818..de8ad54b05fc 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -168,7 +168,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Nastavenia systému."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Upozornenia."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Rozbaľovací kontajner s upozorneniami"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Vymazať upozornenie."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS je povolené."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Prebieha zameriavanie GPS."</string> @@ -570,8 +571,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Všetky kategórie"</string> <string name="notification_more_settings" msgid="816306283396553571">"Ďalšie nastavenia"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Prispôsobiť: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Hotovo"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"ovládacie prvky pre upozornenia"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index c661426a6f46..55699fa95184 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -168,7 +168,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Sistemske nastavitve."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Obvestila."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Prekoračitveni vsebnik za obvestila"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Izbriši obvestilo."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS omogočen."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Pridobivanje GPS."</string> @@ -570,8 +571,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Vse kategorije"</string> <string name="notification_more_settings" msgid="816306283396553571">"Več nastavitev"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Prilagodi: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Dokončano"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"kontrolniki obvestil"</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index dfbe4efd65de..c47fc404ea65 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Bateria po ngarkohet, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> për qind."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Cilësimet e sistemit."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Njoftimet."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Kontejneri i tejkalimit të njoftimeve"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Pastro njoftimin."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS-ja është e aktivizuar."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Po siguron GPS-në."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Të gjitha kategoritë"</string> <string name="notification_more_settings" msgid="816306283396553571">"Cilësime të tjera"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Peresonalizoje: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"U krye"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"kontrollet e njoftimit"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index f0f228fff413..c47ac3fc144c 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -165,7 +165,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Батерија се пуни, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> процената."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Системска подешавања."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Обавештења."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Контејнер преклопног менија за обавештења"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Погледајте сва обавештења"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Обриши обавештење."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS је омогућен."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Учитавање GPS-а."</string> @@ -564,8 +564,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Све категорије"</string> <string name="notification_more_settings" msgid="816306283396553571">"Још подешавања"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Прилагодите: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"контроле обавештења"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 1d19a700692e..682de56f6801 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Batteriet laddas, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> procent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Systeminställningar."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Meddelanden."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Spillbehållare för aviseringar"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Visa alla aviseringar"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Ta bort meddelandet."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS aktiverad."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Tar emot GPS."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Alla kategorier"</string> <string name="notification_more_settings" msgid="816306283396553571">"Fler inställningar"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Anpassa: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Klar"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"inställningar för aviseringar"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 3dd253e4b2b8..5a69fb38ee68 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Betri inachaji, asilimia <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g>."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Mipangilio ya mfumo."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Arifa."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Metadata ya arifa za ziada"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Futa arifa"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS imewashwa."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Kupata GPS."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Aina Zote"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mipangilio zaidi"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Badilisha upendavyo: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Nimemaliza"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"vidhibiti vya arifa"</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 341f7578d86d..495f5c360d09 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"பேட்டரி சார்ஜ் செய்யப்படுகிறது, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> சதவீதம்."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"கணினி அமைப்பு."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"அறிவிப்புகள்."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"அறிவிப்பு ஓவர்ஃப்ளோ கண்டெய்னர்"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"எல்லா அறிவிப்புகளையும் காட்டும்"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"அறிவிப்பை அழி."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS இயக்கப்பட்டது."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS பெறப்படுகிறது."</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"எல்லா வகைகளும்"</string> <string name="notification_more_settings" msgid="816306283396553571">"மேலும் அமைப்புகள்"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"தனிப்பயனாக்கு: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"முடிந்தது"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"அறிவிப்புக் கட்டுப்பாடுகள்"</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index a6a6fde6324e..07447cf009c6 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"బ్యాటరీ ఛార్జ్ అవుతోంది, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> శాతం."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"సిస్టమ్ సెట్టింగ్లు."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"నోటిఫికేషన్లు."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"అధిక నోటిఫికేషన్ల కంటైనర్"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"నోటిఫికేషన్ను క్లియర్ చేయండి."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ప్రారంభించబడింది."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPSని పొందడం."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"అన్ని వర్గాలు"</string> <string name="notification_more_settings" msgid="816306283396553571">"మరిన్ని సెట్టింగ్లు"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"అనుకూలీకరించండి: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"పూర్తయింది"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"నోటిఫికేషన్ నియంత్రణలు"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 64e418d10913..09a734eb08b6 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"กำลังชาร์จแบตเตอรี่ <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> เปอร์เซ็นต์"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"การตั้งค่าระบบ"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"การแจ้งเตือน"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"คอนเทนเนอร์รายการเพิ่มเติมของการแจ้งเตือน"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"ล้างการแจ้งเตือน"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"เปิดใช้งาน GPS แล้ว"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"การดึงข้อมูล GPS"</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"ทุกหมวดหมู่"</string> <string name="notification_more_settings" msgid="816306283396553571">"การตั้งค่าเพิ่มเติม"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"ปรับแต่ง: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"เสร็จสิ้น"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"ส่วนควบคุมการแจ้งเตือน"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 362867573732..c902863f1b40 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Nagcha-charge ang baterya, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> (na) porsyento."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Mga setting ng system."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Mga Notification."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Container ng pag-overflow ng notification"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"I-clear ang notification."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"Pinapagana ang GPS."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Kumukuha ng GPS."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Lahat ng Kategorya"</string> <string name="notification_more_settings" msgid="816306283396553571">"Higit pang mga setting"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"I-customize: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Tapos Na"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"mga kontrol ng notification"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 437516163510..de8f193bac72 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Pil şarj oluyor, yüzde <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g>."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Sistem ayarları."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Bildirimler."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Bildirim taşma kapsayıcısı"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Bildirimi temizle."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS etkin."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS alınıyor."</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Tüm Kategoriler"</string> <string name="notification_more_settings" msgid="816306283396553571">"Diğer ayarlar"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Özelleştir: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Bitti"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"Bildirim kontrolleri"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index d999fc6efc1b..2f8665102029 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -168,7 +168,7 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Налаштування системи."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Сповіщення."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Додатковий контейнер для сповіщень"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Переглянути всі сповіщення"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Очистити сповіщення."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS увімкнено."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Встановлення зв’язку з GPS."</string> @@ -570,8 +570,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Усі категорії"</string> <string name="notification_more_settings" msgid="816306283396553571">"Більше налаштувань"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Налаштувати: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"елементи керування сповіщеннями"</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index e612b6bf1edb..37b38cc76610 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"بیٹری چارجنگ، <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> فیصد۔"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"سسٹم کی ترتیبات۔"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"اطلاعات۔"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"اطلاعاتی اوورفلو کنٹینر"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"اطلاع صاف کریں۔"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS فعال ہے۔"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS حاصل کرنا۔"</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"سبھی زمرے"</string> <string name="notification_more_settings" msgid="816306283396553571">"مزید ترتیبات"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"حسب ضرورت بنائیں: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"ہوگیا"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"اطلاع کے کنٹرولز"</string> @@ -740,22 +740,13 @@ <string name="instant_apps_message" msgid="8116608994995104836">"فوری ایپس کو انسٹالیشن کی ضرورت نہیں ہے۔"</string> <string name="app_info" msgid="6856026610594615344">"ایپ کی معلومات"</string> <string name="mobile_data" msgid="7094582042819250762">"موبائل ڈیٹا"</string> - <!-- no translation found for wifi_is_off (1838559392210456893) --> - <skip /> - <!-- no translation found for bt_is_off (2640685272289706392) --> - <skip /> - <!-- no translation found for dnd_is_off (6167780215212497572) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule (1570808639425342) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_app (1131614608680529190) --> - <skip /> - <!-- no translation found for qs_dnd_prompt_auto_rule_app (3685659782196144067) --> - <skip /> - <!-- no translation found for qs_dnd_until (3469471136280079874) --> - <skip /> - <!-- no translation found for qs_dnd_keep (1825009164681928736) --> - <skip /> - <!-- no translation found for qs_dnd_replace (8019520786644276623) --> - <skip /> + <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi آف ہے"</string> + <string name="bt_is_off" msgid="2640685272289706392">"بلوٹوتھ آف ہے"</string> + <string name="dnd_is_off" msgid="6167780215212497572">"\'ڈسٹرب نہ کریں\' آف ہے"</string> + <string name="qs_dnd_prompt_auto_rule" msgid="1570808639425342">"\'ڈسٹرب نہ کریں\' کسی خودکار اصول (<xliff:g id="ID_1">%s</xliff:g>) کے ذریعے آن ہو گیا تھا۔ موجودہ ترتیبات برقرار رکھیں؟"</string> + <string name="qs_dnd_prompt_app" msgid="1131614608680529190">"\'ڈسٹرب نہ کریں\' کسی ایپ (<xliff:g id="ID_1">%s</xliff:g>) کے ذریعے آن ہو گیا تھا۔ موجودہ ترتیبات برقرار رکھیں؟"</string> + <string name="qs_dnd_prompt_auto_rule_app" msgid="3685659782196144067">"\'ڈسٹرب نہ کریں\' کسی خودکار اصول یا ایپ کے ذریعے آن ہو گیا تھا۔ موجودہ ترتیبات برقرار رکھیں؟"</string> + <string name="qs_dnd_until" msgid="3469471136280079874">"<xliff:g id="ID_1">%s</xliff:g> تک"</string> + <string name="qs_dnd_keep" msgid="1825009164681928736">"رکھیں"</string> + <string name="qs_dnd_replace" msgid="8019520786644276623">"بدلیں"</string> </resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 844ff6016463..bc6fa7adbe27 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -166,7 +166,7 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"Tizim sozlamalari."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Eslatmalar."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Qalqib chiquvchi bildirishnomalar konteyneri"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Barcha bildirishnomalarni ko‘rish"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Eslatmalarni tozalash."</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS yoqildi."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS so‘rovi."</string> @@ -562,8 +562,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Barcha turkumlar"</string> <string name="notification_more_settings" msgid="816306283396553571">"Boshqa sozlamalar"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"<xliff:g id="SUB_CATEGORY">%1$s</xliff:g>: sozlash"</string> <string name="notification_done" msgid="5279426047273930175">"Tayyor"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"bildirishnoma sozlamalari"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index cefd071a806a..942545f6215b 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Đang sạc pin, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> phần trăm."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Cài đặt hệ thống"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Thông báo."</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Vùng chứa bổ sung cho thông báo"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Xóa thông báo"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"Đã bật GPS."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Nhận GPS."</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Tất cả danh mục"</string> <string name="notification_more_settings" msgid="816306283396553571">"Cài đặt khác"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Tùy chỉnh: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Xong"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"điều khiển thông báo"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 22464a60f5ee..35958ffd2a37 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"正在充电，已完成百分之<xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g>。"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"系统设置。"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"通知。"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"通知溢出容器"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"清除通知。"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS已启用。"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"正在获取GPS信号。"</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"所有类别"</string> <string name="notification_more_settings" msgid="816306283396553571">"更多设置"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"自定义：<xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"完成"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g><xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"通知设置"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 16101e1df44c..5a7d676e388c 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -166,7 +166,8 @@ <skip /> <string name="accessibility_settings_button" msgid="799583911231893380">"系統設定"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"通知。"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"通知溢出容器"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"清除通知。"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS 已啟用。"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"正在取得 GPS 訊號。"</string> @@ -562,8 +563,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"所有類別"</string> <string name="notification_more_settings" msgid="816306283396553571">"更多設定"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"自訂：<xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"完成"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"通知控制項"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index e0a4b5752e7b..15b4c2c9859d 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -164,7 +164,8 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"充電中，已完成百分之 <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g>。"</string> <string name="accessibility_settings_button" msgid="799583911231893380">"系統設定"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"通知。"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"通知溢位容器"</string> + <!-- no translation found for accessibility_overflow_action (5681882033274783311) --> + <skip /> <string name="accessibility_remove_notification" msgid="3603099514902182350">"清除通知。"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS 已啟用。"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"正在取得 GPS 訊號。"</string> @@ -560,8 +561,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"所有類別"</string> <string name="notification_more_settings" msgid="816306283396553571">"更多設定"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"自訂：<xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"完成"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"通知控制項"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index e9968eb28cb0..ce52e7eb5133 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Ibhethri liyashaja, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> iphesenti."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Izilungiselelo zesistimu"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Izaziso"</string> - <string name="notification_shelf_content_description" msgid="5511922384591583913">"Isiqukathi sokugeleza kwesaziso"</string> + <string name="accessibility_overflow_action" msgid="5681882033274783311">"Bona zonke izaziso"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Sula isaziso"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"i-GPS inikwe amandla"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"i-GPS iyafuna"</string> @@ -560,8 +560,7 @@ </plurals> <string name="notification_all_categories" msgid="5407190218055113282">"Zonke izigaba"</string> <string name="notification_more_settings" msgid="816306283396553571">"Izilungiselelo eziningi"</string> - <!-- no translation found for notification_app_settings (3743278649182392015) --> - <skip /> + <string name="notification_app_settings" msgid="3743278649182392015">"Enza ngendlela oyifisayo: <xliff:g id="SUB_CATEGORY">%1$s</xliff:g>"</string> <string name="notification_done" msgid="5279426047273930175">"Kwenziwe"</string> <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string> <string name="notification_menu_gear_description" msgid="2204480013726775108">"izilawuli zesaziso"</string> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index f15475cff7a4..e9d6fec30aee 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -332,4 +332,7 @@ <!-- Whether or the notifications can be shown and dismissed with a drag. --> <bool name="config_enableNotificationShadeDrag">true</bool> + <!-- Whether to show activity indicators in the status bar --> + <bool name="config_showActivity">false</bool> + </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index ac4bdfc113f1..809648aba65b 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -563,6 +563,10 @@ <dimen name="screen_pinning_request_button_width">84dp</dimen> <!-- Screen pinning request padding on top of inner circle --> <dimen name="screen_pinning_request_inner_padding">14dp</dimen> + <!-- Screen pinning request seascape negative padding --> + <dimen name="screen_pinning_request_seascape_padding_negative">-18dp</dimen> + <!-- Screen pinning request seascape button offset --> + <dimen name="screen_pinning_request_seascape_button_offset">-4dp</dimen> <!-- Screen pinning request padding on top of icons --> <dimen name="screen_pinning_request_nav_icon_padding">18dp</dimen> <!-- Screen pinning request padding on side of icons diff --git a/packages/SystemUI/res/xml/tuner_prefs.xml b/packages/SystemUI/res/xml/tuner_prefs.xml index 908fb20a45c2..a685c794c5d6 100644 --- a/packages/SystemUI/res/xml/tuner_prefs.xml +++ b/packages/SystemUI/res/xml/tuner_prefs.xml @@ -145,7 +145,7 @@ <com.android.systemui.tuner.TunerSwitch android:key="doze_sensors_wake_up_fully" android:title="@string/tuner_doze_sensors_wake_up_fully" - sysui:defValue="true" /> + sysui:defValue="false" /> </PreferenceScreen> diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index 33ad7fbb0e59..164138e4b1d3 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -72,6 +72,7 @@ import com.android.systemui.recents.model.Task; import com.android.systemui.recents.model.TaskGrouping; import com.android.systemui.recents.model.TaskStack; import com.android.systemui.recents.views.TaskStackLayoutAlgorithm; +import com.android.systemui.recents.views.TaskStackLayoutAlgorithm.VisibilityReport; import com.android.systemui.recents.views.TaskStackView; import com.android.systemui.recents.views.TaskStackViewScroller; import com.android.systemui.recents.views.TaskViewHeader; @@ -126,11 +127,22 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener if (runningTaskInfo != null) { launchOpts.runningTaskId = runningTaskInfo.id; } - launchOpts.numVisibleTasks = 2; - launchOpts.numVisibleTaskThumbnails = 2; + mDummyStackView.setTasks(plan.getTaskStack(), false /* allowNotify */); + updateDummyStackViewLayout(plan.getTaskStack(), + getWindowRect(null /* windowRectOverride */)); + + // Launched from app is always the worst case (in terms of how many thumbnails/tasks + // visible) + RecentsActivityLaunchState launchState = new RecentsActivityLaunchState(); + launchState.launchedFromApp = true; + mDummyStackView.updateLayoutAlgorithm(true /* boundScroll */, launchState); + + VisibilityReport visibilityReport = mDummyStackView.computeStackVisibilityReport(); + launchOpts.numVisibleTasks = visibilityReport.numVisibleTasks; + launchOpts.numVisibleTaskThumbnails = visibilityReport.numVisibleThumbnails; launchOpts.onlyLoadForCache = true; launchOpts.onlyLoadPausedActivities = true; - launchOpts.loadThumbnails = !ActivityManager.ENABLE_TASK_SNAPSHOTS; + launchOpts.loadThumbnails = true; loader.loadTasks(mContext, plan, launchOpts); } } @@ -605,23 +617,12 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener mHeaderBar.setLayoutDirection(res.getConfiguration().getLayoutDirection()); } - /** - * Prepares the header bar layout for the next transition, if the task view bounds has changed - * since the last call, it will attempt to re-measure and layout the header bar to the new size. - * - * @param stack the stack to initialize the stack layout with - * @param windowRectOverride the rectangle to use when calculating the stack state which can - * be different from the current window rect if recents is resizing - * while being launched - */ - private void updateHeaderBarLayout(TaskStack stack, Rect windowRectOverride) { + private void updateDummyStackViewLayout(TaskStack stack, Rect windowRect) { SystemServicesProxy ssp = Recents.getSystemServices(); Rect displayRect = ssp.getDisplayRect(); Rect systemInsets = new Rect(); ssp.getStableInsets(systemInsets); - Rect windowRect = windowRectOverride != null - ? new Rect(windowRectOverride) - : ssp.getWindowRect(); + // When docked, the nav bar insets are consumed and the activity is measured without insets. // However, the window bounds include the insets, so we need to subtract them here to make // them identical. @@ -642,6 +643,29 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener stackLayout.reset(); stackLayout.initialize(displayRect, windowRect, mTaskStackBounds, TaskStackLayoutAlgorithm.StackState.getStackStateForStack(stack)); + } + } + + private Rect getWindowRect(Rect windowRectOverride) { + return windowRectOverride != null + ? new Rect(windowRectOverride) + : Recents.getSystemServices().getWindowRect(); + } + + /** + * Prepares the header bar layout for the next transition, if the task view bounds has changed + * since the last call, it will attempt to re-measure and layout the header bar to the new size. + * + * @param stack the stack to initialize the stack layout with + * @param windowRectOverride the rectangle to use when calculating the stack state which can + * be different from the current window rect if recents is resizing + * while being launched + */ + private void updateHeaderBarLayout(TaskStack stack, Rect windowRectOverride) { + Rect windowRect = getWindowRect(windowRectOverride); + updateDummyStackViewLayout(stack, windowRect); + if (stack != null) { + TaskStackLayoutAlgorithm stackLayout = mDummyStackView.getStackAlgorithm(); mDummyStackView.setTasks(stack, false /* allowNotifyStackChanges */); // Get the width of a task view so that we know how wide to draw the header bar. int taskViewWidth = 0; diff --git a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java index 0336905cd855..521157dc5991 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java +++ b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java @@ -31,6 +31,7 @@ import android.os.Binder; import android.os.RemoteException; import android.util.DisplayMetrics; import android.view.Gravity; +import android.view.Surface; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; @@ -46,6 +47,11 @@ import com.android.systemui.R; import java.util.ArrayList; public class ScreenPinningRequest implements View.OnClickListener { + + private static final int ROTATION_NONE = 0; + private static final int ROTATION_LANDSCAPE = 1; + private static final int ROTATION_SEASCAPE = 2; + private final Context mContext; private final AccessibilityManager mAccessibilityService; @@ -124,11 +130,12 @@ public class ScreenPinningRequest implements View.OnClickListener { clearPrompt(); } - public FrameLayout.LayoutParams getRequestLayoutParams(boolean isLandscape) { + public FrameLayout.LayoutParams getRequestLayoutParams(int rotation) { return new FrameLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, - isLandscape ? (Gravity.CENTER_VERTICAL | Gravity.RIGHT) + rotation == ROTATION_SEASCAPE ? (Gravity.CENTER_VERTICAL | Gravity.LEFT) : + rotation == ROTATION_LANDSCAPE ? (Gravity.CENTER_VERTICAL | Gravity.RIGHT) : (Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM)); } @@ -153,14 +160,16 @@ public class ScreenPinningRequest implements View.OnClickListener { DisplayMetrics metrics = new DisplayMetrics(); mWindowManager.getDefaultDisplay().getMetrics(metrics); float density = metrics.density; - boolean isLandscape = isLandscapePhone(mContext); + int rotation = getRotation(mContext); - inflateView(isLandscape); + inflateView(rotation); int bgColor = mContext.getColor( R.color.screen_pinning_request_window_bg); if (ActivityManager.isHighEndGfx()) { mLayout.setAlpha(0f); - if (isLandscape) { + if (rotation == ROTATION_SEASCAPE) { + mLayout.setTranslationX(-OFFSET_DP * density); + } else if (rotation == ROTATION_LANDSCAPE) { mLayout.setTranslationX(OFFSET_DP * density); } else { mLayout.setTranslationY(OFFSET_DP * density); @@ -193,18 +202,27 @@ public class ScreenPinningRequest implements View.OnClickListener { mContext.registerReceiver(mReceiver, filter); } - private boolean isLandscapePhone(Context context) { + private int getRotation(Context context) { Configuration config = mContext.getResources().getConfiguration(); - return config.orientation == Configuration.ORIENTATION_LANDSCAPE - && config.smallestScreenWidthDp < 600; + int rot = context.getDisplay().getRotation(); + if (config.smallestScreenWidthDp < 600) { + if (rot == Surface.ROTATION_90) { + return ROTATION_LANDSCAPE; + } else if (rot == Surface.ROTATION_270) { + return ROTATION_SEASCAPE; + } + } + return ROTATION_NONE; } - private void inflateView(boolean isLandscape) { + private void inflateView(int rotation) { // We only want this landscape orientation on <600dp, so rather than handle // resource overlay for -land and -sw600dp-land, just inflate this // other view for this single case. - mLayout = (ViewGroup) View.inflate(getContext(), isLandscape - ? R.layout.screen_pinning_request_land_phone : R.layout.screen_pinning_request, + mLayout = (ViewGroup) View.inflate(getContext(), + rotation == ROTATION_SEASCAPE ? R.layout.screen_pinning_request_sea_phone : + rotation == ROTATION_LANDSCAPE ? R.layout.screen_pinning_request_land_phone + : R.layout.screen_pinning_request, null); // Catch touches so they don't trigger cancel/activate, like outside does. mLayout.setClickable(true); @@ -240,7 +258,7 @@ public class ScreenPinningRequest implements View.OnClickListener { mLayout.findViewById(R.id.screen_pinning_back_bg).setVisibility(backBgVisibility); mLayout.findViewById(R.id.screen_pinning_back_bg_light).setVisibility(backBgVisibility); - addView(mLayout, getRequestLayoutParams(isLandscape)); + addView(mLayout, getRequestLayoutParams(rotation)); } private void swapChildrenIfRtlAndVertical(View group) { @@ -269,14 +287,14 @@ public class ScreenPinningRequest implements View.OnClickListener { protected void onConfigurationChanged() { removeAllViews(); - inflateView(isLandscapePhone(mContext)); + inflateView(getRotation(mContext)); } private final Runnable mUpdateLayoutRunnable = new Runnable() { @Override public void run() { if (mLayout != null && mLayout.getParent() != null) { - mLayout.setLayoutParams(getRequestLayoutParams(isLandscapePhone(mContext))); + mLayout.setLayoutParams(getRequestLayoutParams(getRotation(mContext))); } } }; diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java index 1c71da007fd0..397b78dbd281 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java +++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java @@ -355,9 +355,10 @@ public class SystemServicesProxy { rti.firstActiveTime = rti.lastActiveTime = i; if (i % 2 == 0) { rti.taskDescription = new ActivityManager.TaskDescription(description, - Bitmap.createBitmap(mDummyIcon), null, - 0xFF000000 | (0xFFFFFF & new Random().nextInt()), - 0xFF000000 | (0xFFFFFF & new Random().nextInt())); + Bitmap.createBitmap(mDummyIcon), null, + 0xFF000000 | (0xFFFFFF & new Random().nextInt()), + 0xFF000000 | (0xFFFFFF & new Random().nextInt()), + 0, 0); } else { rti.taskDescription = new ActivityManager.TaskDescription(); } @@ -670,8 +671,7 @@ public class SystemServicesProxy { if (ActivityManager.ENABLE_TASK_SNAPSHOTS) { ActivityManager.TaskSnapshot snapshot = null; try { - snapshot = ActivityManager.getService().getTaskSnapshot(taskId, - false /* reducedResolution */); + snapshot = ActivityManager.getService().getTaskSnapshot(taskId, reducedResolution); } catch (RemoteException e) { Log.w(TAG, "Failed to retrieve snapshot", e); } diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java index f8d123b8fdde..5c25bfd6441c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java @@ -64,7 +64,7 @@ public class RecentsTaskLoadPlan { public static class Options { public int runningTaskId = -1; public boolean loadIcons = true; - public boolean loadThumbnails = true; + public boolean loadThumbnails = false; public boolean onlyLoadForCache = false; public boolean onlyLoadPausedActivities = false; public int numVisibleTasks = 0; @@ -189,7 +189,7 @@ public class RecentsTaskLoadPlan { ? loader.getAndUpdateActivityIcon(taskKey, t.taskDescription, res, false) : null; ThumbnailData thumbnail = loader.getAndUpdateThumbnail(taskKey, - false /* loadIfNotCached */); + false /* loadIfNotCached */, false /* storeInCache */); int activityColor = loader.getActivityPrimaryColor(t.taskDescription); int backgroundColor = loader.getActivityBackgroundColor(t.taskDescription); boolean isSystemApp = (info != null) && @@ -223,9 +223,7 @@ public class RecentsTaskLoadPlan { /** * Called to apply the actual loading based on the specified conditions. */ - public synchronized void executePlan(Options opts, RecentsTaskLoader loader, - TaskResourceLoadQueue loadQueue) { - RecentsConfiguration config = Recents.getConfiguration(); + public synchronized void executePlan(Options opts, RecentsTaskLoader loader) { Resources res = mContext.getResources(); // Iterate through each of the tasks and load them according to the load conditions. @@ -250,15 +248,9 @@ public class RecentsTaskLoadPlan { true); } } - if (opts.loadThumbnails && (isRunningTask || isVisibleThumbnail)) { - if (task.thumbnail == null || isRunningTask) { - if (config.svelteLevel <= RecentsConfiguration.SVELTE_LIMIT_CACHE) { - task.thumbnail = loader.getAndUpdateThumbnail(taskKey, - true /* loadIfNotCached */); - } else if (config.svelteLevel == RecentsConfiguration.SVELTE_DISABLE_CACHE) { - loadQueue.addTask(task); - } - } + if (opts.loadThumbnails && isVisibleThumbnail) { + task.thumbnail = loader.getAndUpdateThumbnail(taskKey, + true /* loadIfNotCached */, true /* storeInCache */); } } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java index e378d0ae51de..e8ffb9150da7 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java @@ -37,8 +37,6 @@ import com.android.systemui.recents.RecentsConfiguration; import com.android.systemui.recents.RecentsDebugFlags; import com.android.systemui.recents.events.activity.PackagesChangedEvent; import com.android.systemui.recents.misc.SystemServicesProxy; -import com.android.systemui.recents.misc.Utilities; -import com.android.systemui.recents.model.Task.TaskKey; import java.io.PrintWriter; import java.util.Map; @@ -245,11 +243,11 @@ public class RecentsTaskLoader { private final TaskResourceLoadQueue mLoadQueue; private final BackgroundTaskLoader mLoader; private final HighResThumbnailLoader mHighResThumbnailLoader; - + private final TaskKeyStrongCache<ThumbnailData> mThumbnailCache = new TaskKeyStrongCache<>(); + private final TaskKeyStrongCache<ThumbnailData> mTempCache = new TaskKeyStrongCache<>(); private final int mMaxThumbnailCacheSize; private final int mMaxIconCacheSize; private int mNumVisibleTasksLoaded; - private int mNumVisibleThumbnailsLoaded; int mDefaultTaskBarBackgroundColor; int mDefaultTaskViewBackgroundColor; @@ -332,10 +330,19 @@ public class RecentsTaskLoader { if (opts == null) { throw new RuntimeException("Requires load options"); } - plan.executePlan(opts, this, mLoadQueue); + if (opts.onlyLoadForCache && opts.loadThumbnails) { + + // If we are loading for the cache, we'd like to have the real cache only include the + // visible thumbnails. However, we also don't want to reload already cached thumbnails. + // Thus, we copy over the current entries into a second cache, and clear the real cache, + // such that the real cache only contains visible thumbnails. + mTempCache.copyEntries(mThumbnailCache); + mThumbnailCache.evictAll(); + } + plan.executePlan(opts, this); + mTempCache.evictAll(); if (!opts.onlyLoadForCache) { mNumVisibleTasksLoaded = opts.numVisibleTasks; - mNumVisibleThumbnailsLoaded = opts.numVisibleTaskThumbnails; // Start the loader mLoader.start(context); @@ -349,7 +356,7 @@ public class RecentsTaskLoader { Drawable icon = mIconCache.getAndInvalidateIfModified(t.key); icon = icon != null ? icon : mDefaultIcon; mLoadQueue.addTask(t); - t.notifyTaskDataLoaded(null, icon); + t.notifyTaskDataLoaded(t.thumbnail, icon); } /** Releases the task resource data back into the pool. */ @@ -404,6 +411,7 @@ public class RecentsTaskLoader { // The cache is small, only clear the label cache when we are critical mActivityLabelCache.evictAll(); mContentDescriptionCache.evictAll(); + mThumbnailCache.evictAll(); break; default: break; @@ -500,15 +508,31 @@ public class RecentsTaskLoader { /** * Returns the cached thumbnail if the task key is not expired, updating the cache if it is. */ - ThumbnailData getAndUpdateThumbnail(Task.TaskKey taskKey, boolean loadIfNotCached) { + ThumbnailData getAndUpdateThumbnail(Task.TaskKey taskKey, boolean loadIfNotCached, + boolean storeInCache) { SystemServicesProxy ssp = Recents.getSystemServices(); + ThumbnailData cached = mThumbnailCache.getAndInvalidateIfModified(taskKey); + if (cached != null) { + return cached; + } + + cached = mTempCache.getAndInvalidateIfModified(taskKey); + if (cached != null) { + mThumbnailCache.put(taskKey, cached); + return cached; + } + if (loadIfNotCached) { RecentsConfiguration config = Recents.getConfiguration(); if (config.svelteLevel < RecentsConfiguration.SVELTE_DISABLE_LOADING) { // Load the thumbnail from the system - ThumbnailData thumbnailData = ssp.getTaskThumbnail(taskKey.id, true /* reducedResolution */); + ThumbnailData thumbnailData = ssp.getTaskThumbnail(taskKey.id, + true /* reducedResolution */); if (thumbnailData.thumbnail != null) { + if (storeInCache) { + mThumbnailCache.put(taskKey, thumbnailData); + } return thumbnailData; } } @@ -590,5 +614,6 @@ public class RecentsTaskLoader { writer.print(prefix); writer.println(TAG); writer.print(prefix); writer.println("Icon Cache"); mIconCache.dump(innerPrefix, writer); + mThumbnailCache.dump(innerPrefix, writer); } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyCache.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyCache.java new file mode 100644 index 000000000000..be99f93028dc --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyCache.java @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.systemui.recents.model; + +import android.util.Log; +import android.util.SparseArray; + +import com.android.systemui.recents.model.Task.TaskKey; + +/** + * Base class for both strong and LRU task key cache. + */ +public abstract class TaskKeyCache<V> { + + protected static final String TAG = "TaskKeyCache"; + + protected final SparseArray<TaskKey> mKeys = new SparseArray<>(); + + /** + * Gets a specific entry in the cache with the specified key, regardless of whether the cached + * value is valid or not. + */ + final V get(Task.TaskKey key) { + return getCacheEntry(key.id); + } + + /** + * Returns the value only if the key is valid (has not been updated since the last time it was + * in the cache) + */ + final V getAndInvalidateIfModified(Task.TaskKey key) { + Task.TaskKey lastKey = mKeys.get(key.id); + if (lastKey != null) { + if ((lastKey.stackId != key.stackId) || + (lastKey.lastActiveTime != key.lastActiveTime)) { + // The task has updated (been made active since the last time it was put into the + // LRU cache) or the stack id for the task has changed, invalidate that cache item + remove(key); + return null; + } + } + // Either the task does not exist in the cache, or the last active time is the same as + // the key specified, so return what is in the cache + return getCacheEntry(key.id); + } + + /** Puts an entry in the cache for a specific key. */ + final void put(Task.TaskKey key, V value) { + if (key == null || value == null) { + Log.e(TAG, "Unexpected null key or value: " + key + ", " + value); + return; + } + mKeys.put(key.id, key); + putCacheEntry(key.id, value); + } + + + /** Removes a cache entry for a specific key. */ + final void remove(Task.TaskKey key) { + // Remove the key after the cache value because we need it to make the callback + removeCacheEntry(key.id); + mKeys.remove(key.id); + } + + /** Removes all the entries in the cache. */ + final void evictAll() { + evictAllCache(); + mKeys.clear(); + } + + protected abstract V getCacheEntry(int id); + protected abstract void putCacheEntry(int id, V value); + protected abstract void removeCacheEntry(int id); + protected abstract void evictAllCache(); +} diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyLruCache.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyLruCache.java index 23739a083826..778df6be399b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyLruCache.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyLruCache.java @@ -16,12 +16,9 @@ package com.android.systemui.recents.model; -import android.util.Log; import android.util.LruCache; -import android.util.SparseArray; import java.io.PrintWriter; -import java.util.ArrayList; /** * A mapping of {@link Task.TaskKey} to value, with additional LRU functionality where the least @@ -31,15 +28,12 @@ import java.util.ArrayList; * In addition, this also allows the caller to invalidate cached values for keys that have since * changed. */ -public class TaskKeyLruCache<V> { +public class TaskKeyLruCache<V> extends TaskKeyCache<V> { public interface EvictionCallback { public void onEntryEvicted(Task.TaskKey key); } - private static final String TAG = "TaskKeyLruCache"; - - private final SparseArray<Task.TaskKey> mKeys = new SparseArray<>(); private final LruCache<Integer, V> mCache; private final EvictionCallback mEvictionCallback; @@ -61,57 +55,6 @@ public class TaskKeyLruCache<V> { }; } - /** - * Gets a specific entry in the cache with the specified key, regardless of whether the cached - * value is valid or not. - */ - final V get(Task.TaskKey key) { - return mCache.get(key.id); - } - - /** - * Returns the value only if the key is valid (has not been updated since the last time it was - * in the cache) - */ - final V getAndInvalidateIfModified(Task.TaskKey key) { - Task.TaskKey lastKey = mKeys.get(key.id); - if (lastKey != null) { - if ((lastKey.stackId != key.stackId) || - (lastKey.lastActiveTime != key.lastActiveTime)) { - // The task has updated (been made active since the last time it was put into the - // LRU cache) or the stack id for the task has changed, invalidate that cache item - remove(key); - return null; - } - } - // Either the task does not exist in the cache, or the last active time is the same as - // the key specified, so return what is in the cache - return mCache.get(key.id); - } - - /** Puts an entry in the cache for a specific key. */ - final void put(Task.TaskKey key, V value) { - if (key == null || value == null) { - Log.e(TAG, "Unexpected null key or value: " + key + ", " + value); - return; - } - mKeys.put(key.id, key); - mCache.put(key.id, value); - } - - /** Removes a cache entry for a specific key. */ - final void remove(Task.TaskKey key) { - // Remove the key after the cache value because we need it to make the callback - mCache.remove(key.id); - mKeys.remove(key.id); - } - - /** Removes all the entries in the cache. */ - final void evictAll() { - mCache.evictAll(); - mKeys.clear(); - } - /** Trims the cache to a specific size */ final void trimToSize(int cacheSize) { mCache.trimToSize(cacheSize); @@ -128,4 +71,24 @@ public class TaskKeyLruCache<V> { writer.print(innerPrefix); writer.println(mKeys.get(mKeys.keyAt(i))); } } + + @Override + protected V getCacheEntry(int id) { + return mCache.get(id); + } + + @Override + protected void putCacheEntry(int id, V value) { + mCache.put(id, value); + } + + @Override + protected void removeCacheEntry(int id) { + mCache.remove(id); + } + + @Override + protected void evictAllCache() { + mCache.evictAll(); + } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyStrongCache.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyStrongCache.java new file mode 100644 index 000000000000..c84df8a14288 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskKeyStrongCache.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.systemui.recents.model; + +import android.util.ArrayMap; +import android.util.Log; +import android.util.SparseArray; + +import com.android.systemui.recents.model.Task.TaskKey; + +import java.io.PrintWriter; + +/** + * Like {@link TaskKeyLruCache}, but without LRU functionality. + */ +public class TaskKeyStrongCache<V> extends TaskKeyCache<V> { + + private static final String TAG = "TaskKeyCache"; + + private final ArrayMap<Integer, V> mCache = new ArrayMap<>(); + + final void copyEntries(TaskKeyStrongCache<V> other) { + for (int i = other.mKeys.size() - 1; i >= 0; i--) { + TaskKey key = other.mKeys.valueAt(i); + put(key, other.mCache.get(key.id)); + } + } + + public void dump(String prefix, PrintWriter writer) { + String innerPrefix = prefix + " "; + writer.print(prefix); writer.print(TAG); + writer.print(" numEntries="); writer.print(mKeys.size()); + writer.println(); + int keyCount = mKeys.size(); + for (int i = 0; i < keyCount; i++) { + writer.print(innerPrefix); writer.println(mKeys.get(mKeys.keyAt(i))); + } + } + + @Override + protected V getCacheEntry(int id) { + return mCache.get(id); + } + + @Override + protected void putCacheEntry(int id, V value) { + mCache.put(id, value); + } + + @Override + protected void removeCacheEntry(int id) { + mCache.remove(id); + } + + @Override + protected void evictAllCache() { + mCache.clear(); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java index 4fa7ecb5375d..7ba705e47cf6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java @@ -220,12 +220,11 @@ public class TaskStackLayoutAlgorithm { } // A report of the visibility state of the stack - public class VisibilityReport { + public static class VisibilityReport { public int numVisibleTasks; public int numVisibleThumbnails; - /** Package level ctor */ - VisibilityReport(int tasks, int thumbnails) { + public VisibilityReport(int tasks, int thumbnails) { numVisibleTasks = tasks; numVisibleThumbnails = thumbnails; } @@ -505,9 +504,9 @@ public class TaskStackLayoutAlgorithm { * Computes the minimum and maximum scroll progress values and the progress values for each task * in the stack. */ - void update(TaskStack stack, ArraySet<Task.TaskKey> ignoreTasksSet) { + void update(TaskStack stack, ArraySet<Task.TaskKey> ignoreTasksSet, + RecentsActivityLaunchState launchState) { SystemServicesProxy ssp = Recents.getSystemServices(); - RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState(); // Clear the progress map mTaskIndexMap.clear(); @@ -788,6 +787,10 @@ public class TaskStackLayoutAlgorithm { * stack scroll. Requires that update() is called first. */ public VisibilityReport computeStackVisibilityReport(ArrayList<Task> tasks) { + if (useGridLayout()) { + return mTaskGridLayoutAlgorithm.computeStackVisibilityReport(tasks); + } + // Ensure minimum visibility count if (tasks.size() <= 1) { return new VisibilityReport(1, 1); @@ -795,8 +798,8 @@ public class TaskStackLayoutAlgorithm { // Quick return when there are no stack tasks if (mNumStackTasks == 0) { - return new VisibilityReport(Math.max(mNumFreeformTasks, 1), - Math.max(mNumFreeformTasks, 1)); + return new VisibilityReport(mNumFreeformTasks > 0 ? Math.max(mNumFreeformTasks, 1) : 0, + mNumFreeformTasks > 0 ? Math.max(mNumFreeformTasks, 1) : 0); } // Otherwise, walk backwards in the stack and count the number of tasks and visible @@ -806,8 +809,8 @@ public class TaskStackLayoutAlgorithm { currentRange.offset(mInitialScrollP); int taskBarHeight = mContext.getResources().getDimensionPixelSize( R.dimen.recents_task_view_header_height); - int numVisibleTasks = Math.max(mNumFreeformTasks, 1); - int numVisibleThumbnails = Math.max(mNumFreeformTasks, 1); + int numVisibleTasks = mNumFreeformTasks > 0 ? Math.max(mNumFreeformTasks, 1) : 0; + int numVisibleThumbnails = mNumFreeformTasks > 0 ? Math.max(mNumFreeformTasks, 0) : 0; float prevScreenY = Integer.MAX_VALUE; for (int i = tasks.size() - 1; i >= 0; i--) { Task task = tasks.get(i); @@ -838,15 +841,15 @@ public class TaskStackLayoutAlgorithm { // Once we hit the next front most task that does not have a visible thumbnail, // walk through remaining visible set for (int j = i; j >= 0; j--) { - numVisibleTasks++; taskProgress = getStackScrollForTask(tasks.get(j)); if (!currentRange.isInRange(taskProgress)) { - continue; + break; } + numVisibleTasks++; } break; } - } else if (!isFrontMostTaskInGroup) { + } else { // Affiliated task, no thumbnail numVisibleTasks++; } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index b7cedf79e088..32e3df6a7295 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -868,12 +868,17 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal mTaskViewsClipDirty = false; } + public void updateLayoutAlgorithm(boolean boundScrollToNewMinMax) { + updateLayoutAlgorithm(boundScrollToNewMinMax, Recents.getConfiguration().getLaunchState()); + } + /** * Updates the layout algorithm min and max virtual scroll bounds. */ - public void updateLayoutAlgorithm(boolean boundScrollToNewMinMax) { + public void updateLayoutAlgorithm(boolean boundScrollToNewMinMax, + RecentsActivityLaunchState launchState) { // Compute the min and max scroll values - mLayoutAlgorithm.update(mStack, mIgnoreTasks); + mLayoutAlgorithm.update(mStack, mIgnoreTasks, launchState); // Update the freeform workspace background SystemServicesProxy ssp = Recents.getSystemServices(); @@ -1550,6 +1555,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal @Override public void onStackTasksUpdated(TaskStack stack) { + if (mAwaitingFirstLayout) { + return; + } + // Update the layout and immediately layout updateLayoutAlgorithm(false /* boundScroll */); relayoutTaskViews(AnimationProps.IMMEDIATE); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/grid/TaskGridLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/grid/TaskGridLayoutAlgorithm.java index 4f175368aceb..c5132024d505 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/grid/TaskGridLayoutAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/grid/TaskGridLayoutAlgorithm.java @@ -16,6 +16,8 @@ package com.android.systemui.recents.views.grid; +import static com.android.systemui.recents.views.TaskStackLayoutAlgorithm.*; + import android.content.Context; import android.content.res.Resources; import android.graphics.Point; @@ -26,9 +28,12 @@ import com.android.systemui.R; import com.android.systemui.recents.events.ui.focus.NavigateTaskViewEvent; import com.android.systemui.recents.events.ui.focus.NavigateTaskViewEvent.Direction; import com.android.systemui.recents.misc.Utilities; +import com.android.systemui.recents.model.Task; import com.android.systemui.recents.views.TaskStackLayoutAlgorithm; import com.android.systemui.recents.views.TaskViewTransform; +import java.util.ArrayList; + public class TaskGridLayoutAlgorithm { private final String TAG = "TaskGridLayoutAlgorithm"; @@ -313,4 +318,9 @@ public class TaskGridLayoutAlgorithm { public int getFocusFrameThickness() { return mFocusedFrameThickness; } + + public VisibilityReport computeStackVisibilityReport(ArrayList<Task> tasks) { + int visibleCount = Math.min(TaskGridLayoutAlgorithm.MAX_LAYOUT_TASK_COUNT, tasks.size()); + return new VisibilityReport(visibleCount, visibleCount); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java index b4b1cd3409f6..fab4e592a9aa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java @@ -274,6 +274,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G MetricsLogger.action(mContext, MetricsEvent.ACTION_SAVE_IMPORTANCE, selectedImportance - mStartingUserImportance); mSingleNotificationChannel.setImportance(selectedImportance); + mSingleNotificationChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE); try { mINotificationManager.updateNotificationChannelForPackage( mPkg, mAppUid, mSingleNotificationChannel); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 88711febe18d..c5e1438c272e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -83,7 +83,8 @@ public class SignalClusterView extends LinearLayout implements NetworkController private int mWifiStrengthId = 0; private int mLastWifiBadgeId = -1; private int mLastWifiStrengthId = -1; - private int mWifiActivityId = 0; + private boolean mWifiIn; + private boolean mWifiOut; private int mLastWifiActivityId = -1; private boolean mIsAirplaneMode = false; private int mAirplaneIconId = 0; @@ -99,7 +100,8 @@ public class SignalClusterView extends LinearLayout implements NetworkController ViewGroup mEthernetGroup, mWifiGroup; View mNoSimsCombo; ImageView mVpn, mEthernet, mWifi, mAirplane, mNoSims, mEthernetDark, mWifiDark, mNoSimsDark; - ImageView mWifiActivity; + ImageView mWifiActivityIn; + ImageView mWifiActivityOut; View mWifiAirplaneSpacer; View mWifiSignalSpacer; LinearLayout mMobileSignalGroup; @@ -116,6 +118,7 @@ public class SignalClusterView extends LinearLayout implements NetworkController private boolean mBlockMobile; private boolean mBlockWifi; private boolean mBlockEthernet; + private boolean mActivityEnabled; public SignalClusterView(Context context) { this(context, null); @@ -144,6 +147,7 @@ public class SignalClusterView extends LinearLayout implements NetworkController mIconScaleFactor = typedValue.getFloat(); mNetworkController = Dependency.get(NetworkController.class); mSecurityController = Dependency.get(SecurityController.class); + updateActivityEnabled(); } @Override @@ -180,7 +184,8 @@ public class SignalClusterView extends LinearLayout implements NetworkController mWifiGroup = (ViewGroup) findViewById(R.id.wifi_combo); mWifi = (ImageView) findViewById(R.id.wifi_signal); mWifiDark = (ImageView) findViewById(R.id.wifi_signal_dark); - mWifiActivity = (ImageView) findViewById(R.id.wifi_inout); + mWifiActivityIn = (ImageView) findViewById(R.id.wifi_in); + mWifiActivityOut= (ImageView) findViewById(R.id.wifi_out); mAirplane = (ImageView) findViewById(R.id.airplane); mNoSims = (ImageView) findViewById(R.id.no_sims); mNoSimsDark = (ImageView) findViewById(R.id.no_sims_dark); @@ -264,6 +269,10 @@ public class SignalClusterView extends LinearLayout implements NetworkController }); } + private void updateActivityEnabled() { + mActivityEnabled = mContext.getResources().getBoolean(R.bool.config_showActivity); + } + @Override public void setWifiIndicators(boolean enabled, IconState statusIcon, IconState qsIcon, boolean activityIn, boolean activityOut, String description, boolean isTransient) { @@ -271,10 +280,8 @@ public class SignalClusterView extends LinearLayout implements NetworkController mWifiStrengthId = statusIcon.icon; mWifiBadgeId = statusIcon.iconOverlay; mWifiDescription = statusIcon.contentDescription; - mWifiActivityId = activityIn && activityOut ? R.drawable.stat_sys_wifi_inout - : activityIn ? R.drawable.stat_sys_wifi_in - : activityOut ? R.drawable.stat_sys_wifi_out - : 0; + mWifiIn = activityIn && mActivityEnabled; + mWifiOut = activityOut && mActivityEnabled; apply(); } @@ -294,10 +301,8 @@ public class SignalClusterView extends LinearLayout implements NetworkController state.mMobileTypeDescription = typeContentDescription; state.mIsMobileTypeIconWide = statusType != 0 && isWide; state.mRoaming = roaming; - state.mMobileActivityId = activityIn && activityOut ? R.drawable.stat_sys_signal_inout - : activityIn ? R.drawable.stat_sys_signal_in - : activityOut ? R.drawable.stat_sys_signal_out - : 0; + state.mActivityIn = activityIn && mActivityEnabled; + state.mActivityOut = activityOut && mActivityEnabled; apply(); } @@ -421,10 +426,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController mLastWifiStrengthId = -1; mLastWifiBadgeId = -1; } - if (mWifiActivity != null) { - mWifiActivity.setImageDrawable(null); - mLastWifiActivityId = -1; - } for (PhoneState state : mPhoneStates) { if (state.mMobile != null) { @@ -441,10 +442,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController state.mMobileType.setImageDrawable(null); state.mLastMobileTypeId = -1; } - if (state.mMobileActivity != null) { - state.mMobileActivity.setImageDrawable(null); - state.mLastMobileActivityId = -1; - } } if (mAirplane != null) { @@ -504,12 +501,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController mLastWifiStrengthId = mWifiStrengthId; mLastWifiBadgeId = mWifiBadgeId; } - if (mWifiActivityId != mLastWifiActivityId) { - if (mWifiActivityId != 0) { - setIconForView(mWifiActivity, mWifiActivityId); - } - mLastWifiActivityId = mWifiActivityId; - } mWifiGroup.setContentDescription(mWifiDescription); mWifiGroup.setVisibility(View.VISIBLE); } else { @@ -521,7 +512,8 @@ public class SignalClusterView extends LinearLayout implements NetworkController (mWifiVisible ? "VISIBLE" : "GONE"), mWifiStrengthId)); - mWifiActivity.setVisibility(mWifiActivityId != 0 ? View.VISIBLE : View.GONE); + mWifiActivityIn.setVisibility(mWifiIn ? View.VISIBLE : View.GONE); + mWifiActivityOut.setVisibility(mWifiOut ? View.VISIBLE : View.GONE); boolean anyMobileVisible = false; int firstMobileTypeId = 0; @@ -631,8 +623,10 @@ public class SignalClusterView extends LinearLayout implements NetworkController applyDarkIntensity( DarkIconDispatcher.getDarkIntensity(mTintArea, mWifi, mDarkIntensity), mWifi, mWifiDark); - setTint(mWifiActivity, - DarkIconDispatcher.getTint(mTintArea, mWifiActivity, mIconTint)); + setTint(mWifiActivityIn, + DarkIconDispatcher.getTint(mTintArea, mWifiActivityIn, mIconTint)); + setTint(mWifiActivityOut, + DarkIconDispatcher.getTint(mTintArea, mWifiActivityOut, mIconTint)); applyDarkIntensity( DarkIconDispatcher.getDarkIntensity(mTintArea, mEthernet, mDarkIntensity), mEthernet, mEthernetDark); @@ -657,7 +651,7 @@ public class SignalClusterView extends LinearLayout implements NetworkController private class PhoneState { private final int mSubId; private boolean mMobileVisible = false; - private int mMobileStrengthId = 0, mMobileTypeId = 0, mMobileActivityId = 0; + private int mMobileStrengthId = 0, mMobileTypeId = 0; private int mLastMobileStrengthId = -1; private int mLastMobileTypeId = -1; private int mLastMobileActivityId = -1; @@ -667,7 +661,10 @@ public class SignalClusterView extends LinearLayout implements NetworkController private ViewGroup mMobileGroup; private ImageView mMobile, mMobileDark, mMobileType, mMobileRoaming; public boolean mRoaming; - private ImageView mMobileActivity; + private ImageView mMobileActivityIn; + private ImageView mMobileActivityOut; + public boolean mActivityIn; + public boolean mActivityOut; public PhoneState(int subId, Context context) { ViewGroup root = (ViewGroup) LayoutInflater.from(context) @@ -678,11 +675,12 @@ public class SignalClusterView extends LinearLayout implements NetworkController public void setViews(ViewGroup root) { mMobileGroup = root; - mMobile = (ImageView) root.findViewById(R.id.mobile_signal); - mMobileDark = (ImageView) root.findViewById(R.id.mobile_signal_dark); - mMobileType = (ImageView) root.findViewById(R.id.mobile_type); - mMobileRoaming = (ImageView) root.findViewById(R.id.mobile_roaming); - mMobileActivity = (ImageView) root.findViewById(R.id.mobile_inout); + mMobile = root.findViewById(R.id.mobile_signal); + mMobileDark = root.findViewById(R.id.mobile_signal_dark); + mMobileType = root.findViewById(R.id.mobile_type); + mMobileRoaming = root.findViewById(R.id.mobile_roaming); + mMobileActivityIn = root.findViewById(R.id.mobile_in); + mMobileActivityOut = root.findViewById(R.id.mobile_out); } public boolean apply(boolean isSecondaryIcon) { @@ -698,10 +696,6 @@ public class SignalClusterView extends LinearLayout implements NetworkController mLastMobileTypeId = mMobileTypeId; } - if (mLastMobileActivityId != mMobileActivityId) { - mMobileActivity.setImageResource(mMobileActivityId); - mLastMobileActivityId = mMobileActivityId; - } mMobileGroup.setContentDescription(mMobileTypeDescription + " " + mMobileDescription); mMobileGroup.setVisibility(View.VISIBLE); @@ -724,7 +718,8 @@ public class SignalClusterView extends LinearLayout implements NetworkController mMobileType.setVisibility(mMobileTypeId != 0 ? View.VISIBLE : View.GONE); mMobileRoaming.setVisibility(mRoaming ? View.VISIBLE : View.GONE); - mMobileActivity.setVisibility(mMobileActivityId != 0 ? View.VISIBLE : View.GONE); + mMobileActivityIn.setVisibility(mActivityIn ? View.VISIBLE : View.GONE); + mMobileActivityOut.setVisibility(mActivityOut ? View.VISIBLE : View.GONE); return mMobileVisible; } @@ -786,8 +781,10 @@ public class SignalClusterView extends LinearLayout implements NetworkController setTint(mMobileType, DarkIconDispatcher.getTint(tintArea, mMobileType, tint)); setTint(mMobileRoaming, DarkIconDispatcher.getTint(tintArea, mMobileRoaming, tint)); - setTint(mMobileActivity, - DarkIconDispatcher.getTint(tintArea, mMobileActivity, tint)); + setTint(mMobileActivityIn, + DarkIconDispatcher.getTint(tintArea, mMobileActivityIn, tint)); + setTint(mMobileActivityOut, + DarkIconDispatcher.getTint(tintArea, mMobileActivityOut, tint)); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java index 7b2e9979fb33..c3f8d9711b9c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java @@ -125,7 +125,7 @@ public class DozeParameters { public boolean getSensorsWakeUpFully() { return mAmbientDisplayConfiguration.alwaysOnAvailable() && Settings.Secure.getIntForUser(mContext.getContentResolver(), - DOZE_SENSORS_WAKE_UP_FULLY, 1, UserHandle.USER_CURRENT) != 0; + DOZE_SENSORS_WAKE_UP_FULLY, 0, UserHandle.USER_CURRENT) != 0; } private boolean getBoolean(String propName, int resId) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationInfoTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationInfoTest.java index 2bb7f3b2b36d..66385a1dfb01 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationInfoTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationInfoTest.java @@ -61,6 +61,7 @@ import com.android.systemui.SysuiTestCase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import java.util.ArrayList; import java.util.Arrays; @@ -585,11 +586,16 @@ public class NotificationInfoTest extends SysuiTestCase { mNotificationChannel.getImportance(), mSbn, null, null, null, null, Collections.singleton(TEST_PACKAGE_NAME)); - Switch enabledSwitch = (Switch) mNotificationInfo.findViewById(R.id.channel_enabled_switch); + Switch enabledSwitch = mNotificationInfo.findViewById(R.id.channel_enabled_switch); enabledSwitch.setChecked(false); mNotificationInfo.handleCloseControls(true); + + ArgumentCaptor<NotificationChannel> updated = + ArgumentCaptor.forClass(NotificationChannel.class); verify(mMockINotificationManager, times(1)).updateNotificationChannelForPackage( - eq(TEST_PACKAGE_NAME), anyInt(), eq(mNotificationChannel)); + anyString(), anyInt(), updated.capture()); + assertTrue((updated.getValue().getUserLockedFields() + & NotificationChannel.USER_LOCKED_IMPORTANCE) != 0); } @Test diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java index 89645f457a55..d6f525655d56 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java @@ -24,6 +24,8 @@ import static com.android.server.autofill.Helper.VERBOSE; import static com.android.server.autofill.Helper.bundleToString; import android.annotation.NonNull; +import android.annotation.Nullable; +import android.app.ActivityManager; import android.app.ActivityManagerInternal; import android.content.BroadcastReceiver; import android.content.ContentResolver; @@ -35,6 +37,7 @@ import android.content.pm.UserInfo; import android.database.ContentObserver; import android.graphics.Rect; import android.net.Uri; +import android.os.Binder; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -194,15 +197,29 @@ public final class AutofillManagerService extends SystemService { */ @NonNull AutofillManagerServiceImpl getServiceForUserLocked(int userId) { - AutofillManagerServiceImpl service = mServicesCache.get(userId); + final int resolvedUserId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), + Binder.getCallingUid(), userId, false, false, null, null); + AutofillManagerServiceImpl service = mServicesCache.get(resolvedUserId); if (service == null) { - service = new AutofillManagerServiceImpl(mContext, mLock, - mRequestsHistory, userId, mUi, mDisabledUsers.get(userId)); + service = new AutofillManagerServiceImpl(mContext, mLock, mRequestsHistory, + resolvedUserId, mUi, mDisabledUsers.get(resolvedUserId)); mServicesCache.put(userId, service); } return service; } + /** + * Peeks the service instance for a user. + * + * @return service instance or null if not already present + */ + @Nullable + AutofillManagerServiceImpl peekServiceForUserLocked(int userId) { + final int resolvedUserId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), + Binder.getCallingUid(), userId, false, false, null, null); + return mServicesCache.get(resolvedUserId); + } + // Called by Shell command. void requestSaveForUser(int userId) { Slog.i(TAG, "requestSaveForUser(): " + userId); @@ -210,7 +227,7 @@ public final class AutofillManagerService extends SystemService { final IBinder activityToken = getTopActivityForUser(); if (activityToken != null) { synchronized (mLock) { - final AutofillManagerServiceImpl service = mServicesCache.get(userId); + final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); if (service == null) { Log.w(TAG, "handleSaveForUser(): no cached service for userId " + userId); return; @@ -228,7 +245,10 @@ public final class AutofillManagerService extends SystemService { synchronized (mLock) { if (userId != UserHandle.USER_ALL) { - mServicesCache.get(userId).destroySessionsLocked(); + AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); + if (service != null) { + service.destroySessionsLocked(); + } } else { final int size = mServicesCache.size(); for (int i = 0; i < size; i++) { @@ -253,7 +273,10 @@ public final class AutofillManagerService extends SystemService { synchronized (mLock) { if (userId != UserHandle.USER_ALL) { - mServicesCache.get(userId).listSessionsLocked(sessions); + AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); + if (service != null) { + service.listSessionsLocked(sessions); + } } else { final int size = mServicesCache.size(); for (int i = 0; i < size; i++) { @@ -287,7 +310,7 @@ public final class AutofillManagerService extends SystemService { * Removes a cached service for a given user. */ private void removeCachedServiceLocked(int userId) { - final AutofillManagerServiceImpl service = mServicesCache.get(userId); + final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); if (service != null) { mServicesCache.delete(userId); service.destroyLocked(); @@ -305,7 +328,7 @@ public final class AutofillManagerService extends SystemService { * Updates a cached service for a given user. */ private void updateCachedServiceLocked(int userId, boolean disabled) { - AutofillManagerServiceImpl service = mServicesCache.get(userId); + AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); if (service != null) { service.updateLocked(disabled); } @@ -409,8 +432,7 @@ public final class AutofillManagerService extends SystemService { public void updateSession(int sessionId, AutofillId id, Rect bounds, AutofillValue value, int flags, int userId) { synchronized (mLock) { - final AutofillManagerServiceImpl service = mServicesCache.get( - UserHandle.getCallingUserId()); + final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); if (service != null) { service.updateSessionLocked(sessionId, getCallingUid(), id, bounds, value, flags); @@ -421,8 +443,7 @@ public final class AutofillManagerService extends SystemService { @Override public void finishSession(int sessionId, int userId) { synchronized (mLock) { - final AutofillManagerServiceImpl service = mServicesCache.get( - UserHandle.getCallingUserId()); + final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); if (service != null) { service.finishSessionLocked(sessionId, getCallingUid()); } @@ -432,8 +453,7 @@ public final class AutofillManagerService extends SystemService { @Override public void cancelSession(int sessionId, int userId) { synchronized (mLock) { - final AutofillManagerServiceImpl service = mServicesCache.get( - UserHandle.getCallingUserId()); + final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); if (service != null) { service.cancelSessionLocked(sessionId, getCallingUid()); } @@ -441,6 +461,16 @@ public final class AutofillManagerService extends SystemService { } @Override + public void disableOwnedAutofillServices(int userId) { + synchronized (mLock) { + final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); + if (service != null) { + service.disableOwnedAutofillServicesLocked(Binder.getCallingUid()); + } + } + } + + @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; synchronized (mLock) { diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index 94d534a3d7fe..63bf373316e1 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -43,6 +43,7 @@ import android.os.IBinder; import android.os.Looper; import android.os.RemoteCallbackList; import android.os.RemoteException; +import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.service.autofill.AutofillService; @@ -348,6 +349,25 @@ final class AutofillManagerServiceImpl { session.removeSelfLocked(); } + void disableOwnedAutofillServicesLocked(int uid) { + if (mInfo == null || mInfo.getServiceInfo().applicationInfo.uid + != UserHandle.getAppId(uid)) { + return; + } + final long identity = Binder.clearCallingIdentity(); + try { + final String autoFillService = getComponentNameFromSettings(); + if (mInfo.getServiceInfo().getComponentName().equals( + ComponentName.unflattenFromString(autoFillService))) { + Settings.Secure.putStringForUser(mContext.getContentResolver(), + Settings.Secure.AUTOFILL_SERVICE, null, mUserId); + destroySessionsLocked(); + } + } finally { + Binder.restoreCallingIdentity(identity); + } + } + private Session createSessionByTokenLocked(@NonNull IBinder activityToken, int uid, @Nullable IBinder windowToken, @NonNull IBinder appCallbackToken, boolean hasCallback, int flags, @NonNull String packageName) { @@ -474,20 +494,6 @@ final class AutofillManagerServiceImpl { mSessions.clear(); } - void disableSelf() { - final long identity = Binder.clearCallingIdentity(); - try { - final String autoFillService = getComponentNameFromSettings(); - if (mInfo.getServiceInfo().getComponentName().equals( - ComponentName.unflattenFromString(autoFillService))) { - Settings.Secure.putStringForUser(mContext.getContentResolver(), - Settings.Secure.AUTOFILL_SERVICE, null, mUserId); - } - } finally { - Binder.restoreCallingIdentity(identity); - } - } - CharSequence getServiceLabel() { return mInfo.getServiceInfo().loadLabel(mContext.getPackageManager()); } diff --git a/services/autofill/java/com/android/server/autofill/RemoteFillService.java b/services/autofill/java/com/android/server/autofill/RemoteFillService.java index 003c8f15d5cd..dd520ac43a80 100644 --- a/services/autofill/java/com/android/server/autofill/RemoteFillService.java +++ b/services/autofill/java/com/android/server/autofill/RemoteFillService.java @@ -35,7 +35,6 @@ import android.os.UserHandle; import android.service.autofill.AutofillService; import android.service.autofill.FillResponse; import android.service.autofill.IAutoFillService; -import android.service.autofill.IAutoFillServiceConnection; import android.service.autofill.IFillCallback; import android.service.autofill.ISaveCallback; import android.text.format.DateUtils; @@ -96,7 +95,6 @@ final class RemoteFillService implements DeathRecipient { void onSaveRequestFailure(@Nullable CharSequence message, @NonNull String servicePackageName); void onServiceDied(RemoteFillService service); - void onDisableSelf(); } public RemoteFillService(Context context, ComponentName componentName, @@ -203,10 +201,6 @@ final class RemoteFillService implements DeathRecipient { } } - private void handleDisableSelf() { - mCallbacks.onDisableSelf(); - } - private boolean isBound() { return mAutoFillService != null; } @@ -246,7 +240,7 @@ final class RemoteFillService implements DeathRecipient { mBinding = false; if (isBound()) { try { - mAutoFillService.onInit(null); + mAutoFillService.onConnectedStateChanged(false); } catch (Exception e) { Slog.w(LOG_TAG, "Exception calling onDisconnected(): " + e); } @@ -322,12 +316,7 @@ final class RemoteFillService implements DeathRecipient { return; } try { - mAutoFillService.onInit(new IAutoFillServiceConnection.Stub() { - @Override - public void disableSelf() { - mHandler.obtainMessage(MyHandler.MSG_ON_DISABLE_SELF).sendToTarget(); - } - }); + mAutoFillService.onConnectedStateChanged(true); } catch (RemoteException e) { Slog.w(LOG_TAG, "Exception calling onConnected(): " + e); } @@ -353,7 +342,6 @@ final class RemoteFillService implements DeathRecipient { public static final int MSG_BINDER_DIED = 2; public static final int MSG_UNBIND = 3; public static final int MSG_ON_PENDING_REQUEST = 4; - public static final int MSG_ON_DISABLE_SELF = 5; public MyHandler(Context context) { // Cannot use lambda - doesn't compile @@ -381,10 +369,6 @@ final class RemoteFillService implements DeathRecipient { case MSG_ON_PENDING_REQUEST: { handlePendingRequest((PendingRequest) message.obj); } break; - - case MSG_ON_DISABLE_SELF: { - handleDisableSelf(); - } break; } } }, false); diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index 3ef9cd52762d..67c2314cac35 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -311,15 +311,6 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState // FillServiceCallbacks @Override - public void onDisableSelf() { - mService.disableSelf(); - synchronized (mLock) { - removeSelfLocked(); - } - } - - // FillServiceCallbacks - @Override public void onServiceDied(RemoteFillService service) { // TODO(b/33197203): implement } diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index 8b32c16acb42..21dae4f2139a 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -36,6 +36,7 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Binder; import android.os.Bundle; +import android.os.Environment; import android.os.Handler; import android.os.IBinder; import android.os.Message; @@ -949,6 +950,16 @@ class AlarmManagerService extends SystemService { // because kernel doesn't keep this after reboot setTimeZoneImpl(SystemProperties.get(TIMEZONE_PROPERTY)); + // Also sure that we're booting with a halfway sensible current time + if (mNativeData != 0) { + final long systemBuildTime = Environment.getRootDirectory().lastModified(); + if (System.currentTimeMillis() < systemBuildTime) { + Slog.i(TAG, "Current time only " + System.currentTimeMillis() + + ", advancing to build time " + systemBuildTime); + setKernelTime(mNativeData, systemBuildTime); + } + } + PowerManager pm = (PowerManager) getContext().getSystemService(Context.POWER_SERVICE); mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "*alarm*"); diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 738365d5b36f..5f585cc799c9 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -652,20 +652,20 @@ public class AccountManagerService return visibility; } - boolean isPrivileged = isPermittedForPackage(packageName, accounts.userId, + boolean isPrivileged = isPermittedForPackage(packageName, uid, accounts.userId, Manifest.permission.GET_ACCOUNTS_PRIVILEGED); // Device/Profile owner gets visibility by default. if (isProfileOwner(uid)) { return AccountManager.VISIBILITY_VISIBLE; } - // Apps with READ_CONTACTS permission get visibility by default even post O. - boolean canReadContacts = checkReadContactsPermission(packageName, accounts.userId); boolean preO = isPreOApplication(packageName); if ((signatureCheckResult != SIGNATURE_CHECK_MISMATCH) - || (preO && checkGetAccountsPermission(packageName, accounts.userId)) - || canReadContacts || isPrivileged) { + || (preO && checkGetAccountsPermission(packageName, uid, accounts.userId)) + || (checkReadContactsPermission(packageName, uid, accounts.userId) + && accountTypeManagesContacts(account.type, accounts.userId)) + || isPrivileged) { // Use legacy for preO apps with GET_ACCOUNTS permission or pre/postO with signature // match. visibility = getAccountVisibilityFromCache(account, @@ -5022,14 +5022,20 @@ public class AccountManagerService } } - private boolean isPermittedForPackage(String packageName, int userId, String... permissions) { + private boolean isPermittedForPackage(String packageName, int uid, int userId, + String... permissions) { final long identity = Binder.clearCallingIdentity(); try { IPackageManager pm = ActivityThread.getPackageManager(); for (String perm : permissions) { if (pm.checkPermission(perm, packageName, userId) == PackageManager.PERMISSION_GRANTED) { - return true; + // Checks runtime permission revocation. + final int opCode = AppOpsManager.permissionToOpCode(perm); + if (opCode == AppOpsManager.OP_NONE || mAppOpsManager.noteOp( + opCode, uid, packageName) == AppOpsManager.MODE_ALLOWED) { + return true; + } } } } catch (RemoteException e) { @@ -5145,13 +5151,37 @@ public class AccountManagerService // Method checks visibility for applications targeing API level below {@link // android.os.Build.VERSION_CODES#O}, // returns true if the the app has GET_ACCOUNTS or GET_ACCOUNTS_PRIVILEGED permission. - private boolean checkGetAccountsPermission(String packageName, int userId) { - return isPermittedForPackage(packageName, userId, Manifest.permission.GET_ACCOUNTS, + private boolean checkGetAccountsPermission(String packageName, int uid, int userId) { + return isPermittedForPackage(packageName, uid, userId, Manifest.permission.GET_ACCOUNTS, Manifest.permission.GET_ACCOUNTS_PRIVILEGED); } - private boolean checkReadContactsPermission(String packageName, int userId) { - return isPermittedForPackage(packageName, userId, Manifest.permission.READ_CONTACTS); + private boolean checkReadContactsPermission(String packageName, int uid, int userId) { + return isPermittedForPackage(packageName, uid, userId, Manifest.permission.READ_CONTACTS); + } + + // Heuristic to check that account type may be associated with some contacts data and + // therefore READ_CONTACTS permission grants the access to account by default. + private boolean accountTypeManagesContacts(String accountType, int userId) { + if (accountType == null) { + return false; + } + long identityToken = Binder.clearCallingIdentity(); + Collection<RegisteredServicesCache.ServiceInfo<AuthenticatorDescription>> serviceInfos; + try { + serviceInfos = mAuthenticatorCache.getAllServices(userId); + } finally { + Binder.restoreCallingIdentity(identityToken); + } + // Check contacts related permissions for authenticator. + for (RegisteredServicesCache.ServiceInfo<AuthenticatorDescription> serviceInfo + : serviceInfos) { + if (accountType.equals(serviceInfo.type.type)) { + return isPermittedForPackage(serviceInfo.type.packageName, serviceInfo.uid, userId, + Manifest.permission.WRITE_CONTACTS); + } + } + return false; } /** diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 2b953adfde18..95d715860e4e 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -97,6 +97,7 @@ import static com.android.server.am.ActivityStack.ActivityState.STOPPING; import static com.android.server.am.ActivityStack.LAUNCH_TICK; import static com.android.server.am.ActivityStack.LAUNCH_TICK_MSG; import static com.android.server.am.ActivityStack.PAUSE_TIMEOUT_MSG; +import static com.android.server.am.ActivityStack.STACK_INVISIBLE; import static com.android.server.am.ActivityStack.STOP_TIMEOUT_MSG; import static com.android.server.am.EventLogTags.AM_ACTIVITY_FULLY_DRAWN_TIME; import static com.android.server.am.EventLogTags.AM_ACTIVITY_LAUNCH_TIME; @@ -420,8 +421,14 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo pw.print(" iconFilename="); pw.print(taskDescription.getIconFilename()); pw.print(" label=\""); pw.print(taskDescription.getLabel()); pw.print("\""); - pw.print(" color="); + pw.print(" primaryColor="); pw.println(Integer.toHexString(taskDescription.getPrimaryColor())); + pw.print(" backgroundColor="); + pw.println(Integer.toHexString(taskDescription.getBackgroundColor())); + pw.print(" statusBarColor="); + pw.println(Integer.toHexString(taskDescription.getStatusBarColor())); + pw.print(" navigationBarColor="); + pw.println(Integer.toHexString(taskDescription.getNavigationBarColor())); } if (iconFilename == null && taskDescription.getIcon() != null) { pw.print(prefix); pw.println("taskDescription contains Bitmap"); @@ -2269,6 +2276,20 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo return true; } + // Skip updating configuration for activity that are stopping or stopped. + if (state == STOPPING || state == STOPPED) { + if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION, + "Skipping config check stopped or stopping: " + this); + return true; + } + + // Skip updating configuration for activity is a stack that shouldn't be visible. + if (stack.shouldBeVisible(null /* starting */) == STACK_INVISIBLE) { + if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION, + "Skipping config check invisible stack: " + this); + return true; + } + if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION, "Ensuring correct configuration: " + this); diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 51011b586743..f551a445e773 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -65,6 +65,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NA import static com.android.server.am.ActivityRecord.APPLICATION_ACTIVITY_TYPE; import static com.android.server.am.ActivityRecord.ASSISTANT_ACTIVITY_TYPE; import static com.android.server.am.ActivityRecord.HOME_ACTIVITY_TYPE; +import static com.android.server.am.ActivityStack.ActivityState.STOPPED; import static com.android.server.am.ActivityStackSupervisor.FindTaskResult; import static com.android.server.am.ActivityStackSupervisor.ON_TOP; import static com.android.server.am.ActivityStackSupervisor.PAUSE_IMMEDIATELY; @@ -489,10 +490,14 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai void reparent(ActivityStackSupervisor.ActivityDisplay activityDisplay, boolean onTop) { removeFromDisplay(); mTmpRect2.setEmpty(); - mWindowContainerController.reparent(activityDisplay.mDisplayId, mTmpRect2); postAddToDisplay(activityDisplay, mTmpRect2.isEmpty() ? null : mTmpRect2, onTop); adjustFocusToNextFocusableStackLocked("reparent", true /* allowFocusSelf */); mStackSupervisor.resumeFocusedStackTopActivityLocked(); + // Update visibility of activities before notifying WM. This way it won't try to resize + // windows that are no longer visible. + mStackSupervisor.ensureActivitiesVisibleLocked(null /* starting */, 0 /* configChanges */, + !PRESERVE_WINDOWS); + mWindowContainerController.reparent(activityDisplay.mDisplayId, mTmpRect2, onTop); } /** @@ -1162,6 +1167,8 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai final ArrayList<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities; for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) { final ActivityRecord r = activities.get(activityNdx); + // TODO(b/37244415): This just wrong. We should also be moving PAUSED activities to + // the stopped state when we are sleeping. if (r.state == ActivityState.STOPPING || r.state == ActivityState.STOPPED || r.state == ActivityState.PAUSED || r.state == ActivityState.PAUSING) { r.setSleeping(true); @@ -1796,6 +1803,15 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Skipping: already visible at " + r); + if (r.state == STOPPED) { + // In this case the activity is visible, but in the stopped state. + // This sometimes happens if the activity is behind the lockscreen. + // Restart the activity to the paused or resumed state since we want + // it to be in the visible state now. + makeVisibleAndRestartIfNeeded(starting, configChanges, isTop, + resumeNextActivity, r); + } + if (r.handleAlreadyVisible()) { resumeNextActivity = false; } diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index c9bb9e547693..88de8a5fcbed 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -1477,11 +1477,12 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D stack.minimalResumeActivityLocked(r); } else { // This activity is not starting in the resumed state... which should look like we asked - // it to pause+stop (but remain visible), and it has done so and reported back the + // it to resume+pause (but remain visible), and it has done so and reported back the // current icicle and other state. if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to PAUSED: " + r + " (starting in paused state)"); r.state = PAUSED; + r.stopped = false; } // Launch the new version setup screen if needed. We do this -after- @@ -2775,9 +2776,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D throw new IllegalArgumentException("moveStackToDisplayLocked: Unknown stackId=" + stackId); } - - ensureActivitiesVisibleLocked(null /* starting */, 0 /* configChanges */, - !PRESERVE_WINDOWS); // TODO(multi-display): resize stacks properly if moved from split-screen. } @@ -3092,6 +3090,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D } } mGoingToSleepActivities.clear(); + ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS); } void activitySleptLocked(ActivityRecord r) { diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index 59f6098684eb..56594d3fdf48 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1038,7 +1038,7 @@ class ActivityStarter { sendPowerHintForLaunchStartIfNeeded(false /* forceSend */); reusedActivity = setTargetStackAndMoveToFrontIfNeeded(reusedActivity); - if (outActivity.length > 0) { + if (outActivity != null && outActivity.length > 0) { outActivity[0] = reusedActivity; } diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 0c2c2043fb15..c7f20b9ff904 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -1613,6 +1613,9 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta String iconFilename = null; int colorPrimary = 0; int colorBackground = 0; + int statusBarColor = 0; + int navigationBarColor = 0; + boolean topActivity = true; for (--activityNdx; activityNdx >= 0; --activityNdx) { final ActivityRecord r = mActivities.get(activityNdx); if (r.taskDescription != null) { @@ -1625,13 +1628,16 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta if (colorPrimary == 0) { colorPrimary = r.taskDescription.getPrimaryColor(); } - if (colorBackground == 0) { + if (topActivity) { colorBackground = r.taskDescription.getBackgroundColor(); + statusBarColor = r.taskDescription.getStatusBarColor(); + navigationBarColor = r.taskDescription.getNavigationBarColor(); } } + topActivity = false; } lastTaskDescription = new TaskDescription(label, null, iconFilename, colorPrimary, - colorBackground); + colorBackground, statusBarColor, navigationBarColor); if (mWindowContainerController != null) { mWindowContainerController.setTaskDescription(lastTaskDescription); } diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index c8028fe6d1de..2e499f175650 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -1003,22 +1003,24 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { final boolean meteredHint = info.getMeteredHint(); final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(info.getSSID()); - synchronized (mNetworkPoliciesSecondLock) { - NetworkPolicy policy = mNetworkPolicy.get(template); - if (policy == null && meteredHint) { - // policy doesn't exist, and AP is hinting that it's - // metered: create an inferred policy. - policy = newWifiPolicy(template, meteredHint); - addNetworkPolicyNL(policy); - - } else if (policy != null && policy.inferred) { - // policy exists, and was inferred: update its current - // metered state. - policy.metered = meteredHint; - - // since this is inferred for each wifi session, just update - // rules without persisting. - updateNetworkRulesNL(); + synchronized (mUidRulesFirstLock) { + synchronized (mNetworkPoliciesSecondLock) { + NetworkPolicy policy = mNetworkPolicy.get(template); + if (policy == null && meteredHint) { + // policy doesn't exist, and AP is hinting that it's + // metered: create an inferred policy. + policy = newWifiPolicy(template, meteredHint); + addNetworkPolicyAL(policy); + + } else if (policy != null && policy.inferred) { + // policy exists, and was inferred: update its current + // metered state. + policy.metered = meteredHint; + + // since this is inferred for each wifi session, just update + // rules without persisting. + updateNetworkRulesNL(); + } } } } @@ -1289,12 +1291,14 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { // permission above. maybeRefreshTrustedTime(); - synchronized (mNetworkPoliciesSecondLock) { - ensureActiveMobilePolicyNL(); - normalizePoliciesNL(); - updateNetworkEnabledNL(); - updateNetworkRulesNL(); - updateNotificationsNL(); + synchronized (mUidRulesFirstLock) { + synchronized (mNetworkPoliciesSecondLock) { + ensureActiveMobilePolicyAL(); + normalizePoliciesNL(); + updateNetworkEnabledNL(); + updateNetworkRulesNL(); + updateNotificationsNL(); + } } } }; @@ -1477,7 +1481,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { maybeRefreshTrustedTime(); synchronized (mUidRulesFirstLock) { synchronized (mNetworkPoliciesSecondLock) { - final boolean added = ensureActiveMobilePolicyNL(subId, subscriberId); + final boolean added = ensureActiveMobilePolicyAL(subId, subscriberId); if (added) return; final boolean updated = maybeUpdateMobilePolicyCycleNL(subId); if (!updated) return; @@ -1721,8 +1725,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { * Once any {@link #mNetworkPolicy} are loaded from disk, ensure that we * have at least a default mobile policy defined. */ - private void ensureActiveMobilePolicyNL() { - if (LOGV) Slog.v(TAG, "ensureActiveMobilePolicyNL()"); + private void ensureActiveMobilePolicyAL() { + if (LOGV) Slog.v(TAG, "ensureActiveMobilePolicyAL()"); if (mSuppressDefaultPolicy) return; final TelephonyManager tele = TelephonyManager.from(mContext); @@ -1731,7 +1735,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { final int[] subIds = sub.getActiveSubscriptionIdList(); for (int subId : subIds) { final String subscriberId = tele.getSubscriberId(subId); - ensureActiveMobilePolicyNL(subId, subscriberId); + ensureActiveMobilePolicyAL(subId, subscriberId); } } @@ -1743,7 +1747,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { * @param subscriberId that we check for an existing policy * @return true if a mobile network policy was added, or false one already existed. */ - private boolean ensureActiveMobilePolicyNL(int subId, String subscriberId) { + private boolean ensureActiveMobilePolicyAL(int subId, String subscriberId) { // Poke around to see if we already have a policy final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true); @@ -1761,7 +1765,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { Slog.i(TAG, "No policy for subscriber " + NetworkIdentity.scrubSubscriberId(subscriberId) + "; generating default policy"); final NetworkPolicy policy = buildDefaultMobilePolicy(subId, subscriberId); - addNetworkPolicyNL(policy); + addNetworkPolicyAL(policy); return true; } @@ -2265,7 +2269,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } } - void addNetworkPolicyNL(NetworkPolicy policy) { + void addNetworkPolicyAL(NetworkPolicy policy) { NetworkPolicy[] policies = getNetworkPolicies(mContext.getOpPackageName()); policies = ArrayUtils.appendElement(NetworkPolicy.class, policies, policy); setNetworkPolicies(policies); diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 0774779a4cf2..000cf2e908c8 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -154,6 +154,13 @@ abstract public class ManagedServices { abstract protected void onServiceAdded(ManagedServiceInfo info); + protected List<ManagedServiceInfo> getServices() { + synchronized (mMutex) { + List<ManagedServiceInfo> services = new ArrayList<>(mServices); + return services; + } + } + protected void onServiceRemovedLocked(ManagedServiceInfo removed) { } private ManagedServiceInfo newServiceInfo(IInterface service, diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 64ee1e976378..3c46e05cb70d 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -19,6 +19,12 @@ package com.android.server.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.content.pm.PackageManager.FEATURE_LEANBACK; import static android.content.pm.PackageManager.FEATURE_TELEVISION; +import static android.service.notification.NotificationListenerService + .NOTIFICATION_CHANNEL_OR_GROUP_ADDED; +import static android.service.notification.NotificationListenerService + .NOTIFICATION_CHANNEL_OR_GROUP_DELETED; +import static android.service.notification.NotificationListenerService + .NOTIFICATION_CHANNEL_OR_GROUP_UPDATED; import static android.service.notification.NotificationListenerService.REASON_APP_CANCEL; import static android.service.notification.NotificationListenerService.REASON_APP_CANCEL_ALL; import static android.service.notification.NotificationListenerService.REASON_CHANNEL_BANNED; @@ -70,6 +76,7 @@ import android.app.PendingIntent; import android.app.StatusBarManager; import android.app.usage.UsageEvents; import android.app.usage.UsageStatsManagerInternal; +import android.companion.ICompanionDeviceManager; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; @@ -100,6 +107,7 @@ import android.os.Looper; import android.os.Message; import android.os.Process; import android.os.RemoteException; +import android.os.ServiceManager; import android.os.SystemClock; import android.os.SystemProperties; import android.os.UserHandle; @@ -144,6 +152,7 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.statusbar.NotificationVisibility; +import com.android.internal.util.ArrayUtils; import com.android.internal.util.DumpUtils; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.Preconditions; @@ -260,6 +269,7 @@ public class NotificationManagerService extends SystemService { Vibrator mVibrator; private WindowManagerInternal mWindowManagerInternal; private AlarmManager mAlarmManager; + private ICompanionDeviceManager mCompanionManager; final IBinder mForegroundToken = new Binder(); private Handler mHandler; @@ -1004,7 +1014,8 @@ public class NotificationManagerService extends SystemService { // TODO: Tests should call onStart instead once the methods above are removed. @VisibleForTesting void init(Looper looper, IPackageManager packageManager, PackageManager packageManagerClient, - LightsManager lightsManager, NotificationListeners notificationListeners) { + LightsManager lightsManager, NotificationListeners notificationListeners, + ICompanionDeviceManager companionManager) { Resources resources = getContext().getResources(); mMaxPackageEnqueueRate = Settings.Global.getFloat(getContext().getContentResolver(), Settings.Global.MAX_NOTIFICATION_ENQUEUE_RATE, @@ -1017,6 +1028,7 @@ public class NotificationManagerService extends SystemService { mVibrator = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE); mAppUsageStats = LocalServices.getService(UsageStatsManagerInternal.class); mAlarmManager = (AlarmManager) getContext().getSystemService(Context.ALARM_SERVICE); + mCompanionManager = companionManager; mHandler = new WorkerHandler(looper); mRankingThread.start(); @@ -1192,7 +1204,8 @@ public class NotificationManagerService extends SystemService { @Override public void onStart() { init(Looper.myLooper(), AppGlobals.getPackageManager(), getContext().getPackageManager(), - getLocalService(LightsManager.class), new NotificationListeners()); + getLocalService(LightsManager.class), new NotificationListeners(), + null); publishBinderService(Context.NOTIFICATION_SERVICE, mService); publishLocalService(NotificationManagerInternal.class, mInternalService); } @@ -1294,7 +1307,8 @@ public class NotificationManagerService extends SystemService { sendRegisteredOnlyBroadcast(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED); } - private void updateNotificationChannelInt(String pkg, int uid, NotificationChannel channel) { + private void updateNotificationChannelInt(String pkg, int uid, NotificationChannel channel, + boolean fromListener) { if (channel.getImportance() == NotificationManager.IMPORTANCE_NONE) { // cancel cancelAllNotificationsInt(MY_UID, MY_PID, pkg, channel.getId(), 0, 0, true, @@ -1303,6 +1317,14 @@ public class NotificationManagerService extends SystemService { } mRankingHelper.updateNotificationChannel(pkg, uid, channel); + final NotificationChannel modifiedChannel = + mRankingHelper.getNotificationChannel(pkg, uid, channel.getId(), false); + + if (!fromListener) { + mListeners.notifyNotificationChannelChanged( + pkg, modifiedChannel, NOTIFICATION_CHANNEL_OR_GROUP_UPDATED); + } + synchronized (mNotificationLock) { final int N = mNotificationList.size(); for (int i = N - 1; i >= 0; --i) { @@ -1311,8 +1333,7 @@ public class NotificationManagerService extends SystemService { && r.sbn.getUid() == uid && channel.getId() != null && channel.getId().equals(r.getChannel().getId())) { - r.updateNotificationChannel(mRankingHelper.getNotificationChannel( - pkg, uid, channel.getId(), false)); + r.updateNotificationChannel(modifiedChannel); } } } @@ -1421,6 +1442,11 @@ public class NotificationManagerService extends SystemService { return INotificationManager.Stub.asInterface(mService); } + @VisibleForTesting + NotificationManagerInternal getInternalService() { + return mInternalService; + } + private final IBinder mService = new INotificationManager.Stub() { // Toasts // ============================================================================ @@ -1621,6 +1647,8 @@ public class NotificationManagerService extends SystemService { Preconditions.checkNotNull(group, "group in list is null"); mRankingHelper.createNotificationChannelGroup(pkg, Binder.getCallingUid(), group, true /* fromTargetApp */); + mListeners.notifyNotificationChannelGroupChanged(pkg, group, + NOTIFICATION_CHANNEL_OR_GROUP_ADDED); } savePolicyFile(); } @@ -1634,6 +1662,9 @@ public class NotificationManagerService extends SystemService { Preconditions.checkNotNull(channel, "channel in list is null"); mRankingHelper.createNotificationChannel(pkg, uid, channel, true /* fromTargetApp */); + mListeners.notifyNotificationChannelChanged(pkg, + mRankingHelper.getNotificationChannel(pkg, uid, channel.getId(), false), + NOTIFICATION_CHANNEL_OR_GROUP_ADDED); } savePolicyFile(); } @@ -1669,12 +1700,16 @@ public class NotificationManagerService extends SystemService { @Override public void deleteNotificationChannel(String pkg, String channelId) { checkCallerIsSystemOrSameApp(pkg); + final int callingUid = Binder.getCallingUid(); if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(channelId)) { throw new IllegalArgumentException("Cannot delete default channel"); } cancelAllNotificationsInt(MY_UID, MY_PID, pkg, channelId, 0, 0, true, - UserHandle.getUserId(Binder.getCallingUid()), REASON_CHANNEL_BANNED, null); - mRankingHelper.deleteNotificationChannel(pkg, Binder.getCallingUid(), channelId); + UserHandle.getUserId(callingUid), REASON_CHANNEL_BANNED, null); + mRankingHelper.deleteNotificationChannel(pkg, callingUid, channelId); + mListeners.notifyNotificationChannelChanged(pkg, + mRankingHelper.getNotificationChannel(pkg, callingUid, channelId, true), + NOTIFICATION_CHANNEL_OR_GROUP_DELETED); savePolicyFile(); } @@ -1687,16 +1722,28 @@ public class NotificationManagerService extends SystemService { } @Override - public void deleteNotificationChannelGroup(String pkg, String channelGroupId) { + public void deleteNotificationChannelGroup(String pkg, String groupId) { checkCallerIsSystemOrSameApp(pkg); - List<String> deletedChannelIds = mRankingHelper.deleteNotificationChannelGroup( - pkg, Binder.getCallingUid(), channelGroupId); - for (int i = 0; i < deletedChannelIds.size(); i++) { - cancelAllNotificationsInt(MY_UID, MY_PID, pkg, deletedChannelIds.get(i), 0, 0, true, - UserHandle.getUserId(Binder.getCallingUid()), REASON_CHANNEL_BANNED, null); + final int callingUid = Binder.getCallingUid(); + NotificationChannelGroup groupToDelete = + mRankingHelper.getNotificationChannelGroup(groupId, pkg, callingUid); + if (groupToDelete != null) { + List<NotificationChannel> deletedChannels = + mRankingHelper.deleteNotificationChannelGroup(pkg, callingUid, groupId); + for (int i = 0; i < deletedChannels.size(); i++) { + final NotificationChannel deletedChannel = deletedChannels.get(i); + cancelAllNotificationsInt(MY_UID, MY_PID, pkg, deletedChannel.getId(), 0, 0, + true, + UserHandle.getUserId(Binder.getCallingUid()), REASON_CHANNEL_BANNED, + null); + mListeners.notifyNotificationChannelChanged(pkg, deletedChannel, + NOTIFICATION_CHANNEL_OR_GROUP_DELETED); + } + mListeners.notifyNotificationChannelGroupChanged( + pkg, groupToDelete, NOTIFICATION_CHANNEL_OR_GROUP_DELETED); + savePolicyFile(); } - savePolicyFile(); } @Override @@ -1704,7 +1751,7 @@ public class NotificationManagerService extends SystemService { NotificationChannel channel) { enforceSystemOrSystemUI("Caller not system or systemui"); Preconditions.checkNotNull(channel); - updateNotificationChannelInt(pkg, uid, channel); + updateNotificationChannelInt(pkg, uid, channel, false); } @Override @@ -2641,6 +2688,41 @@ public class NotificationManagerService extends SystemService { Binder.restoreCallingIdentity(identity); } } + + @Override + public void updateNotificationChannelFromPrivilegedListener(INotificationListener token, + String pkg, NotificationChannel channel) throws RemoteException { + Preconditions.checkNotNull(channel); + + ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); + checkHasCompanionDevice(info); + + int uid = mPackageManager.getPackageUid(pkg, 0, info.userid); + updateNotificationChannelInt(pkg, uid, channel, true); + } + + @Override + public ParceledListSlice<NotificationChannel> getNotificationChannelsFromPrivilegedListener( + INotificationListener token, String pkg) throws RemoteException { + ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); + checkHasCompanionDevice(info); + + int uid = mPackageManager.getPackageUid(pkg, 0, info.userid); + return mRankingHelper.getNotificationChannels(pkg, uid, false /* includeDeleted */); + } + + @Override + public ParceledListSlice<NotificationChannelGroup> + getNotificationChannelGroupsFromPrivilegedListener( + INotificationListener token, String pkg) throws RemoteException { + ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); + checkHasCompanionDevice(info); + + List<NotificationChannelGroup> groups = new ArrayList<>(); + int uid = mPackageManager.getPackageUid(pkg, 0, info.userid); + groups.addAll(mRankingHelper.getNotificationChannelGroups(pkg, uid)); + return new ParceledListSlice<>(groups); + } }; private void applyAdjustment(NotificationRecord n, Adjustment adjustment) { @@ -2984,25 +3066,27 @@ public class NotificationManagerService extends SystemService { int userId) { checkCallerIsSystem(); synchronized (mNotificationLock) { - NotificationRecord r = findNotificationByListLocked(mNotificationList, pkg, null, - notificationId, userId); - if (r == null) { - Log.d(TAG, "stripForegroundServiceFlag: Could not find notification with " - + "pkg=" + pkg + " / id=" + notificationId + " / userId=" + userId); - return; - } - StatusBarNotification sbn = r.sbn; - // NoMan adds flags FLAG_NO_CLEAR and FLAG_ONGOING_EVENT when it sees - // FLAG_FOREGROUND_SERVICE. Hence it's not enough to remove FLAG_FOREGROUND_SERVICE, - // we have to revert to the flags we received initially *and* force remove - // FLAG_FOREGROUND_SERVICE. - sbn.getNotification().flags = - (r.mOriginalFlags & ~Notification.FLAG_FOREGROUND_SERVICE); - mRankingHelper.sort(mNotificationList); - mListeners.notifyPostedLocked(sbn, sbn /* oldSbn */); mHandler.post(new Runnable() { @Override public void run() { + NotificationRecord r = + findNotificationLocked(pkg, null, notificationId, userId); + if (r == null) { + Log.d(TAG, + "stripForegroundServiceFlag: Could not find notification with " + + "pkg=" + pkg + " / id=" + notificationId + + " / userId=" + userId); + return; + } + StatusBarNotification sbn = r.sbn; + // NoMan adds flags FLAG_NO_CLEAR and FLAG_ONGOING_EVENT when it sees + // FLAG_FOREGROUND_SERVICE. Hence it's not enough to remove + // FLAG_FOREGROUND_SERVICE, we have to revert to the flags we received + // initially *and* force remove FLAG_FOREGROUND_SERVICE. + sbn.getNotification().flags = + (r.mOriginalFlags & ~Notification.FLAG_FOREGROUND_SERVICE); + mRankingHelper.sort(mNotificationList); + mListeners.notifyPostedLocked(sbn, sbn /* oldSbn */); mGroupHelper.onNotificationPosted(sbn); } }); @@ -3067,9 +3151,17 @@ public class NotificationManagerService extends SystemService { + ", incomingUserId=" + incomingUserId + ", notificationUid=" + notificationUid + ", notification=" + notification; - // STOPSHIP TODO: should throw instead of logging. + // STOPSHIP TODO: should throw instead of logging or toasting. // throw new IllegalArgumentException(noChannelStr); Log.e(TAG, noChannelStr); + + final String noChannelToastStr = + "Developer warning for package \"" + pkg + "\"\n" + + "Failed to post notification on channel \"" + channelId + "\"\n" + + "See log for more details"; + Toast noChannelToast = + Toast.makeText(getContext(), noChannelToastStr, Toast.LENGTH_LONG); + noChannelToast.show(); return; } final StatusBarNotification n = new StatusBarNotification( @@ -4425,16 +4517,16 @@ public class NotificationManagerService extends SystemService { } } - protected static boolean isUidSystem(int uid) { + protected boolean isUidSystem(int uid) { final int appid = UserHandle.getAppId(uid); return (appid == Process.SYSTEM_UID || appid == Process.PHONE_UID || uid == 0); } - private static boolean isCallerSystem() { + protected boolean isCallerSystem() { return isUidSystem(Binder.getCallingUid()); } - private static void checkCallerIsSystem() { + private void checkCallerIsSystem() { if (isCallerSystem()) { return; } @@ -4563,6 +4655,17 @@ public class NotificationManagerService extends SystemService { channels, overridePeople, snoozeCriteria, showBadge); } + private void checkHasCompanionDevice(ManagedServiceInfo info) throws RemoteException { + if (mCompanionManager == null) { + mCompanionManager = ICompanionDeviceManager.Stub.asInterface( + ServiceManager.getService(Context.COMPANION_DEVICE_SERVICE)); + } + if (ArrayUtils.isEmpty(mCompanionManager.getAssociations( + info.component.getPackageName(), info.userid))) { + throw new SecurityException("Disallowed call from " + info.component); + } + } + private boolean isVisibleToListener(StatusBarNotification sbn, ManagedServiceInfo listener) { if (!listener.enabledAndUserMatches(sbn.getUserId())) { return false; @@ -4649,7 +4752,6 @@ public class NotificationManagerService extends SystemService { final StatusBarNotification sbn = r.sbn; TrimCache trimCache = new TrimCache(sbn); - // mServices is the list inside ManagedServices of all the assistants, // There should be only one, but it's a list, so while we enforce // singularity elsewhere, we keep it general here, to avoid surprises. for (final ManagedServiceInfo info : NotificationAssistants.this.mServices) { @@ -4888,6 +4990,58 @@ public class NotificationManagerService extends SystemService { } } + protected void notifyNotificationChannelChanged(final String pkg, + final NotificationChannel channel, final int modificationType) { + if (channel == null) { + return; + } + for (final ManagedServiceInfo serviceInfo : getServices()) { + if (!serviceInfo.isEnabledForCurrentProfiles()) { + continue; + } + try { + checkHasCompanionDevice(serviceInfo); + mHandler.post(new Runnable() { + @Override + public void run() { + notifyNotificationChannelChanged(serviceInfo, pkg, channel, + modificationType); + } + }); + } catch (SecurityException se) { + // Not a privileged listener; do not notify + } catch (RemoteException e) { + Slog.e(TAG, "Cannot reach companion device service", e); + } + } + } + + protected void notifyNotificationChannelGroupChanged(final String pkg, + final NotificationChannelGroup group, final int modificationType) { + if (group == null) { + return; + } + for (final ManagedServiceInfo serviceInfo : getServices()) { + if (!serviceInfo.isEnabledForCurrentProfiles()) { + continue; + } + try { + checkHasCompanionDevice(serviceInfo); + mHandler.post(new Runnable() { + @Override + public void run() { + notifyNotificationChannelGroupChanged(serviceInfo, pkg, group, + modificationType); + } + }); + } catch (SecurityException se) { + // Not a privileged listener; do not notify + } catch (RemoteException e) { + Slog.e(TAG, "Cannot reach companion device service", e); + } + } + } + private void notifyPosted(final ManagedServiceInfo info, final StatusBarNotification sbn, NotificationRankingUpdate rankingUpdate) { final INotificationListener listener = (INotificationListener) info.service; @@ -4942,6 +5096,28 @@ public class NotificationManagerService extends SystemService { } } + void notifyNotificationChannelChanged(ManagedServiceInfo info, + final String pkg, final NotificationChannel channel, + final int modificationType) { + final INotificationListener listener = (INotificationListener) info.service; + try { + listener.onNotificationChannelModification(pkg, channel, modificationType); + } catch (RemoteException ex) { + Log.e(TAG, "unable to notify listener (channel changed): " + listener, ex); + } + } + + private void notifyNotificationChannelGroupChanged(ManagedServiceInfo info, + final String pkg, final NotificationChannelGroup group, + final int modificationType) { + final INotificationListener listener = (INotificationListener) info.service; + try { + listener.onNotificationChannelGroupModification(pkg, group, modificationType); + } catch (RemoteException ex) { + Log.e(TAG, "unable to notify listener (channel group changed): " + listener, ex); + } + } + public boolean isListenerPackage(String packageName) { if (packageName == null) { return false; diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java index b789d5cd602e..9e12f919c417 100644 --- a/services/core/java/com/android/server/notification/RankingHelper.java +++ b/services/core/java/com/android/server/notification/RankingHelper.java @@ -715,12 +715,12 @@ public class RankingHelper implements RankingConfig { return new ParceledListSlice<>(new ArrayList<>(groups.values())); } - public List<String> deleteNotificationChannelGroup(String pkg, int uid, + public List<NotificationChannel> deleteNotificationChannelGroup(String pkg, int uid, String groupId) { - List<String> deletedChannelIds = new ArrayList<>(); + List<NotificationChannel> deletedChannels = new ArrayList<>(); Record r = getRecord(pkg, uid); if (r == null || TextUtils.isEmpty(groupId)) { - return deletedChannelIds; + return deletedChannels; } r.groups.remove(groupId); @@ -730,11 +730,11 @@ public class RankingHelper implements RankingConfig { final NotificationChannel nc = r.channels.valueAt(i); if (groupId.equals(nc.getGroup())) { nc.setDeleted(true); - deletedChannelIds.add(nc.getId()); + deletedChannels.add(nc); } } updateConfig(); - return deletedChannelIds; + return deletedChannels; } @Override diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java index 2026c1b176ba..818c3ad9728b 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -193,13 +193,10 @@ import java.util.concurrent.atomic.AtomicBoolean; * </ul> */ public final class OverlayManagerService extends SystemService { - static final String TAG = "OverlayManager"; static final boolean DEBUG = false; - static final String PERMISSION_DENIED = "Operation not permitted for user shell"; - /** * The system property that specifies the default overlays to apply. * This is a semicolon separated list of package names. @@ -234,7 +231,7 @@ public final class OverlayManagerService extends SystemService { IdmapManager im = new IdmapManager(installer); mSettings = new OverlayManagerSettings(); mImpl = new OverlayManagerServiceImpl(mPackageManager, im, mSettings, - getDefaultOverlayPackages()); + getDefaultOverlayPackages(), new OverlayChangeListener()); mInitCompleteSignal = SystemServerInitThreadPool.get().submit(() -> { final IntentFilter packageFilter = new IntentFilter(); packageFilter.addAction(ACTION_PACKAGE_ADDED); @@ -251,9 +248,6 @@ public final class OverlayManagerService extends SystemService { restoreSettings(); onSwitchUser(UserHandle.USER_SYSTEM); - schedulePersistSettings(); - - mSettings.addChangeListener(new OverlayChangeListener()); publishBinderService(Context.OVERLAY_SERVICE, mService); publishLocalService(OverlayManagerService.class, this); @@ -281,8 +275,9 @@ public final class OverlayManagerService extends SystemService { final List<String> targets; synchronized (mLock) { targets = mImpl.onSwitchUser(newUserId); + updateAssetsLocked(newUserId, targets); } - updateAssets(newUserId, targets); + schedulePersistSettings(); } private static Set<String> getDefaultOverlayPackages() { @@ -348,7 +343,8 @@ public final class OverlayManagerService extends SystemService { @NonNull final int[] userIds) { for (final int userId : userIds) { synchronized (mLock) { - final PackageInfo pi = mPackageManager.getPackageInfo(packageName, userId, false); + final PackageInfo pi = mPackageManager.getPackageInfo(packageName, userId, + false); if (pi != null) { mPackageManager.cachePackageInfo(packageName, userId, pi); if (!isOverlayPackage(pi)) { @@ -365,7 +361,8 @@ public final class OverlayManagerService extends SystemService { @NonNull final int[] userIds) { for (int userId : userIds) { synchronized (mLock) { - final PackageInfo pi = mPackageManager.getPackageInfo(packageName, userId, false); + final PackageInfo pi = mPackageManager.getPackageInfo(packageName, userId, + false); if (pi != null) { mPackageManager.cachePackageInfo(packageName, userId, pi); if (!isOverlayPackage(pi)) { @@ -397,7 +394,8 @@ public final class OverlayManagerService extends SystemService { @NonNull final int[] userIds) { for (int userId : userIds) { synchronized (mLock) { - final PackageInfo pi = mPackageManager.getPackageInfo(packageName, userId, false); + final PackageInfo pi = mPackageManager.getPackageInfo(packageName, userId, + false); if (pi != null) { mPackageManager.cachePackageInfo(packageName, userId, pi); if (!isOverlayPackage(pi)) { @@ -449,8 +447,7 @@ public final class OverlayManagerService extends SystemService { private final IBinder mService = new IOverlayManager.Stub() { @Override - public Map<String, List<OverlayInfo>> getAllOverlays(int userId) - throws RemoteException { + public Map<String, List<OverlayInfo>> getAllOverlays(int userId) throws RemoteException { userId = handleIncomingUser(userId, "getAllOverlays"); synchronized (mLock) { @@ -508,14 +505,14 @@ public final class OverlayManagerService extends SystemService { int userId) throws RemoteException { enforceChangeOverlayPackagesPermission("setEnabled"); userId = handleIncomingUser(userId, "setEnabled"); - if (packageName == null) { + if (packageName == null || !enable) { return false; } final long ident = Binder.clearCallingIdentity(); try { synchronized (mLock) { - return mImpl.setEnabledExclusive(packageName, enable, userId); + return mImpl.setEnabledExclusive(packageName, userId); } } finally { Binder.restoreCallingIdentity(ident); @@ -643,68 +640,24 @@ public final class OverlayManagerService extends SystemService { return pi != null && pi.overlayTarget != null; } - private final class OverlayChangeListener implements OverlayManagerSettings.ChangeListener { + private final class OverlayChangeListener + implements OverlayManagerServiceImpl.OverlayChangeListener { @Override - public void onSettingsChanged() { + public void onOverlaysChanged(@NonNull final String targetPackageName, final int userId) { schedulePersistSettings(); - } - - @Override - public void onOverlayAdded(@NonNull final OverlayInfo oi) { - scheduleBroadcast(Intent.ACTION_OVERLAY_ADDED, oi, oi.isEnabled()); - } - - @Override - public void onOverlayRemoved(@NonNull final OverlayInfo oi) { - scheduleBroadcast(Intent.ACTION_OVERLAY_REMOVED, oi, oi.isEnabled()); - } - - @Override - public void onOverlayChanged(@NonNull final OverlayInfo oi, - @NonNull final OverlayInfo oldOi) { - scheduleBroadcast(Intent.ACTION_OVERLAY_CHANGED, oi, oi.isEnabled() != oldOi.isEnabled()); - } - - @Override - public void onOverlayPriorityChanged(@NonNull final OverlayInfo oi) { - scheduleBroadcast(Intent.ACTION_OVERLAY_PRIORITY_CHANGED, oi, oi.isEnabled()); - } - - private void scheduleBroadcast(@NonNull final String action, @NonNull final OverlayInfo oi, - final boolean doUpdate) { - FgThread.getHandler().post(new BroadcastRunnable(action, oi, doUpdate)); - } - - private final class BroadcastRunnable implements Runnable { - private final String mAction; - private final OverlayInfo mOverlayInfo; - private final boolean mDoUpdate; - - BroadcastRunnable(@NonNull final String action, @NonNull final OverlayInfo oi, - final boolean doUpdate) { - mAction = action; - mOverlayInfo = oi; - mDoUpdate = doUpdate; - } - - @Override - public void run() { - if (mDoUpdate) { - updateAssets(mOverlayInfo.userId, mOverlayInfo.targetPackageName); + FgThread.getHandler().post(() -> { + synchronized (mLock) { + updateAssetsLocked(userId, targetPackageName); } - sendBroadcast(mAction, mOverlayInfo.targetPackageName, mOverlayInfo.packageName, - mOverlayInfo.userId); - } - private void sendBroadcast(@NonNull final String action, - @NonNull final String targetPackageName, @NonNull final String packageName, - final int userId) { - final Intent intent = new Intent(action, Uri.fromParts("package", - String.format("%s/%s", targetPackageName, packageName), null)); + final Intent intent = new Intent(Intent.ACTION_OVERLAY_CHANGED, + Uri.fromParts("package", targetPackageName, null)); intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); + if (DEBUG) { - Slog.d(TAG, String.format("send broadcast %s", intent)); + Slog.d(TAG, "send broadcast " + intent); } + try { ActivityManager.getService().broadcastIntent(null, intent, null, null, 0, null, null, null, android.app.AppOpsManager.OP_NONE, null, false, false, @@ -712,18 +665,20 @@ public final class OverlayManagerService extends SystemService { } catch (RemoteException e) { // Intentionally left empty. } - } - + }); } } - private void updateAssets(final int userId, final String targetPackageName) { + private void updateAssetsLocked(final int userId, final String targetPackageName) { final List<String> list = new ArrayList<>(); list.add(targetPackageName); - updateAssets(userId, list); + updateAssetsLocked(userId, list); } - private void updateAssets(final int userId, List<String> targetPackageNames) { + private void updateAssetsLocked(final int userId, List<String> targetPackageNames) { + if (DEBUG) { + Slog.d(TAG, "Updating overlay assets"); + } final PackageManagerInternal pm = LocalServices.getService(PackageManagerInternal.class); final boolean updateFrameworkRes = targetPackageNames.contains("android"); if (updateFrameworkRes) { @@ -743,6 +698,12 @@ public final class OverlayManagerService extends SystemService { final int N = targetPackageNames.size(); for (int i = 0; i < N; i++) { final String targetPackageName = targetPackageNames.get(i); + if (DEBUG) { + Slog.d(TAG, "-> Updating overlay: target=" + targetPackageName + " overlays=[" + + TextUtils.join(",", pendingChanges.get(targetPackageName)) + + "] userId=" + userId); + } + if (!pm.setEnabledOverlayPackages( userId, targetPackageName, pendingChanges.get(targetPackageName))) { Slog.e(TAG, String.format("Failed to change enabled overlays for %s user %d", @@ -762,20 +723,20 @@ public final class OverlayManagerService extends SystemService { if (mPersistSettingsScheduled.getAndSet(true)) { return; } - IoThread.getHandler().post(new Runnable() { - @Override - public void run() { - mPersistSettingsScheduled.set(false); - synchronized (mLock) { - FileOutputStream stream = null; - try { - stream = mSettingsFile.startWrite(); - mSettings.persist(stream); - mSettingsFile.finishWrite(stream); - } catch (IOException | XmlPullParserException e) { - mSettingsFile.failWrite(stream); - Slog.e(TAG, "failed to persist overlay state", e); - } + IoThread.getHandler().post(() -> { + mPersistSettingsScheduled.set(false); + if (DEBUG) { + Slog.d(TAG, "Writing overlay settings"); + } + synchronized (mLock) { + FileOutputStream stream = null; + try { + stream = mSettingsFile.startWrite(); + mSettings.persist(stream); + mSettingsFile.finishWrite(stream); + } catch (IOException | XmlPullParserException e) { + mSettingsFile.failWrite(stream); + Slog.e(TAG, "failed to persist overlay state", e); } } }); @@ -862,7 +823,8 @@ public final class OverlayManagerService extends SystemService { // The package manager does not support different versions of packages // to be installed for different users: ignore userId for now. try { - return mPackageManager.checkSignatures(packageName1, packageName2) == SIGNATURE_MATCH; + return mPackageManager.checkSignatures( + packageName1, packageName2) == SIGNATURE_MATCH; } catch (RemoteException e) { // Intentionally left blank } diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java index 3705946008f1..b2036741efcb 100644 --- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java @@ -54,15 +54,18 @@ final class OverlayManagerServiceImpl { private final IdmapManager mIdmapManager; private final OverlayManagerSettings mSettings; private final Set<String> mDefaultOverlays; + private final OverlayChangeListener mListener; OverlayManagerServiceImpl(@NonNull final PackageManagerHelper packageManager, @NonNull final IdmapManager idmapManager, @NonNull final OverlayManagerSettings settings, - @NonNull final Set<String> defaultOverlays) { + @NonNull final Set<String> defaultOverlays, + @NonNull final OverlayChangeListener listener) { mPackageManager = packageManager; mIdmapManager = idmapManager; mSettings = settings; mDefaultOverlays = defaultOverlays; + mListener = listener; } /* @@ -98,7 +101,8 @@ final class OverlayManagerServiceImpl { // Update the overlay if it didn't exist or had the wrong target package. mSettings.init(overlayPackage.packageName, newUserId, overlayPackage.overlayTarget, - overlayPackage.applicationInfo.getBaseCodePath()); + overlayPackage.applicationInfo.getBaseCodePath(), + overlayPackage.isStaticOverlay, overlayPackage.overlayPriority); if (oi == null) { // This overlay does not exist in our settings. @@ -145,7 +149,6 @@ final class OverlayManagerServiceImpl { iter.remove(); } } - return new ArrayList<>(packagesToUpdateAssets); } @@ -199,25 +202,30 @@ final class OverlayManagerServiceImpl { updateAllOverlaysForTarget(packageName, userId, null); } - private void updateAllOverlaysForTarget(@NonNull final String packageName, final int userId, + /** + * Returns true if the settings were modified for this target. + */ + private boolean updateAllOverlaysForTarget(@NonNull final String packageName, final int userId, @Nullable final PackageInfo targetPackage) { + boolean modified = false; final List<OverlayInfo> ois = mSettings.getOverlaysForTarget(packageName, userId); final int N = ois.size(); for (int i = 0; i < N; i++) { final OverlayInfo oi = ois.get(i); final PackageInfo overlayPackage = mPackageManager.getPackageInfo(oi.packageName, userId); if (overlayPackage == null) { - mSettings.remove(oi.packageName, oi.userId); + modified |= mSettings.remove(oi.packageName, oi.userId); removeIdmapIfPossible(oi); } else { try { - updateState(targetPackage, overlayPackage, userId); + modified |= updateState(targetPackage, overlayPackage, userId); } catch (OverlayManagerSettings.BadKeyException e) { Slog.e(TAG, "failed to update settings", e); - mSettings.remove(oi.packageName, userId); + modified |= mSettings.remove(oi.packageName, userId); } } } + return modified; } void onOverlayPackageAdded(@NonNull final String packageName, final int userId) { @@ -236,9 +244,12 @@ final class OverlayManagerServiceImpl { mPackageManager.getPackageInfo(overlayPackage.overlayTarget, userId); mSettings.init(packageName, userId, overlayPackage.overlayTarget, - overlayPackage.applicationInfo.getBaseCodePath()); + overlayPackage.applicationInfo.getBaseCodePath(), overlayPackage.isStaticOverlay, + overlayPackage.overlayPriority); try { - updateState(targetPackage, overlayPackage, userId); + if (updateState(targetPackage, overlayPackage, userId)) { + mListener.onOverlaysChanged(overlayPackage.overlayTarget, userId); + } } catch (OverlayManagerSettings.BadKeyException e) { Slog.e(TAG, "failed to update settings", e); mSettings.remove(packageName, userId); @@ -289,8 +300,9 @@ final class OverlayManagerServiceImpl { if (overlayPackage == null) { return false; } - // Static overlay is always being enabled. - if (!enable && overlayPackage.isStaticOverlay) { + + // Ignore static overlays. + if (overlayPackage.isStaticOverlay) { return false; } @@ -298,19 +310,21 @@ final class OverlayManagerServiceImpl { final OverlayInfo oi = mSettings.getOverlayInfo(packageName, userId); final PackageInfo targetPackage = mPackageManager.getPackageInfo(oi.targetPackageName, userId); - mSettings.setEnabled(packageName, userId, enable); - updateState(targetPackage, overlayPackage, userId); + boolean modified = mSettings.setEnabled(packageName, userId, enable); + modified |= updateState(targetPackage, overlayPackage, userId); + + if (modified) { + mListener.onOverlaysChanged(oi.targetPackageName, userId); + } return true; } catch (OverlayManagerSettings.BadKeyException e) { return false; } } - boolean setEnabledExclusive(@NonNull final String packageName, final boolean enable, - final int userId) { + boolean setEnabledExclusive(@NonNull final String packageName, final int userId) { if (DEBUG) { - Slog.d(TAG, String.format("setEnabled packageName=%s enable=%s userId=%d", - packageName, enable, userId)); + Slog.d(TAG, String.format("setEnabledExclusive packageName=%s userId=%d", packageName, userId)); } final PackageInfo overlayPackage = mPackageManager.getPackageInfo(packageName, userId); @@ -320,23 +334,48 @@ final class OverlayManagerServiceImpl { try { final OverlayInfo oi = mSettings.getOverlayInfo(packageName, userId); + final PackageInfo targetPackage = + mPackageManager.getPackageInfo(oi.targetPackageName, userId); + List<OverlayInfo> allOverlays = getOverlayInfosForTarget(oi.targetPackageName, userId); + boolean modified = false; + // Disable all other overlays. allOverlays.remove(oi); for (int i = 0; i < allOverlays.size(); i++) { - // TODO: Optimize this to only send updates after all changes. - setEnabled(allOverlays.get(i).packageName, false, userId); + final String disabledOverlayPackageName = allOverlays.get(i).packageName; + final PackageInfo disabledOverlayPackageInfo = mPackageManager.getPackageInfo( + disabledOverlayPackageName, userId); + if (disabledOverlayPackageInfo == null) { + modified |= mSettings.remove(disabledOverlayPackageName, userId); + continue; + } + + if (disabledOverlayPackageInfo.isStaticOverlay) { + // Don't touch static overlays. + continue; + } + + // Disable the overlay. + modified |= mSettings.setEnabled(disabledOverlayPackageName, userId, false); + modified |= updateState(targetPackage, disabledOverlayPackageInfo, userId); } - setEnabled(packageName, enable, userId); + // Enable the selected overlay. + modified |= mSettings.setEnabled(packageName, userId, true); + modified |= updateState(targetPackage, overlayPackage, userId); + + if (modified) { + mListener.onOverlaysChanged(oi.targetPackageName, userId); + } return true; } catch (OverlayManagerSettings.BadKeyException e) { return false; } } - boolean isPackageUpdatableOverlay(@NonNull final String packageName, final int userId) { + private boolean isPackageUpdatableOverlay(@NonNull final String packageName, final int userId) { final PackageInfo overlayPackage = mPackageManager.getPackageInfo(packageName, userId); if (overlayPackage == null || overlayPackage.isStaticOverlay) { return false; @@ -346,18 +385,64 @@ final class OverlayManagerServiceImpl { boolean setPriority(@NonNull final String packageName, @NonNull final String newParentPackageName, final int userId) { - return isPackageUpdatableOverlay(packageName, userId) && - mSettings.setPriority(packageName, newParentPackageName, userId); + if (DEBUG) { + Slog.d(TAG, "setPriority packageName=" + packageName + " newParentPackageName=" + + newParentPackageName + " userId=" + userId); + } + + if (!isPackageUpdatableOverlay(packageName, userId)) { + return false; + } + + final PackageInfo overlayPackage = mPackageManager.getPackageInfo(packageName, userId); + if (overlayPackage == null) { + return false; + } + + if (mSettings.setPriority(packageName, newParentPackageName, userId)) { + mListener.onOverlaysChanged(overlayPackage.overlayTarget, userId); + } + return true; } boolean setHighestPriority(@NonNull final String packageName, final int userId) { - return isPackageUpdatableOverlay(packageName, userId) && - mSettings.setHighestPriority(packageName, userId); + if (DEBUG) { + Slog.d(TAG, "setHighestPriority packageName=" + packageName + " userId=" + userId); + } + + if (!isPackageUpdatableOverlay(packageName, userId)) { + return false; + } + + final PackageInfo overlayPackage = mPackageManager.getPackageInfo(packageName, userId); + if (overlayPackage == null) { + return false; + } + + if (mSettings.setHighestPriority(packageName, userId)) { + mListener.onOverlaysChanged(overlayPackage.overlayTarget, userId); + } + return true; } boolean setLowestPriority(@NonNull final String packageName, final int userId) { - return isPackageUpdatableOverlay(packageName, userId) && - mSettings.setLowestPriority(packageName, userId); + if (DEBUG) { + Slog.d(TAG, "setLowestPriority packageName=" + packageName + " userId=" + userId); + } + + if (!isPackageUpdatableOverlay(packageName, userId)) { + return false; + } + + final PackageInfo overlayPackage = mPackageManager.getPackageInfo(packageName, userId); + if (overlayPackage == null) { + return false; + } + + if (mSettings.setLowestPriority(packageName, userId)) { + mListener.onOverlaysChanged(overlayPackage.overlayTarget, userId); + } + return true; } void onDump(@NonNull final PrintWriter pw) { @@ -379,16 +464,19 @@ final class OverlayManagerServiceImpl { return paths; } - private void updateState(@Nullable final PackageInfo targetPackage, + /** + * Returns true if the settings/state was modified, false otherwise. + */ + private boolean updateState(@Nullable final PackageInfo targetPackage, @NonNull final PackageInfo overlayPackage, final int userId) - throws OverlayManagerSettings.BadKeyException { + throws OverlayManagerSettings.BadKeyException { // Static RROs targeting to "android", ie framework-res.apk, are handled by native layers. if (targetPackage != null && !("android".equals(targetPackage.packageName) && overlayPackage.isStaticOverlay)) { mIdmapManager.createIdmap(targetPackage, overlayPackage, userId); } - mSettings.setBaseCodePath(overlayPackage.packageName, userId, + boolean modified = mSettings.setBaseCodePath(overlayPackage.packageName, userId, overlayPackage.applicationInfo.getBaseCodePath()); final int currentState = mSettings.getState(overlayPackage.packageName, userId); @@ -400,8 +488,9 @@ final class OverlayManagerServiceImpl { OverlayInfo.stateToString(currentState), OverlayInfo.stateToString(newState))); } - mSettings.setState(overlayPackage.packageName, userId, newState); + modified |= mSettings.setState(overlayPackage.packageName, userId, newState); } + return modified; } private int calculateNewState(@Nullable final PackageInfo targetPackage, @@ -441,10 +530,8 @@ final class OverlayManagerServiceImpl { if (!mIdmapManager.idmapExists(oi)) { return; } - final List<Integer> userIds = mSettings.getUsers(); - final int N = userIds.size(); - for (int i = 0; i < N; i++) { - final int userId = userIds.get(i); + final int[] userIds = mSettings.getUsers(); + for (int userId : userIds) { try { final OverlayInfo tmp = mSettings.getOverlayInfo(oi.packageName, userId); if (tmp != null && tmp.isEnabled()) { @@ -458,6 +545,10 @@ final class OverlayManagerServiceImpl { mIdmapManager.removeIdmap(oi, oi.userId); } + interface OverlayChangeListener { + void onOverlaysChanged(@NonNull String targetPackage, int userId); + } + interface PackageManagerHelper { PackageInfo getPackageInfo(@NonNull String packageName, int userId); boolean signaturesMatching(@NonNull String packageName1, @NonNull String packageName2, diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java index 2262a2e0c208..72979f69a47d 100644 --- a/services/core/java/com/android/server/om/OverlayManagerSettings.java +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java @@ -16,17 +16,11 @@ package com.android.server.om; -import static android.content.om.OverlayInfo.STATE_UNKNOWN; - -import static com.android.server.om.OverlayManagerService.DEBUG; -import static com.android.server.om.OverlayManagerService.TAG; - import android.annotation.NonNull; import android.annotation.Nullable; import android.content.om.OverlayInfo; import android.util.AndroidRuntimeException; import android.util.ArrayMap; -import android.util.Slog; import android.util.Xml; import com.android.internal.util.FastXmlSerializer; @@ -41,252 +35,226 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; import java.util.List; -import java.util.ListIterator; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Data structure representing the current state of all overlay packages in the * system. * - * Modifications to the data are exposed through the ChangeListener interface. + * Modifications to the data are signaled by returning true from any state mutating method. * - * @see ChangeListener * @see OverlayManagerService */ final class OverlayManagerSettings { - private final List<ChangeListener> mListeners = new ArrayList<>(); - + /** + * All overlay data for all users and target packages is stored in this list. + * This keeps memory down, while increasing the cost of running queries or mutating the + * data. This is ok, since changing of overlays is very rare and has larger costs associated + * with it. + * + * The order of the items in the list is important, those with a lower index having a lower + * priority. + */ private final ArrayList<SettingsItem> mItems = new ArrayList<>(); void init(@NonNull final String packageName, final int userId, - @NonNull final String targetPackageName, @NonNull final String baseCodePath) { + @NonNull final String targetPackageName, @NonNull final String baseCodePath, + boolean isStatic, int priority) { remove(packageName, userId); final SettingsItem item = - new SettingsItem(packageName, userId, targetPackageName, baseCodePath); - mItems.add(item); + new SettingsItem(packageName, userId, targetPackageName, baseCodePath, + isStatic, priority); + if (isStatic) { + int i; + for (i = mItems.size() - 1; i >= 0; i--) { + SettingsItem parentItem = mItems.get(i); + if (parentItem.mIsStatic && parentItem.mPriority <= priority) { + break; + } + } + int pos = i + 1; + if (pos == mItems.size()) { + mItems.add(item); + } else { + mItems.add(pos, item); + } + } else { + mItems.add(item); + } } - void remove(@NonNull final String packageName, final int userId) { - final SettingsItem item = select(packageName, userId); - if (item == null) { - return; - } - final OverlayInfo oi = item.getOverlayInfo(); - mItems.remove(item); - if (oi != null) { - notifyOverlayRemoved(oi); + /** + * Returns true if the settings were modified, false if they remain the same. + */ + boolean remove(@NonNull final String packageName, final int userId) { + final int idx = select(packageName, userId); + if (idx < 0) { + return false; } - } - boolean contains(@NonNull final String packageName, final int userId) { - return select(packageName, userId) != null; + mItems.remove(idx); + return true; } OverlayInfo getOverlayInfo(@NonNull final String packageName, final int userId) throws BadKeyException { - final SettingsItem item = select(packageName, userId); - if (item == null) { + final int idx = select(packageName, userId); + if (idx < 0) { throw new BadKeyException(packageName, userId); } - return item.getOverlayInfo(); + return mItems.get(idx).getOverlayInfo(); } - String getTargetPackageName(@NonNull final String packageName, final int userId) - throws BadKeyException { - final SettingsItem item = select(packageName, userId); - if (item == null) { - throw new BadKeyException(packageName, userId); - } - return item.getTargetPackageName(); - } - - void setBaseCodePath(@NonNull final String packageName, final int userId, + /** + * Returns true if the settings were modified, false if they remain the same. + */ + boolean setBaseCodePath(@NonNull final String packageName, final int userId, @NonNull final String path) throws BadKeyException { - final SettingsItem item = select(packageName, userId); - if (item == null) { + final int idx = select(packageName, userId); + if (idx < 0) { throw new BadKeyException(packageName, userId); } - item.setBaseCodePath(path); - notifySettingsChanged(); + return mItems.get(idx).setBaseCodePath(path); } boolean getEnabled(@NonNull final String packageName, final int userId) throws BadKeyException { - final SettingsItem item = select(packageName, userId); - if (item == null) { + final int idx = select(packageName, userId); + if (idx < 0) { throw new BadKeyException(packageName, userId); } - return item.isEnabled(); + return mItems.get(idx).isEnabled(); } - void setEnabled(@NonNull final String packageName, final int userId, final boolean enable) + /** + * Returns true if the settings were modified, false if they remain the same. + */ + boolean setEnabled(@NonNull final String packageName, final int userId, final boolean enable) throws BadKeyException { - final SettingsItem item = select(packageName, userId); - if (item == null) { + final int idx = select(packageName, userId); + if (idx < 0) { throw new BadKeyException(packageName, userId); } - if (enable == item.isEnabled()) { - return; // nothing to do - } - - item.setEnabled(enable); - notifySettingsChanged(); + return mItems.get(idx).setEnabled(enable); } int getState(@NonNull final String packageName, final int userId) throws BadKeyException { - final SettingsItem item = select(packageName, userId); - if (item == null) { + final int idx = select(packageName, userId); + if (idx < 0) { throw new BadKeyException(packageName, userId); } - return item.getState(); + return mItems.get(idx).getState(); } - void setState(@NonNull final String packageName, final int userId, final int state) + /** + * Returns true if the settings were modified, false if they remain the same. + */ + boolean setState(@NonNull final String packageName, final int userId, final int state) throws BadKeyException { - final SettingsItem item = select(packageName, userId); - if (item == null) { + final int idx = select(packageName, userId); + if (idx < 0) { throw new BadKeyException(packageName, userId); } - final OverlayInfo previous = item.getOverlayInfo(); - item.setState(state); - final OverlayInfo current = item.getOverlayInfo(); - if (previous.state == STATE_UNKNOWN) { - notifyOverlayAdded(current); - notifySettingsChanged(); - } else if (current.state != previous.state) { - notifyOverlayChanged(current, previous); - notifySettingsChanged(); - } + return mItems.get(idx).setState(state); } List<OverlayInfo> getOverlaysForTarget(@NonNull final String targetPackageName, final int userId) { - final List<SettingsItem> items = selectWhereTarget(targetPackageName, userId); - if (items.isEmpty()) { - return Collections.emptyList(); - } - final List<OverlayInfo> out = new ArrayList<>(items.size()); - final int N = items.size(); - for (int i = 0; i < N; i++) { - final SettingsItem item = items.get(i); - out.add(item.getOverlayInfo()); - } - return out; + return selectWhereTarget(targetPackageName, userId) + .map(SettingsItem::getOverlayInfo) + .collect(Collectors.toList()); } ArrayMap<String, List<OverlayInfo>> getOverlaysForUser(final int userId) { - final List<SettingsItem> items = selectWhereUser(userId); - if (items.isEmpty()) { - return ArrayMap.EMPTY; - } - final ArrayMap<String, List<OverlayInfo>> out = new ArrayMap<>(items.size()); - final int N = items.size(); - for (int i = 0; i < N; i++) { - final SettingsItem item = items.get(i); - final String targetPackageName = item.getTargetPackageName(); - if (!out.containsKey(targetPackageName)) { - out.put(targetPackageName, new ArrayList<OverlayInfo>()); - } - final List<OverlayInfo> overlays = out.get(targetPackageName); - overlays.add(item.getOverlayInfo()); - } - return out; + return selectWhereUser(userId) + .map(SettingsItem::getOverlayInfo) + .collect(Collectors.groupingBy(info -> info.targetPackageName, ArrayMap::new, + Collectors.toList())); } - List<String> getTargetPackageNamesForUser(final int userId) { - final List<SettingsItem> items = selectWhereUser(userId); - if (items.isEmpty()) { - return Collections.emptyList(); - } - final List<String> out = new ArrayList<>(); - final int N = items.size(); - for (int i = 0; i < N; i++) { - final SettingsItem item = items.get(i); - final String targetPackageName = item.getTargetPackageName(); - if (!out.contains(targetPackageName)) { - out.add(targetPackageName); - } - } - return out; + int[] getUsers() { + return mItems.stream().mapToInt(SettingsItem::getUserId).distinct().toArray(); } - List<Integer> getUsers() { - final ArrayList<Integer> users = new ArrayList<>(); - final int N = mItems.size(); - for (int i = 0; i < N; i++) { + /** + * Returns true if the settings were modified, false if they remain the same. + */ + boolean removeUser(final int userId) { + boolean removed = false; + for (int i = 0; i < mItems.size(); i++) { final SettingsItem item = mItems.get(i); - if (!users.contains(item.userId)) { - users.add(item.userId); - } - } - return users; - } - - void removeUser(final int userId) { - final Iterator<SettingsItem> iter = mItems.iterator(); - while (iter.hasNext()) { - final SettingsItem item = iter.next(); - if (item.userId == userId) { - iter.remove(); + if (item.getUserId() == userId) { + mItems.remove(i); + removed = true; + i--; } } + return removed; } + /** + * Returns true if the settings were modified, false if they remain the same. + */ boolean setPriority(@NonNull final String packageName, @NonNull final String newParentPackageName, final int userId) { if (packageName.equals(newParentPackageName)) { return false; } - final SettingsItem rowToMove = select(packageName, userId); - if (rowToMove == null) { - return false; - } - final SettingsItem newParentRow = select(newParentPackageName, userId); - if (newParentRow == null) { + final int moveIdx = select(packageName, userId); + if (moveIdx < 0) { return false; } - if (!rowToMove.getTargetPackageName().equals(newParentRow.getTargetPackageName())) { + + final int parentIdx = select(newParentPackageName, userId); + if (parentIdx < 0) { return false; } - mItems.remove(rowToMove); - final ListIterator<SettingsItem> iter = mItems.listIterator(); - while (iter.hasNext()) { - final SettingsItem item = iter.next(); - if (item.userId == userId && item.packageName.equals(newParentPackageName)) { - iter.add(rowToMove); - notifyOverlayPriorityChanged(rowToMove.getOverlayInfo()); - notifySettingsChanged(); - return true; - } + final SettingsItem itemToMove = mItems.get(moveIdx); + + // Make sure both packages are targeting the same package. + if (!itemToMove.getTargetPackageName().equals( + mItems.get(parentIdx).getTargetPackageName())) { + return false; } - Slog.wtf(TAG, "failed to find the parent item a second time"); - return false; + mItems.remove(moveIdx); + final int newParentIdx = select(newParentPackageName, userId); + mItems.add(newParentIdx, itemToMove); + return moveIdx != newParentIdx; } + /** + * Returns true if the settings were modified, false if they remain the same. + */ boolean setLowestPriority(@NonNull final String packageName, final int userId) { - final SettingsItem item = select(packageName, userId); - if (item == null) { + final int idx = select(packageName, userId); + if (idx <= 0) { + // If the item doesn't exist or is already the lowest, don't change anything. return false; } + + final SettingsItem item = mItems.get(idx); mItems.remove(item); mItems.add(0, item); - notifyOverlayPriorityChanged(item.getOverlayInfo()); - notifySettingsChanged(); return true; } + /** + * Returns true if the settings were modified, false if they remain the same. + */ boolean setHighestPriority(@NonNull final String packageName, final int userId) { - final SettingsItem item = select(packageName, userId); - if (item == null) { + final int idx = select(packageName, userId); + + // If the item doesn't exist or is already the highest, don't change anything. + if (idx < 0 || idx == mItems.size() - 1) { return false; } - mItems.remove(item); + + final SettingsItem item = mItems.get(idx); + mItems.remove(idx); mItems.add(item); - notifyOverlayPriorityChanged(item.getOverlayInfo()); - notifySettingsChanged(); return true; } @@ -296,11 +264,6 @@ final class OverlayManagerSettings { void dump(@NonNull final PrintWriter pw) { pw.println("Settings"); - dumpItems(pw); - dumpListeners(pw); - } - - private void dumpItems(@NonNull final PrintWriter pw) { pw.println(TAB1 + "Items"); if (mItems.isEmpty()) { @@ -312,34 +275,18 @@ final class OverlayManagerSettings { for (int i = 0; i < N; i++) { final SettingsItem item = mItems.get(i); final StringBuilder sb = new StringBuilder(); - sb.append(TAB2 + item.packageName + ":" + item.userId + " {\n"); - sb.append(TAB3 + "packageName.......: " + item.packageName + "\n"); - sb.append(TAB3 + "userId............: " + item.userId + "\n"); - sb.append(TAB3 + "targetPackageName.: " + item.getTargetPackageName() + "\n"); - sb.append(TAB3 + "baseCodePath......: " + item.getBaseCodePath() + "\n"); - sb.append(TAB3 + "state.............: " + OverlayInfo.stateToString(item.getState()) + "\n"); - sb.append(TAB3 + "isEnabled.........: " + item.isEnabled() + "\n"); + sb.append(TAB2 + item.mPackageName + ":" + item.getUserId() + " {\n"); + sb.append(TAB3 + "mPackageName.......: " + item.mPackageName + "\n"); + sb.append(TAB3 + "mUserId............: " + item.getUserId() + "\n"); + sb.append(TAB3 + "mTargetPackageName.: " + item.getTargetPackageName() + "\n"); + sb.append(TAB3 + "mBaseCodePath......: " + item.getBaseCodePath() + "\n"); + sb.append(TAB3 + "mState.............: " + OverlayInfo.stateToString(item.getState()) + "\n"); + sb.append(TAB3 + "mIsEnabled.........: " + item.isEnabled() + "\n"); sb.append(TAB2 + "}"); pw.println(sb.toString()); } } - private void dumpListeners(@NonNull final PrintWriter pw) { - pw.println(TAB1 + "Change listeners"); - - if (mListeners.isEmpty()) { - pw.println(TAB2 + "<none>"); - return; - } - - final int N = mListeners.size(); - for (int i = 0; i < N; i++) { - final ChangeListener ch = mListeners.get(i); - pw.println(TAB2 + ch); - } - - } - void restore(@NonNull final InputStream is) throws IOException, XmlPullParserException { Serializer.restore(mItems, is); } @@ -357,6 +304,8 @@ final class OverlayManagerSettings { private static final String ATTR_PACKAGE_NAME = "packageName"; private static final String ATTR_STATE = "state"; private static final String ATTR_TARGET_PACKAGE_NAME = "targetPackageName"; + private static final String ATTR_IS_STATIC = "isStatic"; + private static final String ATTR_PRIORITY = "priority"; private static final String ATTR_USER_ID = "userId"; private static final String ATTR_VERSION = "version"; @@ -408,9 +357,11 @@ final class OverlayManagerSettings { final String baseCodePath = XmlUtils.readStringAttribute(parser, ATTR_BASE_CODE_PATH); final int state = XmlUtils.readIntAttribute(parser, ATTR_STATE); final boolean isEnabled = XmlUtils.readBooleanAttribute(parser, ATTR_IS_ENABLED); + final boolean isStatic = XmlUtils.readBooleanAttribute(parser, ATTR_IS_STATIC); + final int priority = XmlUtils.readIntAttribute(parser, ATTR_PRIORITY); return new SettingsItem(packageName, userId, targetPackageName, baseCodePath, state, - isEnabled); + isEnabled, isStatic, priority); } public static void persist(@NonNull final ArrayList<SettingsItem> table, @@ -434,208 +385,149 @@ final class OverlayManagerSettings { private static void persistRow(@NonNull final FastXmlSerializer xml, @NonNull final SettingsItem item) throws IOException { xml.startTag(null, TAG_ITEM); - XmlUtils.writeStringAttribute(xml, ATTR_PACKAGE_NAME, item.packageName); - XmlUtils.writeIntAttribute(xml, ATTR_USER_ID, item.userId); - XmlUtils.writeStringAttribute(xml, ATTR_TARGET_PACKAGE_NAME, item.targetPackageName); - XmlUtils.writeStringAttribute(xml, ATTR_BASE_CODE_PATH, item.baseCodePath); - XmlUtils.writeIntAttribute(xml, ATTR_STATE, item.state); - XmlUtils.writeBooleanAttribute(xml, ATTR_IS_ENABLED, item.isEnabled); + XmlUtils.writeStringAttribute(xml, ATTR_PACKAGE_NAME, item.mPackageName); + XmlUtils.writeIntAttribute(xml, ATTR_USER_ID, item.mUserId); + XmlUtils.writeStringAttribute(xml, ATTR_TARGET_PACKAGE_NAME, item.mTargetPackageName); + XmlUtils.writeStringAttribute(xml, ATTR_BASE_CODE_PATH, item.mBaseCodePath); + XmlUtils.writeIntAttribute(xml, ATTR_STATE, item.mState); + XmlUtils.writeBooleanAttribute(xml, ATTR_IS_ENABLED, item.mIsEnabled); + XmlUtils.writeBooleanAttribute(xml, ATTR_IS_STATIC, item.mIsStatic); + XmlUtils.writeIntAttribute(xml, ATTR_PRIORITY, item.mPriority); xml.endTag(null, TAG_ITEM); } } private static final class SettingsItem { - private final int userId; - private final String packageName; - private final String targetPackageName; - private String baseCodePath; - private int state; - private boolean isEnabled; - private OverlayInfo cache; + private final int mUserId; + private final String mPackageName; + private final String mTargetPackageName; + private String mBaseCodePath; + private int mState; + private boolean mIsEnabled; + private OverlayInfo mCache; + private boolean mIsStatic; + private int mPriority; SettingsItem(@NonNull final String packageName, final int userId, @NonNull final String targetPackageName, @NonNull final String baseCodePath, - final int state, final boolean isEnabled) { - this.packageName = packageName; - this.userId = userId; - this.targetPackageName = targetPackageName; - this.baseCodePath = baseCodePath; - this.state = state; - this.isEnabled = isEnabled; - cache = null; + final int state, final boolean isEnabled, final boolean isStatic, + final int priority) { + mPackageName = packageName; + mUserId = userId; + mTargetPackageName = targetPackageName; + mBaseCodePath = baseCodePath; + mState = state; + mIsEnabled = isEnabled; + mCache = null; + mIsStatic = isStatic; + mPriority = priority; } SettingsItem(@NonNull final String packageName, final int userId, - @NonNull final String targetPackageName, @NonNull final String baseCodePath) { - this(packageName, userId, targetPackageName, baseCodePath, STATE_UNKNOWN, - false); + @NonNull final String targetPackageName, @NonNull final String baseCodePath, + final boolean isStatic, final int priority) { + this(packageName, userId, targetPackageName, baseCodePath, OverlayInfo.STATE_UNKNOWN, + false, isStatic, priority); } private String getTargetPackageName() { - return targetPackageName; + return mTargetPackageName; + } + + private int getUserId() { + return mUserId; } private String getBaseCodePath() { - return baseCodePath; + return mBaseCodePath; } - private void setBaseCodePath(@NonNull final String path) { - if (!baseCodePath.equals(path)) { - baseCodePath = path; + private boolean setBaseCodePath(@NonNull final String path) { + if (!mBaseCodePath.equals(path)) { + mBaseCodePath = path; invalidateCache(); + return true; } + return false; } private int getState() { - return state; + return mState; } - private void setState(final int state) { - if (this.state != state) { - this.state = state; + private boolean setState(final int state) { + if (mState != state) { + mState = state; invalidateCache(); + return true; } + return false; } private boolean isEnabled() { - return isEnabled; + return mIsEnabled; } - private void setEnabled(final boolean enable) { - if (isEnabled != enable) { - isEnabled = enable; + private boolean setEnabled(final boolean enable) { + if (mIsEnabled != enable) { + mIsEnabled = enable; invalidateCache(); + return true; } + return false; } private OverlayInfo getOverlayInfo() { - if (cache == null) { - cache = new OverlayInfo(packageName, targetPackageName, baseCodePath, - state, userId); + if (mCache == null) { + mCache = new OverlayInfo(mPackageName, mTargetPackageName, mBaseCodePath, mState, + mUserId); } - return cache; + return mCache; } private void invalidateCache() { - cache = null; + mCache = null; } - } - private SettingsItem select(@NonNull final String packageName, final int userId) { - final int N = mItems.size(); - for (int i = 0; i < N; i++) { - final SettingsItem item = mItems.get(i); - if (item.userId == userId && item.packageName.equals(packageName)) { - return item; - } + private boolean isStatic() { + return mIsStatic; } - return null; - } - private List<SettingsItem> selectWhereUser(final int userId) { - final ArrayList<SettingsItem> items = new ArrayList<>(); - final int N = mItems.size(); - for (int i = 0; i < N; i++) { - final SettingsItem item = mItems.get(i); - if (item.userId == userId) { - items.add(item); - } + private int getPriority() { + return mPriority; } - return items; } - private List<SettingsItem> selectWhereTarget(@NonNull final String targetPackageName, - final int userId) { - final ArrayList<SettingsItem> items = new ArrayList<>(); + private int select(@NonNull final String packageName, final int userId) { final int N = mItems.size(); for (int i = 0; i < N; i++) { final SettingsItem item = mItems.get(i); - if (item.userId == userId && item.getTargetPackageName().equals(targetPackageName)) { - items.add(item); + if (item.mUserId == userId && item.mPackageName.equals(packageName)) { + return i; } } - return items; + return -1; } - private void assertNotNull(@Nullable final Object o) { - if (o == null) { - throw new AndroidRuntimeException("object must not be null"); - } + private Stream<SettingsItem> selectWhereUser(final int userId) { + return mItems.stream().filter(item -> item.mUserId == userId); } - void addChangeListener(@NonNull final ChangeListener listener) { - mListeners.add(listener); - } - - void removeChangeListener(@NonNull final ChangeListener listener) { - mListeners.remove(listener); - } - - private void notifySettingsChanged() { - final int N = mListeners.size(); - for (int i = 0; i < N; i++) { - final ChangeListener listener = mListeners.get(i); - listener.onSettingsChanged(); - } - } - - private void notifyOverlayAdded(@NonNull final OverlayInfo oi) { - if (DEBUG) { - assertNotNull(oi); - } - final int N = mListeners.size(); - for (int i = 0; i < N; i++) { - final ChangeListener listener = mListeners.get(i); - listener.onOverlayAdded(oi); - } - } - - private void notifyOverlayRemoved(@NonNull final OverlayInfo oi) { - if (DEBUG) { - assertNotNull(oi); - } - final int N = mListeners.size(); - for (int i = 0; i < N; i++) { - final ChangeListener listener = mListeners.get(i); - listener.onOverlayRemoved(oi); - } - } - - private void notifyOverlayChanged(@NonNull final OverlayInfo oi, - @NonNull final OverlayInfo oldOi) { - if (DEBUG) { - assertNotNull(oi); - assertNotNull(oldOi); - } - final int N = mListeners.size(); - for (int i = 0; i < N; i++) { - final ChangeListener listener = mListeners.get(i); - listener.onOverlayChanged(oi, oldOi); - } + private Stream<SettingsItem> selectWhereTarget(@NonNull final String targetPackageName, + final int userId) { + return selectWhereUser(userId) + .filter(item -> item.getTargetPackageName().equals(targetPackageName)); } - private void notifyOverlayPriorityChanged(@NonNull final OverlayInfo oi) { - if (DEBUG) { - assertNotNull(oi); - } - final int N = mListeners.size(); - for (int i = 0; i < N; i++) { - final ChangeListener listener = mListeners.get(i); - listener.onOverlayPriorityChanged(oi); + private void assertNotNull(@Nullable final Object o) { + if (o == null) { + throw new AndroidRuntimeException("object must not be null"); } } - interface ChangeListener { - void onSettingsChanged(); - void onOverlayAdded(@NonNull OverlayInfo oi); - void onOverlayRemoved(@NonNull OverlayInfo oi); - void onOverlayChanged(@NonNull OverlayInfo oi, @NonNull OverlayInfo oldOi); - void onOverlayPriorityChanged(@NonNull OverlayInfo oi); - } - static final class BadKeyException extends RuntimeException { BadKeyException(@NonNull final String packageName, final int userId) { - super("Bad key packageName=" + packageName + " userId=" + userId); + super("Bad key mPackageName=" + packageName + " mUserId=" + userId); } } } diff --git a/services/core/java/com/android/server/pm/EphemeralResolverConnection.java b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java index c4cc4fbf3cf0..e472928e4ab4 100644 --- a/services/core/java/com/android/server/pm/EphemeralResolverConnection.java +++ b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java @@ -32,6 +32,7 @@ import android.os.IRemoteCallback; import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; +import android.util.Slog; import android.util.TimedRemoteCaller; import com.android.internal.os.TransferPipe; @@ -49,9 +50,11 @@ import java.util.concurrent.TimeoutException; * @hide */ final class EphemeralResolverConnection implements DeathRecipient { + private static final String TAG = "PackageManager"; // This is running in a critical section and the timeout must be sufficiently low private static final long BIND_SERVICE_TIMEOUT_MS = ("eng".equals(Build.TYPE)) ? 300 : 200; + private static final boolean DEBUG_EPHEMERAL = Build.IS_DEBUGGABLE; private final Object mLock = new Object(); private final GetEphemeralResolveInfoCaller mGetEphemeralResolveInfoCaller = @@ -143,6 +146,9 @@ final class EphemeralResolverConnection implements DeathRecipient { if (!mBindRequested) { mBindRequested = true; + if (DEBUG_EPHEMERAL) { + Slog.d(TAG, "Binding to resolver service"); + } mContext.bindServiceAsUser(mIntent, mServiceConnection, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE, UserHandle.SYSTEM); } @@ -175,6 +181,9 @@ final class EphemeralResolverConnection implements DeathRecipient { @Override public void binderDied() { + if (DEBUG_EPHEMERAL) { + Slog.d(TAG, "Binder died"); + } if (mRemoteInstance != null) { mRemoteInstance.asBinder().unlinkToDeath(this, 0 /*flags*/); } @@ -193,6 +202,9 @@ final class EphemeralResolverConnection implements DeathRecipient { private final class MyServiceConnection implements ServiceConnection { @Override public void onServiceConnected(ComponentName name, IBinder service) { + if (DEBUG_EPHEMERAL) { + Slog.d(TAG, "Service connected"); + } synchronized (mLock) { try { service.linkToDeath(EphemeralResolverConnection.this, 0 /*flags*/); @@ -205,6 +217,9 @@ final class EphemeralResolverConnection implements DeathRecipient { @Override public void onServiceDisconnected(ComponentName name) { + if (DEBUG_EPHEMERAL) { + Slog.d(TAG, "Service disconnected"); + } synchronized (mLock) { mRemoteInstance = null; } diff --git a/services/core/java/com/android/server/pm/OtaDexoptService.java b/services/core/java/com/android/server/pm/OtaDexoptService.java index 498181b5179e..7b865429d0d7 100644 --- a/services/core/java/com/android/server/pm/OtaDexoptService.java +++ b/services/core/java/com/android/server/pm/OtaDexoptService.java @@ -95,9 +95,6 @@ public class OtaDexoptService extends IOtaDexopt.Stub { public OtaDexoptService(Context context, PackageManagerService packageManagerService) { this.mContext = context; this.mPackageManagerService = packageManagerService; - - // Now it's time to check whether we need to move any A/B artifacts. - moveAbArtifacts(packageManagerService.mInstaller); } public static OtaDexoptService main(Context context, @@ -105,6 +102,9 @@ public class OtaDexoptService extends IOtaDexopt.Stub { OtaDexoptService ota = new OtaDexoptService(context, packageManagerService); ServiceManager.addService("otadexopt", ota); + // Now it's time to check whether we need to move any A/B artifacts. + ota.moveAbArtifacts(packageManagerService.mInstaller); + return ota; } @@ -323,8 +323,15 @@ public class OtaDexoptService extends IOtaDexopt.Stub { throw new IllegalStateException("Should not be ota-dexopting when trying to move."); } + if (!mPackageManagerService.isUpgrade()) { + Slog.d(TAG, "No upgrade, skipping A/B artifacts check."); + return; + } + // Look into all packages. Collection<PackageParser.Package> pkgs = mPackageManagerService.getPackages(); + int packagePaths = 0; + int pathsSuccessful = 0; for (PackageParser.Package pkg : pkgs) { if (pkg == null) { continue; @@ -355,13 +362,16 @@ public class OtaDexoptService extends IOtaDexopt.Stub { // TODO: Check first whether there is an artifact, to save the roundtrip time. + packagePaths++; try { installer.moveAb(path, dexCodeInstructionSet, oatDir); + pathsSuccessful++; } catch (InstallerException e) { } } } } + Slog.i(TAG, "Moved " + pathsSuccessful + "/" + packagePaths); } /** diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index dd3959001f44..71f700cb6060 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -173,6 +173,7 @@ import android.content.pm.VerifierDeviceIdentity; import android.content.pm.VerifierInfo; import android.content.pm.VersionedPackage; import android.content.res.Resources; +import android.database.ContentObserver; import android.graphics.Bitmap; import android.hardware.display.DisplayManager; import android.net.Uri; @@ -396,7 +397,6 @@ public class PackageManagerService extends IPackageManager.Stub { /** REMOVE. According to Svet, this was only used to reset permissions during development. */ static final boolean CLEAR_RUNTIME_PERMISSIONS_ON_UPGRADE = false; - private static final boolean DISABLE_EPHEMERAL_APPS = false; private static final boolean HIDE_EPHEMERAL_APIS = false; private static final boolean ENABLE_FREE_CACHE_V2 = @@ -829,6 +829,7 @@ public class PackageManagerService extends IPackageManager.Stub { volatile boolean mSystemReady; volatile boolean mSafeMode; volatile boolean mHasSystemUidErrors; + private volatile boolean mEphemeralAppsDisabled; ApplicationInfo mAndroidApplication; final ActivityInfo mResolveActivity = new ActivityInfo(); @@ -4083,6 +4084,24 @@ public class PackageManagerService extends IPackageManager.Stub { return updateFlagsForComponent(flags, userId, intent /*cookie*/); } + private ActivityInfo generateActivityInfo(ActivityInfo ai, int flags, PackageUserState state, + int userId) { + ActivityInfo ret = PackageParser.generateActivityInfo(ai, flags, state, userId); + if (ret != null) { + rebaseEnabledOverlays(ret.applicationInfo, userId); + } + return ret; + } + + private ActivityInfo generateActivityInfo(PackageParser.Activity a, int flags, + PackageUserState state, int userId) { + ActivityInfo ai = PackageParser.generateActivityInfo(a, flags, state, userId); + if (ai != null) { + rebaseEnabledOverlays(ai.applicationInfo, userId); + } + return ai; + } + @Override public ActivityInfo getActivityInfo(ComponentName component, int flags, int userId) { if (!sUserManager.exists(userId)) return null; @@ -4096,12 +4115,11 @@ public class PackageManagerService extends IPackageManager.Stub { if (a != null && mSettings.isEnabledAndMatchLPr(a.info, flags, userId)) { PackageSetting ps = mSettings.mPackages.get(component.getPackageName()); if (ps == null) return null; - return PackageParser.generateActivityInfo(a, flags, ps.readUserState(userId), - userId); + return generateActivityInfo(a, flags, ps.readUserState(userId), userId); } if (mResolveComponentName.equals(component)) { - return PackageParser.generateActivityInfo(mResolveActivity, flags, - new PackageUserState(), userId); + return generateActivityInfo(mResolveActivity, flags, new PackageUserState(), + userId); } } return null; @@ -4142,12 +4160,7 @@ public class PackageManagerService extends IPackageManager.Stub { if (a != null && mSettings.isEnabledAndMatchLPr(a.info, flags, userId)) { PackageSetting ps = mSettings.mPackages.get(component.getPackageName()); if (ps == null) return null; - ActivityInfo ri = PackageParser.generateActivityInfo(a, flags, - ps.readUserState(userId), userId); - if (ri != null) { - rebaseEnabledOverlays(ri.applicationInfo, userId); - } - return ri; + return generateActivityInfo(a, flags, ps.readUserState(userId), userId); } } return null; @@ -5703,24 +5716,9 @@ public class PackageManagerService extends IPackageManager.Stub { /** * Returns whether or not instant apps have been disabled remotely. - * <p><em>IMPORTANT</em> This should not be called with the package manager lock - * held. Otherwise we run the risk of deadlock. */ private boolean isEphemeralDisabled() { - // ephemeral apps have been disabled across the board - if (DISABLE_EPHEMERAL_APPS) { - return true; - } - // system isn't up yet; can't read settings, so, assume no ephemeral apps - if (!mSystemReady) { - return true; - } - // we can't get a content resolver until the system is ready; these checks must happen last - final ContentResolver resolver = mContext.getContentResolver(); - if (Global.getInt(resolver, Global.ENABLE_EPHEMERAL_FEATURE, 1) == 0) { - return true; - } - return Secure.getInt(resolver, Secure.WEB_ACTION_ENABLED, 1) == 0; + return mEphemeralAppsDisabled; } private boolean isEphemeralAllowed( @@ -12307,8 +12305,7 @@ public class PackageManagerService extends IPackageManager.Stub { return null; } final PackageUserState userState = ps.readUserState(userId); - ActivityInfo ai = PackageParser.generateActivityInfo(activity, mFlags, - userState, userId); + ActivityInfo ai = generateActivityInfo(activity, mFlags, userState, userId); if (ai == null) { return null; } @@ -13391,6 +13388,7 @@ public class PackageManagerService extends IPackageManager.Stub { final PackageRemovedInfo info = new PackageRemovedInfo(); info.removedPackage = packageName; info.removedUsers = new int[] {userId}; + info.broadcastUsers = new int[] {userId}; info.uid = UserHandle.getUid(userId, pkgSetting.appId); info.sendPackageRemovedBroadcasts(true /*killApp*/); } @@ -18432,6 +18430,7 @@ public class PackageManagerService extends IPackageManager.Stub { outInfo.isStaticSharedLib = pkg != null && pkg.staticSharedLibName != null; outInfo.removedAppId = ps.appId; outInfo.removedUsers = userIds; + outInfo.broadcastUsers = userIds; } return true; @@ -20174,6 +20173,21 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); @Override public void systemReady() { mSystemReady = true; + final ContentResolver resolver = mContext.getContentResolver(); + ContentObserver co = new ContentObserver(mHandler) { + @Override + public void onChange(boolean selfChange) { + mEphemeralAppsDisabled = + (Global.getInt(resolver, Global.ENABLE_EPHEMERAL_FEATURE, 1) == 0) || + (Secure.getInt(resolver, Secure.WEB_ACTION_ENABLED, 1) == 0); + } + }; + mContext.getContentResolver().registerContentObserver(android.provider.Settings.Global + .getUriFor(Global.ENABLE_EPHEMERAL_FEATURE), + false, co, UserHandle.USER_SYSTEM); + mContext.getContentResolver().registerContentObserver(android.provider.Settings.Global + .getUriFor(Secure.WEB_ACTION_ENABLED), false, co, UserHandle.USER_SYSTEM); + co.onChange(true); // Disable any carrier apps. We do this very early in boot to prevent the apps from being // disabled after already being started. diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 6633efdc4141..95fb5af37b60 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -5255,11 +5255,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } - // Don't allow snapshots to influence SystemUI visibility flags. - // TODO: Revisit this once SystemUI flags for snapshots are handled correctly boolean appWindow = attrs.type >= FIRST_APPLICATION_WINDOW - && attrs.type < FIRST_SYSTEM_WINDOW - && (attrs.privateFlags & PRIVATE_FLAG_TASK_SNAPSHOT) == 0; + && attrs.type < FIRST_SYSTEM_WINDOW; final int stackId = win.getStackId(); if (mTopFullscreenOpaqueWindowState == null && visible) { if ((fl & FLAG_FORCE_NOT_FULLSCREEN) != 0) { diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java index be91f48fb76f..a519acc9e8fa 100644 --- a/services/core/java/com/android/server/tv/TvInputManagerService.java +++ b/services/core/java/com/android/server/tv/TvInputManagerService.java @@ -942,6 +942,50 @@ public final class TvInputManagerService extends SystemService { } @Override + public void sendTvInputNotifyIntent(Intent intent, int userId) { + if (mContext.checkCallingPermission(android.Manifest.permission.NOTIFY_TV_INPUTS) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException("The caller: " + getCallingPackageName() + + " doesn't have permission: " + + android.Manifest.permission.NOTIFY_TV_INPUTS); + } + if (TextUtils.isEmpty(intent.getPackage())) { + throw new IllegalArgumentException("Must specify package name to notify."); + } + switch (intent.getAction()) { + case TvContract.ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED: + if (intent.getLongExtra(TvContract.EXTRA_PREVIEW_PROGRAM_ID, -1) < 0) { + throw new IllegalArgumentException("Invalid preview program ID."); + } + break; + case TvContract.ACTION_WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED: + if (intent.getLongExtra(TvContract.EXTRA_WATCH_NEXT_PROGRAM_ID, -1) < 0) { + throw new IllegalArgumentException("Invalid watch next program ID."); + } + break; + case TvContract.ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT: + if (intent.getLongExtra(TvContract.EXTRA_PREVIEW_PROGRAM_ID, -1) < 0) { + throw new IllegalArgumentException("Invalid preview program ID."); + } + if (intent.getLongExtra(TvContract.EXTRA_WATCH_NEXT_PROGRAM_ID, -1) < 0) { + throw new IllegalArgumentException("Invalid watch next program ID."); + } + break; + default: + throw new IllegalArgumentException("Invalid TV input notifying action: " + + intent.getAction()); + } + final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), + Binder.getCallingUid(), userId, "sendTvInputNotifyIntent"); + final long identity = Binder.clearCallingIdentity(); + try { + getContext().sendBroadcastAsUser(intent, new UserHandle(resolvedUserId)); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + + @Override public void registerCallback(final ITvInputManagerCallback callback, int userId) { final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), Binder.getCallingUid(), userId, "registerCallback"); diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java index a39131cbaf03..e26914e5293d 100644 --- a/services/core/java/com/android/server/wm/AppWindowContainerController.java +++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java @@ -566,7 +566,7 @@ public class AppWindowContainerController return false; } - mContainer.startingData = new SnapshotStartingData(mService, snapshot.getSnapshot()); + mContainer.startingData = new SnapshotStartingData(mService, snapshot); scheduleAddStartingWindow(); return true; } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 21be74242aab..2f64cd42e668 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -1662,7 +1662,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo return stack; } - void moveStackToDisplay(TaskStack stack) { + void moveStackToDisplay(TaskStack stack, boolean onTop) { final DisplayContent prevDc = stack.getDisplayContent(); if (prevDc == null) { throw new IllegalStateException("Trying to move stackId=" + stack.mStackId @@ -1674,7 +1674,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } prevDc.mTaskStackContainers.removeStackFromDisplay(stack); - mTaskStackContainers.addStackToDisplay(stack, true /* onTop */); + mTaskStackContainers.addStackToDisplay(stack, onTop); } @Override @@ -2921,7 +2921,11 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo if (stack != null) { stack.getBounds(frame); } - } else if (!mutableIncludeFullDisplay.value && !w.mIsWallpaper) { + + // We want to screenshot with the exact bounds of the surface of the app. Thus, + // intersect it with the frame. + frame.intersect(w.mFrame); + }else if (!mutableIncludeFullDisplay.value && !w.mIsWallpaper) { final Rect wf = w.mFrame; final Rect cr = w.mContentInsets; int left = wf.left + cr.left; diff --git a/services/core/java/com/android/server/wm/SnapshotStartingData.java b/services/core/java/com/android/server/wm/SnapshotStartingData.java index e73d4d2559fb..35f35db5ada3 100644 --- a/services/core/java/com/android/server/wm/SnapshotStartingData.java +++ b/services/core/java/com/android/server/wm/SnapshotStartingData.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import android.app.ActivityManager.TaskSnapshot; import android.graphics.GraphicBuffer; import android.view.WindowManagerPolicy.StartingSurface; @@ -25,9 +26,9 @@ import android.view.WindowManagerPolicy.StartingSurface; class SnapshotStartingData extends StartingData { private final WindowManagerService mService; - private final GraphicBuffer mSnapshot; + private final TaskSnapshot mSnapshot; - SnapshotStartingData(WindowManagerService service, GraphicBuffer snapshot) { + SnapshotStartingData(WindowManagerService service, TaskSnapshot snapshot) { super(service); mService = service; mSnapshot = snapshot; diff --git a/services/core/java/com/android/server/wm/StackWindowController.java b/services/core/java/com/android/server/wm/StackWindowController.java index 5d0384e34e93..bf024cfdd7c3 100644 --- a/services/core/java/com/android/server/wm/StackWindowController.java +++ b/services/core/java/com/android/server/wm/StackWindowController.java @@ -100,7 +100,7 @@ public class StackWindowController } } - public void reparent(int displayId, Rect outStackBounds) { + public void reparent(int displayId, Rect outStackBounds, boolean onTop) { synchronized (mWindowMap) { if (mContainer == null) { throw new IllegalArgumentException("Trying to move unknown stackId=" + mStackId @@ -113,7 +113,7 @@ public class StackWindowController + " to unknown displayId=" + displayId); } - targetDc.moveStackToDisplay(mContainer); + targetDc.moveStackToDisplay(mContainer, onTop); getRawBounds(outStackBounds); } } diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 3ffb093ba386..b816d8199aa6 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -17,15 +17,14 @@ package com.android.server.wm; import static android.app.ActivityManager.RESIZE_MODE_SYSTEM_SCREEN_ROTATION; -import static android.app.ActivityManager.StackId.PINNED_STACK_ID; import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID; +import static android.app.ActivityManager.StackId.PINNED_STACK_ID; import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_LANDSCAPE_ONLY; -import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_PRESERVE_ORIENTATION; import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_PORTRAIT_ONLY; +import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_PRESERVE_ORIENTATION; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static com.android.server.EventLogTags.WM_TASK_REMOVED; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STACK; -import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_MOVEMENT; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; @@ -40,7 +39,6 @@ import android.view.DisplayInfo; import android.view.Surface; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.EventLogTags; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/wm/TaskSnapshotCache.java b/services/core/java/com/android/server/wm/TaskSnapshotCache.java index 1ec020180aa2..7bf4edb2c97a 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotCache.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotCache.java @@ -32,15 +32,10 @@ import java.util.Map.Entry; */ class TaskSnapshotCache { - // TODO: Make this more dynamic to accomodate for different clients. - private static final int RETRIEVAL_CACHE_SIZE = 4; - private final WindowManagerService mService; private final TaskSnapshotLoader mLoader; private final ArrayMap<AppWindowToken, Integer> mAppTaskMap = new ArrayMap<>(); private final ArrayMap<Integer, CacheEntry> mRunningCache = new ArrayMap<>(); - private final LruCache<Integer, TaskSnapshot> mRetrievalCache = - new LruCache<>(RETRIEVAL_CACHE_SIZE); TaskSnapshotCache(WindowManagerService service, TaskSnapshotLoader loader) { mService = service; @@ -55,7 +50,6 @@ class TaskSnapshotCache { final AppWindowToken top = task.getTopChild(); mAppTaskMap.put(top, task.mTaskId); mRunningCache.put(task.mTaskId, new CacheEntry(snapshot, task.getTopChild())); - mRetrievalCache.put(task.mTaskId, snapshot); } /** @@ -70,12 +64,6 @@ class TaskSnapshotCache { if (entry != null) { return entry.snapshot; } - - // Try the retrieval cache. - final TaskSnapshot snapshot = mRetrievalCache.get(taskId); - if (snapshot != null) { - return snapshot; - } } // Try to restore from disk if asked. @@ -93,13 +81,6 @@ class TaskSnapshotCache { if (snapshot == null) { return null; } - - // Only cache non-reduced snapshots. - if (!reducedResolution) { - synchronized (mService.mWindowMap) { - mRetrievalCache.put(taskId, snapshot); - } - } return snapshot; } @@ -111,9 +92,6 @@ class TaskSnapshotCache { if (taskId != null) { removeRunningEntry(taskId); } - if (wtoken.getTask() != null) { - mRetrievalCache.remove(wtoken.getTask().mTaskId); - } } /** @@ -128,7 +106,6 @@ class TaskSnapshotCache { void onTaskRemoved(int taskId) { removeRunningEntry(taskId); - mRetrievalCache.remove(taskId); } private void removeRunningEntry(int taskId) { @@ -142,20 +119,12 @@ class TaskSnapshotCache { void dump(PrintWriter pw, String prefix) { final String doublePrefix = prefix + " "; final String triplePrefix = doublePrefix + " "; - final String quadruplePrefix = triplePrefix + " "; pw.println(prefix + "SnapshotCache"); - pw.println(doublePrefix + "RunningCache"); for (int i = mRunningCache.size() - 1; i >= 0; i--) { final CacheEntry entry = mRunningCache.valueAt(i); - pw.println(triplePrefix + "Entry taskId=" + mRunningCache.keyAt(i)); - pw.println(quadruplePrefix + "topApp=" + entry.topApp); - pw.println(quadruplePrefix + "snapshot=" + entry.snapshot); - } - pw.println(doublePrefix + "RetrievalCache"); - final Map<Integer, TaskSnapshot> retrievalSnapshot = mRetrievalCache.snapshot(); - for (Entry<Integer, TaskSnapshot> entry : retrievalSnapshot.entrySet()) { - pw.println(triplePrefix + "Entry taskId=" + entry.getKey()); - pw.println(quadruplePrefix + "snapshot=" + entry.getValue()); + pw.println(doublePrefix + "Entry taskId=" + mRunningCache.keyAt(i)); + pw.println(triplePrefix + "topApp=" + entry.topApp); + pw.println(triplePrefix + "snapshot=" + entry.snapshot); } } diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java index b8d0b8c096fe..48b01f40fc65 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotController.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java @@ -28,6 +28,7 @@ import android.app.ActivityManager.StackId; import android.app.ActivityManager.TaskSnapshot; import android.graphics.Canvas; import android.graphics.GraphicBuffer; +import android.graphics.Rect; import android.os.Environment; import android.util.ArraySet; import android.view.WindowManagerPolicy.StartingSurface; @@ -152,7 +153,7 @@ class TaskSnapshotController { * MANAGER LOCK WHEN CALLING THIS METHOD! */ StartingSurface createStartingSurface(AppWindowToken token, - GraphicBuffer snapshot) { + TaskSnapshot snapshot) { return TaskSnapshotSurface.create(mService, token, snapshot); } @@ -166,8 +167,17 @@ class TaskSnapshotController { if (buffer == null) { return null; } + final WindowState mainWindow = top.findMainWindow(); return new TaskSnapshot(buffer, top.getConfiguration().orientation, - top.findMainWindow().mStableInsets, false /* reduced */, 1f /* scale */); + minRect(mainWindow.mContentInsets, mainWindow.mStableInsets), false /* reduced */, + 1f /* scale */); + } + + private Rect minRect(Rect rect1, Rect rect2) { + return new Rect(Math.min(rect1.left, rect2.left), + Math.min(rect1.top, rect2.top), + Math.min(rect1.right, rect2.right), + Math.min(rect1.bottom, rect2.bottom)); } /** diff --git a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java index 04403e2712c1..c816ba3fa796 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java @@ -16,20 +16,35 @@ package com.android.server.wm; -import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; -import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR; -import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; +import static android.graphics.Color.WHITE; +import static android.graphics.Color.alpha; +import static android.view.SurfaceControl.HIDDEN; +import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; +import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; +import static android.view.WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES; +import static android.view.WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; +import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; +import static android.view.WindowManager.LayoutParams.FLAG_SCALED; +import static android.view.WindowManager.LayoutParams.FLAG_SECURE; +import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY; +import static android.view.WindowManager.LayoutParams.FLAG_SPLIT_TOUCH; +import static android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DRAW_STATUS_BAR_BACKGROUND; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_TASK_SNAPSHOT; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; +import static com.android.internal.policy.DecorView.NAVIGATION_BAR_COLOR_VIEW_ATTRIBUTES; +import static com.android.internal.policy.DecorView.STATUS_BAR_COLOR_VIEW_ATTRIBUTES; +import static com.android.internal.policy.DecorView.getColorViewLeftInset; +import static com.android.internal.policy.DecorView.getColorViewTopInset; +import static com.android.internal.policy.DecorView.getNavigationBarRect; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import android.app.ActivityManager.TaskDescription; -import android.graphics.Bitmap; +import android.app.ActivityManager.TaskSnapshot; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.GraphicBuffer; import android.graphics.Paint; import android.graphics.Rect; @@ -37,17 +52,22 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.RemoteException; +import android.os.SystemClock; import android.util.MergedConfiguration; import android.util.Slog; import android.view.IWindowSession; import android.view.Surface; +import android.view.SurfaceControl; +import android.view.SurfaceSession; import android.view.View; import android.view.ViewGroup.LayoutParams; import android.view.WindowManager; import android.view.WindowManagerGlobal; import android.view.WindowManagerPolicy.StartingSurface; +import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.policy.DecorView; import com.android.internal.view.BaseIWindow; /** @@ -57,19 +77,57 @@ import com.android.internal.view.BaseIWindow; */ class TaskSnapshotSurface implements StartingSurface { + private static final long SIZE_MISMATCH_MINIMUM_TIME_MS = 450; + + /** + * When creating the starting window, we use the exact same layout flags such that we end up + * with a window with the exact same dimensions etc. However, these flags are not used in layout + * and might cause other side effects so we exclude them. + */ + private static final int FLAG_INHERIT_EXCLUDES = FLAG_NOT_FOCUSABLE + | FLAG_NOT_TOUCHABLE + | FLAG_NOT_TOUCH_MODAL + | FLAG_ALT_FOCUSABLE_IM + | FLAG_NOT_FOCUSABLE + | FLAG_HARDWARE_ACCELERATED + | FLAG_IGNORE_CHEEK_PRESSES + | FLAG_LOCAL_FOCUS_MODE + | FLAG_SLIPPERY + | FLAG_WATCH_OUTSIDE_TOUCH + | FLAG_SPLIT_TOUCH + | FLAG_SCALED + | FLAG_SECURE; + private static final String TAG = TAG_WITH_CLASS_NAME ? "SnapshotStartingWindow" : TAG_WM; private static final int MSG_REPORT_DRAW = 0; private static final String TITLE_FORMAT = "SnapshotStartingWindow for taskId=%s"; private final Window mWindow; private final Surface mSurface; + private SurfaceControl mChildSurfaceControl; private final IWindowSession mSession; private final WindowManagerService mService; + private final Rect mTaskBounds; + private final Rect mStableInsets = new Rect(); + private final Rect mContentInsets = new Rect(); + private final Rect mFrame = new Rect(); + private final TaskSnapshot mSnapshot; + private final CharSequence mTitle; private boolean mHasDrawn; private boolean mReportNextDraw; - private Paint mFillBackgroundPaint = new Paint(); + private long mShownTime; + private final Handler mHandler; + private boolean mSizeMismatch; + private final Paint mBackgroundPaint = new Paint(); + private final Paint mStatusBarPaint = new Paint(); + private final Paint mNavigationBarPaint = new Paint(); + private final int mStatusBarColor; + private final int mNavigationBarColor; + private final int mSysUiVis; + private final int mWindowFlags; + private final int mWindowPrivateFlags; static TaskSnapshotSurface create(WindowManagerService service, AppWindowToken token, - GraphicBuffer snapshot) { + TaskSnapshot snapshot) { final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams(); final Window window = new Window(); @@ -78,32 +136,51 @@ class TaskSnapshotSurface implements StartingSurface { final Surface surface = new Surface(); final Rect tmpRect = new Rect(); final Rect tmpFrame = new Rect(); + final Rect taskBounds; + final Rect tmpContentInsets = new Rect(); + final Rect tmpStableInsets = new Rect(); final MergedConfiguration tmpMergedConfiguration = new MergedConfiguration(); - int fillBackgroundColor = Color.WHITE; + int backgroundColor = WHITE; + int statusBarColor = 0; + int navigationBarColor = 0; + final int sysUiVis; + final int windowFlags; + final int windowPrivateFlags; synchronized (service.mWindowMap) { + final WindowState mainWindow = token.findMainWindow(); + if (mainWindow == null) { + Slog.w(TAG, "TaskSnapshotSurface.create: Failed to find main window for token=" + + token); + return null; + } + sysUiVis = mainWindow.getSystemUiVisibility(); + windowFlags = mainWindow.getAttrs().flags; + windowPrivateFlags = mainWindow.getAttrs().privateFlags; + layoutParams.type = TYPE_APPLICATION_STARTING; - layoutParams.format = snapshot.getFormat(); - layoutParams.flags = FLAG_LAYOUT_INSET_DECOR - | FLAG_LAYOUT_IN_SCREEN + layoutParams.format = snapshot.getSnapshot().getFormat(); + layoutParams.flags = (windowFlags & ~FLAG_INHERIT_EXCLUDES) | FLAG_NOT_FOCUSABLE - | FLAG_NOT_TOUCHABLE - | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; + | FLAG_NOT_TOUCHABLE; layoutParams.privateFlags = PRIVATE_FLAG_TASK_SNAPSHOT; layoutParams.token = token.token; layoutParams.width = LayoutParams.MATCH_PARENT; layoutParams.height = LayoutParams.MATCH_PARENT; - - // TODO: Inherit behavior whether to draw behind status bar/nav bar. - layoutParams.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION; + layoutParams.systemUiVisibility = sysUiVis; final Task task = token.getTask(); if (task != null) { - layoutParams.setTitle(String.format(TITLE_FORMAT,task.mTaskId)); + layoutParams.setTitle(String.format(TITLE_FORMAT, task.mTaskId)); final TaskDescription taskDescription = task.getTaskDescription(); if (taskDescription != null) { - fillBackgroundColor = taskDescription.getBackgroundColor(); + backgroundColor = taskDescription.getBackgroundColor(); + statusBarColor = taskDescription.getStatusBarColor(); + navigationBarColor = taskDescription.getNavigationBarColor(); } + taskBounds = new Rect(); + task.getBounds(taskBounds); + } else { + taskBounds = null; } } try { @@ -118,31 +195,55 @@ class TaskSnapshotSurface implements StartingSurface { // Local call. } final TaskSnapshotSurface snapshotSurface = new TaskSnapshotSurface(service, window, - surface, fillBackgroundColor); + surface, snapshot, layoutParams.getTitle(), backgroundColor, statusBarColor, + navigationBarColor, sysUiVis, windowFlags, windowPrivateFlags, taskBounds); window.setOuter(snapshotSurface); try { session.relayout(window, window.mSeq, layoutParams, -1, -1, View.VISIBLE, 0, tmpFrame, - tmpRect, tmpRect, tmpRect, tmpRect, tmpRect, tmpRect, tmpMergedConfiguration, - surface); + tmpRect, tmpContentInsets, tmpRect, tmpStableInsets, tmpRect, tmpRect, + tmpMergedConfiguration, surface); } catch (RemoteException e) { // Local call. } - snapshotSurface.drawSnapshot(snapshot); + snapshotSurface.setFrames(tmpFrame, tmpContentInsets, tmpStableInsets); + snapshotSurface.drawSnapshot(); return snapshotSurface; } @VisibleForTesting TaskSnapshotSurface(WindowManagerService service, Window window, Surface surface, - int fillBackgroundColor) { + TaskSnapshot snapshot, CharSequence title, int backgroundColor, int statusBarColor, + int navigationBarColor, int sysUiVis, int windowFlags, int windowPrivateFlags, + Rect taskBounds) { mService = service; + mHandler = new Handler(mService.mH.getLooper()); mSession = WindowManagerGlobal.getWindowSession(); mWindow = window; mSurface = surface; - mFillBackgroundPaint.setColor(fillBackgroundColor); + mSnapshot = snapshot; + mTitle = title; + mBackgroundPaint.setColor(backgroundColor != 0 ? backgroundColor : WHITE); + mTaskBounds = taskBounds; + mSysUiVis = sysUiVis; + mWindowFlags = windowFlags; + mWindowPrivateFlags = windowPrivateFlags; + mStatusBarColor = DecorView.calculateStatusBarColor(windowFlags, + service.mContext.getColor(R.color.system_bar_background_semi_transparent), + statusBarColor); + mNavigationBarColor = navigationBarColor; + mStatusBarPaint.setColor(mStatusBarColor); + mNavigationBarPaint.setColor(navigationBarColor); } @Override public void remove() { + synchronized (mService.mWindowMap) { + final long now = SystemClock.uptimeMillis(); + if (mSizeMismatch && now - mShownTime < SIZE_MISMATCH_MINIMUM_TIME_MS) { + mHandler.postAtTime(this::remove, mShownTime + SIZE_MISMATCH_MINIMUM_TIME_MS); + return; + } + } try { mSession.remove(mWindow); } catch (RemoteException e) { @@ -150,31 +251,151 @@ class TaskSnapshotSurface implements StartingSurface { } } - private void drawSnapshot(GraphicBuffer snapshot) { - mSurface.attachAndQueueBuffer(snapshot); + @VisibleForTesting + void setFrames(Rect frame, Rect contentInsets, Rect stableInsets) { + mFrame.set(frame); + mContentInsets.set(contentInsets); + mStableInsets.set(stableInsets); + mSizeMismatch = (mFrame.width() != mSnapshot.getSnapshot().getWidth() + || mFrame.height() != mSnapshot.getSnapshot().getHeight()); + } + + private void drawSnapshot() { + final GraphicBuffer buffer = mSnapshot.getSnapshot(); + if (mSizeMismatch) { + // The dimensions of the buffer and the window don't match, so attaching the buffer + // will fail. Better create a child window with the exact dimensions and fill the parent + // window with the background color! + drawSizeMismatchSnapshot(buffer); + } else { + drawSizeMatchSnapshot(buffer); + } final boolean reportNextDraw; synchronized (mService.mWindowMap) { + mShownTime = SystemClock.uptimeMillis(); mHasDrawn = true; reportNextDraw = mReportNextDraw; } if (reportNextDraw) { reportDrawn(); } + } + + private void drawSizeMatchSnapshot(GraphicBuffer buffer) { + mSurface.attachAndQueueBuffer(buffer); + mSurface.release(); + } + + private void drawSizeMismatchSnapshot(GraphicBuffer buffer) { + final SurfaceSession session = new SurfaceSession(mSurface); + + // Keep a reference to it such that it doesn't get destroyed when finalized. + mChildSurfaceControl = new SurfaceControl(session, + mTitle + " - task-snapshot-surface", + buffer.getWidth(), buffer.getHeight(), buffer.getFormat(), HIDDEN); + Surface surface = new Surface(); + surface.copyFrom(mChildSurfaceControl); + + // Clip off ugly navigation bar. + final Rect crop = calculateSnapshotCrop(); + final Rect frame = calculateSnapshotFrame(crop); + SurfaceControl.openTransaction(); + try { + // We can just show the surface here as it will still be hidden as the parent is + // still hidden. + mChildSurfaceControl.show(); + mChildSurfaceControl.setWindowCrop(crop); + mChildSurfaceControl.setPosition(frame.left, frame.top); + } finally { + SurfaceControl.closeTransaction(); + } + surface.attachAndQueueBuffer(buffer); + surface.release(); + + final Canvas c = mSurface.lockCanvas(null); + drawBackgroundAndBars(c, frame); + mSurface.unlockCanvasAndPost(c); mSurface.release(); } @VisibleForTesting - void fillEmptyBackground(Canvas c, Bitmap b) { - final boolean fillHorizontally = c.getWidth() > b.getWidth(); - final boolean fillVertically = c.getHeight() > b.getHeight(); + Rect calculateSnapshotCrop() { + final Rect rect = new Rect(); + rect.set(0, 0, mSnapshot.getSnapshot().getWidth(), mSnapshot.getSnapshot().getHeight()); + final Rect insets = mSnapshot.getContentInsets(); + + // Let's remove all system decorations except the status bar, but only if the task is at the + // very top of the screen. + rect.inset(insets.left, mTaskBounds.top != 0 ? insets.top : 0, insets.right, insets.bottom); + return rect; + } + + @VisibleForTesting + Rect calculateSnapshotFrame(Rect crop) { + final Rect frame = new Rect(crop); + + // By default, offset it to to top/left corner + frame.offsetTo(-crop.left, -crop.top); + + // However, we also need to make space for the navigation bar on the left side. + final int colorViewLeftInset = getColorViewLeftInset(mStableInsets.left, + mContentInsets.left); + frame.offset(colorViewLeftInset, 0); + return frame; + } + + @VisibleForTesting + void drawBackgroundAndBars(Canvas c, Rect frame) { + final int statusBarHeight = getStatusBarColorViewHeight(); + final boolean fillHorizontally = c.getWidth() > frame.right; + final boolean fillVertically = c.getHeight() > frame.bottom; if (fillHorizontally) { - c.drawRect(b.getWidth(), 0, c.getWidth(), fillVertically - ? b.getHeight() - : c.getHeight(), - mFillBackgroundPaint); + c.drawRect(frame.right, alpha(mStatusBarColor) == 0xFF ? statusBarHeight : 0, + c.getWidth(), fillVertically + ? frame.bottom + : c.getHeight(), + mBackgroundPaint); } if (fillVertically) { - c.drawRect(0, b.getHeight(), c.getWidth(), c.getHeight(), mFillBackgroundPaint); + c.drawRect(0, frame.bottom, c.getWidth(), c.getHeight(), mBackgroundPaint); + } + drawStatusBarBackground(c, frame, statusBarHeight); + drawNavigationBarBackground(c); + } + + private int getStatusBarColorViewHeight() { + final boolean forceStatusBarBackground = + (mWindowPrivateFlags & PRIVATE_FLAG_FORCE_DRAW_STATUS_BAR_BACKGROUND) != 0; + if (STATUS_BAR_COLOR_VIEW_ATTRIBUTES.isVisible( + mSysUiVis, mStatusBarColor, mWindowFlags, forceStatusBarBackground)) { + return getColorViewTopInset(mStableInsets.top, mContentInsets.top); + } else { + return 0; + } + } + + private boolean isNavigationBarColorViewVisible() { + return NAVIGATION_BAR_COLOR_VIEW_ATTRIBUTES.isVisible( + mSysUiVis, mNavigationBarColor, mWindowFlags, false /* force */); + } + + @VisibleForTesting + void drawStatusBarBackground(Canvas c, Rect frame, int statusBarHeight) { + if (statusBarHeight > 0 && c.getWidth() > frame.right) { + final int rightInset = DecorView.getColorViewRightInset(mStableInsets.right, + mContentInsets.right); + c.drawRect(frame.right, 0, c.getWidth() - rightInset, statusBarHeight, mStatusBarPaint); + } + } + + @VisibleForTesting + void drawNavigationBarBackground(Canvas c) { + final Rect navigationBarRect = new Rect(); + getNavigationBarRect(c.getWidth(), c.getHeight(), mStableInsets, mContentInsets, + navigationBarRect); + final boolean visible = isNavigationBarColorViewVisible(); + if (visible && !navigationBarRect.isEmpty()) { + c.drawRect(navigationBarRect, mNavigationBarPaint); } } @@ -211,10 +432,10 @@ class TaskSnapshotSurface implements StartingSurface { } }; - private static class Window extends BaseIWindow { + @VisibleForTesting + static class Window extends BaseIWindow { private TaskSnapshotSurface mOuter; - public void setOuter(TaskSnapshotSurface outer) { mOuter = outer; } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index f74512a00122..e47da552c717 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1437,7 +1437,8 @@ public final class SystemServer { traceEnd(); } - if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_LIVE_TV)) { + if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_LIVE_TV) + || mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) { traceBeginAndSlog("StartTvInputManager"); mSystemServiceManager.startService(TvInputManagerService.class); traceEnd(); diff --git a/services/tests/notification/Android.mk b/services/tests/notification/Android.mk index a5d557048232..940db792489e 100644 --- a/services/tests/notification/Android.mk +++ b/services/tests/notification/Android.mk @@ -23,7 +23,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ guava \ android-support-test \ mockito-target-minus-junit4 \ - platform-test-annotations + platform-test-annotations \ + testables LOCAL_JAVA_LIBRARIES := android.test.runner diff --git a/services/tests/notification/AndroidManifest.xml b/services/tests/notification/AndroidManifest.xml index cf050a89b0e6..99d9c7b87301 100644 --- a/services/tests/notification/AndroidManifest.xml +++ b/services/tests/notification/AndroidManifest.xml @@ -24,6 +24,7 @@ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> + <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" /> <application> <uses-library android:name="android.test.runner" /> diff --git a/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java index 4c23d79cf7ff..6aa8f3a8010e 100644 --- a/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -16,6 +16,8 @@ package com.android.server.notification; +import static android.app.NotificationManager.IMPORTANCE_LOW; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; @@ -26,6 +28,8 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -33,24 +37,29 @@ import static org.mockito.Mockito.when; import android.app.INotificationManager; import android.app.Notification; import android.app.NotificationChannel; +import android.app.NotificationChannelGroup; import android.app.NotificationManager; +import android.companion.ICompanionDeviceManager; import android.content.ComponentName; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.pm.ParceledListSlice; +import android.graphics.Color; import android.os.Binder; -import android.os.HandlerThread; -import android.os.MessageQueue; import android.os.UserHandle; +import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; import android.support.test.annotation.UiThreadTest; import android.support.test.InstrumentationRegistry; +import android.testing.TestableLooper; +import java.util.ArrayList; import java.util.Arrays; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import java.util.List; + +import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -64,66 +73,63 @@ public class NotificationManagerServiceTest { private final int uid = Binder.getCallingUid(); private NotificationManagerService mNotificationManagerService; private INotificationManager mBinderService; + private NotificationManagerInternal mInternalService; private IPackageManager mPackageManager = mock(IPackageManager.class); private final PackageManager mPackageManagerClient = mock(PackageManager.class); private Context mContext = InstrumentationRegistry.getTargetContext(); private final String PKG = mContext.getPackageName(); - private HandlerThread mThread; + private TestableLooper mTestableLooper; private final RankingHelper mRankingHelper = mock(RankingHelper.class); private NotificationChannel mTestNotificationChannel = new NotificationChannel( TEST_CHANNEL_ID, TEST_CHANNEL_ID, NotificationManager.IMPORTANCE_DEFAULT); + private NotificationManagerService.NotificationListeners mNotificationListeners = + mock(NotificationManagerService.NotificationListeners.class); + private ManagedServices.ManagedServiceInfo mListener = + mNotificationListeners.new ManagedServiceInfo( + null, new ComponentName(PKG, "test_class"), uid, true, null, 0); + private ICompanionDeviceManager mCompanionMgr = mock(ICompanionDeviceManager.class); + + // Use a Testable subclass so we can simulate calls from the system without failing. + private static class TestableNotificationManagerService extends NotificationManagerService { + public TestableNotificationManagerService(Context context) { super(context); } + + @Override + protected boolean isCallerSystem() { + return true; + } + } @Before - @Test @UiThreadTest public void setUp() throws Exception { - mNotificationManagerService = new NotificationManagerService(mContext); + mNotificationManagerService = new TestableNotificationManagerService(mContext); // MockPackageManager - default returns ApplicationInfo with matching calling UID final ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.uid = uid; - when(mPackageManager.getApplicationInfo(any(), anyInt(), anyInt())) + when(mPackageManager.getApplicationInfo(anyString(), anyInt(), anyInt())) .thenReturn(applicationInfo); when(mPackageManagerClient.getApplicationInfoAsUser(anyString(), anyInt(), anyInt())) .thenReturn(applicationInfo); final LightsManager mockLightsManager = mock(LightsManager.class); when(mockLightsManager.getLight(anyInt())).thenReturn(mock(Light.class)); - // Use a separate thread for service looper. - mThread = new HandlerThread("TestThread"); - mThread.start(); - // Mock NotificationListeners to bypass security checks. - final NotificationManagerService.NotificationListeners mockNotificationListeners = - mock(NotificationManagerService.NotificationListeners.class); - when(mockNotificationListeners.checkServiceTokenLocked(any())).thenReturn( - mockNotificationListeners.new ManagedServiceInfo(null, - new ComponentName(PKG, "test_class"), uid, true, null, 0)); - - mNotificationManagerService.init(mThread.getLooper(), mPackageManager, - mPackageManagerClient, mockLightsManager, mockNotificationListeners); + // Use this testable looper. + mTestableLooper = new TestableLooper(false); + + when(mNotificationListeners.checkServiceTokenLocked(any())).thenReturn(mListener); + mNotificationManagerService.init(mTestableLooper.getLooper(), mPackageManager, + mPackageManagerClient, mockLightsManager, mNotificationListeners, mCompanionMgr); // Tests call directly into the Binder. mBinderService = mNotificationManagerService.getBinderService(); + mInternalService = mNotificationManagerService.getInternalService(); mBinderService.createNotificationChannels( PKG, new ParceledListSlice(Arrays.asList(mTestNotificationChannel))); } public void waitForIdle() throws Exception { - MessageQueue queue = mThread.getLooper().getQueue(); - if (queue.isIdle()) { - return; - } - CountDownLatch latch = new CountDownLatch(1); - queue.addIdleHandler(new MessageQueue.IdleHandler() { - @Override public boolean queueIdle() { - latch.countDown(); - return false; - } - }); - // Timeout is valid in the cases where the queue goes idle before the IdleHandler - // is added. - latch.await(WAIT_FOR_IDLE_TIMEOUT, TimeUnit.SECONDS); - waitForIdle(); + mTestableLooper.processAllMessages(); } private NotificationRecord generateNotificationRecord(NotificationChannel channel) { @@ -260,7 +266,6 @@ public class NotificationManagerServiceTest { @Test @UiThreadTest - @Ignore("Flaky") public void testEnqueueNotificationWithTag_PopulatesGetActiveNotifications() throws Exception { mBinderService.enqueueNotificationWithTag(PKG, "opPkg", "tag", 0, generateNotificationRecord(null).getNotification(), new int[1], 0); @@ -380,6 +385,21 @@ public class NotificationManagerServiceTest { @Test @UiThreadTest + public void testRemoveForegroundServiceFlag_ImmediatelyAfterEnqueue() throws Exception { + final StatusBarNotification sbn = generateNotificationRecord(null).sbn; + sbn.getNotification().flags |= Notification.FLAG_FOREGROUND_SERVICE; + mBinderService.enqueueNotificationWithTag(PKG, "opPkg", null, + sbn.getId(), sbn.getNotification(), new int[1], sbn.getUserId()); + mInternalService.removeForegroundServiceFlagFromNotification(PKG, sbn.getId(), + sbn.getUserId()); + waitForIdle(); + StatusBarNotification[] notifs = + mBinderService.getActiveNotifications(sbn.getPackageName()); + assertEquals(0, notifs[0].getNotification().flags & Notification.FLAG_FOREGROUND_SERVICE); + } + + @Test + @UiThreadTest public void testTvExtenderChannelOverride_onTv() throws Exception { mNotificationManagerService.setIsTelevision(true); mNotificationManagerService.setRankingHelper(mRankingHelper); @@ -409,4 +429,206 @@ public class NotificationManagerServiceTest { verify(mRankingHelper, times(1)).getNotificationChannel( anyString(), anyInt(), eq(mTestNotificationChannel.getId()), anyBoolean()); } + + @Test + @UiThreadTest + public void testCreateChannelNotifyListener() throws Exception { + List<String> associations = new ArrayList<>(); + associations.add("a"); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + mNotificationManagerService.setRankingHelper(mRankingHelper); + when(mRankingHelper.getNotificationChannel(eq(PKG), anyInt(), + eq(mTestNotificationChannel.getId()), anyBoolean())) + .thenReturn(mTestNotificationChannel); + NotificationChannel channel2 = new NotificationChannel("a", "b", IMPORTANCE_LOW); + when(mRankingHelper.getNotificationChannel(eq(PKG), anyInt(), + eq(channel2.getId()), anyBoolean())) + .thenReturn(channel2); + + reset(mNotificationListeners); + mBinderService.createNotificationChannels(PKG, + new ParceledListSlice(Arrays.asList(mTestNotificationChannel, channel2))); + verify(mNotificationListeners, times(1)).notifyNotificationChannelChanged(eq(PKG), + eq(mTestNotificationChannel), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_ADDED)); + verify(mNotificationListeners, times(1)).notifyNotificationChannelChanged(eq(PKG), + eq(channel2), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_ADDED)); + } + + @Test + @UiThreadTest + public void testCreateChannelGroupNotifyListener() throws Exception { + List<String> associations = new ArrayList<>(); + associations.add("a"); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + mNotificationManagerService.setRankingHelper(mRankingHelper); + NotificationChannelGroup group1 = new NotificationChannelGroup("a", "b"); + NotificationChannelGroup group2 = new NotificationChannelGroup("n", "m"); + + reset(mNotificationListeners); + mBinderService.createNotificationChannelGroups(PKG, + new ParceledListSlice(Arrays.asList(group1, group2))); + verify(mNotificationListeners, times(1)).notifyNotificationChannelGroupChanged(eq(PKG), + eq(group1), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_ADDED)); + verify(mNotificationListeners, times(1)).notifyNotificationChannelGroupChanged(eq(PKG), + eq(group2), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_ADDED)); + } + + @Test + @UiThreadTest + public void testUpdateChannelNotifyListener() throws Exception { + List<String> associations = new ArrayList<>(); + associations.add("a"); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + mNotificationManagerService.setRankingHelper(mRankingHelper); + mTestNotificationChannel.setLightColor(Color.CYAN); + when(mRankingHelper.getNotificationChannel(eq(PKG), anyInt(), + eq(mTestNotificationChannel.getId()), anyBoolean())) + .thenReturn(mTestNotificationChannel); + + reset(mNotificationListeners); + mBinderService.updateNotificationChannelForPackage(PKG, 0, mTestNotificationChannel); + verify(mNotificationListeners, times(1)).notifyNotificationChannelChanged(eq(PKG), + eq(mTestNotificationChannel), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); + } + + @Test + @UiThreadTest + public void testDeleteChannelNotifyListener() throws Exception { + List<String> associations = new ArrayList<>(); + associations.add("a"); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + mNotificationManagerService.setRankingHelper(mRankingHelper); + when(mRankingHelper.getNotificationChannel(eq(PKG), anyInt(), + eq(mTestNotificationChannel.getId()), anyBoolean())) + .thenReturn(mTestNotificationChannel); + reset(mNotificationListeners); + mBinderService.deleteNotificationChannel(PKG, mTestNotificationChannel.getId()); + verify(mNotificationListeners, times(1)).notifyNotificationChannelChanged(eq(PKG), + eq(mTestNotificationChannel), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_DELETED)); + } + + @Test + @UiThreadTest + public void testDeleteChannelGroupNotifyListener() throws Exception { + List<String> associations = new ArrayList<>(); + associations.add("a"); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + NotificationChannelGroup ncg = new NotificationChannelGroup("a", "b/c"); + mNotificationManagerService.setRankingHelper(mRankingHelper); + when(mRankingHelper.getNotificationChannelGroup(eq(ncg.getId()), eq(PKG), anyInt())) + .thenReturn(ncg); + reset(mNotificationListeners); + mBinderService.deleteNotificationChannelGroup(PKG, ncg.getId()); + verify(mNotificationListeners, times(1)).notifyNotificationChannelGroupChanged(eq(PKG), + eq(ncg), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_DELETED)); + } + + @Test + @UiThreadTest + public void testUpdateNotificationChannelFromPrivilegedListener_success() throws Exception { + mNotificationManagerService.setRankingHelper(mRankingHelper); + List<String> associations = new ArrayList<>(); + associations.add("a"); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + + mBinderService.updateNotificationChannelFromPrivilegedListener( + null, PKG, mTestNotificationChannel); + + verify(mRankingHelper, times(1)).updateNotificationChannel(anyString(), anyInt(), any()); + + verify(mNotificationListeners, never()).notifyNotificationChannelChanged(eq(PKG), + eq(mTestNotificationChannel), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); + } + + @Test + @UiThreadTest + public void testUpdateNotificationChannelFromPrivilegedListener_noAccess() throws Exception { + mNotificationManagerService.setRankingHelper(mRankingHelper); + List<String> associations = new ArrayList<>(); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + + try { + mBinderService.updateNotificationChannelFromPrivilegedListener( + null, PKG, mTestNotificationChannel); + fail("listeners that don't have a companion device shouldn't be able to call this"); + } catch (SecurityException e) { + // pass + } + + verify(mRankingHelper, never()).updateNotificationChannel(anyString(), anyInt(), any()); + + verify(mNotificationListeners, never()).notifyNotificationChannelChanged(eq(PKG), + eq(mTestNotificationChannel), + eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); + } + + @Test + @UiThreadTest + public void testGetNotificationChannelFromPrivilegedListener_success() throws Exception { + mNotificationManagerService.setRankingHelper(mRankingHelper); + List<String> associations = new ArrayList<>(); + associations.add("a"); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + + mBinderService.getNotificationChannelsFromPrivilegedListener(null, PKG); + + verify(mRankingHelper, times(1)).getNotificationChannels( + anyString(), anyInt(), anyBoolean()); + } + + @Test + @UiThreadTest + public void testGetNotificationChannelFromPrivilegedListener_noAccess() throws Exception { + mNotificationManagerService.setRankingHelper(mRankingHelper); + List<String> associations = new ArrayList<>(); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + + try { + mBinderService.getNotificationChannelsFromPrivilegedListener(null, PKG); + fail("listeners that don't have a companion device shouldn't be able to call this"); + } catch (SecurityException e) { + // pass + } + + verify(mRankingHelper, never()).getNotificationChannels( + anyString(), anyInt(), anyBoolean()); + } + + @Test + @UiThreadTest + public void testGetNotificationChannelGroupsFromPrivilegedListener_success() throws Exception { + mNotificationManagerService.setRankingHelper(mRankingHelper); + List<String> associations = new ArrayList<>(); + associations.add("a"); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + + mBinderService.getNotificationChannelGroupsFromPrivilegedListener(null, PKG); + + verify(mRankingHelper, times(1)).getNotificationChannelGroups(anyString(), anyInt()); + } + + @Test + @UiThreadTest + public void testGetNotificationChannelGroupsFromPrivilegedListener_noAccess() throws Exception { + mNotificationManagerService.setRankingHelper(mRankingHelper); + List<String> associations = new ArrayList<>(); + when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations); + + try { + mBinderService.getNotificationChannelGroupsFromPrivilegedListener(null, PKG); + fail("listeners that don't have a companion device shouldn't be able to call this"); + } catch (SecurityException e) { + // pass + } + + verify(mRankingHelper, never()).getNotificationChannelGroups(anyString(), anyInt()); + } } diff --git a/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java index d7d365e72480..0270bb955988 100644 --- a/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java @@ -181,7 +181,7 @@ public class DisplayContentTests extends WindowTestsBase { assertEquals(dc, token.getDisplayContent()); // Move stack to first display. - sDisplayContent.moveStackToDisplay(stack); + sDisplayContent.moveStackToDisplay(stack, true /* onTop */); assertEquals(sDisplayContent.getDisplayId(), stack.getDisplayContent().getDisplayId()); assertEquals(sDisplayContent, stack.getParent().getParent()); assertEquals(sDisplayContent, stack.getDisplayContent()); diff --git a/services/tests/servicestests/src/com/android/server/wm/StackWindowControllerTests.java b/services/tests/servicestests/src/com/android/server/wm/StackWindowControllerTests.java index 13098f64bfac..61f7f5708e89 100644 --- a/services/tests/servicestests/src/com/android/server/wm/StackWindowControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/StackWindowControllerTests.java @@ -103,7 +103,7 @@ public class StackWindowControllerTests extends WindowTestsBase { final TaskStack stack2 = stack2Controller.mContainer; // Reparent - stack1Controller.reparent(dc.getDisplayId(), new Rect()); + stack1Controller.reparent(dc.getDisplayId(), new Rect(), true /* onTop */); assertEquals(dc, stack1.getDisplayContent()); final int stack1PositionInParent = stack1.getParent().mChildren.indexOf(stack1); final int stack2PositionInParent = stack1.getParent().mChildren.indexOf(stack2); diff --git a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotCacheTest.java b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotCacheTest.java index 290f69a7a7e7..c61076d3b920 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotCacheTest.java +++ b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotCacheTest.java @@ -79,18 +79,6 @@ public class TaskSnapshotCacheTest extends TaskSnapshotPersisterTestBase { assertNotNull(mCache.getSnapshot(window.getTask().mTaskId, 0 /* userId */, false /* restoreFromDisk */, false /* reducedResolution */)); mCache.onAppDied(window.mAppToken); - - // Should still be in the retrieval cache. - assertNotNull(mCache.getSnapshot(window.getTask().mTaskId, 0 /* userId */, - false /* restoreFromDisk */, false /* reducedResolution */)); - - // Trash retrieval cache. - for (int i = 0; i < 20; i++) { - mCache.putSnapshot(createWindow(null, FIRST_APPLICATION_WINDOW, "window").getTask(), - createSnapshot()); - } - - // Should not be in cache anymore assertNull(mCache.getSnapshot(window.getTask().mTaskId, 0 /* userId */, false /* restoreFromDisk */, false /* reducedResolution */)); } @@ -134,9 +122,5 @@ public class TaskSnapshotCacheTest extends TaskSnapshotPersisterTestBase { // Load it from disk assertNotNull(mCache.getSnapshot(window.getTask().mTaskId, sWm.mCurrentUserId, true /* restoreFromDisk */, false /* reducedResolution */)); - - // Make sure it's in the cache now. - assertNotNull(mCache.getSnapshot(window.getTask().mTaskId, sWm.mCurrentUserId, - false /* restoreFromDisk */, false /* reducedResolution */)); } } diff --git a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotSurfaceTest.java b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotSurfaceTest.java index aab75ee1699b..717ddf26eb2f 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotSurfaceTest.java +++ b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotSurfaceTest.java @@ -16,6 +16,9 @@ package com.android.server.wm; +import static android.content.res.Configuration.ORIENTATION_PORTRAIT; +import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; +import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -24,15 +27,19 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.graphics.Bitmap; -import android.graphics.Bitmap.Config; +import android.app.ActivityManager.TaskSnapshot; import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.GraphicBuffer; +import android.graphics.PixelFormat; +import android.graphics.Rect; import android.platform.test.annotations.Presubmit; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import android.view.Surface; + +import com.android.server.wm.TaskSnapshotSurface.Window; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,59 +55,174 @@ public class TaskSnapshotSurfaceTest extends WindowTestsBase { private TaskSnapshotSurface mSurface; - @Before - public void setUp() { - mSurface = new TaskSnapshotSurface(null, null, null, Color.WHITE); + private void setupSurface(int width, int height, Rect contentInsets, int sysuiVis, + int windowFlags, Rect taskBounds) { + final GraphicBuffer buffer = GraphicBuffer.create(width, height, PixelFormat.RGBA_8888, + GraphicBuffer.USAGE_SW_READ_NEVER | GraphicBuffer.USAGE_SW_WRITE_NEVER); + final TaskSnapshot snapshot = new TaskSnapshot(buffer, + ORIENTATION_PORTRAIT, contentInsets, false, 1.0f); + mSurface = new TaskSnapshotSurface(sWm, new Window(), new Surface(), snapshot, "Test", + Color.WHITE, Color.RED, Color.BLUE, sysuiVis, windowFlags, 0, taskBounds); + } + + private void setupSurface(int width, int height) { + setupSurface(width, height, new Rect(), 0, FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, + new Rect(0, 0, width, height)); } @Test public void fillEmptyBackground_fillHorizontally() throws Exception { + setupSurface(200, 100); final Canvas mockCanvas = mock(Canvas.class); when(mockCanvas.getWidth()).thenReturn(200); when(mockCanvas.getHeight()).thenReturn(100); - final Bitmap b = Bitmap.createBitmap(100, 200, Config.ARGB_8888); - mSurface.fillEmptyBackground(mockCanvas, b); + mSurface.drawBackgroundAndBars(mockCanvas, new Rect(0, 0, 100, 200)); verify(mockCanvas).drawRect(eq(100.0f), eq(0.0f), eq(200.0f), eq(100.0f), any()); } @Test public void fillEmptyBackground_fillVertically() throws Exception { + setupSurface(100, 200); final Canvas mockCanvas = mock(Canvas.class); when(mockCanvas.getWidth()).thenReturn(100); when(mockCanvas.getHeight()).thenReturn(200); - final Bitmap b = Bitmap.createBitmap(200, 100, Config.ARGB_8888); - mSurface.fillEmptyBackground(mockCanvas, b); + mSurface.drawBackgroundAndBars(mockCanvas, new Rect(0, 0, 200, 100)); verify(mockCanvas).drawRect(eq(0.0f), eq(100.0f), eq(100.0f), eq(200.0f), any()); } @Test public void fillEmptyBackground_fillBoth() throws Exception { + setupSurface(200, 200); final Canvas mockCanvas = mock(Canvas.class); when(mockCanvas.getWidth()).thenReturn(200); when(mockCanvas.getHeight()).thenReturn(200); - final Bitmap b = Bitmap.createBitmap(100, 100, Config.ARGB_8888); - mSurface.fillEmptyBackground(mockCanvas, b); + mSurface.drawBackgroundAndBars(mockCanvas, new Rect(0, 0, 100, 100)); verify(mockCanvas).drawRect(eq(100.0f), eq(0.0f), eq(200.0f), eq(100.0f), any()); verify(mockCanvas).drawRect(eq(0.0f), eq(100.0f), eq(200.0f), eq(200.0f), any()); } @Test public void fillEmptyBackground_dontFill_sameSize() throws Exception { + setupSurface(100, 100); final Canvas mockCanvas = mock(Canvas.class); when(mockCanvas.getWidth()).thenReturn(100); when(mockCanvas.getHeight()).thenReturn(100); - final Bitmap b = Bitmap.createBitmap(100, 100, Config.ARGB_8888); - mSurface.fillEmptyBackground(mockCanvas, b); + mSurface.drawBackgroundAndBars(mockCanvas, new Rect(0, 0, 100, 100)); verify(mockCanvas, never()).drawRect(anyInt(), anyInt(), anyInt(), anyInt(), any()); } @Test public void fillEmptyBackground_dontFill_bitmapLarger() throws Exception { + setupSurface(100, 100); + final Canvas mockCanvas = mock(Canvas.class); + when(mockCanvas.getWidth()).thenReturn(100); + when(mockCanvas.getHeight()).thenReturn(100); + mSurface.drawBackgroundAndBars(mockCanvas, new Rect(0, 0, 200, 200)); + verify(mockCanvas, never()).drawRect(anyInt(), anyInt(), anyInt(), anyInt(), any()); + } + + @Test + public void testCalculateSnapshotCrop() { + setupSurface(100, 100, new Rect(0, 10, 0, 10), 0, 0, new Rect(0, 0, 100, 100)); + assertEquals(new Rect(0, 0, 100, 90), mSurface.calculateSnapshotCrop()); + } + + @Test + public void testCalculateSnapshotCrop_taskNotOnTop() { + setupSurface(100, 100, new Rect(0, 10, 0, 10), 0, 0, new Rect(0, 50, 100, 100)); + assertEquals(new Rect(0, 10, 100, 90), mSurface.calculateSnapshotCrop()); + } + + @Test + public void testCalculateSnapshotCrop_navBarLeft() { + setupSurface(100, 100, new Rect(10, 10, 0, 0), 0, 0, new Rect(0, 0, 100, 100)); + assertEquals(new Rect(10, 0, 100, 100), mSurface.calculateSnapshotCrop()); + } + + @Test + public void testCalculateSnapshotCrop_navBarRight() { + setupSurface(100, 100, new Rect(0, 10, 10, 0), 0, 0, new Rect(0, 0, 100, 100)); + assertEquals(new Rect(0, 0, 90, 100), mSurface.calculateSnapshotCrop()); + } + + @Test + public void testCalculateSnapshotFrame() { + setupSurface(100, 100); + final Rect insets = new Rect(0, 10, 0, 10); + mSurface.setFrames(new Rect(0, 0, 100, 100), insets, insets); + assertEquals(new Rect(0, -10, 100, 70), + mSurface.calculateSnapshotFrame(new Rect(0, 10, 100, 90))); + } + + @Test + public void testCalculateSnapshotFrame_navBarLeft() { + setupSurface(100, 100); + final Rect insets = new Rect(10, 10, 0, 0); + mSurface.setFrames(new Rect(0, 0, 100, 100), insets, insets); + assertEquals(new Rect(0, -10, 90, 80), + mSurface.calculateSnapshotFrame(new Rect(10, 10, 100, 100))); + } + + @Test + public void testDrawStatusBarBackground() { + setupSurface(100, 100); + final Rect insets = new Rect(0, 10, 10, 0); + mSurface.setFrames(new Rect(0, 0, 100, 100), insets, insets); final Canvas mockCanvas = mock(Canvas.class); when(mockCanvas.getWidth()).thenReturn(100); when(mockCanvas.getHeight()).thenReturn(100); - final Bitmap b = Bitmap.createBitmap(200, 200, Config.ARGB_8888); - mSurface.fillEmptyBackground(mockCanvas, b); + mSurface.drawStatusBarBackground(mockCanvas, new Rect(0, 0, 50, 100), 10); + verify(mockCanvas).drawRect(eq(50.0f), eq(0.0f), eq(90.0f), eq(10.0f), any()); + } + + @Test + public void testDrawStatusBarBackground_nope() { + setupSurface(100, 100); + final Rect insets = new Rect(0, 10, 10, 0); + mSurface.setFrames(new Rect(0, 0, 100, 100), insets, insets); + final Canvas mockCanvas = mock(Canvas.class); + when(mockCanvas.getWidth()).thenReturn(100); + when(mockCanvas.getHeight()).thenReturn(100); + mSurface.drawStatusBarBackground(mockCanvas, new Rect(0, 0, 100, 100), 10); verify(mockCanvas, never()).drawRect(anyInt(), anyInt(), anyInt(), anyInt(), any()); } + + @Test + public void testDrawNavigationBarBackground() { + final Rect insets = new Rect(0, 10, 0, 10); + setupSurface(100, 100, insets, 0, FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, + new Rect(0, 0, 100, 100)); + mSurface.setFrames(new Rect(0, 0, 100, 100), insets, insets); + final Canvas mockCanvas = mock(Canvas.class); + when(mockCanvas.getWidth()).thenReturn(100); + when(mockCanvas.getHeight()).thenReturn(100); + mSurface.drawNavigationBarBackground(mockCanvas); + verify(mockCanvas).drawRect(eq(new Rect(0, 90, 100, 100)), any()); + } + + @Test + public void testDrawNavigationBarBackground_left() { + final Rect insets = new Rect(10, 10, 0, 0); + setupSurface(100, 100, insets, 0, FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, + new Rect(0, 0, 100, 100)); + mSurface.setFrames(new Rect(0, 0, 100, 100), insets, insets); + final Canvas mockCanvas = mock(Canvas.class); + when(mockCanvas.getWidth()).thenReturn(100); + when(mockCanvas.getHeight()).thenReturn(100); + mSurface.drawNavigationBarBackground(mockCanvas); + verify(mockCanvas).drawRect(eq(new Rect(0, 0, 10, 100)), any()); + } + + @Test + public void testDrawNavigationBarBackground_right() { + final Rect insets = new Rect(0, 10, 10, 0); + setupSurface(100, 100, insets, 0, FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, + new Rect(0, 0, 100, 100)); + mSurface.setFrames(new Rect(0, 0, 100, 100), insets, insets); + final Canvas mockCanvas = mock(Canvas.class); + when(mockCanvas.getWidth()).thenReturn(100); + when(mockCanvas.getHeight()).thenReturn(100); + mSurface.drawNavigationBarBackground(mockCanvas); + verify(mockCanvas).drawRect(eq(new Rect(90, 0, 100, 100)), any()); + } } diff --git a/services/usage/java/com/android/server/usage/StorageStatsService.java b/services/usage/java/com/android/server/usage/StorageStatsService.java index 3f39e4f3cf4b..5ad7f8042c01 100644 --- a/services/usage/java/com/android/server/usage/StorageStatsService.java +++ b/services/usage/java/com/android/server/usage/StorageStatsService.java @@ -162,6 +162,9 @@ public class StorageStatsService extends IStorageStatsManager.Stub { return FileUtils.roundStorageSize(mStorage.getPrimaryStorageSize()); } else { final VolumeInfo vol = mStorage.findVolumeByUuid(volumeUuid); + if (vol == null) { + throw new IllegalStateException("Volume was unexpected null"); + } return FileUtils.roundStorageSize(vol.disk.size); } } @@ -185,6 +188,9 @@ public class StorageStatsService extends IStorageStatsManager.Stub { return Environment.getDataDirectory().getUsableSpace() + cacheBytes; } else { final VolumeInfo vol = mStorage.findVolumeByUuid(volumeUuid); + if (vol == null) { + throw new IllegalStateException("Volume was unexpected null"); + } return vol.getPath().getUsableSpace() + cacheBytes; } } diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index b5a87ca8f110..80b73d3677b0 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -640,8 +640,11 @@ public class UsbDeviceManager { // Set the new USB configuration. setUsbConfig(oemFunctions); - // Start up dependent services. - updateUsbStateBroadcastIfNeeded(true); + if (UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_MTP) + || UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_PTP)) { + // Start up dependent services. + updateUsbStateBroadcastIfNeeded(true); + } if (!waitForState(oemFunctions)) { Slog.e(TAG, "Failed to switch USB config to " + functions); diff --git a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java index 01e36f57d1be..93cfd11b3d46 100644 --- a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java +++ b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java @@ -543,9 +543,8 @@ class UsbProfileGroupSettingsManager { } @Override - public boolean onPackageChanged(String packageName, int uid, String[] components) { + public void onPackageUpdateFinished(String packageName, int uid) { handlePackageUpdate(packageName); - return false; } @Override @@ -1207,8 +1206,11 @@ class UsbProfileGroupSettingsManager { boolean changed = false; for (DeviceFilter test : mDevicePreferenceMap.keySet()) { if (filter.matches(test)) { - mDevicePreferenceMap.remove(test); - changed = true; + UserPackage currentMatch = mDevicePreferenceMap.get(test); + if (!currentMatch.packageName.equals(packageName)) { + mDevicePreferenceMap.remove(test); + changed = true; + } } } return changed; @@ -1218,8 +1220,11 @@ class UsbProfileGroupSettingsManager { boolean changed = false; for (AccessoryFilter test : mAccessoryPreferenceMap.keySet()) { if (filter.matches(test)) { - mAccessoryPreferenceMap.remove(test); - changed = true; + UserPackage currentMatch = mAccessoryPreferenceMap.get(test); + if (!currentMatch.packageName.equals(packageName)) { + mAccessoryPreferenceMap.remove(test); + changed = true; + } } } return changed; diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 8bfe4131d7cb..1874d8d04723 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -755,6 +755,32 @@ public class TelecomManager { } /** + * Returns a list of {@link PhoneAccountHandle}s for self-managed {@link ConnectionService}s. + * <p> + * Self-Managed {@link ConnectionService}s have a {@link PhoneAccount} with + * {@link PhoneAccount#CAPABILITY_SELF_MANAGED}. + * <p> + * Requires permission {@link android.Manifest.permission#READ_PHONE_STATE}, or that the caller + * is the default dialer app. + * <p> + * A {@link SecurityException} will be thrown if a called is not the default dialer, or lacks + * the {@link android.Manifest.permission#READ_PHONE_STATE} permission. + * + * @return A list of {@code PhoneAccountHandle} objects. + */ + @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + public List<PhoneAccountHandle> getSelfManagedPhoneAccounts() { + try { + if (isServiceConnected()) { + return getTelecomService().getSelfManagedPhoneAccounts(mContext.getOpPackageName()); + } + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getSelfManagedPhoneAccounts()", e); + } + return new ArrayList<>(); + } + + /** * Returns a list of {@link PhoneAccountHandle}s including those which have not been enabled * by the user. * diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index 87402243a452..8ebac2c6273a 100644 --- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl +++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl @@ -59,6 +59,11 @@ interface ITelecomService { boolean includeDisabledAccounts, String callingPackage); /** + * @see TelecomServiceImpl#getSelfManagedPhoneAccounts + */ + List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage); + + /** * @see TelecomManager#getPhoneAccountsSupportingScheme */ List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(in String uriScheme, diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 1fd1929dbe01..77da89709d65 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -628,8 +628,14 @@ public class TelephonyManager { * @see #EXTRA_DATA_IFACE * @see #EXTRA_DATA_FAILURE_CAUSE * @hide + * + * @deprecated If the app is running in the background, it won't be able to receive this + * broadcast. Apps should use ConnectivityManager {@link #registerNetworkCallback( + * android.net.NetworkRequest, ConnectivityManager.NetworkCallback)} to listen for network + * changes. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + @Deprecated public static final String ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED = "android.intent.action.PRECISE_DATA_CONNECTION_STATE_CHANGED"; @@ -1087,14 +1093,15 @@ public class TelephonyManager { * this method will return null. The implementation must not to try add LTE * identifiers into the existing cdma/gsm classes. *<p> - * In the future this call will be deprecated. - *<p> * @return Current location of the device or null if not available. * * <p>Requires Permission: * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_FINE_LOCATION}. + * + * @deprecated use {@link #getAllCellInfo} instead, which returns a superset of this API. */ + @Deprecated public CellLocation getCellLocation() { try { ITelephony telephony = getITelephony(); diff --git a/telephony/java/android/telephony/ims/ImsService.java b/telephony/java/android/telephony/ims/ImsService.java index f1f683c70735..ba70374edb7b 100644 --- a/telephony/java/android/telephony/ims/ImsService.java +++ b/telephony/java/android/telephony/ims/ImsService.java @@ -16,7 +16,9 @@ package android.telephony.ims; +import android.annotation.SystemApi; import android.app.PendingIntent; +import android.app.Service; import android.content.Intent; import android.content.pm.PackageManager; import android.os.IBinder; @@ -72,26 +74,30 @@ import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE; * {@link CarrierConfigManager#KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING}. * * The features that are currently supported in an ImsService are: - * - RCS_FEATURE: This ImsService implements the {@link RcsFeature} class. - * - MMTEL_FEATURE: This ImsService implements the {@link MMTelFeature} class. - * - EMERGENCY_MMTEL_FEATURE: This ImsService implements the {@link MMTelFeature} class and will be + * - RCS_FEATURE: This ImsService implements the RcsFeature class. + * - MMTEL_FEATURE: This ImsService implements the MMTelFeature class. + * - EMERGENCY_MMTEL_FEATURE: This ImsService implements the MMTelFeature class and will be * available to place emergency calls at all times. This MUST be implemented by the default * ImsService provided in the device overlay. - * - * @hide + * @hide */ -public abstract class ImsService extends ImsServiceBase { +@SystemApi +public class ImsService extends Service { private static final String LOG_TAG = "ImsService"; /** * The intent that must be defined as an intent-filter in the AndroidManifest of the ImsService. + * @hide */ public static final String SERVICE_INTERFACE = "android.telephony.ims.ImsService"; // A map of slot Id -> Set of features corresponding to that slot. private final SparseArray<SparseArray<ImsFeature>> mFeatures = new SparseArray<>(); + /** + * @hide + */ // Implements all supported features as a flat interface. protected final IBinder mImsServiceController = new IImsServiceController.Stub() { @@ -328,6 +334,9 @@ public abstract class ImsService extends ImsServiceBase { }; + /** + * @hide + */ @Override public IBinder onBind(Intent intent) { if(SERVICE_INTERFACE.equals(intent.getAction())) { @@ -409,12 +418,18 @@ public abstract class ImsService extends ImsServiceBase { return null; } + /** + * @hide + */ @VisibleForTesting // Be sure to lock on mFeatures before accessing this method public SparseArray<ImsFeature> getImsFeatureMap(int slotId) { return mFeatures.get(slotId); } + /** + * @hide + */ @VisibleForTesting // Be sure to lock on mFeatures before accessing this method public ImsFeature getImsFeatureFromType(SparseArray<ImsFeature> set, int featureType) { @@ -451,17 +466,26 @@ public abstract class ImsService extends ImsServiceBase { /** * @return An implementation of MMTelFeature that will be used by the system for MMTel * functionality. Must be able to handle emergency calls at any time as well. + * @hide */ - public abstract MMTelFeature onCreateEmergencyMMTelImsFeature(int slotId); + public MMTelFeature onCreateEmergencyMMTelImsFeature(int slotId) { + return null; + } /** * @return An implementation of MMTelFeature that will be used by the system for MMTel * functionality. + * @hide */ - public abstract MMTelFeature onCreateMMTelImsFeature(int slotId); + public MMTelFeature onCreateMMTelImsFeature(int slotId) { + return null; + } /** * @return An implementation of RcsFeature that will be used by the system for RCS. + * @hide */ - public abstract RcsFeature onCreateRcsFeature(int slotId); + public RcsFeature onCreateRcsFeature(int slotId) { + return null; + } } diff --git a/telephony/java/android/telephony/ims/ImsServiceBase.java b/telephony/java/android/telephony/ims/ImsServiceBase.java deleted file mode 100644 index bb36862ef25f..000000000000 --- a/telephony/java/android/telephony/ims/ImsServiceBase.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package android.telephony.ims; - -import android.annotation.SystemApi; -import android.app.Service; -import android.content.Intent; -import android.os.Binder; -import android.os.IBinder; - -/** - * Base ImsService Implementation, which is used by the ImsResolver to bind. ImsServices that do not - * need to provide an ImsService implementation but still wish to be managed by the ImsResolver - * lifecycle may implement this class directly. - * @hide - */ -@SystemApi -public class ImsServiceBase extends Service { - - /** - * Binder connection that does nothing but keep the connection between this Service and the - * framework active. If this service crashes, the framework will be notified. - */ - private IBinder mConnection = new Binder(); - - @Override - public IBinder onBind(Intent intent) { - return mConnection; - } - -} diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp index ef3797c4a277..b460258248af 100644 --- a/tools/aapt2/Android.bp +++ b/tools/aapt2/Android.bp @@ -15,11 +15,12 @@ // toolSources = [ - "compile/Compile.cpp", - "diff/Diff.cpp", - "dump/Dump.cpp", - "link/Link.cpp", - "optimize/Optimize.cpp", + "cmd/Compile.cpp", + "cmd/Diff.cpp", + "cmd/Dump.cpp", + "cmd/Link.cpp", + "cmd/Optimize.cpp", + "cmd/Util.cpp", ] cc_defaults { @@ -90,7 +91,7 @@ cc_library_host_static { "io/BigBufferStreams.cpp", "io/File.cpp", "io/FileSystem.cpp", - "io/Io.cpp", + "io/Util.cpp", "io/ZipArchive.cpp", "link/AutoVersioner.cpp", "link/ManifestFixer.cpp", diff --git a/tools/aapt2/AppInfo.h b/tools/aapt2/AppInfo.h index 9db21aadb242..d6f599520d71 100644 --- a/tools/aapt2/AppInfo.h +++ b/tools/aapt2/AppInfo.h @@ -29,7 +29,7 @@ struct AppInfo { std::string package; // The app's minimum SDK version, if it is defined. - Maybe<std::string> min_sdk_version; + Maybe<int> min_sdk_version; // The app's version code, if it is defined. Maybe<uint32_t> version_code; diff --git a/tools/aapt2/LoadedApk.cpp b/tools/aapt2/LoadedApk.cpp index b855f8f80c58..8a8f8be205e7 100644 --- a/tools/aapt2/LoadedApk.cpp +++ b/tools/aapt2/LoadedApk.cpp @@ -21,6 +21,7 @@ #include "flatten/Archive.h" #include "flatten/TableFlattener.h" #include "io/BigBufferInputStream.h" +#include "io/Util.h" namespace aapt { @@ -47,11 +48,10 @@ std::unique_ptr<LoadedApk> LoadedApk::LoadApkFromPath(IAaptContext* context, } std::unique_ptr<ResourceTable> table = util::make_unique<ResourceTable>(); - BinaryResourceParser parser(context, table.get(), source, data->data(), data->size()); + BinaryResourceParser parser(context, table.get(), source, data->data(), data->size(), apk.get()); if (!parser.Parse()) { return {}; } - return util::make_unique<LoadedApk>(source, std::move(apk), std::move(table)); } @@ -100,20 +100,16 @@ bool LoadedApk::WriteToArchive(IAaptContext* context, const TableFlattenerOption } io::BigBufferInputStream input_stream(&buffer); - if (!writer->WriteFile(path, ArchiveEntry::kAlign, &input_stream)) { - context->GetDiagnostics()->Error(DiagMessage() - << "Error when writing file '" << path << "' in APK."); + if (!io::CopyInputStreamToArchive(context, &input_stream, path, ArchiveEntry::kAlign, + writer)) { return false; } - continue; - } - std::unique_ptr<io::IData> data = file->OpenAsData(); - uint32_t compression_flags = file->WasCompressed() ? ArchiveEntry::kCompress : 0u; - if (!writer->WriteFile(path, compression_flags, data.get())) { - context->GetDiagnostics()->Error(DiagMessage() - << "Error when writing file '" << path << "' in APK."); - return false; + } else { + uint32_t compression_flags = file->WasCompressed() ? ArchiveEntry::kCompress : 0u; + if (!io::CopyFileToArchive(context, file, path, compression_flags, writer)) { + return false; + } } } return true; diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp index 36c1de6a4f26..87fda16ee956 100644 --- a/tools/aapt2/Main.cpp +++ b/tools/aapt2/Main.cpp @@ -25,7 +25,7 @@ namespace aapt { static const char* sMajorVersion = "2"; // Update minor version whenever a feature or flag is added. -static const char* sMinorVersion = "12"; +static const char* sMinorVersion = "13"; int PrintVersion() { std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "." diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp index ca6738b16911..1bb7d9beee45 100644 --- a/tools/aapt2/ResourceUtils.cpp +++ b/tools/aapt2/ResourceUtils.cpp @@ -675,5 +675,65 @@ std::string BuildResourceFileName(const ResourceFile& res_file, return out.str(); } +std::unique_ptr<Item> ParseBinaryResValue(const ResourceType& type, const ConfigDescription& config, + const android::ResStringPool& src_pool, + const android::Res_value& res_value, + StringPool* dst_pool) { + if (type == ResourceType::kId) { + return util::make_unique<Id>(); + } + + const uint32_t data = util::DeviceToHost32(res_value.data); + switch (res_value.dataType) { + case android::Res_value::TYPE_STRING: { + const std::string str = util::GetString(src_pool, data); + const android::ResStringPool_span* spans = src_pool.styleAt(data); + + // Check if the string has a valid style associated with it. + if (spans != nullptr && spans->name.index != android::ResStringPool_span::END) { + StyleString style_str = {str}; + while (spans->name.index != android::ResStringPool_span::END) { + style_str.spans.push_back(Span{util::GetString(src_pool, spans->name.index), + spans->firstChar, spans->lastChar}); + spans++; + } + return util::make_unique<StyledString>(dst_pool->MakeRef( + style_str, StringPool::Context(StringPool::Context::kStylePriority, config))); + } else { + if (type != ResourceType::kString && util::StartsWith(str, "res/")) { + // This must be a FileReference. + return util::make_unique<FileReference>(dst_pool->MakeRef( + str, StringPool::Context(StringPool::Context::kHighPriority, config))); + } + + // There are no styles associated with this string, so treat it as a simple string. + return util::make_unique<String>(dst_pool->MakeRef(str, StringPool::Context(config))); + } + } break; + + case android::Res_value::TYPE_REFERENCE: + case android::Res_value::TYPE_ATTRIBUTE: + case android::Res_value::TYPE_DYNAMIC_REFERENCE: + case android::Res_value::TYPE_DYNAMIC_ATTRIBUTE: { + Reference::Type ref_type = Reference::Type::kResource; + if (res_value.dataType == android::Res_value::TYPE_ATTRIBUTE || + res_value.dataType == android::Res_value::TYPE_DYNAMIC_ATTRIBUTE) { + ref_type = Reference::Type::kAttribute; + } + + if (data == 0) { + // A reference of 0, must be the magic @null reference. + return util::make_unique<BinaryPrimitive>(android::Res_value::TYPE_REFERENCE, 0u); + } + + // This is a normal reference. + return util::make_unique<Reference>(data, ref_type); + } break; + } + + // Treat this as a raw binary primitive. + return util::make_unique<BinaryPrimitive>(res_value); +} + } // namespace ResourceUtils } // namespace aapt diff --git a/tools/aapt2/ResourceUtils.h b/tools/aapt2/ResourceUtils.h index 59b78f4b3f33..48922b72fefa 100644 --- a/tools/aapt2/ResourceUtils.h +++ b/tools/aapt2/ResourceUtils.h @@ -20,11 +20,13 @@ #include <functional> #include <memory> +#include "androidfw/ResourceTypes.h" #include "androidfw/StringPiece.h" #include "NameMangler.h" #include "Resource.h" #include "ResourceValues.h" +#include "StringPool.h" namespace aapt { namespace ResourceUtils { @@ -200,6 +202,13 @@ uint32_t AndroidTypeToAttributeTypeMask(uint16_t type); std::string BuildResourceFileName(const ResourceFile& res_file, const NameMangler* mangler = nullptr); +// Parses the binary form of a resource value. `type` is used as a hint to know when a value is +// an ID versus a False boolean value, etc. `config` is for sorting strings in the string pool. +std::unique_ptr<Item> ParseBinaryResValue(const ResourceType& type, const ConfigDescription& config, + const android::ResStringPool& src_pool, + const android::Res_value& res_value, + StringPool* dst_pool); + } // namespace ResourceUtils } // namespace aapt diff --git a/tools/aapt2/StringPool.h b/tools/aapt2/StringPool.h index a626d375b625..d1232a29b5aa 100644 --- a/tools/aapt2/StringPool.h +++ b/tools/aapt2/StringPool.h @@ -23,6 +23,7 @@ #include <unordered_map> #include <vector> +#include "android-base/macros.h" #include "androidfw/StringPiece.h" #include "ConfigDescription.h" @@ -148,7 +149,8 @@ class StringPool { static bool FlattenUtf16(BigBuffer* out, const StringPool& pool); StringPool() = default; - StringPool(const StringPool&) = delete; + StringPool(StringPool&&) = default; + StringPool& operator=(StringPool&&) = default; /** * Adds a string to the pool, unless it already exists. Returns @@ -208,6 +210,8 @@ class StringPool { void Prune(); private: + DISALLOW_COPY_AND_ASSIGN(StringPool); + friend const_iterator begin(const StringPool& pool); friend const_iterator end(const StringPool& pool); diff --git a/tools/aapt2/compile/Compile.cpp b/tools/aapt2/cmd/Compile.cpp index 1fe30f0b1478..578a8fb423dc 100644 --- a/tools/aapt2/compile/Compile.cpp +++ b/tools/aapt2/cmd/Compile.cpp @@ -38,6 +38,7 @@ #include "flatten/Archive.h" #include "flatten/XmlFlattener.h" #include "io/BigBufferOutputStream.h" +#include "io/Util.h" #include "proto/ProtoSerialize.h" #include "util/Files.h" #include "util/Maybe.h" @@ -138,9 +139,8 @@ static bool IsHidden(const StringPiece& filename) { /** * Walks the res directory structure, looking for resource files. */ -static bool LoadInputFilesFromDir( - IAaptContext* context, const CompileOptions& options, - std::vector<ResourcePathData>* out_path_data) { +static bool LoadInputFilesFromDir(IAaptContext* context, const CompileOptions& options, + std::vector<ResourcePathData>* out_path_data) { const std::string& root_dir = options.res_dir.value(); std::unique_ptr<DIR, decltype(closedir)*> d(opendir(root_dir.data()), closedir); if (!d) { @@ -190,8 +190,7 @@ static bool LoadInputFilesFromDir( } static bool CompileTable(IAaptContext* context, const CompileOptions& options, - const ResourcePathData& path_data, - IArchiveWriter* writer, + const ResourcePathData& path_data, IArchiveWriter* writer, const std::string& output_path) { ResourceTable table; { @@ -210,11 +209,9 @@ static bool CompileTable(IAaptContext* context, const CompileOptions& options, // If the filename includes donottranslate, then the default translatable is // false. - parser_options.translatable = - path_data.name.find("donottranslate") == std::string::npos; + parser_options.translatable = path_data.name.find("donottranslate") == std::string::npos; - ResourceParser res_parser(context->GetDiagnostics(), &table, - path_data.source, path_data.config, + ResourceParser res_parser(context->GetDiagnostics(), &table, path_data.source, path_data.config, parser_options); if (!res_parser.Parse(&xml_parser)) { return false; @@ -273,10 +270,8 @@ static bool CompileTable(IAaptContext* context, const CompileOptions& options, return true; } -static bool WriteHeaderAndBufferToWriter(const StringPiece& output_path, - const ResourceFile& file, - const BigBuffer& buffer, - IArchiveWriter* writer, +static bool WriteHeaderAndBufferToWriter(const StringPiece& output_path, const ResourceFile& file, + const BigBuffer& buffer, IArchiveWriter* writer, IDiagnostics* diag) { // Start the entry so we can write the header. if (!writer->StartEntry(output_path, 0)) { @@ -312,10 +307,8 @@ static bool WriteHeaderAndBufferToWriter(const StringPiece& output_path, return true; } -static bool WriteHeaderAndMmapToWriter(const StringPiece& output_path, - const ResourceFile& file, - const android::FileMap& map, - IArchiveWriter* writer, +static bool WriteHeaderAndMmapToWriter(const StringPiece& output_path, const ResourceFile& file, + const android::FileMap& map, IArchiveWriter* writer, IDiagnostics* diag) { // Start the entry so we can write the header. if (!writer->StartEntry(output_path, 0)) { @@ -334,8 +327,7 @@ static bool WriteHeaderAndMmapToWriter(const StringPiece& output_path, // Number of CompiledFiles. output_stream.WriteLittleEndian32(1); - std::unique_ptr<pb::CompiledFile> compiled_file = - SerializeCompiledFileToPb(file); + std::unique_ptr<pb::CompiledFile> compiled_file = SerializeCompiledFileToPb(file); output_stream.WriteCompiledFile(compiled_file.get()); output_stream.WriteData(map.getDataPtr(), map.getDataLength()); @@ -352,10 +344,8 @@ static bool WriteHeaderAndMmapToWriter(const StringPiece& output_path, return true; } -static bool FlattenXmlToOutStream(IAaptContext* context, - const StringPiece& output_path, - xml::XmlResource* xmlres, - CompiledFileOutputStream* out) { +static bool FlattenXmlToOutStream(IAaptContext* context, const StringPiece& output_path, + xml::XmlResource* xmlres, CompiledFileOutputStream* out) { BigBuffer buffer(1024); XmlFlattenerOptions xml_flattener_options; xml_flattener_options.keep_raw_values = true; @@ -376,8 +366,8 @@ static bool FlattenXmlToOutStream(IAaptContext* context, } static bool CompileXml(IAaptContext* context, const CompileOptions& options, - const ResourcePathData& path_data, - IArchiveWriter* writer, const std::string& output_path) { + const ResourcePathData& path_data, IArchiveWriter* writer, + const std::string& output_path) { if (context->IsVerbose()) { context->GetDiagnostics()->Note(DiagMessage(path_data.source) << "compiling XML"); } @@ -400,8 +390,7 @@ static bool CompileXml(IAaptContext* context, const CompileOptions& options, return false; } - xmlres->file.name = ResourceName( - {}, *ParseResourceType(path_data.resource_dir), path_data.name); + xmlres->file.name = ResourceName({}, *ParseResourceType(path_data.resource_dir), path_data.name); xmlres->file.config = path_data.config; xmlres->file.source = path_data.source; @@ -419,8 +408,7 @@ static bool CompileXml(IAaptContext* context, const CompileOptions& options, // Start the entry so we can write the header. if (!writer->StartEntry(output_path, 0)) { - context->GetDiagnostics()->Error(DiagMessage(output_path) - << "failed to open file"); + context->GetDiagnostics()->Error(DiagMessage(output_path) << "failed to open file"); return false; } @@ -439,48 +427,42 @@ static bool CompileXml(IAaptContext* context, const CompileOptions& options, // Number of CompiledFiles. output_stream.WriteLittleEndian32(1 + inline_documents.size()); - if (!FlattenXmlToOutStream(context, output_path, xmlres.get(), - &output_stream)) { + if (!FlattenXmlToOutStream(context, output_path, xmlres.get(), &output_stream)) { return false; } for (auto& inline_xml_doc : inline_documents) { - if (!FlattenXmlToOutStream(context, output_path, inline_xml_doc.get(), - &output_stream)) { + if (!FlattenXmlToOutStream(context, output_path, inline_xml_doc.get(), &output_stream)) { return false; } } } if (!writer->FinishEntry()) { - context->GetDiagnostics()->Error(DiagMessage(output_path) - << "failed to finish writing data"); + context->GetDiagnostics()->Error(DiagMessage(output_path) << "failed to finish writing data"); return false; } return true; } static bool CompilePng(IAaptContext* context, const CompileOptions& options, - const ResourcePathData& path_data, - IArchiveWriter* writer, const std::string& output_path) { + const ResourcePathData& path_data, IArchiveWriter* writer, + const std::string& output_path) { if (context->IsVerbose()) { - context->GetDiagnostics()->Note(DiagMessage(path_data.source) - << "compiling PNG"); + context->GetDiagnostics()->Note(DiagMessage(path_data.source) << "compiling PNG"); } BigBuffer buffer(4096); ResourceFile res_file; - res_file.name = ResourceName({}, *ParseResourceType(path_data.resource_dir), - path_data.name); + res_file.name = ResourceName({}, *ParseResourceType(path_data.resource_dir), path_data.name); res_file.config = path_data.config; res_file.source = path_data.source; { std::string content; if (!android::base::ReadFileToString(path_data.source.path, &content)) { - context->GetDiagnostics()->Error( - DiagMessage(path_data.source) - << android::base::SystemErrorCodeToString(errno)); + context->GetDiagnostics()->Error(DiagMessage(path_data.source) + << android::base::SystemErrorCodeToString(errno)); return false; } @@ -517,8 +499,8 @@ static bool CompilePng(IAaptContext* context, const CompileOptions& options, } if (context->IsVerbose()) { - context->GetDiagnostics()->Note(DiagMessage(path_data.source) - << "9-patch: " << *nine_patch); + context->GetDiagnostics()->Note(DiagMessage(path_data.source) << "9-patch: " + << *nine_patch); } } @@ -572,26 +554,22 @@ static bool CompilePng(IAaptContext* context, const CompileOptions& options, } static bool CompileFile(IAaptContext* context, const CompileOptions& options, - const ResourcePathData& path_data, - IArchiveWriter* writer, + const ResourcePathData& path_data, IArchiveWriter* writer, const std::string& output_path) { if (context->IsVerbose()) { - context->GetDiagnostics()->Note(DiagMessage(path_data.source) - << "compiling file"); + context->GetDiagnostics()->Note(DiagMessage(path_data.source) << "compiling file"); } BigBuffer buffer(256); ResourceFile res_file; - res_file.name = ResourceName({}, *ParseResourceType(path_data.resource_dir), - path_data.name); + res_file.name = ResourceName({}, *ParseResourceType(path_data.resource_dir), path_data.name); res_file.config = path_data.config; res_file.source = path_data.source; std::string error_str; Maybe<android::FileMap> f = file::MmapPath(path_data.source.path, &error_str); if (!f) { - context->GetDiagnostics()->Error(DiagMessage(path_data.source) - << error_str); + context->GetDiagnostics()->Error(DiagMessage(path_data.source) << error_str); return false; } @@ -604,11 +582,17 @@ static bool CompileFile(IAaptContext* context, const CompileOptions& options, class CompileContext : public IAaptContext { public: - void SetVerbose(bool val) { verbose_ = val; } + void SetVerbose(bool val) { + verbose_ = val; + } - bool IsVerbose() override { return verbose_; } + bool IsVerbose() override { + return verbose_; + } - IDiagnostics* GetDiagnostics() override { return &diagnostics_; } + IDiagnostics* GetDiagnostics() override { + return &diagnostics_; + } NameMangler* GetNameMangler() override { abort(); @@ -620,14 +604,18 @@ class CompileContext : public IAaptContext { return empty; } - uint8_t GetPackageId() override { return 0x0; } + uint8_t GetPackageId() override { + return 0x0; + } SymbolTable* GetExternalSymbols() override { abort(); return nullptr; } - int GetMinSdkVersion() override { return 0; } + int GetMinSdkVersion() override { + return 0; + } private: StdErrDiagnostics diagnostics_; @@ -646,16 +634,13 @@ int Compile(const std::vector<StringPiece>& args) { Flags flags = Flags() .RequiredFlag("-o", "Output path", &options.output_path) - .OptionalFlag("--dir", "Directory to scan for resources", - &options.res_dir) + .OptionalFlag("--dir", "Directory to scan for resources", &options.res_dir) .OptionalSwitch("--pseudo-localize", "Generate resources for pseudo-locales " "(en-XA and ar-XB)", &options.pseudolocalize) - .OptionalSwitch( - "--legacy", - "Treat errors that used to be valid in AAPT as warnings", - &options.legacy_mode) + .OptionalSwitch("--legacy", "Treat errors that used to be valid in AAPT as warnings", + &options.legacy_mode) .OptionalSwitch("-v", "Enables verbose logging", &verbose); if (!flags.Parse("aapt2 compile", args, &std::cerr)) { return 1; @@ -669,8 +654,7 @@ int Compile(const std::vector<StringPiece>& args) { if (options.res_dir) { if (!flags.GetArgs().empty()) { // Can't have both files and a resource directory. - context.GetDiagnostics()->Error(DiagMessage() - << "files given but --dir specified"); + context.GetDiagnostics()->Error(DiagMessage() << "files given but --dir specified"); flags.Usage("aapt2 compile", &std::cerr); return 1; } @@ -679,8 +663,7 @@ int Compile(const std::vector<StringPiece>& args) { return 1; } - archive_writer = CreateZipFileArchiveWriter(context.GetDiagnostics(), - options.output_path); + archive_writer = CreateZipFileArchiveWriter(context.GetDiagnostics(), options.output_path); } else { input_data.reserve(flags.GetArgs().size()); @@ -688,18 +671,15 @@ int Compile(const std::vector<StringPiece>& args) { // Collect data from the path for each input file. for (const std::string& arg : flags.GetArgs()) { std::string error_str; - if (Maybe<ResourcePathData> path_data = - ExtractResourcePathData(arg, &error_str)) { + if (Maybe<ResourcePathData> path_data = ExtractResourcePathData(arg, &error_str)) { input_data.push_back(std::move(path_data.value())); } else { - context.GetDiagnostics()->Error(DiagMessage() << error_str << " (" - << arg << ")"); + context.GetDiagnostics()->Error(DiagMessage() << error_str << " (" << arg << ")"); return 1; } } - archive_writer = CreateDirectoryArchiveWriter(context.GetDiagnostics(), - options.output_path); + archive_writer = CreateDirectoryArchiveWriter(context.GetDiagnostics(), options.output_path); } if (!archive_writer) { @@ -709,8 +689,7 @@ int Compile(const std::vector<StringPiece>& args) { bool error = false; for (ResourcePathData& path_data : input_data) { if (options.verbose) { - context.GetDiagnostics()->Note(DiagMessage(path_data.source) - << "processing"); + context.GetDiagnostics()->Note(DiagMessage(path_data.source) << "processing"); } if (path_data.resource_dir == "values") { @@ -718,42 +697,35 @@ int Compile(const std::vector<StringPiece>& args) { path_data.extension = "arsc"; const std::string output_filename = BuildIntermediateFilename(path_data); - if (!CompileTable(&context, options, path_data, archive_writer.get(), - output_filename)) { + if (!CompileTable(&context, options, path_data, archive_writer.get(), output_filename)) { error = true; } } else { const std::string output_filename = BuildIntermediateFilename(path_data); - if (const ResourceType* type = - ParseResourceType(path_data.resource_dir)) { + if (const ResourceType* type = ParseResourceType(path_data.resource_dir)) { if (*type != ResourceType::kRaw) { if (path_data.extension == "xml") { - if (!CompileXml(&context, options, path_data, archive_writer.get(), - output_filename)) { + if (!CompileXml(&context, options, path_data, archive_writer.get(), output_filename)) { error = true; } - } else if (path_data.extension == "png" || - path_data.extension == "9.png") { - if (!CompilePng(&context, options, path_data, archive_writer.get(), - output_filename)) { + } else if (path_data.extension == "png" || path_data.extension == "9.png") { + if (!CompilePng(&context, options, path_data, archive_writer.get(), output_filename)) { error = true; } } else { - if (!CompileFile(&context, options, path_data, archive_writer.get(), - output_filename)) { + if (!CompileFile(&context, options, path_data, archive_writer.get(), output_filename)) { error = true; } } } else { - if (!CompileFile(&context, options, path_data, archive_writer.get(), - output_filename)) { + if (!CompileFile(&context, options, path_data, archive_writer.get(), output_filename)) { error = true; } } } else { - context.GetDiagnostics()->Error( - DiagMessage() << "invalid file path '" << path_data.source << "'"); + context.GetDiagnostics()->Error(DiagMessage() << "invalid file path '" << path_data.source + << "'"); error = true; } } diff --git a/tools/aapt2/diff/Diff.cpp b/tools/aapt2/cmd/Diff.cpp index dacf8d9f1e96..fdc89b2b24bd 100644 --- a/tools/aapt2/diff/Diff.cpp +++ b/tools/aapt2/cmd/Diff.cpp @@ -28,21 +28,36 @@ namespace aapt { class DiffContext : public IAaptContext { public: - DiffContext() : name_mangler_({}), symbol_table_(&name_mangler_) {} + DiffContext() : name_mangler_({}), symbol_table_(&name_mangler_) { + } - const std::string& GetCompilationPackage() override { return empty_; } + const std::string& GetCompilationPackage() override { + return empty_; + } - uint8_t GetPackageId() override { return 0x0; } + uint8_t GetPackageId() override { + return 0x0; + } - IDiagnostics* GetDiagnostics() override { return &diagnostics_; } + IDiagnostics* GetDiagnostics() override { + return &diagnostics_; + } - NameMangler* GetNameMangler() override { return &name_mangler_; } + NameMangler* GetNameMangler() override { + return &name_mangler_; + } - SymbolTable* GetExternalSymbols() override { return &symbol_table_; } + SymbolTable* GetExternalSymbols() override { + return &symbol_table_; + } - bool IsVerbose() override { return false; } + bool IsVerbose() override { + return false; + } - int GetMinSdkVersion() override { return 0; } + int GetMinSdkVersion() override { + return 0; + } private: std::string empty_; @@ -55,34 +70,31 @@ static void EmitDiffLine(const Source& source, const StringPiece& message) { std::cerr << source << ": " << message << "\n"; } -static bool IsSymbolVisibilityDifferent(const Symbol& symbol_a, - const Symbol& symbol_b) { +static bool IsSymbolVisibilityDifferent(const Symbol& symbol_a, const Symbol& symbol_b) { return symbol_a.state != symbol_b.state; } template <typename Id> -static bool IsIdDiff(const Symbol& symbol_a, const Maybe<Id>& id_a, - const Symbol& symbol_b, const Maybe<Id>& id_b) { - if (symbol_a.state == SymbolState::kPublic || - symbol_b.state == SymbolState::kPublic) { +static bool IsIdDiff(const Symbol& symbol_a, const Maybe<Id>& id_a, const Symbol& symbol_b, + const Maybe<Id>& id_b) { + if (symbol_a.state == SymbolState::kPublic || symbol_b.state == SymbolState::kPublic) { return id_a != id_b; } return false; } -static bool EmitResourceConfigValueDiff( - IAaptContext* context, LoadedApk* apk_a, ResourceTablePackage* pkg_a, - ResourceTableType* type_a, ResourceEntry* entry_a, - ResourceConfigValue* config_value_a, LoadedApk* apk_b, - ResourceTablePackage* pkg_b, ResourceTableType* type_b, - ResourceEntry* entry_b, ResourceConfigValue* config_value_b) { +static bool EmitResourceConfigValueDiff(IAaptContext* context, LoadedApk* apk_a, + ResourceTablePackage* pkg_a, ResourceTableType* type_a, + ResourceEntry* entry_a, ResourceConfigValue* config_value_a, + LoadedApk* apk_b, ResourceTablePackage* pkg_b, + ResourceTableType* type_b, ResourceEntry* entry_b, + ResourceConfigValue* config_value_b) { Value* value_a = config_value_a->value.get(); Value* value_b = config_value_b->value.get(); if (!value_a->Equals(value_b)) { std::stringstream str_stream; - str_stream << "value " << pkg_a->name << ":" << type_a->type << "/" - << entry_a->name << " config=" << config_value_a->config - << " does not match:\n"; + str_stream << "value " << pkg_a->name << ":" << type_a->type << "/" << entry_a->name + << " config=" << config_value_a->config << " does not match:\n"; value_a->Print(&str_stream); str_stream << "\n vs \n"; value_b->Print(&str_stream); @@ -93,37 +105,33 @@ static bool EmitResourceConfigValueDiff( } static bool EmitResourceEntryDiff(IAaptContext* context, LoadedApk* apk_a, - ResourceTablePackage* pkg_a, - ResourceTableType* type_a, + ResourceTablePackage* pkg_a, ResourceTableType* type_a, ResourceEntry* entry_a, LoadedApk* apk_b, - ResourceTablePackage* pkg_b, - ResourceTableType* type_b, + ResourceTablePackage* pkg_b, ResourceTableType* type_b, ResourceEntry* entry_b) { bool diff = false; for (std::unique_ptr<ResourceConfigValue>& config_value_a : entry_a->values) { - ResourceConfigValue* config_value_b = - entry_b->FindValue(config_value_a->config); + ResourceConfigValue* config_value_b = entry_b->FindValue(config_value_a->config); if (!config_value_b) { std::stringstream str_stream; - str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" - << entry_a->name << " config=" << config_value_a->config; + str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" << entry_a->name + << " config=" << config_value_a->config; EmitDiffLine(apk_b->GetSource(), str_stream.str()); diff = true; } else { - diff |= EmitResourceConfigValueDiff( - context, apk_a, pkg_a, type_a, entry_a, config_value_a.get(), apk_b, - pkg_b, type_b, entry_b, config_value_b); + diff |= + EmitResourceConfigValueDiff(context, apk_a, pkg_a, type_a, entry_a, config_value_a.get(), + apk_b, pkg_b, type_b, entry_b, config_value_b); } } // Check for any newly added config values. for (std::unique_ptr<ResourceConfigValue>& config_value_b : entry_b->values) { - ResourceConfigValue* config_value_a = - entry_a->FindValue(config_value_b->config); + ResourceConfigValue* config_value_a = entry_a->FindValue(config_value_b->config); if (!config_value_a) { std::stringstream str_stream; - str_stream << "new config " << pkg_b->name << ":" << type_b->type << "/" - << entry_b->name << " config=" << config_value_b->config; + str_stream << "new config " << pkg_b->name << ":" << type_b->type << "/" << entry_b->name + << " config=" << config_value_b->config; EmitDiffLine(apk_b->GetSource(), str_stream.str()); diff = true; } @@ -132,22 +140,19 @@ static bool EmitResourceEntryDiff(IAaptContext* context, LoadedApk* apk_a, } static bool EmitResourceTypeDiff(IAaptContext* context, LoadedApk* apk_a, - ResourceTablePackage* pkg_a, - ResourceTableType* type_a, LoadedApk* apk_b, - ResourceTablePackage* pkg_b, + ResourceTablePackage* pkg_a, ResourceTableType* type_a, + LoadedApk* apk_b, ResourceTablePackage* pkg_b, ResourceTableType* type_b) { bool diff = false; for (std::unique_ptr<ResourceEntry>& entry_a : type_a->entries) { ResourceEntry* entry_b = type_b->FindEntry(entry_a->name); if (!entry_b) { std::stringstream str_stream; - str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" - << entry_a->name; + str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" << entry_a->name; EmitDiffLine(apk_b->GetSource(), str_stream.str()); diff = true; } else { - if (IsSymbolVisibilityDifferent(entry_a->symbol_status, - entry_b->symbol_status)) { + if (IsSymbolVisibilityDifferent(entry_a->symbol_status, entry_b->symbol_status)) { std::stringstream str_stream; str_stream << pkg_a->name << ":" << type_a->type << "/" << entry_a->name << " has different visibility ("; @@ -165,8 +170,8 @@ static bool EmitResourceTypeDiff(IAaptContext* context, LoadedApk* apk_a, str_stream << ")"; EmitDiffLine(apk_b->GetSource(), str_stream.str()); diff = true; - } else if (IsIdDiff(entry_a->symbol_status, entry_a->id, - entry_b->symbol_status, entry_b->id)) { + } else if (IsIdDiff(entry_a->symbol_status, entry_a->id, entry_b->symbol_status, + entry_b->id)) { std::stringstream str_stream; str_stream << pkg_a->name << ":" << type_a->type << "/" << entry_a->name << " has different public ID ("; @@ -185,9 +190,8 @@ static bool EmitResourceTypeDiff(IAaptContext* context, LoadedApk* apk_a, EmitDiffLine(apk_b->GetSource(), str_stream.str()); diff = true; } - diff |= - EmitResourceEntryDiff(context, apk_a, pkg_a, type_a, entry_a.get(), - apk_b, pkg_b, type_b, entry_b); + diff |= EmitResourceEntryDiff(context, apk_a, pkg_a, type_a, entry_a.get(), apk_b, pkg_b, + type_b, entry_b); } } @@ -196,8 +200,7 @@ static bool EmitResourceTypeDiff(IAaptContext* context, LoadedApk* apk_a, ResourceEntry* entry_a = type_a->FindEntry(entry_b->name); if (!entry_a) { std::stringstream str_stream; - str_stream << "new entry " << pkg_b->name << ":" << type_b->type << "/" - << entry_b->name; + str_stream << "new entry " << pkg_b->name << ":" << type_b->type << "/" << entry_b->name; EmitDiffLine(apk_b->GetSource(), str_stream.str()); diff = true; } @@ -206,8 +209,7 @@ static bool EmitResourceTypeDiff(IAaptContext* context, LoadedApk* apk_a, } static bool EmitResourcePackageDiff(IAaptContext* context, LoadedApk* apk_a, - ResourceTablePackage* pkg_a, - LoadedApk* apk_b, + ResourceTablePackage* pkg_a, LoadedApk* apk_b, ResourceTablePackage* pkg_b) { bool diff = false; for (std::unique_ptr<ResourceTableType>& type_a : pkg_a->types) { @@ -218,11 +220,9 @@ static bool EmitResourcePackageDiff(IAaptContext* context, LoadedApk* apk_a, EmitDiffLine(apk_a->GetSource(), str_stream.str()); diff = true; } else { - if (IsSymbolVisibilityDifferent(type_a->symbol_status, - type_b->symbol_status)) { + if (IsSymbolVisibilityDifferent(type_a->symbol_status, type_b->symbol_status)) { std::stringstream str_stream; - str_stream << pkg_a->name << ":" << type_a->type - << " has different visibility ("; + str_stream << pkg_a->name << ":" << type_a->type << " has different visibility ("; if (type_b->symbol_status.state == SymbolState::kPublic) { str_stream << "PUBLIC"; } else { @@ -237,11 +237,9 @@ static bool EmitResourcePackageDiff(IAaptContext* context, LoadedApk* apk_a, str_stream << ")"; EmitDiffLine(apk_b->GetSource(), str_stream.str()); diff = true; - } else if (IsIdDiff(type_a->symbol_status, type_a->id, - type_b->symbol_status, type_b->id)) { + } else if (IsIdDiff(type_a->symbol_status, type_a->id, type_b->symbol_status, type_b->id)) { std::stringstream str_stream; - str_stream << pkg_a->name << ":" << type_a->type - << " has different public ID ("; + str_stream << pkg_a->name << ":" << type_a->type << " has different public ID ("; if (type_b->id) { str_stream << "0x" << std::hex << type_b->id.value(); } else { @@ -257,8 +255,7 @@ static bool EmitResourcePackageDiff(IAaptContext* context, LoadedApk* apk_a, EmitDiffLine(apk_b->GetSource(), str_stream.str()); diff = true; } - diff |= EmitResourceTypeDiff(context, apk_a, pkg_a, type_a.get(), apk_b, - pkg_b, type_b); + diff |= EmitResourceTypeDiff(context, apk_a, pkg_a, type_a.get(), apk_b, pkg_b, type_b); } } @@ -275,8 +272,7 @@ static bool EmitResourcePackageDiff(IAaptContext* context, LoadedApk* apk_a, return diff; } -static bool EmitResourceTableDiff(IAaptContext* context, LoadedApk* apk_a, - LoadedApk* apk_b) { +static bool EmitResourceTableDiff(IAaptContext* context, LoadedApk* apk_a, LoadedApk* apk_b) { ResourceTable* table_a = apk_a->GetResourceTable(); ResourceTable* table_b = apk_b->GetResourceTable(); @@ -307,8 +303,7 @@ static bool EmitResourceTableDiff(IAaptContext* context, LoadedApk* apk_a, EmitDiffLine(apk_b->GetSource(), str_stream.str()); diff = true; } - diff |= - EmitResourcePackageDiff(context, apk_a, pkg_a.get(), apk_b, pkg_b); + diff |= EmitResourcePackageDiff(context, apk_a, pkg_a.get(), apk_b, pkg_b); } } @@ -357,10 +352,8 @@ int Diff(const std::vector<StringPiece>& args) { return 1; } - std::unique_ptr<LoadedApk> apk_a = - LoadedApk::LoadApkFromPath(&context, flags.GetArgs()[0]); - std::unique_ptr<LoadedApk> apk_b = - LoadedApk::LoadApkFromPath(&context, flags.GetArgs()[1]); + std::unique_ptr<LoadedApk> apk_a = LoadedApk::LoadApkFromPath(&context, flags.GetArgs()[0]); + std::unique_ptr<LoadedApk> apk_b = LoadedApk::LoadApkFromPath(&context, flags.GetArgs()[1]); if (!apk_a || !apk_b) { return 1; } diff --git a/tools/aapt2/dump/Dump.cpp b/tools/aapt2/cmd/Dump.cpp index bcede72037b2..1bbfb28a7870 100644 --- a/tools/aapt2/dump/Dump.cpp +++ b/tools/aapt2/cmd/Dump.cpp @@ -31,13 +31,12 @@ using android::StringPiece; namespace aapt { -void DumpCompiledFile(const pb::CompiledFile& pb_file, const void* data, - size_t len, const Source& source, IAaptContext* context) { +void DumpCompiledFile(const pb::CompiledFile& pb_file, const void* data, size_t len, + const Source& source, IAaptContext* context) { std::unique_ptr<ResourceFile> file = DeserializeCompiledFileFromPb(pb_file, source, context->GetDiagnostics()); if (!file) { - context->GetDiagnostics()->Warn(DiagMessage() - << "failed to read compiled file"); + context->GetDiagnostics()->Warn(DiagMessage() << "failed to read compiled file"); return; } @@ -50,27 +49,24 @@ void TryDumpFile(IAaptContext* context, const std::string& file_path) { std::unique_ptr<ResourceTable> table; std::string err; - std::unique_ptr<io::ZipFileCollection> zip = - io::ZipFileCollection::Create(file_path, &err); + std::unique_ptr<io::ZipFileCollection> zip = io::ZipFileCollection::Create(file_path, &err); if (zip) { io::IFile* file = zip->FindFile("resources.arsc.flat"); if (file) { std::unique_ptr<io::IData> data = file->OpenAsData(); if (!data) { - context->GetDiagnostics()->Error( - DiagMessage(file_path) << "failed to open resources.arsc.flat"); + context->GetDiagnostics()->Error(DiagMessage(file_path) + << "failed to open resources.arsc.flat"); return; } pb::ResourceTable pb_table; if (!pb_table.ParseFromArray(data->data(), data->size())) { - context->GetDiagnostics()->Error(DiagMessage(file_path) - << "invalid resources.arsc.flat"); + context->GetDiagnostics()->Error(DiagMessage(file_path) << "invalid resources.arsc.flat"); return; } - table = DeserializeTableFromPb(pb_table, Source(file_path), - context->GetDiagnostics()); + table = DeserializeTableFromPb(pb_table, Source(file_path), context->GetDiagnostics()); if (!table) { return; } @@ -87,8 +83,8 @@ void TryDumpFile(IAaptContext* context, const std::string& file_path) { } table = util::make_unique<ResourceTable>(); - BinaryResourceParser parser(context, table.get(), Source(file_path), - data->data(), data->size()); + BinaryResourceParser parser(context, table.get(), Source(file_path), data->data(), + data->size()); if (!parser.Parse()) { return; } @@ -107,16 +103,13 @@ void TryDumpFile(IAaptContext* context, const std::string& file_path) { // Try as a compiled table. pb::ResourceTable pb_table; - if (pb_table.ParseFromArray(file_map->getDataPtr(), - file_map->getDataLength())) { - table = DeserializeTableFromPb(pb_table, Source(file_path), - context->GetDiagnostics()); + if (pb_table.ParseFromArray(file_map->getDataPtr(), file_map->getDataLength())) { + table = DeserializeTableFromPb(pb_table, Source(file_path), context->GetDiagnostics()); } if (!table) { // Try as a compiled file. - CompiledFileInputStream input(file_map->getDataPtr(), - file_map->getDataLength()); + CompiledFileInputStream input(file_map->getDataPtr(), file_map->getDataLength()); uint32_t num_files = 0; if (!input.ReadLittleEndian32(&num_files)) { @@ -126,20 +119,17 @@ void TryDumpFile(IAaptContext* context, const std::string& file_path) { for (uint32_t i = 0; i < num_files; i++) { pb::CompiledFile compiled_file; if (!input.ReadCompiledFile(&compiled_file)) { - context->GetDiagnostics()->Warn(DiagMessage() - << "failed to read compiled file"); + context->GetDiagnostics()->Warn(DiagMessage() << "failed to read compiled file"); return; } uint64_t offset, len; if (!input.ReadDataMetaData(&offset, &len)) { - context->GetDiagnostics()->Warn(DiagMessage() - << "failed to read meta data"); + context->GetDiagnostics()->Warn(DiagMessage() << "failed to read meta data"); return; } - const void* data = - static_cast<const uint8_t*>(file_map->getDataPtr()) + offset; + const void* data = static_cast<const uint8_t*>(file_map->getDataPtr()) + offset; DumpCompiledFile(compiled_file, data, len, Source(file_path), context); } } @@ -154,7 +144,9 @@ void TryDumpFile(IAaptContext* context, const std::string& file_path) { class DumpContext : public IAaptContext { public: - IDiagnostics* GetDiagnostics() override { return &diagnostics_; } + IDiagnostics* GetDiagnostics() override { + return &diagnostics_; + } NameMangler* GetNameMangler() override { abort(); @@ -166,18 +158,26 @@ class DumpContext : public IAaptContext { return empty; } - uint8_t GetPackageId() override { return 0; } + uint8_t GetPackageId() override { + return 0; + } SymbolTable* GetExternalSymbols() override { abort(); return nullptr; } - bool IsVerbose() override { return verbose_; } + bool IsVerbose() override { + return verbose_; + } - void SetVerbose(bool val) { verbose_ = val; } + void SetVerbose(bool val) { + verbose_ = val; + } - int GetMinSdkVersion() override { return 0; } + int GetMinSdkVersion() override { + return 0; + } private: StdErrDiagnostics diagnostics_; @@ -189,8 +189,7 @@ class DumpContext : public IAaptContext { */ int Dump(const std::vector<StringPiece>& args) { bool verbose = false; - Flags flags = - Flags().OptionalSwitch("-v", "increase verbosity of output", &verbose); + Flags flags = Flags().OptionalSwitch("-v", "increase verbosity of output", &verbose); if (!flags.Parse("aapt2 dump", args, &std::cerr)) { return 1; } diff --git a/tools/aapt2/link/Link.cpp b/tools/aapt2/cmd/Link.cpp index 407eb5266785..6e0809e62450 100644 --- a/tools/aapt2/link/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -33,6 +33,7 @@ #include "Locale.h" #include "NameMangler.h" #include "ResourceUtils.h" +#include "cmd/Util.h" #include "compile/IdAssigner.h" #include "filter/ConfigFilter.h" #include "flatten/Archive.h" @@ -40,6 +41,7 @@ #include "flatten/XmlFlattener.h" #include "io/BigBufferInputStream.h" #include "io/FileSystem.h" +#include "io/Util.h" #include "io/ZipArchive.h" #include "java/JavaClassGenerator.h" #include "java/ManifestClassGenerator.h" @@ -60,7 +62,6 @@ using android::StringPiece; using android::base::StringPrintf; -using ::google::protobuf::io::CopyingOutputStreamAdaptor; namespace aapt { @@ -125,11 +126,16 @@ struct LinkOptions { class LinkContext : public IAaptContext { public: - LinkContext() : name_mangler_({}), symbols_(&name_mangler_) {} + LinkContext() : name_mangler_({}), symbols_(&name_mangler_) { + } - IDiagnostics* GetDiagnostics() override { return &diagnostics_; } + IDiagnostics* GetDiagnostics() override { + return &diagnostics_; + } - NameMangler* GetNameMangler() override { return &name_mangler_; } + NameMangler* GetNameMangler() override { + return &name_mangler_; + } void SetNameManglerPolicy(const NameManglerPolicy& policy) { name_mangler_ = NameMangler(policy); @@ -143,19 +149,33 @@ class LinkContext : public IAaptContext { compilation_package_ = package_name.to_string(); } - uint8_t GetPackageId() override { return package_id_; } + uint8_t GetPackageId() override { + return package_id_; + } - void SetPackageId(uint8_t id) { package_id_ = id; } + void SetPackageId(uint8_t id) { + package_id_ = id; + } - SymbolTable* GetExternalSymbols() override { return &symbols_; } + SymbolTable* GetExternalSymbols() override { + return &symbols_; + } - bool IsVerbose() override { return verbose_; } + bool IsVerbose() override { + return verbose_; + } - void SetVerbose(bool val) { verbose_ = val; } + void SetVerbose(bool val) { + verbose_ = val; + } - int GetMinSdkVersion() override { return min_sdk_version_; } + int GetMinSdkVersion() override { + return min_sdk_version_; + } - void SetMinSdkVersion(int minSdk) { min_sdk_version_ = minSdk; } + void SetMinSdkVersion(int minSdk) { + min_sdk_version_ = minSdk; + } private: DISALLOW_COPY_AND_ASSIGN(LinkContext); @@ -169,63 +189,9 @@ class LinkContext : public IAaptContext { int min_sdk_version_ = 0; }; -static bool CopyInputStreamToArchive(io::InputStream* in, const std::string& out_path, - uint32_t compression_flags, IArchiveWriter* writer, - IAaptContext* context) { - if (context->IsVerbose()) { - context->GetDiagnostics()->Note(DiagMessage() << "writing " << out_path << " to archive"); - } - - if (!writer->WriteFile(out_path, compression_flags, in)) { - context->GetDiagnostics()->Error(DiagMessage() << "failed to write " << out_path - << " to archive: " << writer->GetError()); - return false; - } - return true; -} - -static bool CopyFileToArchive(io::IFile* file, const std::string& out_path, - uint32_t compression_flags, - IArchiveWriter* writer, IAaptContext* context) { - std::unique_ptr<io::IData> data = file->OpenAsData(); - if (!data) { - context->GetDiagnostics()->Error(DiagMessage(file->GetSource()) << "failed to open file"); - return false; - } - return CopyInputStreamToArchive(data.get(), out_path, compression_flags, writer, context); -} - -static bool CopyProtoToArchive(::google::protobuf::MessageLite* proto_msg, - const std::string& out_path, uint32_t compression_flags, - IArchiveWriter* writer, IAaptContext* context) { - if (context->IsVerbose()) { - context->GetDiagnostics()->Note(DiagMessage() << "writing " << out_path << " to archive"); - } - - if (writer->StartEntry(out_path, compression_flags)) { - // Make sure CopyingOutputStreamAdaptor is deleted before we call writer->FinishEntry(). - { - // Wrap our IArchiveWriter with an adaptor that implements the ZeroCopyOutputStream interface. - ::google::protobuf::io::CopyingOutputStreamAdaptor adaptor(writer); - if (!proto_msg->SerializeToZeroCopyStream(&adaptor)) { - context->GetDiagnostics()->Error(DiagMessage() - << "failed to write " << out_path << " to archive"); - return false; - } - } - - if (writer->FinishEntry()) { - return true; - } - } - context->GetDiagnostics()->Error(DiagMessage() << "failed to write " << out_path - << " to archive: " << writer->GetError()); - return false; -} - static bool FlattenXml(xml::XmlResource* xml_res, const StringPiece& path, - Maybe<size_t> max_sdk_level, bool keep_raw_values, - IArchiveWriter* writer, IAaptContext* context) { + Maybe<size_t> max_sdk_level, bool keep_raw_values, IArchiveWriter* writer, + IAaptContext* context) { BigBuffer buffer(1024); XmlFlattenerOptions options = {}; options.keep_raw_values = keep_raw_values; @@ -239,21 +205,18 @@ static bool FlattenXml(xml::XmlResource* xml_res, const StringPiece& path, DiagMessage msg; msg << "writing " << path << " to archive"; if (max_sdk_level) { - msg << " maxSdkLevel=" << max_sdk_level.value() - << " keepRawValues=" << keep_raw_values; + msg << " maxSdkLevel=" << max_sdk_level.value() << " keepRawValues=" << keep_raw_values; } context->GetDiagnostics()->Note(msg); } io::BigBufferInputStream input_stream(&buffer); - return CopyInputStreamToArchive(&input_stream, path.to_string(), ArchiveEntry::kCompress, writer, - context); + return io::CopyInputStreamToArchive(context, &input_stream, path.to_string(), + ArchiveEntry::kCompress, writer); } -static std::unique_ptr<ResourceTable> LoadTableFromPb(const Source& source, - const void* data, - size_t len, - IDiagnostics* diag) { +static std::unique_ptr<ResourceTable> LoadTableFromPb(const Source& source, const void* data, + size_t len, IDiagnostics* diag) { pb::ResourceTable pb_table; if (!pb_table.ParseFromArray(data, len)) { diag->Error(DiagMessage(source) << "invalid compiled table"); @@ -270,8 +233,7 @@ static std::unique_ptr<ResourceTable> LoadTableFromPb(const Source& source, /** * Inflates an XML file from the source path. */ -static std::unique_ptr<xml::XmlResource> LoadXml(const std::string& path, - IDiagnostics* diag) { +static std::unique_ptr<xml::XmlResource> LoadXml(const std::string& path, IDiagnostics* diag) { std::ifstream fin(path, std::ifstream::binary); if (!fin) { diag->Error(DiagMessage(path) << strerror(errno)); @@ -293,9 +255,10 @@ struct ResourceFileFlattenerOptions { class ResourceFileFlattener { public: - ResourceFileFlattener(const ResourceFileFlattenerOptions& options, - IAaptContext* context, proguard::KeepSet* keep_set) - : options_(options), context_(context), keep_set_(keep_set) {} + ResourceFileFlattener(const ResourceFileFlattenerOptions& options, IAaptContext* context, + proguard::KeepSet* keep_set) + : options_(options), context_(context), keep_set_(keep_set) { + } bool Flatten(ResourceTable* table, IArchiveWriter* archive_writer); @@ -341,25 +304,15 @@ uint32_t ResourceFileFlattener::GetCompressionFlags(const StringPiece& str) { } static bool IsTransitionElement(const std::string& name) { - return - name == "fade" || - name == "changeBounds" || - name == "slide" || - name == "explode" || - name == "changeImageTransform" || - name == "changeTransform" || - name == "changeClipBounds" || - name == "autoTransition" || - name == "recolor" || - name == "changeScroll" || - name == "transitionSet" || - name == "transition" || - name == "transitionManager"; + return name == "fade" || name == "changeBounds" || name == "slide" || name == "explode" || + name == "changeImageTransform" || name == "changeTransform" || + name == "changeClipBounds" || name == "autoTransition" || name == "recolor" || + name == "changeScroll" || name == "transitionSet" || name == "transition" || + name == "transitionManager"; } -bool ResourceFileFlattener::LinkAndVersionXmlFile( - ResourceTable* table, FileOperation* file_op, - std::queue<FileOperation>* out_file_op_queue) { +bool ResourceFileFlattener::LinkAndVersionXmlFile(ResourceTable* table, FileOperation* file_op, + std::queue<FileOperation>* out_file_op_queue) { xml::XmlResource* doc = file_op->xml_to_flatten.get(); const Source& src = doc->file.source; @@ -372,8 +325,7 @@ bool ResourceFileFlattener::LinkAndVersionXmlFile( return false; } - if (options_.update_proguard_spec && - !proguard::CollectProguardRules(src, doc, keep_set_)) { + if (options_.update_proguard_spec && !proguard::CollectProguardRules(src, doc, keep_set_)) { return false; } @@ -415,8 +367,7 @@ bool ResourceFileFlattener::LinkAndVersionXmlFile( const int min_sdk_version = context_->GetMinSdkVersion(); for (int sdk_level : xml_linker.sdk_levels()) { if (sdk_level > min_sdk_version && sdk_level > config.sdkVersion) { - if (!ShouldGenerateVersionedResource(file_op->entry, config, - sdk_level)) { + if (!ShouldGenerateVersionedResource(file_op->entry, config, sdk_level)) { // If we shouldn't generate a versioned resource, stop checking. break; } @@ -425,24 +376,22 @@ bool ResourceFileFlattener::LinkAndVersionXmlFile( versioned_file_desc.config.sdkVersion = (uint16_t)sdk_level; FileOperation new_file_op; - new_file_op.xml_to_flatten = util::make_unique<xml::XmlResource>( - versioned_file_desc, doc->root->Clone()); + new_file_op.xml_to_flatten = + util::make_unique<xml::XmlResource>(versioned_file_desc, doc->root->Clone()); new_file_op.config = versioned_file_desc.config; new_file_op.entry = file_op->entry; - new_file_op.dst_path = ResourceUtils::BuildResourceFileName( - versioned_file_desc, context_->GetNameMangler()); + new_file_op.dst_path = + ResourceUtils::BuildResourceFileName(versioned_file_desc, context_->GetNameMangler()); if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note( - DiagMessage(versioned_file_desc.source) - << "auto-versioning resource from config '" << config << "' -> '" - << versioned_file_desc.config << "'"); + context_->GetDiagnostics()->Note(DiagMessage(versioned_file_desc.source) + << "auto-versioning resource from config '" << config + << "' -> '" << versioned_file_desc.config << "'"); } bool added = table->AddFileReferenceAllowMangled( - versioned_file_desc.name, versioned_file_desc.config, - versioned_file_desc.source, new_file_op.dst_path, nullptr, - context_->GetDiagnostics()); + versioned_file_desc.name, versioned_file_desc.config, versioned_file_desc.source, + new_file_op.dst_path, nullptr, context_->GetDiagnostics()); if (!added) { return false; } @@ -460,11 +409,9 @@ bool ResourceFileFlattener::LinkAndVersionXmlFile( * will * corrupt the iteration order. */ -bool ResourceFileFlattener::Flatten(ResourceTable* table, - IArchiveWriter* archive_writer) { +bool ResourceFileFlattener::Flatten(ResourceTable* table, IArchiveWriter* archive_writer) { bool error = false; - std::map<std::pair<ConfigDescription, StringPiece>, FileOperation> - config_sorted_files; + std::map<std::pair<ConfigDescription, StringPiece>, FileOperation> config_sorted_files; for (auto& pkg : table->packages) { for (auto& type : pkg->types) { @@ -476,8 +423,7 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, // Populate the queue with all files in the ResourceTable. for (auto& entry : type->entries) { for (auto& config_value : entry->values) { - FileReference* file_ref = - ValueCast<FileReference>(config_value->value.get()); + FileReference* file_ref = ValueCast<FileReference>(config_value->value.get()); if (!file_ref) { continue; } @@ -496,8 +442,7 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, const StringPiece src_path = file->GetSource().path; if (type->type != ResourceType::kRaw && - (util::EndsWith(src_path, ".xml.flat") || - util::EndsWith(src_path, ".xml"))) { + (util::EndsWith(src_path, ".xml.flat") || util::EndsWith(src_path, ".xml"))) { std::unique_ptr<io::IData> data = file->OpenAsData(); if (!data) { context_->GetDiagnostics()->Error(DiagMessage(file->GetSource()) @@ -505,9 +450,8 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, return false; } - file_op.xml_to_flatten = - xml::Inflate(data->data(), data->size(), - context_->GetDiagnostics(), file->GetSource()); + file_op.xml_to_flatten = xml::Inflate(data->data(), data->size(), + context_->GetDiagnostics(), file->GetSource()); if (!file_op.xml_to_flatten) { return false; @@ -515,8 +459,7 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, file_op.xml_to_flatten->file.config = config_value->config; file_op.xml_to_flatten->file.source = file_ref->GetSource(); - file_op.xml_to_flatten->file.name = - ResourceName(pkg->name, type->type, entry->name); + file_op.xml_to_flatten->file.name = ResourceName(pkg->name, type->type, entry->name); // Enqueue the XML files to be processed. file_operations.push(std::move(file_op)); @@ -528,8 +471,8 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, // then creating a StringPiece from the copy, which would cause us // to end up referencing garbage in the map. const StringPiece entry_name(entry->name); - config_sorted_files[std::make_pair( - config_value->config, entry_name)] = std::move(file_op); + config_sorted_files[std::make_pair(config_value->config, entry_name)] = + std::move(file_op); } } } @@ -548,8 +491,7 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, // creating a StringPiece from the copy, which would cause us to end up // referencing garbage in the map. const StringPiece entry_name(file_op.entry->name); - config_sorted_files[std::make_pair(file_op.config, entry_name)] = - std::move(file_op); + config_sorted_files[std::make_pair(file_op.config, entry_name)] = std::move(file_op); } if (error) { @@ -564,21 +506,19 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, if (file_op.xml_to_flatten) { Maybe<size_t> max_sdk_level; if (!options_.no_auto_version && !file_op.skip_version) { - max_sdk_level = - std::max<size_t>(std::max<size_t>(config.sdkVersion, 1u), - context_->GetMinSdkVersion()); + max_sdk_level = std::max<size_t>(std::max<size_t>(config.sdkVersion, 1u), + context_->GetMinSdkVersion()); } - bool result = FlattenXml( - file_op.xml_to_flatten.get(), file_op.dst_path, max_sdk_level, - options_.keep_raw_values, archive_writer, context_); + bool result = FlattenXml(file_op.xml_to_flatten.get(), file_op.dst_path, max_sdk_level, + options_.keep_raw_values, archive_writer, context_); if (!result) { error = true; } } else { - bool result = CopyFileToArchive( - file_op.file_to_copy, file_op.dst_path, - GetCompressionFlags(file_op.dst_path), archive_writer, context_); + bool result = + io::CopyFileToArchive(context_, file_op.file_to_copy, file_op.dst_path, + GetCompressionFlags(file_op.dst_path), archive_writer); if (!result) { error = true; } @@ -589,10 +529,9 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, return !error; } -static bool WriteStableIdMapToPath( - IDiagnostics* diag, - const std::unordered_map<ResourceName, ResourceId>& id_map, - const std::string& id_map_path) { +static bool WriteStableIdMapToPath(IDiagnostics* diag, + const std::unordered_map<ResourceName, ResourceId>& id_map, + const std::string& id_map_path) { std::ofstream fout(id_map_path, std::ofstream::binary); if (!fout) { diag->Error(DiagMessage(id_map_path) << strerror(errno)); @@ -606,18 +545,16 @@ static bool WriteStableIdMapToPath( } if (!fout) { - diag->Error(DiagMessage(id_map_path) - << "failed writing to file: " - << android::base::SystemErrorCodeToString(errno)); + diag->Error(DiagMessage(id_map_path) << "failed writing to file: " + << android::base::SystemErrorCodeToString(errno)); return false; } return true; } -static bool LoadStableIdMap( - IDiagnostics* diag, const std::string& path, - std::unordered_map<ResourceName, ResourceId>* out_id_map) { +static bool LoadStableIdMap(IDiagnostics* diag, const std::string& path, + std::unordered_map<ResourceName, ResourceId>* out_id_map) { std::string content; if (!android::base::ReadFileToString(path, &content)) { diag->Error(DiagMessage(path) << "failed reading stable ID file"); @@ -643,20 +580,19 @@ static bool LoadStableIdMap( StringPiece res_name_str = util::TrimWhitespace(line.substr(0, std::distance(line.begin(), iter))); if (!ResourceUtils::ParseResourceName(res_name_str, &name)) { - diag->Error(DiagMessage(Source(path, line_no)) - << "invalid resource name '" << res_name_str << "'"); + diag->Error(DiagMessage(Source(path, line_no)) << "invalid resource name '" << res_name_str + << "'"); return false; } const size_t res_id_start_idx = std::distance(line.begin(), iter) + 1; const size_t res_id_str_len = line.size() - res_id_start_idx; - StringPiece res_id_str = - util::TrimWhitespace(line.substr(res_id_start_idx, res_id_str_len)); + StringPiece res_id_str = util::TrimWhitespace(line.substr(res_id_start_idx, res_id_str_len)); Maybe<ResourceId> maybe_id = ResourceUtils::ParseResourceId(res_id_str); if (!maybe_id) { - diag->Error(DiagMessage(Source(path, line_no)) << "invalid resource ID '" - << res_id_str << "'"); + diag->Error(DiagMessage(Source(path, line_no)) << "invalid resource ID '" << res_id_str + << "'"); return false; } @@ -665,38 +601,14 @@ static bool LoadStableIdMap( return true; } -static bool ParseSplitParameter(const StringPiece& arg, IDiagnostics* diag, - std::string* out_path, - SplitConstraints* out_split) { - std::vector<std::string> parts = util::Split(arg, ':'); - if (parts.size() != 2) { - diag->Error(DiagMessage() << "invalid split parameter '" << arg << "'"); - diag->Note( - DiagMessage() - << "should be --split path/to/output.apk:<config>[,<config>...]"); - return false; - } - *out_path = parts[0]; - std::vector<ConfigDescription> configs; - for (const StringPiece& config_str : util::Tokenize(parts[1], ',')) { - configs.push_back({}); - if (!ConfigDescription::Parse(config_str, &configs.back())) { - diag->Error(DiagMessage() << "invalid config '" << config_str - << "' in split parameter '" << arg << "'"); - return false; - } - } - out_split->configs.insert(configs.begin(), configs.end()); - return true; -} - class LinkCommand { public: LinkCommand(LinkContext* context, const LinkOptions& options) : options_(options), context_(context), final_table_(), - file_collection_(util::make_unique<io::FileCollection>()) {} + file_collection_(util::make_unique<io::FileCollection>()) { + } /** * Creates a SymbolTable that loads symbols from the various APKs and caches @@ -707,8 +619,7 @@ class LinkCommand { util::make_unique<AssetManagerSymbolSource>(); for (const std::string& path : options_.include_paths) { if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note(DiagMessage(path) - << "loading include path"); + context_->GetDiagnostics()->Note(DiagMessage(path) << "loading include path"); } // First try to load the file as a static lib. @@ -820,7 +731,7 @@ class LinkCommand { if (xml::Element* uses_sdk_el = manifest_el->FindChild({}, "uses-sdk")) { if (xml::Attribute* min_sdk = uses_sdk_el->FindAttribute(xml::kSchemaAndroid, "minSdkVersion")) { - app_info.min_sdk_version = min_sdk->value; + app_info.min_sdk_version = ResourceUtils::ParseSdkVersion(min_sdk->value); } } return app_info; @@ -832,8 +743,7 @@ class LinkCommand { * stripped, or there is an error and false is returned. */ bool VerifyNoExternalPackages() { - auto is_ext_package_func = - [&](const std::unique_ptr<ResourceTablePackage>& pkg) -> bool { + auto is_ext_package_func = [&](const std::unique_ptr<ResourceTablePackage>& pkg) -> bool { return context_->GetCompilationPackage() != pkg->name || !pkg->id || pkg->id.value() != context_->GetPackageId(); }; @@ -849,17 +759,16 @@ class LinkCommand { for (const auto& config_value : entry->values) { // Special case the occurrence of an ID that is being generated // for the 'android' package. This is due to legacy reasons. - if (ValueCast<Id>(config_value->value.get()) && - package->name == "android") { - context_->GetDiagnostics()->Warn( - DiagMessage(config_value->value->GetSource()) - << "generated id '" << res_name - << "' for external package '" << package->name << "'"); + if (ValueCast<Id>(config_value->value.get()) && package->name == "android") { + context_->GetDiagnostics()->Warn(DiagMessage(config_value->value->GetSource()) + << "generated id '" << res_name + << "' for external package '" << package->name + << "'"); } else { - context_->GetDiagnostics()->Error( - DiagMessage(config_value->value->GetSource()) - << "defined resource '" << res_name - << "' for external package '" << package->name << "'"); + context_->GetDiagnostics()->Error(DiagMessage(config_value->value->GetSource()) + << "defined resource '" << res_name + << "' for external package '" << package->name + << "'"); error = true; } } @@ -868,9 +777,8 @@ class LinkCommand { } } - auto new_end_iter = - std::remove_if(final_table_.packages.begin(), - final_table_.packages.end(), is_ext_package_func); + auto new_end_iter = std::remove_if(final_table_.packages.begin(), final_table_.packages.end(), + is_ext_package_func); final_table_.packages.erase(new_end_iter, final_table_.packages.end()); return !error; } @@ -919,17 +827,16 @@ class LinkCommand { } io::BigBufferInputStream input_stream(&buffer); - return CopyInputStreamToArchive(&input_stream, "resources.arsc", ArchiveEntry::kAlign, writer, - context_); + return io::CopyInputStreamToArchive(context_, &input_stream, "resources.arsc", + ArchiveEntry::kAlign, writer); } bool FlattenTableToPb(ResourceTable* table, IArchiveWriter* writer) { std::unique_ptr<pb::ResourceTable> pb_table = SerializeTableToPb(table); - return CopyProtoToArchive(pb_table.get(), "resources.arsc.flat", 0, writer, context_); + return io::CopyProtoToArchive(context_, pb_table.get(), "resources.arsc.flat", 0, writer); } - bool WriteJavaFile(ResourceTable* table, - const StringPiece& package_name_to_generate, + bool WriteJavaFile(ResourceTable* table, const StringPiece& package_name_to_generate, const StringPiece& out_package, const JavaClassGeneratorOptions& java_options) { if (!options_.generate_java_class_path) { @@ -939,8 +846,8 @@ class LinkCommand { std::string out_path = options_.generate_java_class_path.value(); file::AppendPath(&out_path, file::PackageToPath(out_package)); if (!file::mkdirs(out_path)) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed to create directory '" << out_path << "'"); + context_->GetDiagnostics()->Error(DiagMessage() << "failed to create directory '" << out_path + << "'"); return false; } @@ -948,9 +855,9 @@ class LinkCommand { std::ofstream fout(out_path, std::ofstream::binary); if (!fout) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed writing to '" << out_path << "': " - << android::base::SystemErrorCodeToString(errno)); + context_->GetDiagnostics()->Error(DiagMessage() + << "failed writing to '" << out_path + << "': " << android::base::SystemErrorCodeToString(errno)); return false; } @@ -961,9 +868,9 @@ class LinkCommand { } if (!fout) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed writing to '" << out_path << "': " - << android::base::SystemErrorCodeToString(errno)); + context_->GetDiagnostics()->Error(DiagMessage() + << "failed writing to '" << out_path + << "': " << android::base::SystemErrorCodeToString(errno)); } return true; } @@ -999,8 +906,8 @@ class LinkCommand { file::AppendPath(&out_path, file::PackageToPath(package_utf8)); if (!file::mkdirs(out_path)) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed to create directory '" << out_path << "'"); + context_->GetDiagnostics()->Error(DiagMessage() << "failed to create directory '" << out_path + << "'"); return false; } @@ -1008,24 +915,22 @@ class LinkCommand { std::ofstream fout(out_path, std::ofstream::binary); if (!fout) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed writing to '" << out_path << "': " - << android::base::SystemErrorCodeToString(errno)); + context_->GetDiagnostics()->Error(DiagMessage() + << "failed writing to '" << out_path + << "': " << android::base::SystemErrorCodeToString(errno)); return false; } - if (!ClassDefinition::WriteJavaFile(manifest_class.get(), package_utf8, - true, &fout)) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed writing to '" << out_path << "': " - << android::base::SystemErrorCodeToString(errno)); + if (!ClassDefinition::WriteJavaFile(manifest_class.get(), package_utf8, true, &fout)) { + context_->GetDiagnostics()->Error(DiagMessage() + << "failed writing to '" << out_path + << "': " << android::base::SystemErrorCodeToString(errno)); return false; } return true; } - bool WriteProguardFile(const Maybe<std::string>& out, - const proguard::KeepSet& keep_set) { + bool WriteProguardFile(const Maybe<std::string>& out, const proguard::KeepSet& keep_set) { if (!out) { return true; } @@ -1033,17 +938,17 @@ class LinkCommand { const std::string& out_path = out.value(); std::ofstream fout(out_path, std::ofstream::binary); if (!fout) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed to open '" << out_path << "': " - << android::base::SystemErrorCodeToString(errno)); + context_->GetDiagnostics()->Error(DiagMessage() + << "failed to open '" << out_path + << "': " << android::base::SystemErrorCodeToString(errno)); return false; } proguard::WriteKeepSet(&fout, keep_set); if (!fout) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed writing to '" << out_path << "': " - << android::base::SystemErrorCodeToString(errno)); + context_->GetDiagnostics()->Error(DiagMessage() + << "failed writing to '" << out_path + << "': " << android::base::SystemErrorCodeToString(errno)); return false; } return true; @@ -1059,8 +964,7 @@ class LinkCommand { return LoadTablePbFromCollection(collection.get()); } - std::unique_ptr<ResourceTable> LoadTablePbFromCollection( - io::IFileCollection* collection) { + std::unique_ptr<ResourceTable> LoadTablePbFromCollection(io::IFileCollection* collection) { io::IFile* file = collection->FindFile("resources.arsc.flat"); if (!file) { return {}; @@ -1073,8 +977,7 @@ class LinkCommand { bool MergeStaticLibrary(const std::string& input, bool override) { if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note(DiagMessage() - << "merging static library " << input); + context_->GetDiagnostics()->Note(DiagMessage() << "merging static library " << input); } std::string error_str; @@ -1118,8 +1021,8 @@ class LinkCommand { } else { // This is the proper way to merge libraries, where the package name is // preserved and resource names are mangled. - result = table_merger_->MergeAndMangle(Source(input), pkg->name, - table.get(), collection.get()); + result = + table_merger_->MergeAndMangle(Source(input), pkg->name, table.get(), collection.get()); } if (!result) { @@ -1133,20 +1036,18 @@ class LinkCommand { bool MergeResourceTable(io::IFile* file, bool override) { if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note( - DiagMessage() << "merging resource table " << file->GetSource()); + context_->GetDiagnostics()->Note(DiagMessage() << "merging resource table " + << file->GetSource()); } std::unique_ptr<io::IData> data = file->OpenAsData(); if (!data) { - context_->GetDiagnostics()->Error(DiagMessage(file->GetSource()) - << "failed to open file"); + context_->GetDiagnostics()->Error(DiagMessage(file->GetSource()) << "failed to open file"); return false; } std::unique_ptr<ResourceTable> table = - LoadTableFromPb(file->GetSource(), data->data(), data->size(), - context_->GetDiagnostics()); + LoadTableFromPb(file->GetSource(), data->data(), data->size(), context_->GetDiagnostics()); if (!table) { return false; } @@ -1160,12 +1061,11 @@ class LinkCommand { return result; } - bool MergeCompiledFile(io::IFile* file, ResourceFile* file_desc, - bool override) { + bool MergeCompiledFile(io::IFile* file, ResourceFile* file_desc, bool override) { if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note( - DiagMessage() << "merging '" << file_desc->name - << "' from compiled file " << file->GetSource()); + context_->GetDiagnostics()->Note(DiagMessage() << "merging '" << file_desc->name + << "' from compiled file " + << file->GetSource()); } bool result = false; @@ -1196,8 +1096,8 @@ class LinkCommand { std::unique_ptr<Id> id = util::make_unique<Id>(); id->SetSource(file_desc->source.WithLine(exported_symbol.line)); bool result = final_table_.AddResourceAllowMangled( - res_name, ConfigDescription::DefaultConfig(), std::string(), - std::move(id), context_->GetDiagnostics()); + res_name, ConfigDescription::DefaultConfig(), std::string(), std::move(id), + context_->GetDiagnostics()); if (!result) { return false; } @@ -1216,8 +1116,7 @@ class LinkCommand { */ bool MergeArchive(const std::string& input, bool override) { if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note(DiagMessage() << "merging archive " - << input); + context_->GetDiagnostics()->Note(DiagMessage() << "merging archive " << input); } std::string error_str; @@ -1296,49 +1195,43 @@ class LinkCommand { CompiledFileInputStream input_stream(data->data(), data->size()); uint32_t num_files = 0; if (!input_stream.ReadLittleEndian32(&num_files)) { - context_->GetDiagnostics()->Error(DiagMessage(src) - << "failed read num files"); + context_->GetDiagnostics()->Error(DiagMessage(src) << "failed read num files"); return false; } for (uint32_t i = 0; i < num_files; i++) { pb::CompiledFile compiled_file; if (!input_stream.ReadCompiledFile(&compiled_file)) { - context_->GetDiagnostics()->Error( - DiagMessage(src) << "failed to read compiled file header"); + context_->GetDiagnostics()->Error(DiagMessage(src) + << "failed to read compiled file header"); return false; } uint64_t offset, len; if (!input_stream.ReadDataMetaData(&offset, &len)) { - context_->GetDiagnostics()->Error(DiagMessage(src) - << "failed to read data meta data"); + context_->GetDiagnostics()->Error(DiagMessage(src) << "failed to read data meta data"); return false; } - std::unique_ptr<ResourceFile> resource_file = - DeserializeCompiledFileFromPb(compiled_file, file->GetSource(), - context_->GetDiagnostics()); + std::unique_ptr<ResourceFile> resource_file = DeserializeCompiledFileFromPb( + compiled_file, file->GetSource(), context_->GetDiagnostics()); if (!resource_file) { return false; } - if (!MergeCompiledFile(file->CreateFileSegment(offset, len), - resource_file.get(), override)) { + if (!MergeCompiledFile(file->CreateFileSegment(offset, len), resource_file.get(), + override)) { return false; } } return true; - } else if (util::EndsWith(src.path, ".xml") || - util::EndsWith(src.path, ".png")) { + } else if (util::EndsWith(src.path, ".xml") || util::EndsWith(src.path, ".png")) { // Since AAPT compiles these file types and appends .flat to them, seeing // their raw extensions is a sign that they weren't compiled. - const StringPiece file_type = - util::EndsWith(src.path, ".xml") ? "XML" : "PNG"; - context_->GetDiagnostics()->Error(DiagMessage(src) - << "uncompiled " << file_type - << " file passed as argument. Must be " - "compiled first into .flat file."); + const StringPiece file_type = util::EndsWith(src.path, ".xml") ? "XML" : "PNG"; + context_->GetDiagnostics()->Error(DiagMessage(src) << "uncompiled " << file_type + << " file passed as argument. Must be " + "compiled first into .flat file."); return false; } @@ -1348,51 +1241,6 @@ class LinkCommand { return true; } - std::unique_ptr<xml::XmlResource> GenerateSplitManifest(const AppInfo& app_info, - const SplitConstraints& constraints) { - std::unique_ptr<xml::XmlResource> doc = util::make_unique<xml::XmlResource>(); - - std::unique_ptr<xml::Namespace> namespace_android = util::make_unique<xml::Namespace>(); - namespace_android->namespace_uri = xml::kSchemaAndroid; - namespace_android->namespace_prefix = "android"; - - std::unique_ptr<xml::Element> manifest_el = util::make_unique<xml::Element>(); - manifest_el->name = "manifest"; - manifest_el->attributes.push_back(xml::Attribute{"", "package", app_info.package}); - - if (app_info.version_code) { - manifest_el->attributes.push_back(xml::Attribute{ - xml::kSchemaAndroid, "versionCode", std::to_string(app_info.version_code.value())}); - } - - if (app_info.revision_code) { - manifest_el->attributes.push_back(xml::Attribute{ - xml::kSchemaAndroid, "revisionCode", std::to_string(app_info.revision_code.value())}); - } - - std::stringstream split_name; - if (app_info.split_name) { - split_name << app_info.split_name.value() << "."; - } - split_name << "config." << util::Joiner(constraints.configs, "_"); - - manifest_el->attributes.push_back(xml::Attribute{"", "split", split_name.str()}); - - if (app_info.split_name) { - manifest_el->attributes.push_back( - xml::Attribute{"", "configForSplit", app_info.split_name.value()}); - } - - std::unique_ptr<xml::Element> application_el = util::make_unique<xml::Element>(); - application_el->name = "application"; - application_el->attributes.push_back(xml::Attribute{xml::kSchemaAndroid, "hasCode", "false"}); - - manifest_el->AppendChild(std::move(application_el)); - namespace_android->AppendChild(std::move(manifest_el)); - doc->root = std::move(namespace_android); - return doc; - } - bool CopyAssetsDirsToApk(IArchiveWriter* writer) { std::map<std::string, std::unique_ptr<io::RegularFile>> merged_assets; for (const std::string& assets_dir : options_.assets_dirs) { @@ -1425,8 +1273,8 @@ class LinkCommand { compression_flags = 0u; } - if (!CopyFileToArchive(entry.second.get(), entry.first, compression_flags, writer, - context_)) { + if (!io::CopyFileToArchive(context_, entry.second.get(), entry.first, compression_flags, + writer)) { return false; } } @@ -1437,21 +1285,19 @@ class LinkCommand { * Writes the AndroidManifest, ResourceTable, and all XML files referenced by * the ResourceTable to the IArchiveWriter. */ - bool WriteApk(IArchiveWriter* writer, proguard::KeepSet* keep_set, - xml::XmlResource* manifest, ResourceTable* table) { + bool WriteApk(IArchiveWriter* writer, proguard::KeepSet* keep_set, xml::XmlResource* manifest, + ResourceTable* table) { const bool keep_raw_values = options_.package_type == PackageType::kStaticLib; - bool result = FlattenXml(manifest, "AndroidManifest.xml", {}, - keep_raw_values, writer, context_); + bool result = + FlattenXml(manifest, "AndroidManifest.xml", {}, keep_raw_values, writer, context_); if (!result) { return false; } ResourceFileFlattenerOptions file_flattener_options; file_flattener_options.keep_raw_values = keep_raw_values; - file_flattener_options.do_not_compress_anything = - options_.do_not_compress_anything; - file_flattener_options.extensions_to_not_compress = - options_.extensions_to_not_compress; + file_flattener_options.do_not_compress_anything = options_.do_not_compress_anything; + file_flattener_options.extensions_to_not_compress = options_.extensions_to_not_compress; file_flattener_options.no_auto_version = options_.no_auto_version; file_flattener_options.no_version_vectors = options_.no_version_vectors; file_flattener_options.no_version_transitions = options_.no_version_transitions; @@ -1487,10 +1333,9 @@ class LinkCommand { return 1; } - // First extract the Package name without modifying it (via - // --rename-manifest-package). - if (Maybe<AppInfo> maybe_app_info = ExtractAppInfoFromManifest( - manifest_xml.get(), context_->GetDiagnostics())) { + // First extract the Package name without modifying it (via --rename-manifest-package). + if (Maybe<AppInfo> maybe_app_info = + ExtractAppInfoFromManifest(manifest_xml.get(), context_->GetDiagnostics())) { const AppInfo& app_info = maybe_app_info.value(); context_->SetCompilationPackage(app_info.package); } @@ -1500,22 +1345,16 @@ class LinkCommand { return 1; } - Maybe<AppInfo> maybe_app_info = ExtractAppInfoFromManifest( - manifest_xml.get(), context_->GetDiagnostics()); + Maybe<AppInfo> maybe_app_info = + ExtractAppInfoFromManifest(manifest_xml.get(), context_->GetDiagnostics()); if (!maybe_app_info) { return 1; } const AppInfo& app_info = maybe_app_info.value(); - if (app_info.min_sdk_version) { - if (Maybe<int> maybe_min_sdk_version = ResourceUtils::ParseSdkVersion( - app_info.min_sdk_version.value())) { - context_->SetMinSdkVersion(maybe_min_sdk_version.value()); - } - } + context_->SetMinSdkVersion(app_info.min_sdk_version.value_or_default(0)); - context_->SetNameManglerPolicy( - NameManglerPolicy{context_->GetCompilationPackage()}); + context_->SetNameManglerPolicy(NameManglerPolicy{context_->GetCompilationPackage()}); // Override the package ID when it is "android". if (context_->GetCompilationPackage() == "android") { @@ -1535,8 +1374,7 @@ class LinkCommand { TableMergerOptions table_merger_options; table_merger_options.auto_add_overlay = options_.auto_add_overlay; - table_merger_ = util::make_unique<TableMerger>(context_, &final_table_, - table_merger_options); + table_merger_ = util::make_unique<TableMerger>(context_, &final_table_, table_merger_options); if (context_->IsVerbose()) { context_->GetDiagnostics()->Note(DiagMessage() @@ -1547,16 +1385,14 @@ class LinkCommand { for (const std::string& input : input_files) { if (!MergePath(input, false)) { - context_->GetDiagnostics()->Error(DiagMessage() - << "failed parsing input"); + context_->GetDiagnostics()->Error(DiagMessage() << "failed parsing input"); return 1; } } for (const std::string& input : options_.overlay_files) { if (!MergePath(input, true)) { - context_->GetDiagnostics()->Error(DiagMessage() - << "failed parsing overlays"); + context_->GetDiagnostics()->Error(DiagMessage() << "failed parsing overlays"); return 1; } } @@ -1568,8 +1404,7 @@ class LinkCommand { if (options_.package_type != PackageType::kStaticLib) { PrivateAttributeMover mover; if (!mover.Consume(context_, &final_table_)) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed moving private attributes"); + context_->GetDiagnostics()->Error(DiagMessage() << "failed moving private attributes"); return 1; } @@ -1587,14 +1422,13 @@ class LinkCommand { for (auto& entry : type->entries) { ResourceName name(package->name, type->type, entry->name); // The IDs are guaranteed to exist. - options_.stable_id_map[std::move(name)] = ResourceId( - package->id.value(), type->id.value(), entry->id.value()); + options_.stable_id_map[std::move(name)] = + ResourceId(package->id.value(), type->id.value(), entry->id.value()); } } } - if (!WriteStableIdMapToPath(context_->GetDiagnostics(), - options_.stable_id_map, + if (!WriteStableIdMapToPath(context_->GetDiagnostics(), options_.stable_id_map, options_.resource_id_map_path.value())) { return 1; } @@ -1609,8 +1443,8 @@ class LinkCommand { } // Add the names to mangle based on our source merge earlier. - context_->SetNameManglerPolicy(NameManglerPolicy{ - context_->GetCompilationPackage(), table_merger_->merged_packages()}); + context_->SetNameManglerPolicy( + NameManglerPolicy{context_->GetCompilationPackage(), table_merger_->merged_packages()}); // Add our table to the symbol table. context_->GetExternalSymbols()->PrependSource( @@ -1618,8 +1452,7 @@ class LinkCommand { ReferenceLinker linker; if (!linker.Consume(context_, &final_table_)) { - context_->GetDiagnostics()->Error(DiagMessage() - << "failed linking references"); + context_->GetDiagnostics()->Error(DiagMessage() << "failed linking references"); return 1; } @@ -1639,17 +1472,16 @@ class LinkCommand { if (!options_.no_auto_version) { AutoVersioner versioner; if (!versioner.Consume(context_, &final_table_)) { - context_->GetDiagnostics()->Error(DiagMessage() - << "failed versioning styles"); + context_->GetDiagnostics()->Error(DiagMessage() << "failed versioning styles"); return 1; } } if (options_.package_type != PackageType::kStaticLib && context_->GetMinSdkVersion() > 0) { if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note( - DiagMessage() << "collapsing resource versions for minimum SDK " - << context_->GetMinSdkVersion()); + context_->GetDiagnostics()->Note(DiagMessage() + << "collapsing resource versions for minimum SDK " + << context_->GetMinSdkVersion()); } VersionCollapser collapser; @@ -1676,27 +1508,12 @@ class LinkCommand { << "can't strip resources when building static library"); } } else { - // Adjust the SplitConstraints so that their SDK version is stripped if it - // is less - // than or equal to the minSdk. Otherwise the resources that have had - // their SDK version - // stripped due to minSdk won't ever match. - std::vector<SplitConstraints> adjusted_constraints_list; - adjusted_constraints_list.reserve(options_.split_constraints.size()); - for (const SplitConstraints& constraints : options_.split_constraints) { - SplitConstraints adjusted_constraints; - for (const ConfigDescription& config : constraints.configs) { - if (config.sdkVersion <= context_->GetMinSdkVersion()) { - adjusted_constraints.configs.insert(config.CopyWithoutSdkVersion()); - } else { - adjusted_constraints.configs.insert(config); - } - } - adjusted_constraints_list.push_back(std::move(adjusted_constraints)); - } + // Adjust the SplitConstraints so that their SDK version is stripped if it is less than or + // equal to the minSdk. + options_.split_constraints = + AdjustSplitConstraintsForMinSdk(context_->GetMinSdkVersion(), options_.split_constraints); - TableSplitter table_splitter(adjusted_constraints_list, - options_.table_splitter_options); + TableSplitter table_splitter(options_.split_constraints, options_.table_splitter_options); if (!table_splitter.VerifySplitConstraints(context_)) { return 1; } @@ -1704,21 +1521,18 @@ class LinkCommand { // Now we need to write out the Split APKs. auto path_iter = options_.split_paths.begin(); - auto split_constraints_iter = adjusted_constraints_list.begin(); - for (std::unique_ptr<ResourceTable>& split_table : - table_splitter.splits()) { + auto split_constraints_iter = options_.split_constraints.begin(); + for (std::unique_ptr<ResourceTable>& split_table : table_splitter.splits()) { if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note( - DiagMessage(*path_iter) - << "generating split with configurations '" - << util::Joiner(split_constraints_iter->configs, ", ") << "'"); + context_->GetDiagnostics()->Note(DiagMessage(*path_iter) + << "generating split with configurations '" + << util::Joiner(split_constraints_iter->configs, ", ") + << "'"); } - std::unique_ptr<IArchiveWriter> archive_writer = - MakeArchiveWriter(*path_iter); + std::unique_ptr<IArchiveWriter> archive_writer = MakeArchiveWriter(*path_iter); if (!archive_writer) { - context_->GetDiagnostics()->Error(DiagMessage() - << "failed to create archive"); + context_->GetDiagnostics()->Error(DiagMessage() << "failed to create archive"); return 1; } @@ -1728,13 +1542,13 @@ class LinkCommand { XmlReferenceLinker linker; if (!linker.Consume(context_, split_manifest.get())) { - context_->GetDiagnostics()->Error( - DiagMessage() << "failed to create Split AndroidManifest.xml"); + context_->GetDiagnostics()->Error(DiagMessage() + << "failed to create Split AndroidManifest.xml"); return 1; } - if (!WriteApk(archive_writer.get(), &proguard_keep_set, - split_manifest.get(), split_table.get())) { + if (!WriteApk(archive_writer.get(), &proguard_keep_set, split_manifest.get(), + split_table.get())) { return 1; } @@ -1925,10 +1739,10 @@ int Link(const std::vector<StringPiece>& args) { std::vector<std::string> split_args; Flags flags = Flags() - .RequiredFlag("-o", "Output path", &options.output_path) - .RequiredFlag("--manifest", "Path to the Android manifest to build", + .RequiredFlag("-o", "Output path.", &options.output_path) + .RequiredFlag("--manifest", "Path to the Android manifest to build.", &options.manifest_path) - .OptionalFlagList("-I", "Adds an Android APK to link against", &options.include_paths) + .OptionalFlagList("-I", "Adds an Android APK to link against.", &options.include_paths) .OptionalFlagList("-A", "An assets directory to include in the APK. These are unprocessed.", &options.assets_dirs) @@ -1940,24 +1754,23 @@ int Link(const std::vector<StringPiece>& args) { "Specify the package ID to use for this app. Must be greater or equal to\n" "0x7f and can't be used with --static-lib or --shared-lib.", &package_id) - .OptionalFlag("--java", "Directory in which to generate R.java", + .OptionalFlag("--java", "Directory in which to generate R.java.", &options.generate_java_class_path) - .OptionalFlag("--proguard", "Output file for generated Proguard rules", + .OptionalFlag("--proguard", "Output file for generated Proguard rules.", &options.generate_proguard_rules_path) .OptionalFlag("--proguard-main-dex", - "Output file for generated Proguard rules for the main dex", + "Output file for generated Proguard rules for the main dex.", &options.generate_main_dex_proguard_rules_path) - .OptionalSwitch("--no-auto-version", "Disables automatic style and layout SDK versioning", + .OptionalSwitch("--no-auto-version", + "Disables automatic style and layout SDK versioning.", &options.no_auto_version) .OptionalSwitch("--no-version-vectors", - "Disables automatic versioning of vector drawables. " - "Use this only\n" - "when building with vector drawable support library", + "Disables automatic versioning of vector drawables. Use this only\n" + "when building with vector drawable support library.", &options.no_version_vectors) .OptionalSwitch("--no-version-transitions", - "Disables automatic versioning of transition resources. " - "Use this only\n" - "when building with transition support library", + "Disables automatic versioning of transition resources. Use this only\n" + "when building with transition support library.", &options.no_version_transitions) .OptionalSwitch("--no-resource-deduping", "Disables automatic deduping of resources with\n" @@ -1967,100 +1780,90 @@ int Link(const std::vector<StringPiece>& args) { "Enables encoding sparse entries using a binary search tree.\n" "This decreases APK size at the cost of resource retrieval performance.", &options.table_flattener_options.use_sparse_entries) - .OptionalSwitch("-x", "Legacy flag that specifies to use the package identifier 0x01", + .OptionalSwitch("-x", "Legacy flag that specifies to use the package identifier 0x01.", &legacy_x_flag) - .OptionalSwitch("-z", "Require localization of strings marked 'suggested'", + .OptionalSwitch("-z", "Require localization of strings marked 'suggested'.", &require_localization) .OptionalFlagList("-c", "Comma separated list of configurations to include. The default\n" - "is all configurations", + "is all configurations.", &configs) .OptionalFlag("--preferred-density", "Selects the closest matching density and strips out all others.", &preferred_density) .OptionalFlag("--product", "Comma separated list of product names to keep", &product_list) .OptionalSwitch("--output-to-dir", - "Outputs the APK contents to a directory specified " - "by -o", + "Outputs the APK contents to a directory specified by -o.", &options.output_to_directory) .OptionalSwitch("--no-xml-namespaces", - "Removes XML namespace prefix and URI " - "information from AndroidManifest.xml\nand XML " - "binaries in res/*.", + "Removes XML namespace prefix and URI information from\n" + "AndroidManifest.xml and XML binaries in res/*.", &options.no_xml_namespaces) .OptionalFlag("--min-sdk-version", - "Default minimum SDK version to use for " - "AndroidManifest.xml", + "Default minimum SDK version to use for AndroidManifest.xml.", &options.manifest_fixer_options.min_sdk_version_default) .OptionalFlag("--target-sdk-version", - "Default target SDK version to use for " - "AndroidManifest.xml", + "Default target SDK version to use for AndroidManifest.xml.", &options.manifest_fixer_options.target_sdk_version_default) .OptionalFlag("--version-code", - "Version code (integer) to inject into the " - "AndroidManifest.xml if none is present", + "Version code (integer) to inject into the AndroidManifest.xml if none is\n" + "present.", &options.manifest_fixer_options.version_code_default) .OptionalFlag("--version-name", - "Version name to inject into the AndroidManifest.xml " - "if none is present", + "Version name to inject into the AndroidManifest.xml if none is present.", &options.manifest_fixer_options.version_name_default) - .OptionalSwitch("--shared-lib", "Generates a shared Android runtime library", &shared_lib) - .OptionalSwitch("--static-lib", "Generate a static Android library", &static_lib) + .OptionalSwitch("--shared-lib", "Generates a shared Android runtime library.", + &shared_lib) + .OptionalSwitch("--static-lib", "Generate a static Android library.", &static_lib) .OptionalSwitch("--no-static-lib-packages", - "Merge all library resources under the app's package", + "Merge all library resources under the app's package.", &options.no_static_lib_packages) .OptionalSwitch("--non-final-ids", - "Generates R.java without the final modifier.\n" - "This is implied when --static-lib is specified.", + "Generates R.java without the final modifier. This is implied when\n" + "--static-lib is specified.", &options.generate_non_final_ids) .OptionalFlag("--stable-ids", "File containing a list of name to ID mapping.", &stable_id_file_path) .OptionalFlag("--emit-ids", - "Emit a file at the given path with a list of name to ID\n" - "mappings, suitable for use with --stable-ids.", + "Emit a file at the given path with a list of name to ID mappings,\n" + "suitable for use with --stable-ids.", &options.resource_id_map_path) .OptionalFlag("--private-symbols", - "Package name to use when generating R.java for " - "private symbols.\n" - "If not specified, public and private symbols will use " - "the application's " - "package name", + "Package name to use when generating R.java for private symbols.\n" + "If not specified, public and private symbols will use the application's\n" + "package name.", &options.private_symbols) - .OptionalFlag("--custom-package", "Custom Java package under which to generate R.java", + .OptionalFlag("--custom-package", "Custom Java package under which to generate R.java.", &options.custom_java_package) .OptionalFlagList("--extra-packages", - "Generate the same R.java but with different " - "package names", + "Generate the same R.java but with different package names.", &extra_java_packages) .OptionalFlagList("--add-javadoc-annotation", - "Adds a JavaDoc annotation to all " - "generated Java classes", + "Adds a JavaDoc annotation to all generated Java classes.", &options.javadoc_annotations) .OptionalSwitch("--auto-add-overlay", - "Allows the addition of new resources in " - "overlays without <add-resource> tags", + "Allows the addition of new resources in overlays without\n" + "<add-resource> tags.", &options.auto_add_overlay) - .OptionalFlag("--rename-manifest-package", "Renames the package in AndroidManifest.xml", + .OptionalFlag("--rename-manifest-package", "Renames the package in AndroidManifest.xml.", &options.manifest_fixer_options.rename_manifest_package) .OptionalFlag("--rename-instrumentation-target-package", - "Changes the name of the target package for instrumentation. " - "Most useful " - "when used\nin conjunction with --rename-manifest-package", + "Changes the name of the target package for instrumentation. Most useful\n" + "when used in conjunction with --rename-manifest-package.", &options.manifest_fixer_options.rename_instrumentation_target_package) - .OptionalFlagList("-0", "File extensions not to compress", + .OptionalFlagList("-0", "File extensions not to compress.", &options.extensions_to_not_compress) .OptionalFlagList("--split", - "Split resources matching a set of configs out to a " - "Split APK.\nSyntax: path/to/output.apk:<config>[,<config>[...]]", + "Split resources matching a set of configs out to a Split APK.\n" + "Syntax: path/to/output.apk:<config>[,<config>[...]].", &split_args) - .OptionalSwitch("-v", "Enables verbose logging", &verbose); + .OptionalSwitch("-v", "Enables verbose logging.", &verbose); if (!flags.Parse("aapt2 link", args, &std::cerr)) { return 1; } - // Expand all argument-files passed into the command line. These start with - // '@'. + // Expand all argument-files passed into the command line. These start with '@'. std::vector<std::string> arg_list; for (const std::string& arg : flags.GetArgs()) { if (util::StartsWith(arg, "@")) { @@ -2150,55 +1953,32 @@ int Link(const std::vector<StringPiece>& args) { } } - AxisConfigFilter filter; + std::unique_ptr<IConfigFilter> filter; if (!configs.empty()) { - for (const std::string& config_arg : configs) { - for (const StringPiece& config_str : util::Tokenize(config_arg, ',')) { - ConfigDescription config; - LocaleValue lv; - if (lv.InitFromFilterString(config_str)) { - lv.WriteTo(&config); - } else if (!ConfigDescription::Parse(config_str, &config)) { - context.GetDiagnostics()->Error(DiagMessage() << "invalid config '" - << config_str - << "' for -c option"); - return 1; - } - - if (config.density != 0) { - context.GetDiagnostics()->Warn(DiagMessage() << "ignoring density '" - << config - << "' for -c option"); - } else { - filter.AddConfig(config); - } - } + filter = ParseConfigFilterParameters(configs, context.GetDiagnostics()); + if (filter == nullptr) { + return 1; } - options.table_splitter_options.config_filter = &filter; + options.table_splitter_options.config_filter = filter.get(); } if (preferred_density) { - ConfigDescription preferred_density_config; - if (!ConfigDescription::Parse(preferred_density.value(), - &preferred_density_config)) { - context.GetDiagnostics()->Error( - DiagMessage() << "invalid density '" << preferred_density.value() - << "' for --preferred-density option"); + Maybe<uint16_t> density = + ParseTargetDensityParameter(preferred_density.value(), context.GetDiagnostics()); + if (!density) { return 1; } + options.table_splitter_options.preferred_densities.push_back(density.value()); + } - // Clear the version that can be automatically added. - preferred_density_config.sdkVersion = 0; - - if (preferred_density_config.diff(ConfigDescription::DefaultConfig()) != - ConfigDescription::CONFIG_DENSITY) { - context.GetDiagnostics()->Error( - DiagMessage() << "invalid preferred density '" - << preferred_density.value() << "'. " - << "Preferred density must only be a density value"); + // Parse the split parameters. + for (const std::string& split_arg : split_args) { + options.split_paths.push_back({}); + options.split_constraints.push_back({}); + if (!ParseSplitParameter(split_arg, context.GetDiagnostics(), &options.split_paths.back(), + &options.split_constraints.back())) { return 1; } - options.table_splitter_options.preferred_densities.push_back(preferred_density_config.density); } if (options.package_type != PackageType::kStaticLib && stable_id_file_path) { @@ -2215,17 +1995,6 @@ int Link(const std::vector<StringPiece>& args) { ".imy", ".xmf", ".mp4", ".m4a", ".m4v", ".3gp", ".3gpp", ".3g2", ".3gpp2", ".amr", ".awb", ".wma", ".wmv", ".webm", ".mkv"}); - // Parse the split parameters. - for (const std::string& split_arg : split_args) { - options.split_paths.push_back({}); - options.split_constraints.push_back({}); - if (!ParseSplitParameter(split_arg, context.GetDiagnostics(), - &options.split_paths.back(), - &options.split_constraints.back())) { - return 1; - } - } - // Turn off auto versioning for static-libs. if (options.package_type == PackageType::kStaticLib) { options.no_auto_version = true; diff --git a/tools/aapt2/cmd/Optimize.cpp b/tools/aapt2/cmd/Optimize.cpp new file mode 100644 index 000000000000..8f8e0c8e4f6d --- /dev/null +++ b/tools/aapt2/cmd/Optimize.cpp @@ -0,0 +1,369 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <memory> +#include <vector> + +#include "androidfw/StringPiece.h" + +#include "Diagnostics.h" +#include "Flags.h" +#include "LoadedApk.h" +#include "ResourceUtils.h" +#include "SdkConstants.h" +#include "ValueVisitor.h" +#include "cmd/Util.h" +#include "flatten/TableFlattener.h" +#include "flatten/XmlFlattener.h" +#include "io/BigBufferInputStream.h" +#include "io/Util.h" +#include "optimize/ResourceDeduper.h" +#include "optimize/VersionCollapser.h" +#include "split/TableSplitter.h" + +using android::StringPiece; + +namespace aapt { + +struct OptimizeOptions { + // Path to the output APK. + std::string output_path; + + // Details of the app extracted from the AndroidManifest.xml + AppInfo app_info; + + // Split APK options. + TableSplitterOptions table_splitter_options; + + // List of output split paths. These are in the same order as `split_constraints`. + std::vector<std::string> split_paths; + + // List of SplitConstraints governing what resources go into each split. Ordered by `split_paths`. + std::vector<SplitConstraints> split_constraints; + + TableFlattenerOptions table_flattener_options; +}; + +class OptimizeContext : public IAaptContext { + public: + IDiagnostics* GetDiagnostics() override { + return &diagnostics_; + } + + NameMangler* GetNameMangler() override { + UNIMPLEMENTED(FATAL); + return nullptr; + } + + const std::string& GetCompilationPackage() override { + static std::string empty; + return empty; + } + + uint8_t GetPackageId() override { + return 0; + } + + SymbolTable* GetExternalSymbols() override { + UNIMPLEMENTED(FATAL); + return nullptr; + } + + bool IsVerbose() override { + return verbose_; + } + + void SetVerbose(bool val) { + verbose_ = val; + } + + void SetMinSdkVersion(int sdk_version) { + sdk_version_ = sdk_version; + } + + int GetMinSdkVersion() override { + return sdk_version_; + } + + private: + StdErrDiagnostics diagnostics_; + bool verbose_ = false; + int sdk_version_ = 0; +}; + +class OptimizeCommand { + public: + OptimizeCommand(OptimizeContext* context, const OptimizeOptions& options) + : options_(options), context_(context) { + } + + int Run(std::unique_ptr<LoadedApk> apk) { + if (context_->IsVerbose()) { + context_->GetDiagnostics()->Note(DiagMessage() << "Optimizing APK..."); + } + + VersionCollapser collapser; + if (!collapser.Consume(context_, apk->GetResourceTable())) { + return 1; + } + + ResourceDeduper deduper; + if (!deduper.Consume(context_, apk->GetResourceTable())) { + context_->GetDiagnostics()->Error(DiagMessage() << "failed deduping resources"); + return 1; + } + + // Adjust the SplitConstraints so that their SDK version is stripped if it is less than or + // equal to the minSdk. + options_.split_constraints = + AdjustSplitConstraintsForMinSdk(context_->GetMinSdkVersion(), options_.split_constraints); + + // Stripping the APK using the TableSplitter. The resource table is modified in place in the + // LoadedApk. + TableSplitter splitter(options_.split_constraints, options_.table_splitter_options); + if (!splitter.VerifySplitConstraints(context_)) { + return 1; + } + splitter.SplitTable(apk->GetResourceTable()); + + auto path_iter = options_.split_paths.begin(); + auto split_constraints_iter = options_.split_constraints.begin(); + for (std::unique_ptr<ResourceTable>& split_table : splitter.splits()) { + if (context_->IsVerbose()) { + context_->GetDiagnostics()->Note( + DiagMessage(*path_iter) << "generating split with configurations '" + << util::Joiner(split_constraints_iter->configs, ", ") << "'"); + } + + // Generate an AndroidManifest.xml for each split. + std::unique_ptr<xml::XmlResource> split_manifest = + GenerateSplitManifest(options_.app_info, *split_constraints_iter); + std::unique_ptr<IArchiveWriter> split_writer = + CreateZipFileArchiveWriter(context_->GetDiagnostics(), *path_iter); + if (!split_writer) { + return 1; + } + + if (!WriteSplitApk(split_table.get(), split_manifest.get(), split_writer.get())) { + return 1; + } + + ++path_iter; + ++split_constraints_iter; + } + + std::unique_ptr<IArchiveWriter> writer = + CreateZipFileArchiveWriter(context_->GetDiagnostics(), options_.output_path); + if (!apk->WriteToArchive(context_, options_.table_flattener_options, writer.get())) { + return 1; + } + + return 0; + } + + private: + bool WriteSplitApk(ResourceTable* table, xml::XmlResource* manifest, IArchiveWriter* writer) { + BigBuffer manifest_buffer(4096); + XmlFlattener xml_flattener(&manifest_buffer, {}); + if (!xml_flattener.Consume(context_, manifest)) { + return false; + } + + io::BigBufferInputStream manifest_buffer_in(&manifest_buffer); + if (!io::CopyInputStreamToArchive(context_, &manifest_buffer_in, "AndroidManifest.xml", + ArchiveEntry::kCompress, writer)) { + return false; + } + + std::map<std::pair<ConfigDescription, StringPiece>, FileReference*> config_sorted_files; + for (auto& pkg : table->packages) { + for (auto& type : pkg->types) { + // Sort by config and name, so that we get better locality in the zip file. + config_sorted_files.clear(); + + for (auto& entry : type->entries) { + for (auto& config_value : entry->values) { + FileReference* file_ref = ValueCast<FileReference>(config_value->value.get()); + if (file_ref == nullptr) { + continue; + } + + if (file_ref->file == nullptr) { + ResourceNameRef name(pkg->name, type->type, entry->name); + context_->GetDiagnostics()->Error(DiagMessage(file_ref->GetSource()) + << "file for resource " << name << " with config '" + << config_value->config << "' not found"); + return false; + } + + const StringPiece entry_name = entry->name; + config_sorted_files[std::make_pair(config_value->config, entry_name)] = file_ref; + } + } + + for (auto& entry : config_sorted_files) { + FileReference* file_ref = entry.second; + uint32_t compression_flags = + file_ref->file->WasCompressed() ? ArchiveEntry::kCompress : 0u; + if (!io::CopyFileToArchive(context_, file_ref->file, *file_ref->path, compression_flags, + writer)) { + return false; + } + } + } + } + + BigBuffer table_buffer(4096); + TableFlattener table_flattener(options_.table_flattener_options, &table_buffer); + if (!table_flattener.Consume(context_, table)) { + return false; + } + + io::BigBufferInputStream table_buffer_in(&table_buffer); + if (!io::CopyInputStreamToArchive(context_, &table_buffer_in, "resources.arsc", + ArchiveEntry::kAlign, writer)) { + return false; + } + return true; + } + + OptimizeOptions options_; + OptimizeContext* context_; +}; + +bool ExtractAppDataFromManifest(OptimizeContext* context, LoadedApk* apk, + OptimizeOptions* out_options) { + io::IFile* manifest_file = apk->GetFileCollection()->FindFile("AndroidManifest.xml"); + if (manifest_file == nullptr) { + context->GetDiagnostics()->Error(DiagMessage(apk->GetSource()) + << "missing AndroidManifest.xml"); + return false; + } + + std::unique_ptr<io::IData> data = manifest_file->OpenAsData(); + if (data == nullptr) { + context->GetDiagnostics()->Error(DiagMessage(manifest_file->GetSource()) + << "failed to open file"); + return false; + } + + std::unique_ptr<xml::XmlResource> manifest = xml::Inflate( + data->data(), data->size(), context->GetDiagnostics(), manifest_file->GetSource()); + if (manifest == nullptr) { + context->GetDiagnostics()->Error(DiagMessage() << "failed to read binary AndroidManifest.xml"); + return false; + } + + Maybe<AppInfo> app_info = + ExtractAppInfoFromBinaryManifest(manifest.get(), context->GetDiagnostics()); + if (!app_info) { + context->GetDiagnostics()->Error(DiagMessage() + << "failed to extract data from AndroidManifest.xml"); + return false; + } + + out_options->app_info = std::move(app_info.value()); + context->SetMinSdkVersion(out_options->app_info.min_sdk_version.value_or_default(0)); + return true; +} + +int Optimize(const std::vector<StringPiece>& args) { + OptimizeContext context; + OptimizeOptions options; + Maybe<std::string> target_densities; + std::vector<std::string> configs; + std::vector<std::string> split_args; + bool verbose = false; + Flags flags = + Flags() + .RequiredFlag("-o", "Path to the output APK.", &options.output_path) + .OptionalFlag( + "--target-densities", + "Comma separated list of the screen densities that the APK will be optimized for.\n" + "All the resources that would be unused on devices of the given densities will be \n" + "removed from the APK.", + &target_densities) + .OptionalFlagList("-c", + "Comma separated list of configurations to include. The default\n" + "is all configurations.", + &configs) + .OptionalFlagList("--split", + "Split resources matching a set of configs out to a " + "Split APK.\nSyntax: path/to/output.apk:<config>[,<config>[...]].", + &split_args) + .OptionalSwitch("--enable-sparse-encoding", + "Enables encoding sparse entries using a binary search tree.\n" + "This decreases APK size at the cost of resource retrieval performance.", + &options.table_flattener_options.use_sparse_entries) + .OptionalSwitch("-v", "Enables verbose logging", &verbose); + + if (!flags.Parse("aapt2 optimize", args, &std::cerr)) { + return 1; + } + + if (flags.GetArgs().size() != 1u) { + std::cerr << "must have one APK as argument.\n\n"; + flags.Usage("aapt2 optimize", &std::cerr); + return 1; + } + + std::unique_ptr<LoadedApk> apk = LoadedApk::LoadApkFromPath(&context, flags.GetArgs()[0]); + if (!apk) { + return 1; + } + + context.SetVerbose(verbose); + + if (target_densities) { + // Parse the target screen densities. + for (const StringPiece& config_str : util::Tokenize(target_densities.value(), ',')) { + Maybe<uint16_t> target_density = + ParseTargetDensityParameter(config_str, context.GetDiagnostics()); + if (!target_density) { + return 1; + } + options.table_splitter_options.preferred_densities.push_back(target_density.value()); + } + } + + std::unique_ptr<IConfigFilter> filter; + if (!configs.empty()) { + filter = ParseConfigFilterParameters(configs, context.GetDiagnostics()); + if (filter == nullptr) { + return 1; + } + options.table_splitter_options.config_filter = filter.get(); + } + + // Parse the split parameters. + for (const std::string& split_arg : split_args) { + options.split_paths.push_back({}); + options.split_constraints.push_back({}); + if (!ParseSplitParameter(split_arg, context.GetDiagnostics(), &options.split_paths.back(), + &options.split_constraints.back())) { + return 1; + } + } + + if (!ExtractAppDataFromManifest(&context, apk.get(), &options)) { + return 1; + } + + OptimizeCommand cmd(&context, options); + return cmd.Run(std::move(apk)); +} + +} // namespace aapt diff --git a/tools/aapt2/cmd/Util.cpp b/tools/aapt2/cmd/Util.cpp new file mode 100644 index 000000000000..fd94bbc0a1c3 --- /dev/null +++ b/tools/aapt2/cmd/Util.cpp @@ -0,0 +1,347 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "cmd/Util.h" + +#include <vector> + +#include "android-base/logging.h" + +#include "ConfigDescription.h" +#include "Locale.h" +#include "ResourceUtils.h" +#include "ValueVisitor.h" +#include "split/TableSplitter.h" +#include "util/Maybe.h" +#include "util/Util.h" + +using android::StringPiece; + +namespace aapt { + +Maybe<uint16_t> ParseTargetDensityParameter(const StringPiece& arg, IDiagnostics* diag) { + ConfigDescription preferred_density_config; + if (!ConfigDescription::Parse(arg, &preferred_density_config)) { + diag->Error(DiagMessage() << "invalid density '" << arg << "' for --preferred-density option"); + return {}; + } + + // Clear the version that can be automatically added. + preferred_density_config.sdkVersion = 0; + + if (preferred_density_config.diff(ConfigDescription::DefaultConfig()) != + ConfigDescription::CONFIG_DENSITY) { + diag->Error(DiagMessage() << "invalid preferred density '" << arg << "'. " + << "Preferred density must only be a density value"); + return {}; + } + return preferred_density_config.density; +} + +bool ParseSplitParameter(const StringPiece& arg, IDiagnostics* diag, std::string* out_path, + SplitConstraints* out_split) { + CHECK(diag != nullptr); + CHECK(out_path != nullptr); + CHECK(out_split != nullptr); + + std::vector<std::string> parts = util::Split(arg, ':'); + if (parts.size() != 2) { + diag->Error(DiagMessage() << "invalid split parameter '" << arg << "'"); + diag->Note(DiagMessage() << "should be --split path/to/output.apk:<config>[,<config>...]"); + return false; + } + + *out_path = parts[0]; + std::vector<ConfigDescription> configs; + for (const StringPiece& config_str : util::Tokenize(parts[1], ',')) { + ConfigDescription config; + if (!ConfigDescription::Parse(config_str, &config)) { + diag->Error(DiagMessage() << "invalid config '" << config_str << "' in split parameter '" + << arg << "'"); + return false; + } + out_split->configs.insert(config); + } + return true; +} + +std::unique_ptr<IConfigFilter> ParseConfigFilterParameters(const std::vector<std::string>& args, + IDiagnostics* diag) { + std::unique_ptr<AxisConfigFilter> filter = util::make_unique<AxisConfigFilter>(); + for (const std::string& config_arg : args) { + for (const StringPiece& config_str : util::Tokenize(config_arg, ',')) { + ConfigDescription config; + LocaleValue lv; + if (lv.InitFromFilterString(config_str)) { + lv.WriteTo(&config); + } else if (!ConfigDescription::Parse(config_str, &config)) { + diag->Error(DiagMessage() << "invalid config '" << config_str << "' for -c option"); + return {}; + } + + if (config.density != 0) { + diag->Warn(DiagMessage() << "ignoring density '" << config << "' for -c option"); + } else { + filter->AddConfig(config); + } + } + } + return std::move(filter); +} + +// Adjust the SplitConstraints so that their SDK version is stripped if it +// is less than or equal to the minSdk. Otherwise the resources that have had +// their SDK version stripped due to minSdk won't ever match. +std::vector<SplitConstraints> AdjustSplitConstraintsForMinSdk( + int min_sdk, const std::vector<SplitConstraints>& split_constraints) { + std::vector<SplitConstraints> adjusted_constraints; + adjusted_constraints.reserve(split_constraints.size()); + for (const SplitConstraints& constraints : split_constraints) { + SplitConstraints constraint; + for (const ConfigDescription& config : constraints.configs) { + if (config.sdkVersion <= min_sdk) { + constraint.configs.insert(config.CopyWithoutSdkVersion()); + } else { + constraint.configs.insert(config); + } + } + adjusted_constraints.push_back(std::move(constraint)); + } + return adjusted_constraints; +} + +static xml::AaptAttribute CreateAttributeWithId(const ResourceId& id) { + return xml::AaptAttribute{id, Attribute(true)}; +} + +std::unique_ptr<xml::XmlResource> GenerateSplitManifest(const AppInfo& app_info, + const SplitConstraints& constraints) { + const ResourceId kVersionCode(0x0101021b); + const ResourceId kRevisionCode(0x010104d5); + const ResourceId kHasCode(0x0101000c); + + std::unique_ptr<xml::XmlResource> doc = util::make_unique<xml::XmlResource>(); + + std::unique_ptr<xml::Namespace> namespace_android = util::make_unique<xml::Namespace>(); + namespace_android->namespace_uri = xml::kSchemaAndroid; + namespace_android->namespace_prefix = "android"; + + std::unique_ptr<xml::Element> manifest_el = util::make_unique<xml::Element>(); + manifest_el->name = "manifest"; + manifest_el->attributes.push_back(xml::Attribute{"", "package", app_info.package}); + + if (app_info.version_code) { + const uint32_t version_code = app_info.version_code.value(); + manifest_el->attributes.push_back(xml::Attribute{ + xml::kSchemaAndroid, "versionCode", std::to_string(version_code), + CreateAttributeWithId(kVersionCode), + util::make_unique<BinaryPrimitive>(android::Res_value::TYPE_INT_DEC, version_code)}); + } + + if (app_info.revision_code) { + const uint32_t revision_code = app_info.revision_code.value(); + manifest_el->attributes.push_back(xml::Attribute{ + xml::kSchemaAndroid, "revisionCode", std::to_string(revision_code), + CreateAttributeWithId(kRevisionCode), + util::make_unique<BinaryPrimitive>(android::Res_value::TYPE_INT_DEC, revision_code)}); + } + + std::stringstream split_name; + if (app_info.split_name) { + split_name << app_info.split_name.value() << "."; + } + split_name << "config." << util::Joiner(constraints.configs, "_"); + + manifest_el->attributes.push_back(xml::Attribute{"", "split", split_name.str()}); + + if (app_info.split_name) { + manifest_el->attributes.push_back( + xml::Attribute{"", "configForSplit", app_info.split_name.value()}); + } + + std::unique_ptr<xml::Element> application_el = util::make_unique<xml::Element>(); + application_el->name = "application"; + application_el->attributes.push_back( + xml::Attribute{xml::kSchemaAndroid, "hasCode", "false", CreateAttributeWithId(kHasCode), + util::make_unique<BinaryPrimitive>(android::Res_value::TYPE_INT_BOOLEAN, 0u)}); + + manifest_el->AppendChild(std::move(application_el)); + namespace_android->AppendChild(std::move(manifest_el)); + doc->root = std::move(namespace_android); + return doc; +} + +static Maybe<std::string> ExtractCompiledString(xml::Attribute* attr, std::string* out_error) { + if (attr->compiled_value != nullptr) { + String* compiled_str = ValueCast<String>(attr->compiled_value.get()); + if (compiled_str != nullptr) { + if (!compiled_str->value->empty()) { + return *compiled_str->value; + } else { + *out_error = "compiled value is an empty string"; + return {}; + } + } + *out_error = "compiled value is not a string"; + return {}; + } + + // Fallback to the plain text value if there is one. + if (!attr->value.empty()) { + return attr->value; + } + *out_error = "value is an empty string"; + return {}; +} + +static Maybe<uint32_t> ExtractCompiledInt(xml::Attribute* attr, std::string* out_error) { + if (attr->compiled_value != nullptr) { + BinaryPrimitive* compiled_prim = ValueCast<BinaryPrimitive>(attr->compiled_value.get()); + if (compiled_prim != nullptr) { + if (compiled_prim->value.dataType >= android::Res_value::TYPE_FIRST_INT && + compiled_prim->value.dataType <= android::Res_value::TYPE_LAST_INT) { + return compiled_prim->value.data; + } + } + *out_error = "compiled value is not an integer"; + return {}; + } + + // Fallback to the plain text value if there is one. + Maybe<uint32_t> integer = ResourceUtils::ParseInt(attr->value); + if (integer) { + return integer; + } + std::stringstream error_msg; + error_msg << "'" << attr->value << "' is not a valid integer"; + *out_error = error_msg.str(); + return {}; +} + +static Maybe<int> ExtractSdkVersion(xml::Attribute* attr, std::string* out_error) { + if (attr->compiled_value != nullptr) { + BinaryPrimitive* compiled_prim = ValueCast<BinaryPrimitive>(attr->compiled_value.get()); + if (compiled_prim != nullptr) { + if (compiled_prim->value.dataType >= android::Res_value::TYPE_FIRST_INT && + compiled_prim->value.dataType <= android::Res_value::TYPE_LAST_INT) { + return compiled_prim->value.data; + } + *out_error = "compiled value is not an integer or string"; + return {}; + } + + String* compiled_str = ValueCast<String>(attr->compiled_value.get()); + if (compiled_str != nullptr) { + Maybe<int> sdk_version = ResourceUtils::ParseSdkVersion(*compiled_str->value); + if (sdk_version) { + return sdk_version; + } + + *out_error = "compiled string value is not a valid SDK version"; + return {}; + } + *out_error = "compiled value is not an integer or string"; + return {}; + } + + // Fallback to the plain text value if there is one. + Maybe<int> sdk_version = ResourceUtils::ParseSdkVersion(attr->value); + if (sdk_version) { + return sdk_version; + } + std::stringstream error_msg; + error_msg << "'" << attr->value << "' is not a valid SDK version"; + *out_error = error_msg.str(); + return {}; +} + +Maybe<AppInfo> ExtractAppInfoFromBinaryManifest(xml::XmlResource* xml_res, IDiagnostics* diag) { + // Make sure the first element is <manifest> with package attribute. + xml::Element* manifest_el = xml::FindRootElement(xml_res->root.get()); + if (manifest_el == nullptr) { + return {}; + } + + AppInfo app_info; + + if (!manifest_el->namespace_uri.empty() || manifest_el->name != "manifest") { + diag->Error(DiagMessage(xml_res->file.source) << "root tag must be <manifest>"); + return {}; + } + + xml::Attribute* package_attr = manifest_el->FindAttribute({}, "package"); + if (!package_attr) { + diag->Error(DiagMessage(xml_res->file.source) << "<manifest> must have a 'package' attribute"); + return {}; + } + + std::string error_msg; + Maybe<std::string> maybe_package = ExtractCompiledString(package_attr, &error_msg); + if (!maybe_package) { + diag->Error(DiagMessage(xml_res->file.source.WithLine(manifest_el->line_number)) + << "invalid package name: " << error_msg); + return {}; + } + app_info.package = maybe_package.value(); + + if (xml::Attribute* version_code_attr = + manifest_el->FindAttribute(xml::kSchemaAndroid, "versionCode")) { + Maybe<uint32_t> maybe_code = ExtractCompiledInt(version_code_attr, &error_msg); + if (!maybe_code) { + diag->Error(DiagMessage(xml_res->file.source.WithLine(manifest_el->line_number)) + << "invalid android:versionCode: " << error_msg); + return {}; + } + app_info.version_code = maybe_code.value(); + } + + if (xml::Attribute* revision_code_attr = + manifest_el->FindAttribute(xml::kSchemaAndroid, "revisionCode")) { + Maybe<uint32_t> maybe_code = ExtractCompiledInt(revision_code_attr, &error_msg); + if (!maybe_code) { + diag->Error(DiagMessage(xml_res->file.source.WithLine(manifest_el->line_number)) + << "invalid android:revisionCode: " << error_msg); + return {}; + } + app_info.revision_code = maybe_code.value(); + } + + if (xml::Attribute* split_name_attr = manifest_el->FindAttribute({}, "split")) { + Maybe<std::string> maybe_split_name = ExtractCompiledString(split_name_attr, &error_msg); + if (!maybe_split_name) { + diag->Error(DiagMessage(xml_res->file.source.WithLine(manifest_el->line_number)) + << "invalid split name: " << error_msg); + return {}; + } + app_info.split_name = maybe_split_name.value(); + } + + if (xml::Element* uses_sdk_el = manifest_el->FindChild({}, "uses-sdk")) { + if (xml::Attribute* min_sdk = + uses_sdk_el->FindAttribute(xml::kSchemaAndroid, "minSdkVersion")) { + Maybe<int> maybe_sdk = ExtractSdkVersion(min_sdk, &error_msg); + if (!maybe_sdk) { + diag->Error(DiagMessage(xml_res->file.source.WithLine(uses_sdk_el->line_number)) + << "invalid android:minSdkVersion: " << error_msg); + return {}; + } + app_info.min_sdk_version = maybe_sdk.value(); + } + } + return app_info; +} + +} // namespace aapt diff --git a/tools/aapt2/cmd/Util.h b/tools/aapt2/cmd/Util.h new file mode 100644 index 000000000000..fd9b39c67380 --- /dev/null +++ b/tools/aapt2/cmd/Util.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef AAPT_SPLIT_UTIL_H +#define AAPT_SPLIT_UTIL_H + +#include "androidfw/StringPiece.h" + +#include "AppInfo.h" +#include "Diagnostics.h" +#include "SdkConstants.h" +#include "filter/ConfigFilter.h" +#include "split/TableSplitter.h" +#include "util/Maybe.h" +#include "xml/XmlDom.h" + +namespace aapt { + +// Parses a configuration density (ex. hdpi, xxhdpi, 234dpi, anydpi, etc). +// Returns Nothing and logs a human friendly error message if the string was not legal. +Maybe<uint16_t> ParseTargetDensityParameter(const android::StringPiece& arg, IDiagnostics* diag); + +// Parses a string of the form 'path/to/output.apk:<config>[,<config>...]' and fills in +// `out_path` with the path and `out_split` with the set of ConfigDescriptions. +// Returns false and logs a human friendly error message if the string was not legal. +bool ParseSplitParameter(const android::StringPiece& arg, IDiagnostics* diag, std::string* out_path, + SplitConstraints* out_split); + +// Parses a set of config filter strings of the form 'en,fr-rFR' and returns an IConfigFilter. +// Returns nullptr and logs a human friendly error message if the string was not legal. +std::unique_ptr<IConfigFilter> ParseConfigFilterParameters(const std::vector<std::string>& args, + IDiagnostics* diag); + +// Adjust the SplitConstraints so that their SDK version is stripped if it +// is less than or equal to the min_sdk. Otherwise the resources that have had +// their SDK version stripped due to min_sdk won't ever match. +std::vector<SplitConstraints> AdjustSplitConstraintsForMinSdk( + int min_sdk, const std::vector<SplitConstraints>& split_constraints); + +// Generates a split AndroidManifest.xml given the split constraints and app info. The resulting +// XmlResource does not need to be linked via XmlReferenceLinker. +// This will never fail/return nullptr. +std::unique_ptr<xml::XmlResource> GenerateSplitManifest(const AppInfo& app_info, + const SplitConstraints& constraints); + +// Extracts relevant info from the AndroidManifest.xml. +Maybe<AppInfo> ExtractAppInfoFromBinaryManifest(xml::XmlResource* xml_res, IDiagnostics* diag); + +} // namespace aapt + +#endif /* AAPT_SPLIT_UTIL_H */ diff --git a/tools/aapt2/io/Io.cpp b/tools/aapt2/io/Io.cpp deleted file mode 100644 index f5c5737cb149..000000000000 --- a/tools/aapt2/io/Io.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2016 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. - */ - -#include "io/Io.h" - -#include <cstring> - -namespace aapt { -namespace io { - -bool Copy(OutputStream* out, InputStream* in) { - const void* in_buffer; - size_t in_len; - while (in->Next(&in_buffer, &in_len)) { - void* out_buffer; - size_t out_len; - if (!out->Next(&out_buffer, &out_len)) { - return !out->HadError(); - } - - const size_t bytes_to_copy = in_len < out_len ? in_len : out_len; - memcpy(out_buffer, in_buffer, bytes_to_copy); - out->BackUp(out_len - bytes_to_copy); - in->BackUp(in_len - bytes_to_copy); - } - return !in->HadError(); -} - -} // namespace io -} // namespace aapt diff --git a/tools/aapt2/io/Io.h b/tools/aapt2/io/Io.h index 2a34d4dd442d..a656740b35da 100644 --- a/tools/aapt2/io/Io.h +++ b/tools/aapt2/io/Io.h @@ -87,10 +87,6 @@ class OutputStream { virtual bool HadError() const = 0; }; -// Copies the data from in to out. Returns false if there was an error. -// If there was an error, check the individual streams' HadError/GetError methods. -bool Copy(OutputStream* out, InputStream* in); - } // namespace io } // namespace aapt diff --git a/tools/aapt2/io/Util.cpp b/tools/aapt2/io/Util.cpp new file mode 100644 index 000000000000..15114e8dbf54 --- /dev/null +++ b/tools/aapt2/io/Util.cpp @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "io/Util.h" + +#include "google/protobuf/io/zero_copy_stream_impl_lite.h" + +namespace aapt { +namespace io { + +bool CopyInputStreamToArchive(IAaptContext* context, InputStream* in, const std::string& out_path, + uint32_t compression_flags, IArchiveWriter* writer) { + if (context->IsVerbose()) { + context->GetDiagnostics()->Note(DiagMessage() << "writing " << out_path << " to archive"); + } + + if (!writer->WriteFile(out_path, compression_flags, in)) { + context->GetDiagnostics()->Error(DiagMessage() << "failed to write " << out_path + << " to archive: " << writer->GetError()); + return false; + } + return true; +} + +bool CopyFileToArchive(IAaptContext* context, io::IFile* file, const std::string& out_path, + uint32_t compression_flags, IArchiveWriter* writer) { + std::unique_ptr<io::IData> data = file->OpenAsData(); + if (!data) { + context->GetDiagnostics()->Error(DiagMessage(file->GetSource()) << "failed to open file"); + return false; + } + return CopyInputStreamToArchive(context, data.get(), out_path, compression_flags, writer); +} + +bool CopyProtoToArchive(IAaptContext* context, ::google::protobuf::MessageLite* proto_msg, + const std::string& out_path, uint32_t compression_flags, + IArchiveWriter* writer) { + if (context->IsVerbose()) { + context->GetDiagnostics()->Note(DiagMessage() << "writing " << out_path << " to archive"); + } + + if (writer->StartEntry(out_path, compression_flags)) { + // Make sure CopyingOutputStreamAdaptor is deleted before we call writer->FinishEntry(). + { + // Wrap our IArchiveWriter with an adaptor that implements the ZeroCopyOutputStream interface. + ::google::protobuf::io::CopyingOutputStreamAdaptor adaptor(writer); + if (!proto_msg->SerializeToZeroCopyStream(&adaptor)) { + context->GetDiagnostics()->Error(DiagMessage() << "failed to write " << out_path + << " to archive"); + return false; + } + } + + if (writer->FinishEntry()) { + return true; + } + } + context->GetDiagnostics()->Error(DiagMessage() << "failed to write " << out_path + << " to archive: " << writer->GetError()); + return false; +} + +bool Copy(OutputStream* out, InputStream* in) { + const void* in_buffer; + size_t in_len; + while (in->Next(&in_buffer, &in_len)) { + void* out_buffer; + size_t out_len; + if (!out->Next(&out_buffer, &out_len)) { + return !out->HadError(); + } + + const size_t bytes_to_copy = in_len < out_len ? in_len : out_len; + memcpy(out_buffer, in_buffer, bytes_to_copy); + out->BackUp(out_len - bytes_to_copy); + in->BackUp(in_len - bytes_to_copy); + } + return !in->HadError(); +} + +} // namespace io +} // namespace aapt diff --git a/tools/aapt2/io/Util.h b/tools/aapt2/io/Util.h new file mode 100644 index 000000000000..ec1ddb8a07aa --- /dev/null +++ b/tools/aapt2/io/Util.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef AAPT_IO_UTIL_H +#define AAPT_IO_UTIL_H + +#include <string> + +#include "google/protobuf/message_lite.h" + +#include "flatten/Archive.h" +#include "io/File.h" +#include "io/Io.h" +#include "process/IResourceTableConsumer.h" + +namespace aapt { +namespace io { + +bool CopyInputStreamToArchive(IAaptContext* context, InputStream* in, const std::string& out_path, + uint32_t compression_flags, IArchiveWriter* writer); + +bool CopyFileToArchive(IAaptContext* context, IFile* file, const std::string& out_path, + uint32_t compression_flags, IArchiveWriter* writer); + +bool CopyProtoToArchive(IAaptContext* context, ::google::protobuf::MessageLite* proto_msg, + const std::string& out_path, uint32_t compression_flags, + IArchiveWriter* writer); + +// Copies the data from in to out. Returns false if there was an error. +// If there was an error, check the individual streams' HadError/GetError methods. +bool Copy(OutputStream* out, InputStream* in); + +} // namespace io +} // namespace aapt + +#endif /* AAPT_IO_UTIL_H */ diff --git a/tools/aapt2/jni/aapt2_jni.cpp b/tools/aapt2/jni/aapt2_jni.cpp index b029b20bcf15..ce3d282e6f9b 100644 --- a/tools/aapt2/jni/aapt2_jni.cpp +++ b/tools/aapt2/jni/aapt2_jni.cpp @@ -77,20 +77,20 @@ static std::vector<StringPiece> extract_pieces(const std::vector<ScopedUtfChars> return pieces; } -JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeCompile( +JNIEXPORT jint JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeCompile( JNIEnv *env, jclass aapt_obj, jobject arguments_obj) { std::vector<ScopedUtfChars> compile_args_jni = list_to_utfchars(env, arguments_obj); std::vector<StringPiece> compile_args = extract_pieces(compile_args_jni); - aapt::Compile(compile_args); + return aapt::Compile(compile_args); } -JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeLink( +JNIEXPORT jint JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeLink( JNIEnv *env, jclass aapt_obj, jobject arguments_obj) { std::vector<ScopedUtfChars> link_args_jni = list_to_utfchars(env, arguments_obj); std::vector<StringPiece> link_args = extract_pieces(link_args_jni); - aapt::Link(link_args); + return aapt::Link(link_args); } JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_ping( diff --git a/tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h b/tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h index 56c3c18e3a1e..90150b4d731e 100644 --- a/tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h +++ b/tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h @@ -18,17 +18,17 @@ JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_ping /* * Class: com_android_tools_aapt2_Aapt2Jni * Method: nativeCompile - * Signature: (Ljava/util/List;)V + * Signature: (Ljava/util/List;)I */ -JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeCompile +JNIEXPORT jint JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeCompile (JNIEnv *, jclass, jobject); /* * Class: com_android_tools_aapt2_Aapt2Jni * Method: nativeLink - * Signature: (Ljava/util/List;)V + * Signature: (Ljava/util/List;)I */ -JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeLink +JNIEXPORT jint JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeLink (JNIEnv *, jclass, jobject); #ifdef __cplusplus diff --git a/tools/aapt2/optimize/Optimize.cpp b/tools/aapt2/optimize/Optimize.cpp deleted file mode 100644 index 96159622e653..000000000000 --- a/tools/aapt2/optimize/Optimize.cpp +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <memory> -#include <vector> - -#include "androidfw/StringPiece.h" - -#include "Diagnostics.h" -#include "Flags.h" -#include "LoadedApk.h" -#include "SdkConstants.h" -#include "flatten/TableFlattener.h" -#include "optimize/ResourceDeduper.h" -#include "optimize/VersionCollapser.h" -#include "split/TableSplitter.h" - -using android::StringPiece; - -namespace aapt { - -struct OptimizeOptions { - // Path to the output APK. - std::string output_path; - - // List of screen density configurations the APK will be optimized for. - std::vector<ConfigDescription> target_configs; - - TableFlattenerOptions table_flattener_options; -}; - -class OptimizeContext : public IAaptContext { - public: - IDiagnostics* GetDiagnostics() override { return &diagnostics_; } - - NameMangler* GetNameMangler() override { - abort(); - return nullptr; - } - - const std::string& GetCompilationPackage() override { - static std::string empty; - return empty; - } - - uint8_t GetPackageId() override { return 0; } - - SymbolTable* GetExternalSymbols() override { - abort(); - return nullptr; - } - - bool IsVerbose() override { return verbose_; } - - void SetVerbose(bool val) { verbose_ = val; } - - void SetMinSdkVersion(int sdk_version) { sdk_version_ = sdk_version; } - - int GetMinSdkVersion() override { return sdk_version_; } - - private: - StdErrDiagnostics diagnostics_; - bool verbose_ = false; - int sdk_version_ = 0; -}; - -class OptimizeCommand { - public: - OptimizeCommand(OptimizeContext* context, const OptimizeOptions& options) - : options_(options), - context_(context) {} - - int Run(std::unique_ptr<LoadedApk> apk) { - if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note(DiagMessage() << "Optimizing APK..."); - } - - VersionCollapser collapser; - if (!collapser.Consume(context_, apk->GetResourceTable())) { - return 1; - } - - ResourceDeduper deduper; - if (!deduper.Consume(context_, apk->GetResourceTable())) { - context_->GetDiagnostics()->Error(DiagMessage() << "failed deduping resources"); - return 1; - } - - // Stripping the APK using the TableSplitter with no splits and the target - // densities as the preferred densities. The resource table is modified in - // place in the LoadedApk. - TableSplitterOptions splitter_options; - for (auto& config : options_.target_configs) { - splitter_options.preferred_densities.push_back(config.density); - } - std::vector<SplitConstraints> splits; - TableSplitter splitter(splits, splitter_options); - splitter.SplitTable(apk->GetResourceTable()); - - std::unique_ptr<IArchiveWriter> writer = - CreateZipFileArchiveWriter(context_->GetDiagnostics(), options_.output_path); - if (!apk->WriteToArchive(context_, options_.table_flattener_options, writer.get())) { - return 1; - } - - return 0; - } - - private: - OptimizeOptions options_; - OptimizeContext* context_; -}; - -int Optimize(const std::vector<StringPiece>& args) { - OptimizeContext context; - OptimizeOptions options; - Maybe<std::string> target_densities; - bool verbose = false; - Flags flags = - Flags() - .RequiredFlag("-o", "Path to the output APK.", &options.output_path) - .OptionalFlag( - "--target-densities", - "Comma separated list of the screen densities that the APK will " - "be optimized for. All the resources that would be unused on " - "devices of the given densities will be removed from the APK.", - &target_densities) - .OptionalSwitch("--enable-sparse-encoding", - "Enables encoding sparse entries using a binary search tree.\n" - "This decreases APK size at the cost of resource retrieval performance.", - &options.table_flattener_options.use_sparse_entries) - .OptionalSwitch("-v", "Enables verbose logging", &verbose); - - if (!flags.Parse("aapt2 optimize", args, &std::cerr)) { - return 1; - } - - if (flags.GetArgs().size() != 1u) { - std::cerr << "must have one APK as argument.\n\n"; - flags.Usage("aapt2 optimize", &std::cerr); - return 1; - } - - std::unique_ptr<LoadedApk> apk = - LoadedApk::LoadApkFromPath(&context, flags.GetArgs()[0]); - if (!apk) { - return 1; - } - - if (verbose) { - context.SetVerbose(verbose); - } - - if (target_densities) { - // Parse the target screen densities. - for (const StringPiece& config_str : util::Tokenize(target_densities.value(), ',')) { - ConfigDescription config; - if (!ConfigDescription::Parse(config_str, &config) || config.density == 0) { - context.GetDiagnostics()->Error( - DiagMessage() << "invalid density '" << config_str - << "' for --target-densities option"); - return 1; - } - - // Clear the version that can be automatically added. - config.sdkVersion = 0; - - if (config.diff(ConfigDescription::DefaultConfig()) != - ConfigDescription::CONFIG_DENSITY) { - context.GetDiagnostics()->Error( - DiagMessage() << "invalid density '" << config_str - << "' for --target-densities option. Must be only a " - << "density value."); - return 1; - } - - options.target_configs.push_back(config); - } - } - - // TODO(adamlesinski): Read manfiest and set the proper minSdkVersion. - // context.SetMinSdkVersion(SDK_O); - - OptimizeCommand cmd(&context, options); - return cmd.Run(std::move(apk)); -} - -} // namespace aapt diff --git a/tools/aapt2/readme.md b/tools/aapt2/readme.md index 2e674bddce7e..daf1ebc20461 100644 --- a/tools/aapt2/readme.md +++ b/tools/aapt2/readme.md @@ -1,5 +1,10 @@ # Android Asset Packaging Tool 2.0 (AAPT2) release notes +## Version 2.13 +### `aapt2 optimize ...` +- aapt2 optimize can now split a binary APK with the same --split parameters as the link + phase. + ## Version 2.12 ### `aapt2 optimize ...` - aapt2 optimize now understands map (complex) values under the type `id`. It ignores their diff --git a/tools/aapt2/unflatten/BinaryResourceParser.cpp b/tools/aapt2/unflatten/BinaryResourceParser.cpp index 35bf618c1635..20a45312993d 100644 --- a/tools/aapt2/unflatten/BinaryResourceParser.cpp +++ b/tools/aapt2/unflatten/BinaryResourceParser.cpp @@ -73,15 +73,16 @@ class ReferenceIdToNameVisitor : public ValueVisitor { } // namespace -BinaryResourceParser::BinaryResourceParser(IAaptContext* context, - ResourceTable* table, - const Source& source, - const void* data, size_t len) +BinaryResourceParser::BinaryResourceParser(IAaptContext* context, ResourceTable* table, + const Source& source, const void* data, size_t len, + io::IFileCollection* files) : context_(context), table_(table), source_(source), data_(data), - data_len_(len) {} + data_len_(len), + files_(files) { +} bool BinaryResourceParser::Parse() { ResChunkPullParser parser(data_, data_len_); @@ -359,16 +360,14 @@ bool BinaryResourceParser::ParseType(const ResourceTablePackage* package, std::unique_ptr<Value> resource_value; if (entry->flags & ResTable_entry::FLAG_COMPLEX) { - const ResTable_map_entry* mapEntry = - static_cast<const ResTable_map_entry*>(entry); + const ResTable_map_entry* mapEntry = static_cast<const ResTable_map_entry*>(entry); // TODO(adamlesinski): Check that the entry count is valid. resource_value = ParseMapEntry(name, config, mapEntry); } else { const Res_value* value = - (const Res_value*)((const uint8_t*)entry + - util::DeviceToHost32(entry->size)); - resource_value = ParseValue(name, config, value, entry->flags); + (const Res_value*)((const uint8_t*)entry + util::DeviceToHost32(entry->size)); + resource_value = ParseValue(name, config, *value); } if (!resource_value) { @@ -388,8 +387,7 @@ bool BinaryResourceParser::ParseType(const ResourceTablePackage* package, Symbol symbol; symbol.state = SymbolState::kPublic; symbol.source = source_.WithLine(0); - if (!table_->SetSymbolStateAllowMangled(name, res_id, symbol, - context_->GetDiagnostics())) { + if (!table_->SetSymbolStateAllowMangled(name, res_id, symbol, context_->GetDiagnostics())) { return false; } } @@ -419,70 +417,25 @@ bool BinaryResourceParser::ParseLibrary(const ResChunk_header* chunk) { return true; } -std::unique_ptr<Item> BinaryResourceParser::ParseValue( - const ResourceNameRef& name, const ConfigDescription& config, - const Res_value* value, uint16_t flags) { - if (name.type == ResourceType::kId) { - return util::make_unique<Id>(); - } - - const uint32_t data = util::DeviceToHost32(value->data); - - if (value->dataType == Res_value::TYPE_STRING) { - const std::string str = util::GetString(value_pool_, data); - - const ResStringPool_span* spans = value_pool_.styleAt(data); - - // Check if the string has a valid style associated with it. - if (spans != nullptr && spans->name.index != ResStringPool_span::END) { - StyleString style_str = {str}; - while (spans->name.index != ResStringPool_span::END) { - style_str.spans.push_back( - Span{util::GetString(value_pool_, spans->name.index), - spans->firstChar, spans->lastChar}); - spans++; - } - return util::make_unique<StyledString>(table_->string_pool.MakeRef( - style_str, - StringPool::Context(StringPool::Context::kStylePriority, config))); - } else { - if (name.type != ResourceType::kString && util::StartsWith(str, "res/")) { - // This must be a FileReference. - return util::make_unique<FileReference>(table_->string_pool.MakeRef( - str, - StringPool::Context(StringPool::Context::kHighPriority, config))); +std::unique_ptr<Item> BinaryResourceParser::ParseValue(const ResourceNameRef& name, + const ConfigDescription& config, + const android::Res_value& value) { + std::unique_ptr<Item> item = ResourceUtils::ParseBinaryResValue(name.type, config, value_pool_, + value, &table_->string_pool); + if (files_ != nullptr && item != nullptr) { + FileReference* file_ref = ValueCast<FileReference>(item.get()); + if (file_ref != nullptr) { + file_ref->file = files_->FindFile(*file_ref->path); + if (file_ref->file == nullptr) { + context_->GetDiagnostics()->Error(DiagMessage() << "resource " << name << " for config '" + << config << "' is a file reference to '" + << *file_ref->path + << "' but no such path exists"); + return {}; } - - // There are no styles associated with this string, so treat it as - // a simple string. - return util::make_unique<String>( - table_->string_pool.MakeRef(str, StringPool::Context(config))); - } - } - - if (value->dataType == Res_value::TYPE_REFERENCE || - value->dataType == Res_value::TYPE_ATTRIBUTE || - value->dataType == Res_value::TYPE_DYNAMIC_REFERENCE || - value->dataType == Res_value::TYPE_DYNAMIC_ATTRIBUTE) { - Reference::Type type = Reference::Type::kResource; - if (value->dataType == Res_value::TYPE_ATTRIBUTE || - value->dataType == Res_value::TYPE_DYNAMIC_ATTRIBUTE) { - type = Reference::Type::kAttribute; } - - if (data == 0) { - // A reference of 0, must be the magic @null reference. - Res_value null_type = {}; - null_type.dataType = Res_value::TYPE_REFERENCE; - return util::make_unique<BinaryPrimitive>(null_type); - } - - // This is a normal reference. - return util::make_unique<Reference>(data, type); } - - // Treat this as a raw binary primitive. - return util::make_unique<BinaryPrimitive>(*value); + return item; } std::unique_ptr<Value> BinaryResourceParser::ParseMapEntry( @@ -528,7 +481,7 @@ std::unique_ptr<Style> BinaryResourceParser::ParseStyle( Style::Entry style_entry; style_entry.key = Reference(util::DeviceToHost32(map_entry.name.ident)); - style_entry.value = ParseValue(name, config, &map_entry.value, 0); + style_entry.value = ParseValue(name, config, map_entry.value); if (!style_entry.value) { return {}; } @@ -586,7 +539,7 @@ std::unique_ptr<Array> BinaryResourceParser::ParseArray( const ResTable_map_entry* map) { std::unique_ptr<Array> array = util::make_unique<Array>(); for (const ResTable_map& map_entry : map) { - array->items.push_back(ParseValue(name, config, &map_entry.value, 0)); + array->items.push_back(ParseValue(name, config, map_entry.value)); } return array; } @@ -596,7 +549,7 @@ std::unique_ptr<Plural> BinaryResourceParser::ParsePlural( const ResTable_map_entry* map) { std::unique_ptr<Plural> plural = util::make_unique<Plural>(); for (const ResTable_map& map_entry : map) { - std::unique_ptr<Item> item = ParseValue(name, config, &map_entry.value, 0); + std::unique_ptr<Item> item = ParseValue(name, config, map_entry.value); if (!item) { return {}; } diff --git a/tools/aapt2/unflatten/BinaryResourceParser.h b/tools/aapt2/unflatten/BinaryResourceParser.h index e3dd80212f12..c41ada09e551 100644 --- a/tools/aapt2/unflatten/BinaryResourceParser.h +++ b/tools/aapt2/unflatten/BinaryResourceParser.h @@ -45,8 +45,8 @@ class BinaryResourceParser { * Creates a parser, which will read `len` bytes from `data`, and * add any resources parsed to `table`. `source` is for logging purposes. */ - BinaryResourceParser(IAaptContext* context, ResourceTable* table, - const Source& source, const void* data, size_t data_len); + BinaryResourceParser(IAaptContext* context, ResourceTable* table, const Source& source, + const void* data, size_t data_len, io::IFileCollection* files = nullptr); /* * Parses the binary resource table and returns true if successful. @@ -63,10 +63,8 @@ class BinaryResourceParser { const android::ResChunk_header* chunk); bool ParseLibrary(const android::ResChunk_header* chunk); - std::unique_ptr<Item> ParseValue(const ResourceNameRef& name, - const ConfigDescription& config, - const android::Res_value* value, - uint16_t flags); + std::unique_ptr<Item> ParseValue(const ResourceNameRef& name, const ConfigDescription& config, + const android::Res_value& value); std::unique_ptr<Value> ParseMapEntry(const ResourceNameRef& name, const ConfigDescription& config, @@ -104,6 +102,9 @@ class BinaryResourceParser { const void* data_; const size_t data_len_; + // Optional file collection from which to create io::IFile objects. + io::IFileCollection* files_; + // The standard value string pool for resource values. android::ResStringPool value_pool_; diff --git a/tools/aapt2/util/Util.h b/tools/aapt2/util/Util.h index 7210d21f64ab..30b9af61d896 100644 --- a/tools/aapt2/util/Util.h +++ b/tools/aapt2/util/Util.h @@ -99,8 +99,7 @@ Maybe<std::string> GetFullyQualifiedClassName(const android::StringPiece& packag const android::StringPiece& class_name); /** - * Makes a std::unique_ptr<> with the template parameter inferred by the - * compiler. + * Makes a std::unique_ptr<> with the template parameter inferred by the compiler. * This will be present in C++14 and can be removed then. */ template <typename T, class... Args> diff --git a/tools/aapt2/xml/XmlDom.cpp b/tools/aapt2/xml/XmlDom.cpp index d9ea1bcf3766..4a278f632a4a 100644 --- a/tools/aapt2/xml/XmlDom.cpp +++ b/tools/aapt2/xml/XmlDom.cpp @@ -25,6 +25,7 @@ #include "android-base/logging.h" +#include "ResourceUtils.h" #include "XmlPullParser.h" #include "util/Util.h" @@ -193,16 +194,14 @@ static void XMLCALL CommentDataHandler(void* user_data, const char* comment) { stack->pending_comment += comment; } -std::unique_ptr<XmlResource> Inflate(std::istream* in, IDiagnostics* diag, - const Source& source) { +std::unique_ptr<XmlResource> Inflate(std::istream* in, IDiagnostics* diag, const Source& source) { Stack stack; XML_Parser parser = XML_ParserCreateNS(nullptr, kXmlNamespaceSep); XML_SetUserData(parser, &stack); XML_UseParserAsHandlerArg(parser); XML_SetElementHandler(parser, StartElementHandler, EndElementHandler); - XML_SetNamespaceDeclHandler(parser, StartNamespaceHandler, - EndNamespaceHandler); + XML_SetNamespaceDeclHandler(parser, StartNamespaceHandler, EndNamespaceHandler); XML_SetCharacterDataHandler(parser, CharacterDataHandler); XML_SetCommentHandler(parser, CommentDataHandler); @@ -215,8 +214,7 @@ std::unique_ptr<XmlResource> Inflate(std::istream* in, IDiagnostics* diag, break; } - if (XML_Parse(parser, buffer, in->gcount(), in->eof()) == - XML_STATUS_ERROR) { + if (XML_Parse(parser, buffer, in->gcount(), in->eof()) == XML_STATUS_ERROR) { stack.root = {}; diag->Error(DiagMessage(source.WithLine(XML_GetCurrentLineNumber(parser))) << XML_ErrorString(XML_GetErrorCode(parser))); @@ -226,13 +224,12 @@ std::unique_ptr<XmlResource> Inflate(std::istream* in, IDiagnostics* diag, XML_ParserFree(parser); if (stack.root) { - return util::make_unique<XmlResource>(ResourceFile{{}, {}, source}, - std::move(stack.root)); + return util::make_unique<XmlResource>(ResourceFile{{}, {}, source}, std::move(stack.root)); } return {}; } -static void CopyAttributes(Element* el, android::ResXMLParser* parser) { +static void CopyAttributes(Element* el, android::ResXMLParser* parser, StringPool* out_pool) { const size_t attr_count = parser->getAttributeCount(); if (attr_count > 0) { el->attributes.reserve(attr_count); @@ -253,18 +250,26 @@ static void CopyAttributes(Element* el, android::ResXMLParser* parser) { if (str16) { attr.value = util::Utf16ToUtf8(StringPiece16(str16, len)); } + + android::Res_value res_value; + if (parser->getAttributeValue(i, &res_value) > 0) { + attr.compiled_value = ResourceUtils::ParseBinaryResValue( + ResourceType::kAnim, {}, parser->getStrings(), res_value, out_pool); + } + el->attributes.push_back(std::move(attr)); } } } -std::unique_ptr<XmlResource> Inflate(const void* data, size_t data_len, - IDiagnostics* diag, const Source& source) { +std::unique_ptr<XmlResource> Inflate(const void* data, size_t data_len, IDiagnostics* diag, + const Source& source) { // We import the android namespace because on Windows NO_ERROR is a macro, not // an enum, which // causes errors when qualifying it with android:: using namespace android; + StringPool string_pool; std::unique_ptr<Node> root; std::stack<Node*> node_stack; @@ -307,7 +312,7 @@ std::unique_ptr<XmlResource> Inflate(const void* data, size_t data_len, node->name = util::Utf16ToUtf8(StringPiece16(str16, len)); } - CopyAttributes(node.get(), &tree); + CopyAttributes(node.get(), &tree, &string_pool); new_node = std::move(node); break; @@ -352,7 +357,7 @@ std::unique_ptr<XmlResource> Inflate(const void* data, size_t data_len, } } } - return util::make_unique<XmlResource>(ResourceFile{}, std::move(root)); + return util::make_unique<XmlResource>(ResourceFile{}, std::move(root), std::move(string_pool)); } std::unique_ptr<Node> Namespace::Clone() { diff --git a/tools/aapt2/xml/XmlDom.h b/tools/aapt2/xml/XmlDom.h index 90cdfb6932b1..f1d0953c5494 100644 --- a/tools/aapt2/xml/XmlDom.h +++ b/tools/aapt2/xml/XmlDom.h @@ -129,21 +129,21 @@ class XmlResource { public: ResourceFile file; std::unique_ptr<xml::Node> root; + StringPool string_pool; }; /** * Inflates an XML DOM from a text stream, logging errors to the logger. * Returns the root node on success, or nullptr on failure. */ -std::unique_ptr<XmlResource> Inflate(std::istream* in, IDiagnostics* diag, - const Source& source); +std::unique_ptr<XmlResource> Inflate(std::istream* in, IDiagnostics* diag, const Source& source); /** * Inflates an XML DOM from a binary ResXMLTree, logging errors to the logger. * Returns the root node on success, or nullptr on failure. */ -std::unique_ptr<XmlResource> Inflate(const void* data, size_t data_len, - IDiagnostics* diag, const Source& source); +std::unique_ptr<XmlResource> Inflate(const void* data, size_t data_len, IDiagnostics* diag, + const Source& source); Element* FindRootElement(XmlResource* doc); Element* FindRootElement(Node* node); diff --git a/tools/fonts/fontchain_lint.py b/tools/fonts/fontchain_lint.py index baee21c315d6..f5b904220f76 100755 --- a/tools/fonts/fontchain_lint.py +++ b/tools/fonts/fontchain_lint.py @@ -126,7 +126,10 @@ def get_emoji_map(font): # Add GSUB rules ttfont = open_font(font) for lookup in ttfont['GSUB'].table.LookupList.Lookup: - assert lookup.LookupType == 4, 'We only understand type 4 lookups' + if lookup.LookupType != 4: + # Other lookups are used in the emoji font for fallback. + # We ignore them for now. + continue for subtable in lookup.SubTable: ligatures = subtable.ligatures for first_glyph in ligatures: @@ -385,7 +388,7 @@ def parse_unicode_datafile(file_path, reverse=False): return output_dict -def parse_standardized_variants(file_path): +def parse_emoji_variants(file_path): emoji_set = set() text_set = set() with open(file_path) as datafile: @@ -420,8 +423,8 @@ def parse_ucd(ucd_path): _chars_by_age = parse_unicode_datafile( path.join(ucd_path, 'DerivedAge.txt'), reverse=True) - sequences = parse_standardized_variants( - path.join(ucd_path, 'StandardizedVariants.txt')) + sequences = parse_emoji_variants( + path.join(ucd_path, 'emoji-variation-sequences.txt')) _text_variation_sequences, _emoji_variation_sequences = sequences _emoji_sequences = parse_unicode_datafile( path.join(ucd_path, 'emoji-sequences.txt')) @@ -442,8 +445,7 @@ UNSUPPORTED_FLAGS = frozenset({ flag_sequence('GF'), flag_sequence('GP'), flag_sequence('GS'), flag_sequence('MF'), flag_sequence('MQ'), flag_sequence('NC'), flag_sequence('PM'), flag_sequence('RE'), flag_sequence('TF'), - flag_sequence('UN'), flag_sequence('WF'), flag_sequence('XK'), - flag_sequence('YT'), + flag_sequence('WF'), flag_sequence('XK'), flag_sequence('YT'), }) EQUIVALENT_FLAGS = { @@ -489,6 +491,55 @@ ZWJ_IDENTICALS = { (0x1F468, 0x200D, 0x1F469, 0x200D, 0x1F466): 0x1F46A, } +ZWJ = 0x200D +FEMALE_SIGN = 0x2640 +MALE_SIGN = 0x2642 + +GENDER_DEFAULTS = [ + (0x26F9, MALE_SIGN), # PERSON WITH BALL + (0x1F3C3, MALE_SIGN), # RUNNER + (0x1F3C4, MALE_SIGN), # SURFER + (0x1F3CA, MALE_SIGN), # SWIMMER + (0x1F3CB, MALE_SIGN), # WEIGHT LIFTER + (0x1F3CC, MALE_SIGN), # GOLFER + (0x1F46E, MALE_SIGN), # POLICE OFFICER + (0x1F46F, FEMALE_SIGN), # WOMAN WITH BUNNY EARS + (0x1F471, MALE_SIGN), # PERSON WITH BLOND HAIR + (0x1F473, MALE_SIGN), # MAN WITH TURBAN + (0x1F477, MALE_SIGN), # CONSTRUCTION WORKER + (0x1F481, FEMALE_SIGN), # INFORMATION DESK PERSON + (0x1F482, MALE_SIGN), # GUARDSMAN + (0x1F486, FEMALE_SIGN), # FACE MASSAGE + (0x1F487, FEMALE_SIGN), # HAIRCUT + (0x1F575, MALE_SIGN), # SLEUTH OR SPY + (0x1F645, FEMALE_SIGN), # FACE WITH NO GOOD GESTURE + (0x1F646, FEMALE_SIGN), # FACE WITH OK GESTURE + (0x1F647, MALE_SIGN), # PERSON BOWING DEEPLY + (0x1F64B, FEMALE_SIGN), # HAPPY PERSON RAISING ONE HAND + (0x1F64D, FEMALE_SIGN), # PERSON FROWNING + (0x1F64E, FEMALE_SIGN), # PERSON WITH POUTING FACE + (0x1F6A3, MALE_SIGN), # ROWBOAT + (0x1F6B4, MALE_SIGN), # BICYCLIST + (0x1F6B5, MALE_SIGN), # MOUNTAIN BICYCLIST + (0x1F6B6, MALE_SIGN), # PEDESTRIAN + (0x1F926, FEMALE_SIGN), # FACE PALM + (0x1F937, FEMALE_SIGN), # SHRUG + (0x1F938, MALE_SIGN), # PERSON DOING CARTWHEEL + (0x1F939, MALE_SIGN), # JUGGLING + (0x1F93C, MALE_SIGN), # WRESTLERS + (0x1F93D, MALE_SIGN), # WATER POLO + (0x1F93E, MALE_SIGN), # HANDBALL + (0x1F9D6, FEMALE_SIGN), # PERSON IN STEAMY ROOM + (0x1F9D7, FEMALE_SIGN), # PERSON CLIMBING + (0x1F9D8, FEMALE_SIGN), # PERSON IN LOTUS POSITION + (0x1F9D9, FEMALE_SIGN), # MAGE + (0x1F9DA, FEMALE_SIGN), # FAIRY + (0x1F9DB, FEMALE_SIGN), # VAMPIRE + (0x1F9DC, FEMALE_SIGN), # MERPERSON + (0x1F9DD, FEMALE_SIGN), # ELF + (0x1F9DE, FEMALE_SIGN), # GENIE + (0x1F9DF, FEMALE_SIGN), # ZOMBIE +] def is_fitzpatrick_modifier(cp): return 0x1F3FB <= cp <= 0x1F3FF @@ -514,10 +565,20 @@ def compute_expected_emoji(): adjusted_emoji_zwj_sequences = dict(_emoji_zwj_sequences) adjusted_emoji_zwj_sequences.update(_emoji_zwj_sequences) + # Add empty flag tag sequence that is supported as fallback + _emoji_sequences[(0x1F3F4, 0xE007F)] = 'Emoji_Tag_Sequence' + for sequence in _emoji_sequences.keys(): sequence = tuple(ch for ch in sequence if ch != EMOJI_VS) all_sequences.add(sequence) sequence_pieces.update(sequence) + if _emoji_sequences.get(sequence, None) == 'Emoji_Tag_Sequence': + # Add reverse of all emoji ZWJ sequences, which are added to the fonts + # as a workaround to get the sequences work in RTL text. + # TODO: test if these are actually needed by Minikin/HarfBuzz. + reversed_seq = reverse_emoji(sequence) + all_sequences.add(reversed_seq) + equivalent_emoji[reversed_seq] = sequence for sequence in adjusted_emoji_zwj_sequences.keys(): sequence = tuple(ch for ch in sequence if ch != EMOJI_VS) @@ -529,13 +590,12 @@ def compute_expected_emoji(): all_sequences.add(reversed_seq) equivalent_emoji[reversed_seq] = sequence - # Add all two-letter flag sequences, as even the unsupported ones should - # resolve to a flag tofu. - all_letters = [chr(code) for code in range(ord('A'), ord('Z')+1)] - all_two_letter_codes = itertools.product(all_letters, repeat=2) - all_flags = {flag_sequence(code) for code in all_two_letter_codes} - all_sequences.update(all_flags) - tofu_flags = UNSUPPORTED_FLAGS | (all_flags - set(_emoji_sequences.keys())) + # Remove unsupported flags + all_sequences.difference_update(UNSUPPORTED_FLAGS) + + # Add all tag characters used in flags + sequence_pieces.update(range(0xE0030, 0xE0039 + 1)) + sequence_pieces.update(range(0xE0061, 0xE007A + 1)) all_emoji = ( _emoji_properties['Emoji'] | @@ -547,13 +607,17 @@ def compute_expected_emoji(): all_sequences | set(LEGACY_ANDROID_EMOJI.keys())) - first_tofu_flag = sorted(tofu_flags)[0] - for flag in tofu_flags: - if flag != first_tofu_flag: - equivalent_emoji[flag] = first_tofu_flag equivalent_emoji.update(EQUIVALENT_FLAGS) equivalent_emoji.update(LEGACY_ANDROID_EMOJI) equivalent_emoji.update(ZWJ_IDENTICALS) + + for ch, gender in GENDER_DEFAULTS: + equivalent_emoji[(ch, ZWJ, gender)] = ch + for skin_tone in range(0x1F3FB, 0x1F3FF+1): + skin_toned = (ch, skin_tone, ZWJ, gender) + if skin_toned in all_emoji: + equivalent_emoji[skin_toned] = (ch, skin_tone) + for seq in _emoji_variation_sequences: equivalent_emoji[seq] = seq[0] diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index f87f6c53c8dc..29c933ac7e75 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -36,20 +36,18 @@ built_core_classes := $(call java-lib-files,core-libart) built_ext_dep := $(call java-lib-deps,ext) built_ext_classes := $(call java-lib-files,ext) -built_ext_data := $(call intermediates-dir-for, \ - JAVA_LIBRARIES,ext,,COMMON)/javalib.jar + built_icudata_dep := $(call java-lib-deps,icu4j-icudata-host-jarjar,HOST) built_icutzdata_dep := $(call java-lib-deps,icu4j-icutzdata-host-jarjar,HOST) -built_layoutlib_create_jar := $(call intermediates-dir-for, \ - JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar +built_layoutlib_create_jar := $(call java-lib-files,layoutlib_create,HOST) # This is mostly a copy of config/host_java_library.mk LOCAL_MODULE := temp_layoutlib LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX) LOCAL_IS_HOST_MODULE := true -LOCAL_BUILT_MODULE_STEM := javalib.jar +LOCAL_BUILT_MODULE_STEM := classes.jar ####################################### include $(BUILD_SYSTEM)/base_rules.mk @@ -59,7 +57,6 @@ $(LOCAL_BUILT_MODULE): $(built_oj_dep) \ $(built_core_dep) \ $(built_framework_dep) \ $(built_ext_dep) \ - $(built_ext_data) \ $(built_icudata_dep) \ $(built_icutzdata_dep) \ $(built_layoutlib_create_jar) |